From e941d115d1af60b2db9628ecad7d57b5e2af11fd Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 12 Apr 2023 15:49:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=AE=B6=E5=BA=93=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=EF=BC=8C=E6=97=A0=E6=B3=95=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=AD=90=E7=BA=A7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/device/TestController.java | 45 +++- .../admin/dao/udi/ProductInfoMapper.java | 3 + .../service/dataSync/DeviceSaveService.java | 226 +++++++++--------- .../service/dataSync/DeviceSyncService.java | 21 +- .../mybatis/mapper/udi/ProductInfoMapper.xml | 155 ++++++------ 5 files changed, 256 insertions(+), 194 deletions(-) diff --git a/src/main/java/com/glxp/udidl/admin/controller/device/TestController.java b/src/main/java/com/glxp/udidl/admin/controller/device/TestController.java index 4ed7472..7c46a7e 100644 --- a/src/main/java/com/glxp/udidl/admin/controller/device/TestController.java +++ b/src/main/java/com/glxp/udidl/admin/controller/device/TestController.java @@ -2,6 +2,7 @@ package com.glxp.udidl.admin.controller.device; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; +import com.glxp.udidl.admin.constant.Constant; import com.glxp.udidl.admin.dao.udi.ProductInfoMapper; import com.glxp.udidl.admin.entity.udi.ProductInfoEntity; import com.glxp.udidl.admin.entity.udi.UdiCompanyEntity; @@ -11,13 +12,14 @@ 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.res.BaseResponse; -import com.glxp.udidl.admin.service.dataSync.DeviceSyncService; -import com.glxp.udidl.admin.service.dataSync.UdplatDownloadService; -import com.glxp.udidl.admin.service.dataSync.UdplatSyncService; +import com.glxp.udidl.admin.res.udid.DataSetResult; +import com.glxp.udidl.admin.res.udid.DataSetSingleResult; +import com.glxp.udidl.admin.service.dataSync.*; import com.glxp.udidl.admin.service.inout.DeviceService; import com.glxp.udidl.admin.service.inout.ProductInfoService; import com.glxp.udidl.admin.service.udi.UdiCompanyService; import com.glxp.udidl.admin.thread.UdiTransferUtils; +import com.glxp.udidl.admin.util.RedisUtil; import com.glxp.udidl.admin.util.ResultVOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,6 +31,7 @@ import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -169,4 +172,40 @@ public class TestController { return ResultVOUtils.error(500, "未查询到数据"); } + @Resource + private DeviceDownloadService deviceDownloadService; + @Resource + private DeviceSaveService deviceSaveService; + @Resource + RedisUtil redisUtil; + + @GetMapping("udidl/device/updateDi") + public BaseResponse updateDi(ListPageRequest listPageRequest) { + List keys = productInfoDao.findAllNameCodes(listPageRequest); + int index = listPageRequest.getPage(); + for (String key : keys) { + index++; + if (key.length() != 14) + continue; + DataSetSingleResult res = null; + try { + Thread.sleep(5 * 1000); + res = deviceDownloadService.downloadByDi(key); + if (res.getReturnCode() != 1) { + return ResultVOUtils.error(-1, res.getReturnMsg()); + } + List dataSets = new ArrayList<>(); + dataSets.add(res.getDataSet()); + int insertCount = deviceSaveService.DeviceSave(dataSets, new Date(), Constant.DL_TYPE_UPDATE); + } catch (Exception e) { + e.printStackTrace(); + redisUtil.set("updateDLLastCount", index + ""); + return ResultVOUtils.error(500, res.getReturnMsg()); + } + redisUtil.set("updateDLLastCount", index + ""); + logger.info(listPageRequest.getPage() + "---" + listPageRequest.getLimit() + "----" + index); + } + return ResultVOUtils.success("总数=" + keys.size() + "\n"); + } + } diff --git a/src/main/java/com/glxp/udidl/admin/dao/udi/ProductInfoMapper.java b/src/main/java/com/glxp/udidl/admin/dao/udi/ProductInfoMapper.java index 56ae1d5..b90d00b 100644 --- a/src/main/java/com/glxp/udidl/admin/dao/udi/ProductInfoMapper.java +++ b/src/main/java/com/glxp/udidl/admin/dao/udi/ProductInfoMapper.java @@ -37,6 +37,9 @@ public interface ProductInfoMapper extends BaseMapper { List findAllUuids(ListPageRequest listPageRequest); + List findAllNameCodes(ListPageRequest listPageRequest); + + List selectByUuid(@Param("uuid") String uuid); List filterUdi(ProductInfoFilterRequest productInfoFilterRequest); 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 6bf4780..5010810 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 @@ -47,140 +47,140 @@ public class DeviceSaveService { List ClinicalInfoAll = ds.getClinicalInfo(); List storageInfoAll = ds.getStorageInfo(); List packingInfoAll = ds.getPackingInfo(); + if (ds.getDeviceInfo() != null) + for (DataSetResult.DeviceInfo item : ds.getDeviceInfo()) { - for (DataSetResult.DeviceInfo item : ds.getDeviceInfo()) { - - //1:判断数据是否存在 - String uuid = null; - Device originDevice = deviceService.selectDiIsSame(item.getZxxsdycpbs(), item.getVersionNumber() + ""); - if (dlType == Constant.DL_TYPE_ADD) { - if (originDevice != null) - continue; - } + //1:判断数据是否存在 + String uuid = null; + Device originDevice = deviceService.selectDiIsSame(item.getZxxsdycpbs(), item.getVersionNumber() + ""); + if (dlType == Constant.DL_TYPE_ADD) { + if (originDevice != null) + continue; + } - //2,存储 deviceInfo - Device device = responseToDevice(item); - Boolean isHistory = false; - if (item.getDeviceHistoryKey() != null && !item.getDeviceHistoryKey().isEmpty()) { - isHistory = true; - } + //2,存储 deviceInfo + Device device = responseToDevice(item); + Boolean isHistory = false; + if (item.getDeviceHistoryKey() != null && !item.getDeviceHistoryKey().isEmpty()) { + isHistory = true; + } - if (requestDate != null) - device.setRequestDate(requestDate); + if (requestDate != null) + device.setRequestDate(requestDate); - //2.1 判断更新或者新增 - if (dlType == Constant.DL_TYPE_ADD || originDevice == null) { - uuid = getUUId(); - device.setUuid(uuid); - deviceService.insertDevice(device); - } else { - //2.2 判断字段是否与原来的一致，若不一致则更新 - if (!device.equals(originDevice)) { - uuid = originDevice.getUuid(); + //2.1 判断更新或者新增 + if (dlType == Constant.DL_TYPE_ADD || originDevice == null) { + uuid = getUUId(); device.setUuid(uuid); - deviceService.updateDevice(device); - } else { //，若一致则跳过 + deviceService.insertDevice(device); + } else { + //2.2 判断字段是否与原来的一致，若不一致则更新 + if (!device.equals(originDevice)) { + uuid = originDevice.getUuid(); + device.setUuid(uuid); + deviceService.updateDevice(device); + } else { //，若一致则跳过 // uuid = getUUId(); // device.setUuid(uuid); // deviceService.insertDevice(device); - continue; - } - } - result++; - //3,存储ContactList - List contactInfos = item.getContactList(); - if (contactInfos != null && contactInfos.size() > 0) { - List contactlistList = new ArrayList<>(); - for (DataSetResult.ContactInfo contactInfo : contactInfos) { - Contactlist contactlist = responseToContactlist(contactInfo); - contactlist.setDevicerecordkey(device.getDevicerecordkey()); - contactlist.setUuid(uuid); - contactlistList.add(contactlist); + continue; + } } - deviceService.deleteClinicalByUuid(uuid); - deviceService.insertContactlist(contactlistList); - } - //4,存储 Deviceclinical - if (ClinicalInfoAll != null && ClinicalInfoAll.size() > 0) { - List deviceclinicals; - if (isHistory == true) - deviceclinicals = ClinicalInfoAll.stream().filter(p -> p.getDeviceHistoryKey().equals(item.getDeviceHistoryKey())). - collect(Collectors.toList()); - else - deviceclinicals = ClinicalInfoAll.stream().filter(p -> p.getDeviceRecordKey().equals(item.getDeviceRecordKey())). - collect(Collectors.toList()); - List deviceclinicalList = new ArrayList<>(); - if (deviceclinicals != null && deviceclinicals.size() > 0) { - for (DataSetResult.ClinicalInfo deviceClinical : deviceclinicals) { - Deviceclinical deviceclinical = responseToDeviceclinical(deviceClinical); - if (isHistory == true) - deviceclinical.setDevicerecordkey(item.getDeviceHistoryKey()); - else - deviceclinical.setDevicerecordkey(device.getDevicerecordkey()); - deviceclinical.setUuid(uuid); - deviceclinicalList.add(deviceclinical); + result++; + //3,存储ContactList + List contactInfos = item.getContactList(); + if (contactInfos != null && contactInfos.size() > 0) { + List contactlistList = new ArrayList<>(); + for (DataSetResult.ContactInfo contactInfo : contactInfos) { + Contactlist contactlist = responseToContactlist(contactInfo); + contactlist.setDevicerecordkey(device.getDevicerecordkey()); + contactlist.setUuid(uuid); + contactlistList.add(contactlist); } deviceService.deleteClinicalByUuid(uuid); - deviceService.insertDeviceClinical(deviceclinicalList); + deviceService.insertContactlist(contactlistList); } - } - - //5 存储 Devicestorage - if (storageInfoAll != null && storageInfoAll.size() > 0) { - List storageInfos; - if (isHistory == true) - storageInfos = storageInfoAll.stream().filter(p -> p.getDeviceHistoryKey().equals(item.getDeviceHistoryKey())). - collect(Collectors.toList()); - else - storageInfos = storageInfoAll.stream().filter(p -> p.getDeviceRecordKey().equals(item.getDeviceRecordKey())). - collect(Collectors.toList()); - if (storageInfos != null && storageInfos.size() > 0) { - List devicestorageList = new ArrayList<>(); - for (DataSetResult.StorageInfo storageInfo : storageInfos) { - Devicestorage devicestorage = responseToDevicestorage(storageInfo); - if (isHistory == true) - devicestorage.setDevicerecordkey(item.getDeviceHistoryKey()); - else - devicestorage.setDevicerecordkey(device.getDevicerecordkey()); - devicestorage.setUuid(uuid); - devicestorageList.add(devicestorage); + //4,存储 Deviceclinical + if (ClinicalInfoAll != null && ClinicalInfoAll.size() > 0) { + List deviceclinicals; + if (isHistory == true) + deviceclinicals = ClinicalInfoAll.stream().filter(p -> p.getDeviceHistoryKey().equals(item.getDeviceHistoryKey())). + collect(Collectors.toList()); + else + deviceclinicals = ClinicalInfoAll.stream().filter(p -> p.getDeviceRecordKey().equals(item.getDeviceRecordKey())). + collect(Collectors.toList()); + List deviceclinicalList = new ArrayList<>(); + if (deviceclinicals != null && deviceclinicals.size() > 0) { + for (DataSetResult.ClinicalInfo deviceClinical : deviceclinicals) { + Deviceclinical deviceclinical = responseToDeviceclinical(deviceClinical); + if (isHistory == true) + deviceclinical.setDevicerecordkey(item.getDeviceHistoryKey()); + else + deviceclinical.setDevicerecordkey(device.getDevicerecordkey()); + deviceclinical.setUuid(uuid); + deviceclinicalList.add(deviceclinical); + } + deviceService.deleteClinicalByUuid(uuid); + deviceService.insertDeviceClinical(deviceclinicalList); } - deviceService.deleteStorageByUuid(uuid); - deviceService.insertDevicestorage(devicestorageList); } - } + //5 存储 Devicestorage + if (storageInfoAll != null && storageInfoAll.size() > 0) { + List storageInfos; + if (isHistory == true) + storageInfos = storageInfoAll.stream().filter(p -> p.getDeviceHistoryKey().equals(item.getDeviceHistoryKey())). + collect(Collectors.toList()); + else + storageInfos = storageInfoAll.stream().filter(p -> p.getDeviceRecordKey().equals(item.getDeviceRecordKey())). + collect(Collectors.toList()); + if (storageInfos != null && storageInfos.size() > 0) { + List devicestorageList = new ArrayList<>(); + for (DataSetResult.StorageInfo storageInfo : storageInfos) { + Devicestorage devicestorage = responseToDevicestorage(storageInfo); + if (isHistory == true) + devicestorage.setDevicerecordkey(item.getDeviceHistoryKey()); + else + devicestorage.setDevicerecordkey(device.getDevicerecordkey()); + devicestorage.setUuid(uuid); + devicestorageList.add(devicestorage); + } + deviceService.deleteStorageByUuid(uuid); + deviceService.insertDevicestorage(devicestorageList); + } - //6 存储Devicepackage - if (packingInfoAll != null && packingInfoAll.size() > 0) { - List packingInfos; - if (isHistory == true) - packingInfos = packingInfoAll.stream().filter(p -> p.getDeviceHistoryKey().equals(item.getDeviceHistoryKey())). - collect(Collectors.toList()); - else - packingInfos = packingInfoAll.stream().filter(p -> p.getDeviceRecordKey().equals(item.getDeviceRecordKey())). - collect(Collectors.toList()); - if (packingInfos != null && packingInfos.size() > 0) { - List devicepackageList = new ArrayList<>(); - for (DataSetResult.PackingInfo packingInfo : packingInfos) { - Devicepackage devicepackage = responseToDevicepackage(packingInfo); - if (isHistory == true) - devicepackage.setDevicerecordkey(item.getDeviceHistoryKey()); - else - devicepackage.setDevicerecordkey(device.getDevicerecordkey()); - devicepackage.setUuid(uuid); - devicepackageList.add(devicepackage); + } + + //6 存储Devicepackage + if (packingInfoAll != null && packingInfoAll.size() > 0) { + List packingInfos; + if (isHistory == true) + packingInfos = packingInfoAll.stream().filter(p -> p.getDeviceHistoryKey().equals(item.getDeviceHistoryKey())). + collect(Collectors.toList()); + else + packingInfos = packingInfoAll.stream().filter(p -> p.getDeviceRecordKey().equals(item.getDeviceRecordKey())). + collect(Collectors.toList()); + if (packingInfos != null && packingInfos.size() > 0) { + List devicepackageList = new ArrayList<>(); + for (DataSetResult.PackingInfo packingInfo : packingInfos) { + Devicepackage devicepackage = responseToDevicepackage(packingInfo); + if (isHistory == true) + devicepackage.setDevicerecordkey(item.getDeviceHistoryKey()); + else + devicepackage.setDevicerecordkey(device.getDevicerecordkey()); + devicepackage.setUuid(uuid); + devicepackageList.add(devicepackage); + } + deviceService.deletePakcageByUuid(uuid); + deviceService.insertDevicepackage(devicepackageList); } - deviceService.deletePakcageByUuid(uuid); - deviceService.insertDevicepackage(devicepackageList); + } + //7存储productInfo信息 + productInfoSave(uuid); } - - //7存储productInfo信息 - productInfoSave(uuid); - } } return result; } diff --git a/src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceSyncService.java b/src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceSyncService.java index eeb4eb7..cf668cb 100644 --- a/src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceSyncService.java +++ b/src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceSyncService.java @@ -25,6 +25,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import javax.annotation.Resource; +import javax.servlet.http.PushBuilder; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -159,9 +160,7 @@ public class DeviceSyncService { } public BaseResponse searchDlByDi(String deviceId) { - ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest(); - productInfoFilterRequest.setNameCode(deviceId); - List productInfoEntityList = productInfoService.findAll(productInfoFilterRequest); + List productInfoEntityList = searchByDI(deviceId); if (CollUtil.isEmpty(productInfoEntityList)) { DataSetSingleResult result1 = deviceDownloadService.downloadByDi(deviceId); if (result1.getReturnCode() != 1) @@ -171,7 +170,7 @@ public class DeviceSyncService { List dataSets = new ArrayList<>(); dataSets.add(result1.getDataSet()); deviceSaveService.DeviceSave(dataSets, new Date(), Constant.DL_TYPE_UPDATE); - productInfoEntityList = productInfoService.findAll(productInfoFilterRequest); + productInfoEntityList = searchByDI(deviceId); } else { return ResultVOUtils.error(501, "医疗器械唯一标识数据库未找到此产品DI,请检查是否输入正确或联系厂家是否已上传"); } @@ -180,6 +179,20 @@ public class DeviceSyncService { return ResultVOUtils.success(productInfoEntityList); } + public List searchByDI(String deviceId) { + ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest(); + productInfoFilterRequest.setNameCode(deviceId); + productInfoFilterRequest.setIsNewest(1); + List productInfoEntityList = productInfoService.findAll(productInfoFilterRequest); + if (CollUtil.isNotEmpty(productInfoEntityList)) { + ProductInfoFilterRequest request = new ProductInfoFilterRequest(); + request.setUuid(productInfoEntityList.get(0).getUuid()); + productInfoEntityList = productInfoService.findAll(request); + } + return productInfoEntityList; + + } + public BaseResponse searchDlByUuid(String uuid) { ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest(); productInfoFilterRequest.setUuid(uuid); diff --git a/src/main/resources/mybatis/mapper/udi/ProductInfoMapper.xml b/src/main/resources/mybatis/mapper/udi/ProductInfoMapper.xml index 54e4776..d2f385e 100644 --- a/src/main/resources/mybatis/mapper/udi/ProductInfoMapper.xml +++ b/src/main/resources/mybatis/mapper/udi/ProductInfoMapper.xml @@ -98,7 +98,7 @@ resultType="com.glxp.udidl.admin.entity.udi.ProductInfoEntity"> select * from productinfo where - uuid in ( + uuid in ( #{item} @@ -116,7 +116,8 @@ select p.uuid from productinfo p - INNER JOIN - (select deviceRecordKey, max(versionNumber) versionNumber - from productinfo + INNER JOIN + (select deviceRecordKey, max(versionNumber) versionNumber + from productinfo @@ -185,8 +186,8 @@ GROUP BY deviceRecordKey) - a on p.deviceRecordKey = a.deviceRecordKey and p.versionNumber = a.versionNumber - group by uuid + a on p.deviceRecordKey = a.deviceRecordKey and p.versionNumber = a.versionNumber + group by uuid + + +