From fedfdf1bf47214a04ab4548282ec521d8b204f7e Mon Sep 17 00:00:00 2001
From: anthonyywj2 <353682448@qq.com>
Date: Sun, 20 Nov 2022 16:12:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96UDI=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/device/UdidlDeviceController.java   | 14 +-------------
 .../admin/service/dataSync/DeviceSaveService.java  |  7 ++++++-
 src/main/resources/application-dev.yml             |  4 ++--
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/glxp/udidl/admin/controller/device/UdidlDeviceController.java b/src/main/java/com/glxp/udidl/admin/controller/device/UdidlDeviceController.java
index 45b6164..1346d86 100644
--- a/src/main/java/com/glxp/udidl/admin/controller/device/UdidlDeviceController.java
+++ b/src/main/java/com/glxp/udidl/admin/controller/device/UdidlDeviceController.java
@@ -62,7 +62,7 @@ public class UdidlDeviceController {
     @ApiImplicitParam(name = "day", value = "指定日期", required = true, dataType = "String")
     @AuthRuleAnnotation("udidl/device/dlByDay")
     @GetMapping("udidl/device/dlByDay")
-    public BaseResponse dlByDay(String day, String jobId) {
+    public BaseResponse dlByDay(String day, String jobId)  {
         logger.info(day + "---按天开启下载");
 
         if (jobId != null) {
@@ -113,7 +113,6 @@ public class UdidlDeviceController {
     }
 
 
-    //todo 补全返回参数说明
     @ApiOperation(value = "下载指定标识的设备信息", response = DataSetSingleHistoryResult.class)
     @ApiImplicitParam(name = "deviceId", value = "设备ID", required = true, dataType = "String")
     @AuthRuleAnnotation("udidl/device/dlByDi")
@@ -136,12 +135,6 @@ public class UdidlDeviceController {
     }
 
 
-    /**
-     * 获取产品标识详情
-     *
-     * @param deviceId
-     * @return
-     */
     @ApiOperation(value = "下载单个产品详情", response = DeviceEntity.class)
     @ApiImplicitParam(name = "deviceId", value = "医疗器械设备ID", required = true, dataType = "String")
     @AuthRuleAnnotation("udidl/device/downloadSingle")
@@ -172,11 +165,6 @@ public class UdidlDeviceController {
     }
 
 
-    /**
-     * 下载医疗器械信息
-     *
-     * @return
-     */
     @ApiOperation(value = "下载国家库产品数据", response = BaseResponse.class)
     @AuthRuleAnnotation("")
     @PostMapping("udidl/device/downloadUdiData")
diff --git a/src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceSaveService.java b/src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceSaveService.java
index a0a1d57..7fd0a3e 100644
--- a/src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceSaveService.java
+++ b/src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceSaveService.java
@@ -44,8 +44,14 @@ public class DeviceSaveService {
 
             for (DataSetResult.DeviceInfo item : ds.getDeviceInfo()) {
                 //1:判断数据是否存在
+                //1.1:正常更新时，若存在相同版本号则跳过
                 if (StrUtil.isNotEmpty(deviceService.selectDiIsSame(item.getZxxsdycpbs(), item.getVersionNumber() + "")))
                     continue;
+
+                //1.2:手动下载更新时
+
+
+                //2,存储 deviceInfo
                 Device device = responseToDevice(item);
                 String uuid = getUUId();
                 Boolean isHistory = false;
@@ -55,7 +61,6 @@ public class DeviceSaveService {
                 device.setUuid(uuid);
                 if (requestDate != null)
                     device.setRequestDate(requestDate);
-                //2,存储 deviceInfo
                 deviceService.insertDevice(device);
                 result++;
                 //3,存储ContactList
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 555e15d..ad40489 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -4,9 +4,9 @@ spring:
       matching-strategy: ant_path_matcher
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.0.66:3360/udidl_test?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://127.0.0.1:3306/udidl_test?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: root
+    password: 123456
     hikari:
       pool-name: udidl
       connection-timeout: 100000 #设置等待超时时间为10秒