From 34a4b9dfd7e950ccb5b56be7462f8cfb630b77c0 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Mon, 21 Nov 2022 14:30:38 +0800 Subject: [PATCH] =?UTF-8?q?UDI=E6=95=B0=E6=8D=AE=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/udidl/admin/constant/Constant.java | 4 + .../device/UdidlDeviceController.java | 14 +- .../admin/dao/udid/ContactlistMapper.java | 2 + .../udidl/admin/dao/udid/DeviceMapper.java | 2 +- .../admin/dao/udid/DeviceclinicalMapper.java | 2 + .../admin/dao/udid/DevicepackageMapper.java | 2 + .../admin/dao/udid/DevicestorageMapper.java | 2 + .../glxp/udidl/admin/entity/udid/Device.java | 71 ++- .../udidl/admin/req/udid/DeviceRequest.java | 1 + .../dataSync/DeviceDownloadService.java | 7 +- .../service/dataSync/DeviceSaveService.java | 48 +- .../service/dataSync/DeviceSyncService.java | 44 +- .../dataUpdate/DeviceParseService.java | 3 +- .../dataUpdate/DeviceUpdateService.java | 4 - .../admin/service/inout/DeviceService.java | 11 +- .../service/inout/impl/DeviceServiceImpl.java | 31 +- src/main/resources/application-dev.yml | 2 +- src/main/resources/config/redis.setting | 2 +- .../mybatis/mapper/udid/ContactlistMapper.xml | 62 ++- .../mybatis/mapper/udid/DeviceMapper.xml | 78 ++- .../mapper/udid/DeviceclinicalMapper.xml | 7 + .../mapper/udid/DevicepackageMapper.xml | 500 +++++++++--------- .../mapper/udid/DevicestorageMapper.xml | 39 +- .../mybatis/mapper/udid/JobLogMapper.xml | 4 +- 24 files changed, 601 insertions(+), 341 deletions(-) diff --git a/src/main/java/com/glxp/udidl/admin/constant/Constant.java b/src/main/java/com/glxp/udidl/admin/constant/Constant.java index 95cfcd4..c1008dd 100644 --- a/src/main/java/com/glxp/udidl/admin/constant/Constant.java +++ b/src/main/java/com/glxp/udidl/admin/constant/Constant.java @@ -55,5 +55,9 @@ public interface Constant { */ String JOB_TASK_TYPE_UPDATE = "update"; + + int DL_TYPE_ADD = 1; + int DL_TYPE_UPDATE = 2; + } 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 2114f55..87a5c4a 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 @@ -91,13 +91,19 @@ public class UdidlDeviceController { jobLog.setCreateTime(new Date()); jobLog.setType(Constant.LOG_TYPE_INFO); jobLog.setDownloadType(Constant.DOWNLOAD_TYPE_MANUAL); - jobLog.setTaskType(Constant.JOB_TASK_TYPE_DOWNLOAD); + Integer dlType = 1; + if (jobLog.getTaskType() == Constant.JOB_TASK_TYPE_DOWNLOAD) { + dlType = Constant.DL_TYPE_ADD; + } else if (jobLog.getTaskType() == Constant.JOB_TASK_TYPE_DOWNLOAD) { + dlType = Constant.DL_TYPE_UPDATE; + } + jobLogService.update(jobLog); if (StrUtil.isNotEmpty(jobLog.getLastUploadRequest())) { DeviceRequest deviceRequest = JSONUtil.toBean(jobLog.getLastUploadRequest(), DeviceRequest.class); if (deviceRequest != null) { logger.info("继续上一次下载"); - boolean b = deviceDownloadService.getDataAndSave(deviceRequest, jobLog); + boolean b = deviceDownloadService.getDataAndSave(deviceRequest, jobLog, dlType); if (b) { jobLog.setStatus(1); jobLog.setType(Constant.LOG_TYPE_SUCCESS); @@ -150,7 +156,7 @@ public class UdidlDeviceController { @AuthRuleAnnotation("udidl/device/downloadSingle") @PostMapping("udidl/device/downloadSingle") public BaseResponse downloadSingle(String deviceId) { - return deviceSyncService.downloadSingle(deviceId); + return deviceSyncService.downloadSingle(deviceId, Constant.DL_TYPE_UPDATE); } @ApiOperation(value = "下载产品历史信息", response = DeviceEntity.class) @@ -167,7 +173,7 @@ public class UdidlDeviceController { @AuthRuleAnnotation("udidl/device/dlLastVersionByDi") @GetMapping("udidl/device/dlLastVersionByDi") public BaseResponse dlLastVersionByDi(String deviceId) { - BaseResponse baseResponse = deviceSyncService.downloadSingle(deviceId); + deviceSyncService.downloadSingle(deviceId, Constant.DL_TYPE_UPDATE); ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest(); productInfoFilterRequest.setNameCode(deviceId); return ResultVOUtils.success(productInfoService.findLastVersion(productInfoFilterRequest)); diff --git a/src/main/java/com/glxp/udidl/admin/dao/udid/ContactlistMapper.java b/src/main/java/com/glxp/udidl/admin/dao/udid/ContactlistMapper.java index c298482..20bb8df 100644 --- a/src/main/java/com/glxp/udidl/admin/dao/udid/ContactlistMapper.java +++ b/src/main/java/com/glxp/udidl/admin/dao/udid/ContactlistMapper.java @@ -40,4 +40,6 @@ public interface ContactlistMapper extends BaseMapper { List dlConnacts(DlConnactRequest dlConnactRequest); void update(Contactlist contactlist); + + int deleteByUuid(@Param("uuid") String uuid); } \ No newline at end of file diff --git a/src/main/java/com/glxp/udidl/admin/dao/udid/DeviceMapper.java b/src/main/java/com/glxp/udidl/admin/dao/udid/DeviceMapper.java index 2bae176..98b0424 100644 --- a/src/main/java/com/glxp/udidl/admin/dao/udid/DeviceMapper.java +++ b/src/main/java/com/glxp/udidl/admin/dao/udid/DeviceMapper.java @@ -55,7 +55,7 @@ public interface DeviceMapper extends BaseMapper { String selectisSame(@Param("deviceRecordKey") String deviceRecordKey, @Param("versionNumber") String versionNumber); - String selectDiIsSame(@Param("zxxsdycpbs") String zxxsdycpbs, @Param("versionNumber") String versionNumber); + Device selectDiIsSame(@Param("zxxsdycpbs") String zxxsdycpbs, @Param("versionNumber") String versionNumber); String selectKey(@Param("zxxsdycpbs") String zxxsdycpbs); diff --git a/src/main/java/com/glxp/udidl/admin/dao/udid/DeviceclinicalMapper.java b/src/main/java/com/glxp/udidl/admin/dao/udid/DeviceclinicalMapper.java index 94c0d3a..2708127 100644 --- a/src/main/java/com/glxp/udidl/admin/dao/udid/DeviceclinicalMapper.java +++ b/src/main/java/com/glxp/udidl/admin/dao/udid/DeviceclinicalMapper.java @@ -37,4 +37,6 @@ public interface DeviceclinicalMapper extends BaseMapper { List downloadDeviceclinical(DownloadUdiRequest downloadUdiRequest); void update(Deviceclinical deviceclinical); + + int deleteByUuid(@Param("uuid") String uuid); } \ No newline at end of file diff --git a/src/main/java/com/glxp/udidl/admin/dao/udid/DevicepackageMapper.java b/src/main/java/com/glxp/udidl/admin/dao/udid/DevicepackageMapper.java index 864f45a..372aaf3 100644 --- a/src/main/java/com/glxp/udidl/admin/dao/udid/DevicepackageMapper.java +++ b/src/main/java/com/glxp/udidl/admin/dao/udid/DevicepackageMapper.java @@ -37,4 +37,6 @@ public interface DevicepackageMapper extends BaseMapper { List downloadDevicepackage(DownloadUdiRequest downloadUdiRequest); void update(Devicepackage devicepackage); + + int deleteByUuid(@Param("uuid") String uuid); } \ No newline at end of file diff --git a/src/main/java/com/glxp/udidl/admin/dao/udid/DevicestorageMapper.java b/src/main/java/com/glxp/udidl/admin/dao/udid/DevicestorageMapper.java index 433f79c..07f99fc 100644 --- a/src/main/java/com/glxp/udidl/admin/dao/udid/DevicestorageMapper.java +++ b/src/main/java/com/glxp/udidl/admin/dao/udid/DevicestorageMapper.java @@ -37,4 +37,6 @@ public interface DevicestorageMapper extends BaseMapper { List downloadDevicestorage(DownloadUdiRequest downloadUdiRequest); void update(Devicestorage devicestorage); + + int deleteByUuid(@Param("uuid") String uuid); } \ No newline at end of file diff --git a/src/main/java/com/glxp/udidl/admin/entity/udid/Device.java b/src/main/java/com/glxp/udidl/admin/entity/udid/Device.java index 53cff97..0fb2869 100644 --- a/src/main/java/com/glxp/udidl/admin/entity/udid/Device.java +++ b/src/main/java/com/glxp/udidl/admin/entity/udid/Device.java @@ -1,10 +1,12 @@ package com.glxp.udidl.admin.entity.udid; +import cn.hutool.core.util.StrUtil; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; +import java.util.Objects; @ApiModel(value = "医疗器械信息实体") @Data @@ -165,9 +167,9 @@ public class Device { private String deviceHistoryKey; private String deviceRecordKey; - private int versionNumber; + // private int versionNumber; private String versionStatus; - private String versionTime; +// private String versionTime; public Date getRequestDate() { return requestDate; @@ -576,4 +578,69 @@ public class Device { public void setLastModifyTime(String lastModifyTime) { this.lastModifyTime = lastModifyTime; } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + Device device = (Device) o; + return + StrUtil.trimToEmpty(devicerecordkey).equals(StrUtil.trimToEmpty(device.devicerecordkey) + ) && StrUtil.trimToEmpty(btcpbs).equals(StrUtil.trimToEmpty(device.btcpbs) + ) && StrUtil.trimToEmpty(btcpbsyzxxsdycpbssfyz).equals(StrUtil.trimToEmpty(device.btcpbsyzxxsdycpbssfyz) + ) && StrUtil.trimToEmpty(cgzmraqxgxx).equals(StrUtil.trimToEmpty(device.cgzmraqxgxx) + ) && StrUtil.trimToEmpty(cpbsbmtxmc).equals(StrUtil.trimToEmpty(device.cpbsbmtxmc) + ) && StrUtil.trimToEmpty(cpbsfbrq).equals(StrUtil.trimToEmpty(device.cpbsfbrq) + ) && StrUtil.trimToEmpty(cphhhbh).equals(StrUtil.trimToEmpty(device.cphhhbh) + ) && StrUtil.trimToEmpty(cplb).equals(StrUtil.trimToEmpty(device.cplb) + ) && StrUtil.trimToEmpty(cpmctymc).equals(StrUtil.trimToEmpty(device.cpmctymc) + ) && StrUtil.trimToEmpty(cpms).equals(StrUtil.trimToEmpty(device.cpms) + ) && StrUtil.trimToEmpty(flbm).equals(StrUtil.trimToEmpty(device.flbm) + ) && StrUtil.trimToEmpty(ggxh).equals(StrUtil.trimToEmpty(device.ggxh) + ) && StrUtil.trimToEmpty(mjfs).equals(StrUtil.trimToEmpty(device.mjfs) + ) && StrUtil.trimToEmpty(qtxxdwzlj).equals(StrUtil.trimToEmpty(device.qtxxdwzlj) + ) && StrUtil.trimToEmpty(qxlb).equals(StrUtil.trimToEmpty(device.qxlb) + ) && StrUtil.trimToEmpty(scbssfbhph).equals(StrUtil.trimToEmpty(device.scbssfbhph) + ) && StrUtil.trimToEmpty(scbssfbhscrq).equals(StrUtil.trimToEmpty(device.scbssfbhscrq) + ) && StrUtil.trimToEmpty(scbssfbhsxrq).equals(StrUtil.trimToEmpty(device.scbssfbhsxrq) + ) && StrUtil.trimToEmpty(scbssfbhxlh).equals(StrUtil.trimToEmpty(device.scbssfbhxlh) + ) && StrUtil.trimToEmpty(sfbjwycxsy).equals(StrUtil.trimToEmpty(device.sfbjwycxsy) + ) && StrUtil.trimToEmpty(sfwblztlcp).equals(StrUtil.trimToEmpty(device.sfwblztlcp) + ) && StrUtil.trimToEmpty(sfwwjbz).equals(StrUtil.trimToEmpty(device.sfwwjbz) + ) && StrUtil.trimToEmpty(sfybtzjbs).equals(StrUtil.trimToEmpty(device.sfybtzjbs) + ) && StrUtil.trimToEmpty(spmc).equals(StrUtil.trimToEmpty(device.spmc) + ) && StrUtil.trimToEmpty(sydycpbs).equals(StrUtil.trimToEmpty(device.sydycpbs) + ) && StrUtil.trimToEmpty(syqsfxyjxmj).equals(StrUtil.trimToEmpty(device.syqsfxyjxmj) + ) && StrUtil.trimToEmpty(tscchcztj).equals(StrUtil.trimToEmpty(device.tscchcztj) + ) && StrUtil.trimToEmpty(tsccsm).equals(StrUtil.trimToEmpty(device.tsccsm) + ) && StrUtil.trimToEmpty(tsrq).equals(StrUtil.trimToEmpty(device.tsrq) + ) && StrUtil.trimToEmpty(tyshxydm).equals(StrUtil.trimToEmpty(device.tyshxydm) + ) && StrUtil.trimToEmpty(versionnumber).equals(StrUtil.trimToEmpty(device.versionnumber) + ) && StrUtil.trimToEmpty(versionstatus).equals(StrUtil.trimToEmpty(device.versionstatus) + ) && StrUtil.trimToEmpty(versiontime).equals(StrUtil.trimToEmpty(device.versiontime) + ) && StrUtil.trimToEmpty(ybbm).equals(StrUtil.trimToEmpty(device.ybbm) + ) && StrUtil.trimToEmpty(yflbm).equals(StrUtil.trimToEmpty(device.yflbm) + ) && StrUtil.trimToEmpty(ylqxzcrbarmc).equals(StrUtil.trimToEmpty(device.ylqxzcrbarmc) + ) && StrUtil.trimToEmpty(ylqxzcrbarywmc).equals(StrUtil.trimToEmpty(device.ylqxzcrbarywmc) + ) && StrUtil.trimToEmpty(zczbhhzbapzbh).equals(StrUtil.trimToEmpty(device.zczbhhzbapzbh) + ) && StrUtil.trimToEmpty(zdcfsycs).equals(StrUtil.trimToEmpty(device.zdcfsycs) + ) && StrUtil.trimToEmpty(zxxsdycpbs).equals(StrUtil.trimToEmpty(device.zxxsdycpbs) + ) && StrUtil.trimToEmpty(bszt).equals(StrUtil.trimToEmpty(device.bszt) + ) && StrUtil.trimToEmpty(sfyzcbayz).equals(StrUtil.trimToEmpty(device.sfyzcbayz) + ) && StrUtil.trimToEmpty(zcbacpbs).equals(StrUtil.trimToEmpty(device.zcbacpbs) + ) && StrUtil.trimToEmpty(zxxsdyzsydydsl).equals(StrUtil.trimToEmpty(device.zxxsdyzsydydsl) + ) && StrUtil.trimToEmpty(devicehistoryrecordkey).equals(StrUtil.trimToEmpty(device.devicehistoryrecordkey) + ) && StrUtil.trimToEmpty(bssjzt).equals(StrUtil.trimToEmpty(device.bssjzt) + ) && StrUtil.trimToEmpty(hchzsb).equals(StrUtil.trimToEmpty(device.hchzsb) + ) && StrUtil.trimToEmpty(cplx).equals(StrUtil.trimToEmpty(device.cplx) + ) && StrUtil.trimToEmpty(deviceHistoryKey).equals(StrUtil.trimToEmpty(device.deviceHistoryKey) + ) && StrUtil.trimToEmpty(deviceRecordKey).equals(StrUtil.trimToEmpty(device.deviceRecordKey) + ) && StrUtil.trimToEmpty(versionStatus).equals(StrUtil.trimToEmpty(device.versionStatus) + ); + } + + @Override + public int hashCode() { + return Objects.hash(devicerecordkey, btcpbs, btcpbsyzxxsdycpbssfyz, cgzmraqxgxx, cpbsbmtxmc, cpbsfbrq, cphhhbh, cplb, cpmctymc, cpms, flbm, ggxh, mjfs, qtxxdwzlj, qxlb, scbssfbhph, scbssfbhscrq, scbssfbhsxrq, scbssfbhxlh, sfbjwycxsy, sfwblztlcp, sfwwjbz, sfybtzjbs, spmc, sydycpbs, syqsfxyjxmj, tscchcztj, tsccsm, tsrq, tyshxydm, versionnumber, versionstatus, versiontime, ybbm, yflbm, ylqxzcrbarmc, ylqxzcrbarywmc, zczbhhzbapzbh, zdcfsycs, zxxsdycpbs, bszt, sfyzcbayz, zcbacpbs, zxxsdyzsydydsl, devicehistoryrecordkey, bssjzt, hchzsb, cplx, deviceHistoryKey, deviceRecordKey, versionStatus); + } } \ No newline at end of file diff --git a/src/main/java/com/glxp/udidl/admin/req/udid/DeviceRequest.java b/src/main/java/com/glxp/udidl/admin/req/udid/DeviceRequest.java index 171f1d0..70ad6c8 100644 --- a/src/main/java/com/glxp/udidl/admin/req/udid/DeviceRequest.java +++ b/src/main/java/com/glxp/udidl/admin/req/udid/DeviceRequest.java @@ -54,6 +54,7 @@ public class DeviceRequest { private String downloadType; + private Integer dlType; } diff --git a/src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceDownloadService.java b/src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceDownloadService.java index 355e94d..2c3b8fb 100644 --- a/src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceDownloadService.java +++ b/src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceDownloadService.java @@ -284,14 +284,13 @@ public class DeviceDownloadService { } - public boolean getDataAndSave(DeviceRequest deviceRequest, JobLog jobLog) { + public boolean getDataAndSave(DeviceRequest deviceRequest, JobLog jobLog, Integer dlType) { DataSetTotalResult results = new DataSetTotalResult(); int page = 1; if (StrUtil.isNotEmpty(deviceRequest.getCurrentPageNumber())) { page = Integer.parseInt(deviceRequest.getCurrentPageNumber()); } boolean hasData = true; //是否还有数据，如无退出 - while (hasData) { DataSetResult dataSetResult = getData(deviceRequest, page); if (dataSetResult.getReturnCode() != 1 && reCount == 0) { @@ -326,7 +325,7 @@ public class DeviceDownloadService { List dataSets = new ArrayList<>(); dataSets.add(dataSetResult.getDataSet()); try { - int insertCount = deviceSaveService.DeviceSave(dataSets, jobLog.getDownloadDate()); + int insertCount = deviceSaveService.DeviceSave(dataSets, jobLog.getDownloadDate(), dlType); jobLog.setRealCount(jobLog.getRealCount() + dataSetResult.getDataSet().getDeviceInfo().size()); jobLog.setInsertCount(jobLog.getInsertCount() + insertCount); jobLog.setTotalCount(dataSetResult.getTotalRecordCount()); @@ -530,7 +529,7 @@ public class DeviceDownloadService { //存储数据 List dataSets = new ArrayList<>(); dataSets.add(dataSetResult.getDataSet()); - deviceSaveService.DeviceSave(dataSets, null); + deviceSaveService.DeviceSave(dataSets, null, null); } totalPage = dataSetResult.getTotalPageCount(); totalRecordCount = dataSetResult.getTotalRecordCount(); 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..6bf4780 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 @@ -1,6 +1,7 @@ package com.glxp.udidl.admin.service.dataSync; import cn.hutool.core.util.StrUtil; +import com.glxp.udidl.admin.constant.Constant; import com.glxp.udidl.admin.entity.udid.*; import com.glxp.udidl.admin.res.udid.DataSetResult; import com.glxp.udidl.admin.service.inout.DeviceService; @@ -35,7 +36,12 @@ public class DeviceSaveService { * @param dataSets * @return 返回存储条数 */ - public int DeviceSave(List dataSets, Date requestDate) { + public int DeviceSave(List dataSets, Date requestDate, Integer dlType) { + + if (dlType == null) { //默认新增 + dlType = Constant.DL_TYPE_ADD; + } + int result = 0; for (DataSetResult.DataSet ds : dataSets) { List ClinicalInfoAll = ds.getClinicalInfo(); @@ -43,20 +49,44 @@ public class DeviceSaveService { List packingInfoAll = ds.getPackingInfo(); for (DataSetResult.DeviceInfo item : ds.getDeviceInfo()) { + //1:判断数据是否存在 - if (StrUtil.isNotEmpty(deviceService.selectDiIsSame(item.getZxxsdycpbs(), item.getVersionNumber() + ""))) - continue; + 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); - String uuid = getUUId(); Boolean isHistory = false; if (item.getDeviceHistoryKey() != null && !item.getDeviceHistoryKey().isEmpty()) { isHistory = true; } - device.setUuid(uuid); + if (requestDate != null) device.setRequestDate(requestDate); - //2,存储 deviceInfo - deviceService.insertDevice(device); + + //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(); + device.setUuid(uuid); + deviceService.updateDevice(device); + } else { //，若一致则跳过 +// uuid = getUUId(); +// device.setUuid(uuid); +// deviceService.insertDevice(device); + continue; + } + } result++; //3,存储ContactList List contactInfos = item.getContactList(); @@ -68,6 +98,7 @@ public class DeviceSaveService { contactlist.setUuid(uuid); contactlistList.add(contactlist); } + deviceService.deleteClinicalByUuid(uuid); deviceService.insertContactlist(contactlistList); } //4,存储 Deviceclinical @@ -90,6 +121,7 @@ public class DeviceSaveService { deviceclinical.setUuid(uuid); deviceclinicalList.add(deviceclinical); } + deviceService.deleteClinicalByUuid(uuid); deviceService.insertDeviceClinical(deviceclinicalList); } } @@ -114,6 +146,7 @@ public class DeviceSaveService { devicestorage.setUuid(uuid); devicestorageList.add(devicestorage); } + deviceService.deleteStorageByUuid(uuid); deviceService.insertDevicestorage(devicestorageList); } @@ -139,6 +172,7 @@ public class DeviceSaveService { devicepackage.setUuid(uuid); devicepackageList.add(devicepackage); } + deviceService.deletePakcageByUuid(uuid); deviceService.insertDevicepackage(devicepackageList); } 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 58ae4b0..eeb4eb7 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 @@ -43,8 +43,11 @@ public class DeviceSyncService { @Resource private ProductInfoService productInfoService; - public void downloadAndSave(String day, String downloadType) { + public void downloadAndSave(String day, String downloadType, Integer dlType) { //1.下载唯一标识数据 + if (dlType == null) { + dlType = Constant.DL_TYPE_ADD; + } DataSetTotalResult result; String rangeValue = ""; if (day.isEmpty()) @@ -63,7 +66,7 @@ public class DeviceSyncService { jobLogService.insert(jobLog); return; } - int insertCount = deviceSaveService.DeviceSave(result.getData(), DateUtil.parseDate(rangeValue)); + int insertCount = deviceSaveService.DeviceSave(result.getData(), DateUtil.parseDate(rangeValue), dlType); //2.下载历史记录 List keyList = new ArrayList(); for (DataSetResult.DataSet ds : result.getData()) { @@ -83,7 +86,7 @@ public class DeviceSyncService { List data = result.getData(); data.addAll(res.getData()); result.setData(data); - int hisInsertCount = deviceSaveService.DeviceSave(res.getData(), null); + int hisInsertCount = deviceSaveService.DeviceSave(res.getData(), null, dlType); insertCount = insertCount + hisInsertCount; } } else { @@ -121,7 +124,7 @@ public class DeviceSyncService { @Async public void downloadUdi(String day, String downloadType) { try { - downloadAndSave(day, downloadType); + downloadAndSave(day, downloadType, Constant.DL_TYPE_UPDATE); } catch (Exception e) { log.error("下载UDI国家库信息异常", e); JobLog jobLog = new JobLog(); @@ -167,7 +170,7 @@ public class DeviceSyncService { if (CollUtil.isNotEmpty(result1.getDataSet().getDeviceInfo())) { List dataSets = new ArrayList<>(); dataSets.add(result1.getDataSet()); - deviceSaveService.DeviceSave(dataSets, new Date()); + deviceSaveService.DeviceSave(dataSets, new Date(), Constant.DL_TYPE_UPDATE); productInfoEntityList = productInfoService.findAll(productInfoFilterRequest); } else { return ResultVOUtils.error(501, "医疗器械唯一标识数据库未找到此产品DI,请检查是否输入正确或联系厂家是否已上传"); @@ -213,11 +216,11 @@ public class DeviceSyncService { } List dataSets = new ArrayList<>(); dataSets.add(result1.getDataSet()); - deviceSaveService.DeviceSave(dataSets, new Date()); + deviceSaveService.DeviceSave(dataSets, new Date(), Constant.DL_TYPE_UPDATE); return ResultVOUtils.success(result); } - public BaseResponse downloadSingle(String deviceId) { + public BaseResponse downloadSingle(String deviceId, Integer dlType) { //插入日志 JobLog jobLog = new JobLog(); jobLog.setDownloadType(Constant.DOWNLOAD_TYPE_MANUAL); @@ -232,12 +235,15 @@ public class DeviceSyncService { DataSetSingleResult res = null; try { res = deviceDownloadService.downloadByDi(deviceId); - if (res.getReturnCode() != 1) + if (res.getReturnCode() != 1) { + log.error("下载产品信息失败", res.getReturnMsg()); + jobLog.setMsg("下载失败：" + res.getReturnMsg()); + jobLog.setType(Constant.LOG_TYPE_ERROR); return ResultVOUtils.error(-1, res.getReturnMsg()); + } List dataSets = new ArrayList<>(); dataSets.add(res.getDataSet()); - int insertCount = deviceSaveService.DeviceSave(dataSets, new Date()); - + int insertCount = deviceSaveService.DeviceSave(dataSets, new Date(), dlType); jobLog.setMsg("下载成功，总条数：" + dataSets.size() + " ；插入数据：" + insertCount + " 条"); jobLog.setType(Constant.LOG_TYPE_SUCCESS); jobLogService.update(jobLog); @@ -407,8 +413,17 @@ public class DeviceSyncService { dates.add(deviceRequest.getRangeValue()); } - if (deviceRequest.getDataType().equals("3")) { + int dlType = Constant.DL_TYPE_ADD; + + if (StrUtil.isEmpty(deviceRequest.getDataType()) || deviceRequest.getDataType().equals("3")) { deviceRequest.setDataType(null); + } else if (deviceRequest.getDataType().equals("1")) { + dlType = Constant.DL_TYPE_ADD; + } else if (deviceRequest.getDataType().equals("2")) { + dlType = Constant.DL_TYPE_UPDATE; + } + if (deviceRequest.getDlType() != null) { + dlType = deviceRequest.getDlType(); } log.info("开始下载国家UDI库数据"); @@ -420,7 +435,10 @@ public class DeviceSyncService { //插入日志 JobLog jobLog = new JobLog(); jobLog.setDownloadType(deviceRequest.getDownloadType()); - jobLog.setTaskType(Constant.JOB_TASK_TYPE_DOWNLOAD); + if (dlType == Constant.DL_TYPE_UPDATE) { + jobLog.setTaskType(Constant.JOB_TASK_TYPE_UPDATE); + } else + jobLog.setTaskType(Constant.JOB_TASK_TYPE_DOWNLOAD); jobLog.setDownloadDate(DateUtil.parseDate(date)); jobLog.setType(Constant.LOG_TYPE_INFO); jobLog.setMsg("下载中"); @@ -429,7 +447,7 @@ public class DeviceSyncService { jobLogService.insertLog(jobLog); log.info(jobLog.getId() + "----"); //开始下载数据 - boolean b = deviceDownloadService.getDataAndSave(deviceRequest, jobLog); + boolean b = deviceDownloadService.getDataAndSave(deviceRequest, jobLog, dlType); if (b) { jobLog.setStatus(1); diff --git a/src/main/java/com/glxp/udidl/admin/service/dataUpdate/DeviceParseService.java b/src/main/java/com/glxp/udidl/admin/service/dataUpdate/DeviceParseService.java index d402121..c66fb49 100644 --- a/src/main/java/com/glxp/udidl/admin/service/dataUpdate/DeviceParseService.java +++ b/src/main/java/com/glxp/udidl/admin/service/dataUpdate/DeviceParseService.java @@ -58,7 +58,8 @@ public class DeviceParseService { for (DataSetResult.DeviceInfo item : ds.getDeviceInfo()) { //1:不判断数据是否存在，直接以当前拉取到的最新数据进行更新 - String uuid = deviceService.selectDiIsSame(item.getZxxsdycpbs(), item.getVersionNumber() + ""); + Device temp = deviceService.selectDiIsSame(item.getZxxsdycpbs(), item.getVersionNumber() + ""); + String uuid = temp.getUuid(); //此版本数据存在，使用当前数据库存在的数据的ID进行更新 Device device = responseToDevice(item); if (StrUtil.isBlank(uuid)) { diff --git a/src/main/java/com/glxp/udidl/admin/service/dataUpdate/DeviceUpdateService.java b/src/main/java/com/glxp/udidl/admin/service/dataUpdate/DeviceUpdateService.java index e0f81da..fa9c785 100644 --- a/src/main/java/com/glxp/udidl/admin/service/dataUpdate/DeviceUpdateService.java +++ b/src/main/java/com/glxp/udidl/admin/service/dataUpdate/DeviceUpdateService.java @@ -46,10 +46,6 @@ public class DeviceUpdateService { private JobLogService jobLogService; //日志 @Resource private DeviceParseService deviceParseService; - @Resource - private DeviceService deviceService; - @Resource - private ProductInfoService productInfoService; public void updateUdiData(UpdateUdiRequest updateUdiRequest) { JobLog jobLog = new JobLog(); diff --git a/src/main/java/com/glxp/udidl/admin/service/inout/DeviceService.java b/src/main/java/com/glxp/udidl/admin/service/inout/DeviceService.java index 4b8834e..c429282 100644 --- a/src/main/java/com/glxp/udidl/admin/service/inout/DeviceService.java +++ b/src/main/java/com/glxp/udidl/admin/service/inout/DeviceService.java @@ -4,6 +4,7 @@ import com.glxp.udidl.admin.entity.udid.*; import com.glxp.udidl.admin.req.ListPageRequest; import com.glxp.udidl.admin.req.udid.DeviceListRequest; import com.glxp.udidl.admin.req.udid.DeviceSearchRequest; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -37,7 +38,7 @@ public interface DeviceService { String selectisSame(String deviceRecordKey, String versionNumber); - String selectDiIsSame(String zxxsdycpbs, String versionNumber); + Device selectDiIsSame(String zxxsdycpbs, String versionNumber); String selectKey(String zxxsdycpbs); @@ -56,4 +57,12 @@ public interface DeviceService { boolean updateDevicestorage(List devicestorageList); boolean updateDevicepackage(List devicepackageList); + + int deleteClinicalByUuid(String uuid); + + int deleteStorageByUuid(String uuid); + + int deletePakcageByUuid(String uuid); + + int deleteConactByUuid(String uuid); } diff --git a/src/main/java/com/glxp/udidl/admin/service/inout/impl/DeviceServiceImpl.java b/src/main/java/com/glxp/udidl/admin/service/inout/impl/DeviceServiceImpl.java index 243ebe8..33955f5 100644 --- a/src/main/java/com/glxp/udidl/admin/service/inout/impl/DeviceServiceImpl.java +++ b/src/main/java/com/glxp/udidl/admin/service/inout/impl/DeviceServiceImpl.java @@ -1,5 +1,6 @@ package com.glxp.udidl.admin.service.inout.impl; +import cn.hutool.core.util.StrUtil; import com.glxp.udidl.admin.dao.udid.*; import com.glxp.udidl.admin.entity.udid.*; import com.glxp.udidl.admin.req.ListPageRequest; @@ -191,7 +192,7 @@ public class DeviceServiceImpl implements DeviceService { } @Override - public String selectDiIsSame(String zxxsdycpbs, String versionNumber) { + public Device selectDiIsSame(String zxxsdycpbs, String versionNumber) { return deviceMapper.selectDiIsSame(zxxsdycpbs, versionNumber); } @@ -263,6 +264,34 @@ public class DeviceServiceImpl implements DeviceService { return true; } + @Override + public int deleteClinicalByUuid(String uuid) { + if (StrUtil.isEmpty(uuid)) + return 0; + return deviceclinicalMapper.deleteByUuid(uuid); + } + + @Override + public int deleteStorageByUuid(String uuid) { + if (StrUtil.isEmpty(uuid)) + return 0; + return devicestorageMapper.deleteByUuid(uuid); + } + + @Override + public int deletePakcageByUuid(String uuid) { + if (StrUtil.isEmpty(uuid)) + return 0; + return devicepackageMapper.deleteByUuid(uuid); + } + + @Override + public int deleteConactByUuid(String uuid) { + if (StrUtil.isEmpty(uuid)) + return 0; + return contactlistMapper.deleteByUuid(uuid); + } + @Override public boolean insertDevice(Device device) { deviceMapper.insert(device); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 2dda414..8064ef9 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -6,7 +6,7 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver 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秒 diff --git a/src/main/resources/config/redis.setting b/src/main/resources/config/redis.setting index 1d122ec..2593a47 100644 --- a/src/main/resources/config/redis.setting +++ b/src/main/resources/config/redis.setting @@ -28,7 +28,7 @@ ssl = false; #----- 自定义分组的连接 [custom] # 地址，默认localhost -host = 192.168.235.137 +host = 127.0.0.1 # 连接耗尽时是否阻塞, false报异常,ture阻塞直到超时, 默认true BlockWhenExhausted = true; # 设置的逐出策略类名, 默认DefaultEvictionPolicy(当连接超过最大空闲时间,或连接数超过最大空闲连接数) diff --git a/src/main/resources/mybatis/mapper/udid/ContactlistMapper.xml b/src/main/resources/mybatis/mapper/udid/ContactlistMapper.xml index 2df62f8..fa60d1e 100644 --- a/src/main/resources/mybatis/mapper/udid/ContactlistMapper.xml +++ b/src/main/resources/mybatis/mapper/udid/ContactlistMapper.xml @@ -70,8 +70,9 @@ - id, deviceRecordKey, qylxrcz, qylxrdh, qylxryx, uuid - + id + , deviceRecordKey, qylxrcz, qylxrdh, qylxryx, uuid + - delete from contactlist - where id = #{id,jdbcType=INTEGER} - + delete + from contactlist + where id = #{id,jdbcType=INTEGER} + delete from contactlist @@ -104,13 +106,11 @@ - insert into contactlist ( deviceRecordKey, qylxrcz, - qylxrdh, qylxryx, uuid - ) - values ( #{devicerecordkey,jdbcType=VARCHAR}, #{qylxrcz,jdbcType=VARCHAR}, - #{qylxrdh,jdbcType=VARCHAR}, #{qylxryx,jdbcType=VARCHAR}, #{uuid,jdbcType=VARCHAR} - ) - + insert into contactlist (deviceRecordKey, qylxrcz, + qylxrdh, qylxryx, uuid) + values (#{devicerecordkey,jdbcType=VARCHAR}, #{qylxrcz,jdbcType=VARCHAR}, + #{qylxrdh,jdbcType=VARCHAR}, #{qylxryx,jdbcType=VARCHAR}, #{uuid,jdbcType=VARCHAR}) + insert into contactlist @@ -221,31 +221,43 @@ where id = #{id,jdbcType=INTEGER} - update contactlist - set deviceRecordKey = #{devicerecordkey,jdbcType=VARCHAR}, - qylxrcz = #{qylxrcz,jdbcType=VARCHAR}, - qylxrdh = #{qylxrdh,jdbcType=VARCHAR}, - qylxryx = #{qylxryx,jdbcType=VARCHAR}, - uuid = #{uuid,jdbcType=VARCHAR} - where id = #{id,jdbcType=INTEGER} + update contactlist + set deviceRecordKey = #{devicerecordkey,jdbcType=VARCHAR}, + qylxrcz = #{qylxrcz,jdbcType=VARCHAR}, + qylxrdh = #{qylxrdh,jdbcType=VARCHAR}, + qylxryx = #{qylxryx,jdbcType=VARCHAR}, + uuid = #{uuid,jdbcType=VARCHAR} + where id = #{id,jdbcType=INTEGER} - replace into contactlist ( deviceRecordKey, qylxrcz, + replace + into contactlist ( deviceRecordKey, qylxrcz, qylxrdh, qylxryx, uuid ) - values ( #{devicerecordkey,jdbcType=VARCHAR}, #{qylxrcz,jdbcType=VARCHAR}, - #{qylxrdh,jdbcType=VARCHAR}, #{qylxryx,jdbcType=VARCHAR}, #{uuid,jdbcType=VARCHAR} + values ( + #{devicerecordkey,jdbcType=VARCHAR}, + #{qylxrcz,jdbcType=VARCHAR}, + #{qylxrdh,jdbcType=VARCHAR}, + #{qylxryx,jdbcType=VARCHAR}, + #{uuid,jdbcType=VARCHAR} ) + + + delete + from contactlist + where uuid = #{uuid} + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/udid/DeviceMapper.xml b/src/main/resources/mybatis/mapper/udid/DeviceMapper.xml index 2d80221..97ee87d 100644 --- a/src/main/resources/mybatis/mapper/udid/DeviceMapper.xml +++ b/src/main/resources/mybatis/mapper/udid/DeviceMapper.xml @@ -990,8 +990,8 @@ - + SELECT * from device WHERE zxxsdycpbs = #{zxxsdycpbs} and versionNumber = #{versionNumber} limit 1 @@ -1032,7 +1032,8 @@ - replace into device (uuid, deviceRecordKey, btcpbs, + replace + into device (uuid, deviceRecordKey, btcpbs, btcpbsyzxxsdycpbssfyz, cgzmraqxgxx, cpbsbmtxmc, cpbsfbrq, cphhhbh, cplb, cpmctymc, cpms, flbm, @@ -1048,24 +1049,59 @@ zdcfsycs, zxxsdycpbs, bszt, sfyzcbayz, zcbacpbs, zxxsdyzsydydsl, deviceHistoryRecordKey, bssjzt, lastModifyTime, requestDate, hchzsb, cplx) - values (#{uuid,jdbcType=VARCHAR}, #{devicerecordkey,jdbcType=VARCHAR}, #{btcpbs,jdbcType=VARCHAR}, - #{btcpbsyzxxsdycpbssfyz,jdbcType=VARCHAR}, #{cgzmraqxgxx,jdbcType=VARCHAR}, - #{cpbsbmtxmc,jdbcType=VARCHAR}, - #{cpbsfbrq,jdbcType=VARCHAR}, #{cphhhbh,jdbcType=VARCHAR}, #{cplb,jdbcType=VARCHAR}, - #{cpmctymc,jdbcType=VARCHAR}, #{cpms,jdbcType=VARCHAR}, #{flbm,jdbcType=VARCHAR}, - #{ggxh,jdbcType=VARCHAR}, #{mjfs,jdbcType=VARCHAR}, #{qtxxdwzlj,jdbcType=VARCHAR}, - #{qxlb,jdbcType=VARCHAR}, #{scbssfbhph,jdbcType=VARCHAR}, #{scbssfbhscrq,jdbcType=VARCHAR}, - #{scbssfbhsxrq,jdbcType=VARCHAR}, #{scbssfbhxlh,jdbcType=VARCHAR}, #{sfbjwycxsy,jdbcType=VARCHAR}, - #{sfwblztlcp,jdbcType=VARCHAR}, #{sfwwjbz,jdbcType=VARCHAR}, #{sfybtzjbs,jdbcType=VARCHAR}, - #{spmc,jdbcType=VARCHAR}, #{sydycpbs,jdbcType=VARCHAR}, #{syqsfxyjxmj,jdbcType=VARCHAR}, - #{tscchcztj,jdbcType=VARCHAR}, #{tsccsm,jdbcType=VARCHAR}, #{tsrq,jdbcType=VARCHAR}, - #{tyshxydm,jdbcType=VARCHAR}, #{versionnumber,jdbcType=VARCHAR}, #{versionstatus,jdbcType=VARCHAR}, - #{versiontime,jdbcType=VARCHAR}, #{ybbm,jdbcType=VARCHAR}, #{yflbm,jdbcType=VARCHAR}, - #{ylqxzcrbarmc,jdbcType=VARCHAR}, #{ylqxzcrbarywmc,jdbcType=VARCHAR}, #{zczbhhzbapzbh,jdbcType=VARCHAR}, - #{zdcfsycs,jdbcType=VARCHAR}, #{zxxsdycpbs,jdbcType=VARCHAR}, #{bszt,jdbcType=VARCHAR}, - #{sfyzcbayz,jdbcType=VARCHAR}, #{zcbacpbs,jdbcType=VARCHAR}, #{zxxsdyzsydydsl,jdbcType=VARCHAR}, - #{devicehistoryrecordkey,jdbcType=VARCHAR}, #{bssjzt,jdbcType=VARCHAR}, - #{lastModifyTime,jdbcType=VARCHAR}, #{requestDate}, #{hchzsb}, #{cplx}) + values ( + #{uuid,jdbcType=VARCHAR}, + #{devicerecordkey,jdbcType=VARCHAR}, + #{btcpbs,jdbcType=VARCHAR}, + #{btcpbsyzxxsdycpbssfyz,jdbcType=VARCHAR}, + #{cgzmraqxgxx,jdbcType=VARCHAR}, + #{cpbsbmtxmc,jdbcType=VARCHAR}, + #{cpbsfbrq,jdbcType=VARCHAR}, + #{cphhhbh,jdbcType=VARCHAR}, + #{cplb,jdbcType=VARCHAR}, + #{cpmctymc,jdbcType=VARCHAR}, + #{cpms,jdbcType=VARCHAR}, + #{flbm,jdbcType=VARCHAR}, + #{ggxh,jdbcType=VARCHAR}, + #{mjfs,jdbcType=VARCHAR}, + #{qtxxdwzlj,jdbcType=VARCHAR}, + #{qxlb,jdbcType=VARCHAR}, + #{scbssfbhph,jdbcType=VARCHAR}, + #{scbssfbhscrq,jdbcType=VARCHAR}, + #{scbssfbhsxrq,jdbcType=VARCHAR}, + #{scbssfbhxlh,jdbcType=VARCHAR}, + #{sfbjwycxsy,jdbcType=VARCHAR}, + #{sfwblztlcp,jdbcType=VARCHAR}, + #{sfwwjbz,jdbcType=VARCHAR}, + #{sfybtzjbs,jdbcType=VARCHAR}, + #{spmc,jdbcType=VARCHAR}, + #{sydycpbs,jdbcType=VARCHAR}, + #{syqsfxyjxmj,jdbcType=VARCHAR}, + #{tscchcztj,jdbcType=VARCHAR}, + #{tsccsm,jdbcType=VARCHAR}, + #{tsrq,jdbcType=VARCHAR}, + #{tyshxydm,jdbcType=VARCHAR}, + #{versionnumber,jdbcType=VARCHAR}, + #{versionstatus,jdbcType=VARCHAR}, + #{versiontime,jdbcType=VARCHAR}, + #{ybbm,jdbcType=VARCHAR}, + #{yflbm,jdbcType=VARCHAR}, + #{ylqxzcrbarmc,jdbcType=VARCHAR}, + #{ylqxzcrbarywmc,jdbcType=VARCHAR}, + #{zczbhhzbapzbh,jdbcType=VARCHAR}, + #{zdcfsycs,jdbcType=VARCHAR}, + #{zxxsdycpbs,jdbcType=VARCHAR}, + #{bszt,jdbcType=VARCHAR}, + #{sfyzcbayz,jdbcType=VARCHAR}, + #{zcbacpbs,jdbcType=VARCHAR}, + #{zxxsdyzsydydsl,jdbcType=VARCHAR}, + #{devicehistoryrecordkey,jdbcType=VARCHAR}, + #{bssjzt,jdbcType=VARCHAR}, + #{lastModifyTime,jdbcType=VARCHAR}, + #{requestDate}, + #{hchzsb}, + #{cplx} + ) \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/udid/DeviceclinicalMapper.xml b/src/main/resources/mybatis/mapper/udid/DeviceclinicalMapper.xml index 7d04ffd..cf41176 100644 --- a/src/main/resources/mybatis/mapper/udid/DeviceclinicalMapper.xml +++ b/src/main/resources/mybatis/mapper/udid/DeviceclinicalMapper.xml @@ -248,4 +248,11 @@ values (#{devicerecordkey,jdbcType=VARCHAR}, #{lcsycclx,jdbcType=VARCHAR}, #{ccz,jdbcType=VARCHAR}, #{ccdw,jdbcType=VARCHAR}, #{uuid,jdbcType=VARCHAR}) + + + + delete + from deviceclinical + where uuid = #{uuid} + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/udid/DevicepackageMapper.xml b/src/main/resources/mybatis/mapper/udid/DevicepackageMapper.xml index 16bd267..07b197f 100644 --- a/src/main/resources/mybatis/mapper/udid/DevicepackageMapper.xml +++ b/src/main/resources/mybatis/mapper/udid/DevicepackageMapper.xml @@ -1,257 +1,277 @@ - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + - + + + + id + , bzcpbs, bznhxyjbzcpbs, cpbzjb, bznhxyjcpbssl, deviceRecordKey, uuid + + - select - - distinct - - - from devicepackage - - - - - order by ${orderByClause} - - - - - delete from devicepackage - where id = #{id,jdbcType=INTEGER} - - - delete from devicepackage - - - - - - insert into devicepackage (bzcpbs, bznhxyjbzcpbs, - cpbzjb, bznhxyjcpbssl, deviceRecordKey, - uuid) - values ( #{bzcpbs,jdbcType=VARCHAR}, #{bznhxyjbzcpbs,jdbcType=VARCHAR}, - #{cpbzjb,jdbcType=VARCHAR}, #{bznhxyjcpbssl,jdbcType=INTEGER}, #{devicerecordkey,jdbcType=VARCHAR}, - #{uuid,jdbcType=VARCHAR}) - - - insert into devicepackage - - - id, - - - bzcpbs, - - - bznhxyjbzcpbs, - - - cpbzjb, - - - bznhxyjcpbssl, - - - deviceRecordKey, - - - uuid, - - - - - #{id,jdbcType=INTEGER}, - - - #{bzcpbs,jdbcType=VARCHAR}, - - - #{bznhxyjbzcpbs,jdbcType=VARCHAR}, - - - #{cpbzjb,jdbcType=VARCHAR}, - - - #{bznhxyjcpbssl,jdbcType=INTEGER}, - - - #{devicerecordkey,jdbcType=VARCHAR}, - - - #{uuid,jdbcType=VARCHAR}, - - - - - - update devicepackage - - - id = #{record.id,jdbcType=INTEGER}, - - + + from devicepackage + + + + + order by ${orderByClause} + + + + + delete + from devicepackage + where id = #{id,jdbcType=INTEGER} + + + delete from devicepackage + + + + + + insert into devicepackage (bzcpbs, bznhxyjbzcpbs, + cpbzjb, bznhxyjcpbssl, deviceRecordKey, + uuid) + values (#{bzcpbs,jdbcType=VARCHAR}, #{bznhxyjbzcpbs,jdbcType=VARCHAR}, + #{cpbzjb,jdbcType=VARCHAR}, #{bznhxyjcpbssl,jdbcType=INTEGER}, #{devicerecordkey,jdbcType=VARCHAR}, + #{uuid,jdbcType=VARCHAR}) + + + insert into devicepackage + + + id, + + + bzcpbs, + + + bznhxyjbzcpbs, + + + cpbzjb, + + + bznhxyjcpbssl, + + + deviceRecordKey, + + + uuid, + + + + + #{id,jdbcType=INTEGER}, + + + #{bzcpbs,jdbcType=VARCHAR}, + + + #{bznhxyjbzcpbs,jdbcType=VARCHAR}, + + + #{cpbzjb,jdbcType=VARCHAR}, + + + #{bznhxyjcpbssl,jdbcType=INTEGER}, + + + #{devicerecordkey,jdbcType=VARCHAR}, + + + #{uuid,jdbcType=VARCHAR}, + + + + + + update devicepackage + + + id = #{record.id,jdbcType=INTEGER}, + + + bzcpbs = #{record.bzcpbs,jdbcType=VARCHAR}, + + + bznhxyjbzcpbs = #{record.bznhxyjbzcpbs,jdbcType=VARCHAR}, + + + cpbzjb = #{record.cpbzjb,jdbcType=VARCHAR}, + + + bznhxyjcpbssl = #{record.bznhxyjcpbssl,jdbcType=INTEGER}, + + + deviceRecordKey = #{record.devicerecordkey,jdbcType=VARCHAR}, + + + uuid = #{record.uuid,jdbcType=VARCHAR}, + + + + + + + + update devicepackage + set id = #{record.id,jdbcType=INTEGER}, bzcpbs = #{record.bzcpbs,jdbcType=VARCHAR}, - - bznhxyjbzcpbs = #{record.bznhxyjbzcpbs,jdbcType=VARCHAR}, - - cpbzjb = #{record.cpbzjb,jdbcType=VARCHAR}, - - bznhxyjcpbssl = #{record.bznhxyjcpbssl,jdbcType=INTEGER}, - - deviceRecordKey = #{record.devicerecordkey,jdbcType=VARCHAR}, - - - uuid = #{record.uuid,jdbcType=VARCHAR}, - - - - - - - - update devicepackage - set id = #{record.id,jdbcType=INTEGER}, - bzcpbs = #{record.bzcpbs,jdbcType=VARCHAR}, - bznhxyjbzcpbs = #{record.bznhxyjbzcpbs,jdbcType=VARCHAR}, - cpbzjb = #{record.cpbzjb,jdbcType=VARCHAR}, - bznhxyjcpbssl = #{record.bznhxyjcpbssl,jdbcType=INTEGER}, - deviceRecordKey = #{record.devicerecordkey,jdbcType=VARCHAR}, - uuid = #{record.uuid,jdbcType=VARCHAR} - - - - - - update devicepackage - - - bzcpbs = #{bzcpbs,jdbcType=VARCHAR}, - - - bznhxyjbzcpbs = #{bznhxyjbzcpbs,jdbcType=VARCHAR}, - - - cpbzjb = #{cpbzjb,jdbcType=VARCHAR}, - - - bznhxyjcpbssl = #{bznhxyjcpbssl,jdbcType=INTEGER}, - - - deviceRecordKey = #{devicerecordkey,jdbcType=VARCHAR}, - - - uuid = #{uuid,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=INTEGER} - - - update devicepackage - set bzcpbs = #{bzcpbs,jdbcType=VARCHAR}, - bznhxyjbzcpbs = #{bznhxyjbzcpbs,jdbcType=VARCHAR}, - cpbzjb = #{cpbzjb,jdbcType=VARCHAR}, - bznhxyjcpbssl = #{bznhxyjcpbssl,jdbcType=INTEGER}, - deviceRecordKey = #{devicerecordkey,jdbcType=VARCHAR}, - uuid = #{uuid,jdbcType=VARCHAR} - where id = #{id,jdbcType=INTEGER} - + uuid = #{record.uuid,jdbcType=VARCHAR} + + + + + + update devicepackage + + + bzcpbs = #{bzcpbs,jdbcType=VARCHAR}, + + + bznhxyjbzcpbs = #{bznhxyjbzcpbs,jdbcType=VARCHAR}, + + + cpbzjb = #{cpbzjb,jdbcType=VARCHAR}, + + + bznhxyjcpbssl = #{bznhxyjcpbssl,jdbcType=INTEGER}, + + + deviceRecordKey = #{devicerecordkey,jdbcType=VARCHAR}, + + + uuid = #{uuid,jdbcType=VARCHAR}, + + + where id = #{id,jdbcType=INTEGER} + + + update devicepackage + set bzcpbs = #{bzcpbs,jdbcType=VARCHAR}, + bznhxyjbzcpbs = #{bznhxyjbzcpbs,jdbcType=VARCHAR}, + cpbzjb = #{cpbzjb,jdbcType=VARCHAR}, + bznhxyjcpbssl = #{bznhxyjcpbssl,jdbcType=INTEGER}, + deviceRecordKey = #{devicerecordkey,jdbcType=VARCHAR}, + uuid = #{uuid,jdbcType=VARCHAR} + where id = #{id,jdbcType=INTEGER} + - + select * + from devicepackage limit #{page},#{limit} - - replace into devicepackage (bzcpbs, bznhxyjbzcpbs, + + replace + into devicepackage (bzcpbs, bznhxyjbzcpbs, cpbzjb, bznhxyjcpbssl, deviceRecordKey, uuid) - values ( #{bzcpbs,jdbcType=VARCHAR}, #{bznhxyjbzcpbs,jdbcType=VARCHAR}, - #{cpbzjb,jdbcType=VARCHAR}, #{bznhxyjcpbssl,jdbcType=INTEGER}, #{devicerecordkey,jdbcType=VARCHAR}, - #{uuid,jdbcType=VARCHAR}) - + values ( + #{bzcpbs,jdbcType=VARCHAR}, + #{bznhxyjbzcpbs,jdbcType=VARCHAR}, + #{cpbzjb,jdbcType=VARCHAR}, + #{bznhxyjcpbssl,jdbcType=INTEGER}, + #{devicerecordkey,jdbcType=VARCHAR}, + #{uuid,jdbcType=VARCHAR} + ) + + + + delete + from devicepackage + where uuid = #{uuid} + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/udid/DevicestorageMapper.xml b/src/main/resources/mybatis/mapper/udid/DevicestorageMapper.xml index 69286a7..5272fae 100644 --- a/src/main/resources/mybatis/mapper/udid/DevicestorageMapper.xml +++ b/src/main/resources/mybatis/mapper/udid/DevicestorageMapper.xml @@ -71,7 +71,8 @@ - id, + id + , deviceRecordKey, cchcztj, jldw, @@ -206,13 +207,13 @@ update devicestorage - set id = #{record.id,jdbcType=INTEGER}, - deviceRecordKey = #{record.devicerecordkey,jdbcType=VARCHAR}, - cchcztj = #{record.cchcztj,jdbcType=VARCHAR}, - jldw = #{record.jldw,jdbcType=VARCHAR}, - zdz = #{record.zdz,jdbcType=VARCHAR}, - zgz = #{record.zgz,jdbcType=VARCHAR}, - uuid = #{record.uuid,jdbcType=VARCHAR} + set id = #{record.id,jdbcType=INTEGER}, + deviceRecordKey = #{record.devicerecordkey,jdbcType=VARCHAR}, + cchcztj = #{record.cchcztj,jdbcType=VARCHAR}, + jldw = #{record.jldw,jdbcType=VARCHAR}, + zdz = #{record.zdz,jdbcType=VARCHAR}, + zgz = #{record.zgz,jdbcType=VARCHAR}, + uuid = #{record.uuid,jdbcType=VARCHAR} @@ -254,14 +255,26 @@ - replace into devicestorage (deviceRecordKey, cchcztj, + replace + into devicestorage (deviceRecordKey, cchcztj, jldw, zdz, zgz, uuid) - values (#{devicerecordkey,jdbcType=VARCHAR}, #{cchcztj,jdbcType=VARCHAR}, - #{jldw,jdbcType=VARCHAR}, #{zdz,jdbcType=VARCHAR}, #{zgz,jdbcType=VARCHAR}, #{uuid,jdbcType=VARCHAR}) + values ( + #{devicerecordkey,jdbcType=VARCHAR}, + #{cchcztj,jdbcType=VARCHAR}, + #{jldw,jdbcType=VARCHAR}, + #{zdz,jdbcType=VARCHAR}, + #{zgz,jdbcType=VARCHAR}, + #{uuid,jdbcType=VARCHAR} + ) + + + delete + from devicestorage + where uuid = #{uuid} + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/udid/JobLogMapper.xml b/src/main/resources/mybatis/mapper/udid/JobLogMapper.xml index 6cbb8a9..ae53762 100644 --- a/src/main/resources/mybatis/mapper/udid/JobLogMapper.xml +++ b/src/main/resources/mybatis/mapper/udid/JobLogMapper.xml @@ -16,10 +16,10 @@ and createTime >= #{startDate} - and createTime <= #{endDate} + and createTime <= #{endDate} - order by downloadDate desc, createTime desc + order by createTime desc \ No newline at end of file