From 694dbfc1f521d6fbddc4496c35dc15bb33bdd354 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Tue, 7 Jun 2022 09:21:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=BA=93bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/device/TestController.java | 43 +++++++++++++++++++ .../service/DataSync/DeviceSyncService.java | 14 ++++-- .../udidl/admin/thread/UdiTransferUtils.java | 3 -- .../main/resources/application-dev.properties | 6 +-- 4 files changed, 56 insertions(+), 10 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/controller/device/TestController.java b/api-admin/src/main/java/com/glxp/udidl/admin/controller/device/TestController.java index a5d0297..df5a240 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/controller/device/TestController.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/controller/device/TestController.java @@ -2,8 +2,13 @@ package com.glxp.udidl.admin.controller.device; import com.alibaba.fastjson.JSONObject; import com.glxp.udidl.admin.dao.udi.ProductInfoDao; +import com.glxp.udidl.admin.entity.udi.ProductInfoEntity; +import com.glxp.udidl.admin.entity.udi.UdiCompanyEntity; +import com.glxp.udidl.admin.entity.udid.Contactlist; import com.glxp.udidl.admin.entity.udid.Device; import com.glxp.udidl.admin.req.ListPageRequest; +import com.glxp.udidl.admin.req.ProductInfoFilterRequest; +import com.glxp.udidl.admin.req.UdiCompanyRequest; import com.glxp.udidl.admin.service.DataSync.DeviceSyncService; import com.glxp.udidl.admin.service.DataSync.UdplatDownloadService; import com.glxp.udidl.admin.service.DataSync.UdplatSyncService; @@ -23,6 +28,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.Date; import java.util.List; @RestController @@ -150,4 +156,41 @@ public class TestController { public JSONObject getDistributeOrderDetails(Long orderId) { return udplatDownloadService.getDistributeOrderDetails(orderId); } + + + @GetMapping("/test/transferUdiCompany") + public BaseResponse transferUdiCompany(String nameCode) { + //更新为最新版本 + ProductInfoFilterRequest filterRequest1 = new ProductInfoFilterRequest(); + filterRequest1.setNameCode(nameCode); + List updateEntitys = productInfoService.filterUdi(filterRequest1); + ProductInfoEntity productInfoEntity; + if (updateEntitys != null && updateEntitys.size() > 0) { + //获取最高版本号 + productInfoEntity = updateEntitys.get(0); + //更新厂家信息， + UdiCompanyRequest udiCompanyRequest = new UdiCompanyRequest(); + udiCompanyRequest.setTyshxydm(productInfoEntity.getTyshxydm()); + List udiCompanyEntitys = udiCompanyService.filterUdiCompany(udiCompanyRequest); + if (udiCompanyEntitys == null || udiCompanyEntitys.size() == 0) { + UdiCompanyEntity udiCompanyEntity = new UdiCompanyEntity(); + udiCompanyEntity.setTyshxydm(productInfoEntity.getTyshxydm()); + udiCompanyEntity.setUpdateTime(new Date()); + udiCompanyEntity.setYlqxzcrbarywmc(productInfoEntity.getYlqxzcrbarywmc()); + udiCompanyEntity.setYlqxzcrbarmc(productInfoEntity.getYlqxzcrbarmc()); + List contactlists = udiCompanyService.selectContactBykey(productInfoEntity.getDeviceRecordKey()); + if (contactlists != null && contactlists.size() > 0) { + udiCompanyEntity.setQylxrcz(contactlists.get(0).getQylxrcz()); + udiCompanyEntity.setQylxrdh(contactlists.get(0).getQylxrdh()); + udiCompanyEntity.setQylxryx(contactlists.get(0).getQylxryx()); + } + udiCompanyEntity.setUpdateTime(new Date()); + udiCompanyService.insertUdiCompany(udiCompanyEntity); + return ResultVOUtils.success(udiCompanyEntity); + } + + } + return ResultVOUtils.error(500, "未查询到数据"); + } + } diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/service/DataSync/DeviceSyncService.java b/api-admin/src/main/java/com/glxp/udidl/admin/service/DataSync/DeviceSyncService.java index 268329b..9a80d5a 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/service/DataSync/DeviceSyncService.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/service/DataSync/DeviceSyncService.java @@ -185,10 +185,16 @@ public class DeviceSyncService { DataSetSingleResult result1 = deviceDownloadService.downloadByDi(deviceId); if (result1.getReturnCode() != 1) return ResultVOUtils.error(-1, result1.getReturnMsg()); - List dataSets = new ArrayList<>(); - dataSets.add(result1.getDataSet()); - deviceSaveService.DeviceSave(dataSets, new Date()); - productInfoEntityList = productInfoService.findAll(productInfoFilterRequest); + + if(CollUtil.isNotEmpty(result1.getDataSet().getDeviceInfo()) ){ + List dataSets = new ArrayList<>(); + dataSets.add(result1.getDataSet()); + deviceSaveService.DeviceSave(dataSets, new Date()); + productInfoEntityList = productInfoService.findAll(productInfoFilterRequest); + }else { + return ResultVOUtils.error(501,"医疗器械唯一标识数据库未找到此产品DI,请检查是否输入正确或联系厂家是否已上传"); + } + } return ResultVOUtils.success(productInfoEntityList); } diff --git a/api-admin/src/main/java/com/glxp/udidl/admin/thread/UdiTransferUtils.java b/api-admin/src/main/java/com/glxp/udidl/admin/thread/UdiTransferUtils.java index a1465fe..a955353 100644 --- a/api-admin/src/main/java/com/glxp/udidl/admin/thread/UdiTransferUtils.java +++ b/api-admin/src/main/java/com/glxp/udidl/admin/thread/UdiTransferUtils.java @@ -181,9 +181,6 @@ public class UdiTransferUtils { update.setUpdateTime(new Date()); productInfoService.updateProductInfo(update); } -// updateEntity.setIsNewest(true); -// updateEntity.setUpdateTime(new Date()); -// productInfoService.updateProductInfo(updateEntity); } //更新厂家信息， diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties index de35311..aefb9c2 100644 --- a/api-admin/src/main/resources/application-dev.properties +++ b/api-admin/src/main/resources/application-dev.properties @@ -3,8 +3,8 @@ server.port=9994 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udidl_test?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root -spring.datasource.password=mysql@2020 -#spring.datasource.password=123456 +#spring.datasource.password=mysql@2020 +spring.datasource.password=123456 server.servlet.context-path= logging.level.com.glxp.udidl.admin.dao=debug # 跨域设置 @@ -14,7 +14,7 @@ cors.allowed-methods=GET,POST,OPTIONS #mips服务地址 UDIC_MIPSDOWNLOAD_URL = http://127.0.0.1:8080/UDIC_MIPSDL_Server #UDIC_MIPSDOWNLOAD_URL=http://127.0.0.1:9997 -config.downloadPath=E:/temp +config.downloadPath=D:/temp config.openAuth=false spring.servlet.multipart.max-file-size=100MB spring.servlet.multipart.max-request-size=1000MB