数据下载bug修复，查询优化

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<ProductInfoEntity> productInfoEntityList = productInfoService.syncDlUdi(productInfoFilterRequest);

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<ProductInfoEntity> productInfoEntities;

src/main/java/com/glxp/udidl/admin/dao/udid/DeviceMapper.java

@@ -53,6 +53,8 @@ public interface DeviceMapper extends BaseMapper<Device> {
 
     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<Device> downloadDevice(DownloadUdiRequest downloadUdiRequest);

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 {
 
 

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;
     }

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();

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<String> findAllByZxxscpbs();

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);

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<ProductInfoEntity> data = productInfoDao.filterUdiNoPage(productInfoFilterRequest);

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

src/main/resources/mybatis/mapper/udi/UdiCompanyMapper.xml

@@ -55,43 +55,44 @@
             </if>
         </where>
         limit #{page}
-                ,#{limit}
+        ,#{limit}
     </select>
 
 
     <select id="searchByName" parameterType="java.lang.String" resultType="java.lang.String">
         select ylqxzcrbarmc
         from udicompany
-        where ylqxzcrbarmc like concat('%', #{name}, '%')
-        limit 50
+        where ylqxzcrbarmc like concat('%', #{name}, '%') limit 50
     </select>
 
     <insert id="insertUdiCompany" keyProperty="id" parameterType="com.glxp.udidl.admin.entity.udi.UdiCompanyEntity">
         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}
+        )
     </insert>
 
     <insert id="insertUdiCompanys" keyProperty="id" parameterType="com.glxp.udidl.admin.entity.udi.UdiCompanyEntity">
         replace INTO udicompany(tyshxydm, ylqxzcrbarmc, ylqxzcrbarywmc, qylxrdh,
-                                qylxrcz, qylxryx, updateTime)
-                values
+        qylxrcz, qylxryx, updateTime)
+        values
         <foreach collection="udiCompanyEntities" item="item" index="index"
                  separator=",">
             (#{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}
         </foreach>
     </insert>
     <delete id="deleteById" parameterType="Map">

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>
     <insert id="insertSelective" parameterType="com.glxp.udidl.admin.entity.udid.Device">
         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}
     </update>
@@ -990,6 +989,14 @@
           and versionNumber = #{versionNumber} limit 1
     </select>
 
+
+    <select id="selectDiIsSame" parameterType="Map" resultType="java.lang.String">
+        SELECT uuid
+        from device
+        WHERE zxxsdycpbs = #{zxxsdycpbs}
+          and versionNumber = #{versionNumber} limit 1
+    </select>
+
     <select id="selectKey" parameterType="Map" resultType="java.lang.String">
         SELECT uuid
         from device