From ed65e148c155df16b8f42abf15329d10bcc59228 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Wed, 21 Sep 2022 14:05:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=8B=E8=BD=BDbug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=8C=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/ProductInfoController.java | 2 +- .../device/UdiCompanyController.java | 2 +- .../udidl/admin/dao/udid/DeviceMapper.java | 2 + .../glxp/udidl/admin/entity/udid/Device.java | 2 + .../admin/req/ProductInfoFilterRequest.java | 1 + .../service/dataSync/DeviceSaveService.java | 3 +- .../admin/service/inout/DeviceService.java | 3 ++ .../service/inout/impl/DeviceServiceImpl.java | 5 +++ .../inout/impl/ProductInfoServiceImpl.java | 6 +++ src/main/resources/application-dev.yml | 4 +- .../mybatis/mapper/udi/UdiCompanyMapper.xml | 37 ++++++++++--------- .../mybatis/mapper/udid/DeviceMapper.xml | 15 ++++++-- 12 files changed, 55 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/glxp/udidl/admin/controller/device/ProductInfoController.java b/src/main/java/com/glxp/udidl/admin/controller/device/ProductInfoController.java index a405b0d..12c400b 100644 --- a/src/main/java/com/glxp/udidl/admin/controller/device/ProductInfoController.java +++ b/src/main/java/com/glxp/udidl/admin/controller/device/ProductInfoController.java @@ -135,7 +135,7 @@ public class ProductInfoController { @GetMapping("udidl/udiwms/syncUdi") public BaseResponse syncUdi(SyncUdiRequest syncUdiRequest) { ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest(); - BeanUtils.copyProperties(productInfoFilterRequest, syncUdiRequest); + BeanUtils.copyProperties(syncUdiRequest, productInfoFilterRequest); if (productInfoFilterRequest.getPage() == null || productInfoFilterRequest.getLimit() == null) return ResultVOUtils.error(500, "分页参数不能为空"); List productInfoEntityList = productInfoService.syncDlUdi(productInfoFilterRequest); diff --git a/src/main/java/com/glxp/udidl/admin/controller/device/UdiCompanyController.java b/src/main/java/com/glxp/udidl/admin/controller/device/UdiCompanyController.java index 5e1a83b..fc13b6a 100644 --- a/src/main/java/com/glxp/udidl/admin/controller/device/UdiCompanyController.java +++ b/src/main/java/com/glxp/udidl/admin/controller/device/UdiCompanyController.java @@ -69,7 +69,7 @@ public class UdiCompanyController { ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest(); BeanUtils.copyProperties(filterCompanyDiRequest, productInfoFilterRequest); - if (StrUtil.isNotEmpty(productInfoFilterRequest.getTyshxydm())) { + if (StrUtil.isEmpty(productInfoFilterRequest.getTyshxydm())) { return ResultVOUtils.error(500, "统一社会信用代码不能为空！"); } List productInfoEntities; 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 c175386..1ab9eed 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 @@ -53,6 +53,8 @@ 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); + String selectKey(@Param("zxxsdycpbs") String zxxsdycpbs); List downloadDevice(DownloadUdiRequest downloadUdiRequest); 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 10f7178..61a13f4 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 @@ -2,10 +2,12 @@ package com.glxp.udidl.admin.entity.udid; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import java.util.Date; @ApiModel(value = "医疗器械信息实体") +@Data public class Device { diff --git a/src/main/java/com/glxp/udidl/admin/req/ProductInfoFilterRequest.java b/src/main/java/com/glxp/udidl/admin/req/ProductInfoFilterRequest.java index 1bf693d..151a94f 100644 --- a/src/main/java/com/glxp/udidl/admin/req/ProductInfoFilterRequest.java +++ b/src/main/java/com/glxp/udidl/admin/req/ProductInfoFilterRequest.java @@ -45,6 +45,7 @@ public class ProductInfoFilterRequest extends ListPageRequest { private String updateTime; + public String toCacheKey() { return nameCode + deviceRecordKey + uuid + cpmctymc + ylqxzcrbarmc + ggxh + tyshxydm + showHis + diType + zczbhhzbapzbh + updateTime; } 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 4b7144e..a0a1d57 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,5 +1,6 @@ package com.glxp.udidl.admin.service.dataSync; +import cn.hutool.core.util.StrUtil; import com.glxp.udidl.admin.entity.udid.*; import com.glxp.udidl.admin.res.udid.DataSetResult; import com.glxp.udidl.admin.service.inout.DeviceService; @@ -43,7 +44,7 @@ public class DeviceSaveService { for (DataSetResult.DeviceInfo item : ds.getDeviceInfo()) { //1:判断数据是否存在 - if (deviceService.selectisSame(item.getDeviceRecordKey(), item.getVersionNumber() + "") != null) + if (StrUtil.isNotEmpty(deviceService.selectDiIsSame(item.getZxxsdycpbs(), item.getVersionNumber() + ""))) continue; Device device = responseToDevice(item); String uuid = getUUId(); 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 4e7cb86..1a7e632 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,6 +38,8 @@ public interface DeviceService { String selectisSame(String deviceRecordKey, String versionNumber); + String selectDiIsSame(String zxxsdycpbs, String versionNumber); + String selectKey(String zxxsdycpbs); List findAllByZxxscpbs(); 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 14fee05..d9db939 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 @@ -189,6 +189,11 @@ public class DeviceServiceImpl implements DeviceService { return deviceMapper.selectisSame(deviceRecordKey, versionNumber); } + @Override + public String selectDiIsSame(String zxxsdycpbs, String versionNumber) { + return deviceMapper.selectDiIsSame(zxxsdycpbs, versionNumber); + } + @Override public String selectKey(String zxxsdycpbs) { return deviceMapper.selectKey(zxxsdycpbs); diff --git a/src/main/java/com/glxp/udidl/admin/service/inout/impl/ProductInfoServiceImpl.java b/src/main/java/com/glxp/udidl/admin/service/inout/impl/ProductInfoServiceImpl.java index 307785d..95db338 100644 --- a/src/main/java/com/glxp/udidl/admin/service/inout/impl/ProductInfoServiceImpl.java +++ b/src/main/java/com/glxp/udidl/admin/service/inout/impl/ProductInfoServiceImpl.java @@ -108,8 +108,14 @@ public class ProductInfoServiceImpl implements ProductInfoService { } if (productInfoFilterRequest.getPage() != null) { int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit(); + if (offset < 0) { + offset = 0; + } productInfoFilterRequest.setPage(offset); productInfoFilterRequest.setLimit(productInfoFilterRequest.getLimit()); + } else { + productInfoFilterRequest.setPage(1); + productInfoFilterRequest.setLimit(10); } List data = productInfoDao.filterUdiNoPage(productInfoFilterRequest); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 6ea1c55..c1e1701 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://192.168.0.66:3306/udidl_test?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root - password: root + password: 123456 servlet: multipart: max-file-size: 100MB diff --git a/src/main/resources/mybatis/mapper/udi/UdiCompanyMapper.xml b/src/main/resources/mybatis/mapper/udi/UdiCompanyMapper.xml index 92609af..647f3d6 100644 --- a/src/main/resources/mybatis/mapper/udi/UdiCompanyMapper.xml +++ b/src/main/resources/mybatis/mapper/udi/UdiCompanyMapper.xml @@ -55,43 +55,44 @@ limit #{page} - ,#{limit} + ,#{limit} REPLACE - INTO udicompany + INTO udicompany (tyshxydm, ylqxzcrbarmc, ylqxzcrbarywmc, qylxrdh, qylxrcz, qylxryx, updateTime) - values (#{tyshxydm}, - #{ylqxzcrbarmc}, - #{ylqxzcrbarywmc}, - #{qylxrdh}, - #{qylxrcz}, - #{qylxryx}, - #{updateTime}) + values ( + #{tyshxydm}, + #{ylqxzcrbarmc}, + #{ylqxzcrbarywmc}, + #{qylxrdh}, + #{qylxrcz}, + #{qylxryx}, + #{updateTime} + ) replace INTO udicompany(tyshxydm, ylqxzcrbarmc, ylqxzcrbarywmc, qylxrdh, - qylxrcz, qylxryx, updateTime) - values + qylxrcz, qylxryx, updateTime) + values (#{item.tyshxydm}, - #{item.ylqxzcrbarmc}, - #{item.ylqxzcrbarywmc}, - #{item.qylxrdh}, - #{item.qylxrcz}, - #{item.qylxryx}),#{item.updateTime} + #{item.ylqxzcrbarmc}, + #{item.ylqxzcrbarywmc}, + #{item.qylxrdh}, + #{item.qylxrcz}, + #{item.qylxryx}),#{item.updateTime} diff --git a/src/main/resources/mybatis/mapper/udid/DeviceMapper.xml b/src/main/resources/mybatis/mapper/udid/DeviceMapper.xml index e68d22f..3e9406f 100644 --- a/src/main/resources/mybatis/mapper/udid/DeviceMapper.xml +++ b/src/main/resources/mybatis/mapper/udid/DeviceMapper.xml @@ -169,7 +169,7 @@ ylqxzcrbarmc, ylqxzcrbarywmc, zczbhhzbapzbh, zdcfsycs, zxxsdycpbs, bszt, sfyzcbayz, zcbacpbs, zxxsdyzsydydsl, - deviceHistoryRecordKey, bssjzt, lastModifyTime, requestDate,hchzsb,cplx) + 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}, @@ -187,7 +187,7 @@ #{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}) + #{lastModifyTime,jdbcType=VARCHAR}, #{requestDate}, #{hchzsb}, #{cplx}) insert into device @@ -890,8 +890,7 @@ zcbacpbs = #{zcbacpbs,jdbcType=VARCHAR}, zxxsdyzsydydsl = #{zxxsdyzsydydsl,jdbcType=VARCHAR}, deviceHistoryRecordKey = #{devicehistoryrecordkey,jdbcType=VARCHAR}, - bssjzt = #{bssjzt,jdbcType=VARCHAR} - hchzsb = #{hchzsb,jdbcType=VARCHAR} + bssjzt = #{bssjzt,jdbcType=VARCHAR} hchzsb = #{hchzsb,jdbcType=VARCHAR} where uuid = #{uuid,jdbcType=VARCHAR} @@ -990,6 +989,14 @@ and versionNumber = #{versionNumber} limit 1 + + +