最新版本问题

src/main/java/com/glxp/udidl/admin/controller/device/TestController.java

@@ -3,8 +3,10 @@ package com.glxp.udidl.admin.controller.device;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.glxp.udidl.admin.constant.Constant;
 import com.glxp.udidl.admin.dao.udi.ProductInfoMapper;
+import com.glxp.udidl.admin.dao.udid.DeviceMapper;
 import com.glxp.udidl.admin.entity.udi.ProductInfoEntity;
 import com.glxp.udidl.admin.entity.udi.UdiCompanyEntity;
 import com.glxp.udidl.admin.entity.udid.Contactlist;
@@ -20,6 +22,7 @@ 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.IntUtil;
 import com.glxp.udidl.admin.util.RedisUtil;
 import com.glxp.udidl.admin.util.ResultVOUtils;
 import org.slf4j.Logger;
@@ -209,6 +212,31 @@ public class TestController {
         return ResultVOUtils.success("总数=" + keys.size() + "\n");
     }
 
+    @Resource
+    DeviceMapper deviceMapper;
+
+    @GetMapping("udidl/device/transNewest")
+    public BaseResponse transNewest() {
+        List<Device> devices = deviceMapper.selectNew();
+        for (Device device : devices) {
+            List<ProductInfoEntity> productInfoEntityList = productInfoDao.selectList(new QueryWrapper<ProductInfoEntity>().eq("deviceRecordKey", device.getDevicerecordkey()));
+            if (CollUtil.isNotEmpty(productInfoEntityList) && productInfoEntityList.size() > 1) {
+                for (ProductInfoEntity productInfoEntity : productInfoEntityList) {
+                    productInfoEntity.setIsNewest(false);
+                }
+
+                for (ProductInfoEntity productInfoEntity : productInfoEntityList) {
+                    if (IntUtil.value(productInfoEntity.getVersionNumber()) == IntUtil.value(device.getVersionnumber())) {
+                        productInfoEntity.setIsNewest(true);
+                    }
+
+                    productInfoService.updateProductInfo(productInfoEntity);
+                }
+
+            }
+        }
+        return ResultVOUtils.success();
+    }
 
 
 }

src/main/java/com/glxp/udidl/admin/controller/device/UdiInfoController.java

@@ -92,6 +92,9 @@ public class UdiInfoController {
                     checkSuccess = false;
                     lostMsg = lostMsg + ",序列号";
                 }
+                if (!checkSuccess) {
+                    lostMsg = "UDI码格式错误,缺少" + lostMsg.substring(1);
+                }
                 if (StrUtil.isNotEmpty(udiEntity.getSerialNo()) && udiEntity.getSerialNo().length() > 20) {
                     checkSuccess = false;
                     lostMsg = lostMsg + ",序列号超出20位";

src/main/java/com/glxp/udidl/admin/controller/device/UdidlDeviceController.java

@@ -173,10 +173,7 @@ public class UdidlDeviceController {
     @AuthRuleAnnotation("udidl/device/dlLastVersionByDi")
     @GetMapping("udidl/device/dlLastVersionByDi")
     public BaseResponse dlLastVersionByDi(String deviceId) {
-        deviceSyncService.downloadSingle(deviceId, Constant.DL_TYPE_UPDATE);
+        return deviceSyncService.searchDlLastByDi(deviceId);
-        ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest();
-        productInfoFilterRequest.setNameCode(deviceId);
-        return ResultVOUtils.success(productInfoService.findLastVersion(productInfoFilterRequest));
     }
 
 

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

@@ -68,4 +68,6 @@ public interface DeviceMapper extends BaseMapper<Device> {
 
     void updateDevice(Device device);
 
+    List<Device>  selectNew();
+
 }

src/main/java/com/glxp/udidl/admin/entity/udi/ProductInfoEntity.java

@@ -1,5 +1,6 @@
 package com.glxp.udidl.admin.entity.udi;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -160,12 +161,16 @@ public class ProductInfoEntity {
 
     //额外字段
     @ApiModelProperty(value = "批次号")
+    @TableField(exist = false)
     private String batchNo;
     @ApiModelProperty(value = "生产日期")
+    @TableField(exist = false)
     private String produceDate;
     @ApiModelProperty(value = "失效日期")
+    @TableField(exist = false)
     private String expireDate;
     @ApiModelProperty(value = "序列号")
+    @TableField(exist = false)
     private String serialNo;
 
 

src/main/java/com/glxp/udidl/admin/res/test/SelectNewResponse.java

@@ -0,0 +1,7 @@
+package com.glxp.udidl.admin.res.test;
+
+import lombok.Data;
+
+@Data
+public class SelectNewResponse {
+}

src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceSaveService.java

@@ -2,6 +2,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.udi.ProductInfoEntity;
 import com.glxp.udidl.admin.entity.udid.*;
 import com.glxp.udidl.admin.res.udid.DataSetResult;
 import com.glxp.udidl.admin.service.inout.DeviceService;
@@ -10,6 +11,7 @@ import com.glxp.udidl.admin.service.udi.UdiCompanyService;
 import com.glxp.udidl.admin.thread.UdiTransferUtils;
 import com.glxp.udidl.admin.util.BeanUtils;
 import com.glxp.udidl.admin.util.DateUtil;
+import com.glxp.udidl.admin.util.IntUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -54,10 +56,13 @@ public class DeviceSaveService {
                     String uuid = null;
                     Device originDevice = deviceService.selectDiIsSame(item.getZxxsdycpbs(), item.getVersionNumber() + "");
                     if (dlType == Constant.DL_TYPE_ADD) {
-                        if (originDevice != null)
+                        if (originDevice != null){
+                            updateNewest(originDevice);
                             continue;
                         }
 
+                    }
+
 
                     //2,存储 deviceInfo
                     Device device = responseToDevice(item);
@@ -84,6 +89,7 @@ public class DeviceSaveService {
 //                        uuid = getUUId();
 //                        device.setUuid(uuid);
 //                        deviceService.insertDevice(device);
+                            updateNewest(originDevice);
                             continue;
                         }
                     }
@@ -184,6 +190,16 @@ public class DeviceSaveService {
         }
         return result;
     }
+    @Resource
+    ProductInfoService productInfoService;
+
+    public void updateNewest(Device device){
+        if(!productInfoService.selectNewst(device.getDevicerecordkey(),true, IntUtil.value(device.getVersionnumber()))){
+            productInfoService.updateNoNewst(device.getDevicerecordkey(),false,null);
+            productInfoService.updateNoNewst(device.getDevicerecordkey(),true, IntUtil.value(device.getVersionnumber()));
+        }
+
+    }
 
     /**
      * device数据格式转换

src/main/java/com/glxp/udidl/admin/service/dataSync/DeviceSyncService.java

@@ -179,6 +179,25 @@ public class DeviceSyncService {
         return ResultVOUtils.success(productInfoEntityList);
     }
 
+    public BaseResponse searchDlLastByDi(String deviceId) {
+        List<ProductInfoEntity> productInfoEntityList;
+        DataSetSingleResult result1 = deviceDownloadService.downloadByDi(deviceId);
+        if (result1.getReturnCode() != 1)
+            return ResultVOUtils.error(-1, result1.getReturnMsg());
+
+        if (CollUtil.isNotEmpty(result1.getDataSet().getDeviceInfo())) {
+            List<DataSetResult.DataSet> dataSets = new ArrayList<>();
+            dataSets.add(result1.getDataSet());
+            deviceSaveService.DeviceSave(dataSets, new Date(), Constant.DL_TYPE_UPDATE);
+            productInfoEntityList = searchByDI(deviceId);
+        } else {
+            return ResultVOUtils.error(501, "医疗器械唯一标识数据库未找到此产品DI,请检查是否输入正确或联系厂家是否已上传");
+        }
+
+        return ResultVOUtils.success(productInfoEntityList);
+    }
+
+
     public List<ProductInfoEntity> searchByDI(String deviceId) {
         ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest();
         productInfoFilterRequest.setNameCode(deviceId);

src/main/java/com/glxp/udidl/admin/service/inout/ProductInfoService.java

@@ -53,4 +53,6 @@ public interface ProductInfoService {
 
     boolean updateProductInfoData(ProductInfoEntity productInfoEntity);
 
+    boolean updateNoNewst(String deviceRecordKey,Boolean isNewst,Integer versionNum);
+    boolean selectNewst(String deviceRecordKey,Boolean isNewst,Integer versionNum);
 }

src/main/java/com/glxp/udidl/admin/service/inout/impl/ProductInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.glxp.udidl.admin.service.inout.impl;
 
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.glxp.udidl.admin.dao.udi.ProductInfoMapper;
 import com.glxp.udidl.admin.entity.udi.ProductInfoEntity;
@@ -12,6 +13,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -213,6 +215,22 @@ public class ProductInfoServiceImpl implements ProductInfoService {
         return productInfoDao.updateProductInfoData(productInfoEntity);
     }
 
+    @Override
+    public boolean updateNoNewst(String deviceRecordKey, Boolean isNewst, Integer versionNum) {
+        ProductInfoEntity productInfoEntity = new ProductInfoEntity();
+        productInfoEntity.setIsNewest(isNewst);
+        productInfoEntity.setUpdateTime(new Date());
+        return productInfoDao.update(productInfoEntity,
+                new QueryWrapper<ProductInfoEntity>().eq("deviceRecordKey",deviceRecordKey)
+        .eq(versionNum!=null,"versionNumber",versionNum))>0;
+    }
+
+    @Override
+    public boolean selectNewst(String deviceRecordKey, Boolean isNewest, Integer versionNum) {
+        return productInfoDao.exists(new QueryWrapper<ProductInfoEntity>().eq("deviceRecordKey",deviceRecordKey)
+        .eq("isNewest",isNewest).eq("versionNumber",versionNum));
+    }
+
     @Override
     public boolean deleteById(String id) {
         return productInfoDao.deleteById(id);

src/main/java/com/glxp/udidl/admin/thread/UdiTransferUtils.java

@@ -1,5 +1,6 @@
 package com.glxp.udidl.admin.thread;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.glxp.udidl.admin.entity.udi.CountProductEntity;
 import com.glxp.udidl.admin.entity.udi.ProductClassify;
@@ -193,40 +194,31 @@ public class UdiTransferUtils {
                 productInfoEntity.setSjcpbm(getSjcpbm(devicepackages, productInfoEntity.getNameCode()));
                 productInfoEntity.setDiType(4);
                 productInfoEntity.setUpdateTime(new Date());
+                productInfoEntity.setIsNewest(true);
                 productInfoService.insertProductInfo(productInfoEntity);
             }
         }
 
-        //更新为最新版本
+//        //更新为最新版本
         ProductInfoFilterRequest filterRequest1 = new ProductInfoFilterRequest();
         filterRequest1.setNameCode(di);
         List<ProductInfoEntity> updateEntitys = productInfoService.filterUdi(filterRequest1);
         if (updateEntitys != null && updateEntitys.size() > 0) {
-
-            //获取最高版本号
-            ProductInfoEntity updateEntity = updateEntitys.get(0);
-            for (ProductInfoEntity tempEntity : updateEntitys) {
-                if (tempEntity.getVersionNumber() > updateEntity.getVersionNumber()) {
-                    updateEntity = tempEntity;
-                }
-            }
-
             ProductInfoFilterRequest filterRequest = new ProductInfoFilterRequest();
-            filterRequest.setDeviceRecordKey(updateEntity.getDeviceRecordKey());
+            filterRequest.setDeviceRecordKey(productInfoEntity.getDeviceRecordKey());
             List<ProductInfoEntity> temps = productInfoService.filterProductInfo(filterRequest);
-            if (temps != null && temps.size() > 0) {
+            if (CollUtil.isNotEmpty(temps)) {
                 for (ProductInfoEntity change : temps) {
                     change.setIsNewest(false);
                     change.setUpdateTime(new Date());
-                    productInfoService.updateProductInfo(change);
                 }
+                for (ProductInfoEntity change : temps) {
+                    if (productInfoEntity.getUuid().equals(change.getUuid())) {
+                        change.setIsNewest(true);
+                        change.setUpdateTime(new Date());
+                    }
+                    productInfoService.updateProductInfo(change);
                 }
-
-            List<ProductInfoEntity> updates = productInfoService.selectByUuid(updateEntity.getUuid());
-            for (ProductInfoEntity update : updates) {
-                update.setIsNewest(true);
-                update.setUpdateTime(new Date());
-                productInfoService.updateProductInfo(update);
             }
         }
 

src/main/java/com/glxp/udidl/admin/util/IntUtil.java

@@ -0,0 +1,42 @@
+package com.glxp.udidl.admin.util;
+
+import cn.hutool.core.util.StrUtil;
+
+public class IntUtil {
+
+    public static int value(Integer value) {
+        if (value == null)
+            return 0;
+        else return value.intValue();
+
+    }
+
+    public static long value(Long value) {
+        if (value == null)
+            return 0l;
+        else return value.longValue();
+
+    }
+
+
+    public static boolean value(Boolean value) {
+        if (value == null)
+            return false;
+        else return value;
+    }
+
+    public static int value(String value) {
+        if (StrUtil.isNotEmpty(value)) {
+            try {
+                int r = Integer.parseInt(value);
+                return r;
+            } catch (Exception e) {
+                e.printStackTrace();
+                return 0;
+            }
+        }
+
+        return 0;
+    }
+
+}

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

@@ -753,4 +753,6 @@
                 #{qtxxdwzlj},
                 #{categoryName})
     </insert>
+
+
 </mapper>

src/main/resources/mybatis/mapper/udid/DeviceMapper.xml

@@ -114,12 +114,55 @@
     </sql>
     <sql id="Base_Column_List">
         uuid
-        , deviceRecordKey, btcpbs, btcpbsyzxxsdycpbssfyz, cgzmraqxgxx, cpbsbmtxmc, cpbsfbrq,
+                ,
-    cphhhbh, cplb, cpmctymc, cpms, flbm, ggxh, mjfs, qtxxdwzlj, qxlb, scbssfbhph, scbssfbhscrq,
+        deviceRecordKey,
-    scbssfbhsxrq, scbssfbhxlh, sfbjwycxsy, sfwblztlcp, sfwwjbz, sfybtzjbs, spmc, sydycpbs,
+        btcpbs,
-    syqsfxyjxmj, tscchcztj, tsccsm, tsrq, tyshxydm, versionNumber, versionStatus, versionTime,
+        btcpbsyzxxsdycpbssfyz,
-    ybbm, yflbm, ylqxzcrbarmc, ylqxzcrbarywmc, zczbhhzbapzbh, zdcfsycs, zxxsdycpbs, bszt,
+        cgzmraqxgxx,
-    sfyzcbayz, zcbacpbs, zxxsdyzsydydsl, deviceHistoryRecordKey, bssjzt,hchzsb,cplx
+        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
     </sql>
     <select id="selectByExample" parameterType="com.glxp.udidl.admin.entity.udid.DeviceExample"
             resultMap="BaseResultMap">
@@ -148,7 +191,8 @@
         where uuid = #{uuid,jdbcType=VARCHAR}
     </delete>
     <delete id="deleteByExample" parameterType="com.glxp.udidl.admin.entity.udid.DeviceExample">
-        delete from device
+        delete
+        from device
         <if test="_parameter != null">
             <include refid="Example_Where_Clause"/>
         </if>
@@ -301,7 +345,6 @@
             <if test="hchzsb != null">
                 hchzsb,
             </if>
-
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="uuid != null">
@@ -448,12 +491,12 @@
             <if test="hchzsb != null">
                 #{hchzsb,jdbcType=VARCHAR},
             </if>
-
         </trim>
     </insert>
     <select id="countByExample" parameterType="com.glxp.udidl.admin.entity.udid.DeviceExample"
             resultType="java.lang.Long">
-        select count(*) from device
+        select count(*)
+        from device
         <if test="_parameter != null">
             <include refid="Example_Where_Clause"/>
         </if>
@@ -804,7 +847,6 @@
             <if test="hchzsb != null">
                 hchzsb = #{bssjzt,jdbcType=VARCHAR},
             </if>
-
         </set>
         where uuid = #{uuid,jdbcType=VARCHAR}
     </update>
@@ -855,7 +897,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>
@@ -863,8 +905,8 @@
     <select id="searchBykey" parameterType="com.glxp.udidl.admin.req.udid.DeviceListRequest" resultMap="BaseResultMap">
         select *
         from device
-        WHERE (zxxsdycpbs like concat(#{key}, '%') or cpmctymc like concat(#{key}, '%')) limit #{page}
+        WHERE (zxxsdycpbs like concat(#{key}, '%') or cpmctymc like concat(#{key}, '%'))
-            , #{limit}
+        limit #{page} , #{limit}
     </select>
 
 
@@ -875,49 +917,48 @@
     </select>
 
     <select id="search" parameterType="com.glxp.udidl.admin.req.udid.DeviceSearchRequest" resultMap="BaseResultMap">
-        select * from device
+        select *
+        from device
 
         <where>
-            <if test="zxxsdycpbs != '' and zxxsdycpbs!=null">
+            <if test="zxxsdycpbs != '' and zxxsdycpbs != null">
-                and zxxsdycpbs LIKE concat(#{zxxsdycpbs,jdbcType=VARCHAR},'%')
+                and zxxsdycpbs LIKE concat(#{zxxsdycpbs,jdbcType=VARCHAR}, '%')
             </if>
-            <if test="cpmctymc != '' and cpmctymc!=null">
+            <if test="cpmctymc != '' and cpmctymc != null">
-                and cpmctymc LIKE concat(#{cpmctymc,jdbcType=VARCHAR},'%')
+                and cpmctymc LIKE concat(#{cpmctymc,jdbcType=VARCHAR}, '%')
             </if>
-            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc!=null">
+            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
-                and ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc,jdbcType=VARCHAR},'%')
+                and ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc,jdbcType=VARCHAR}, '%')
             </if>
-            <if test="ggxh != '' and ggxh!=null">
+            <if test="ggxh != '' and ggxh != null">
-                and ggxh LIKE concat(#{ggxh,jdbcType=VARCHAR},'%')
+                and ggxh LIKE concat(#{ggxh,jdbcType=VARCHAR}, '%')
             </if>
-            <if test="zczbhhzbapzbh != '' and zczbhhzbapzbh!=null">
+            <if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
-                and zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh,jdbcType=VARCHAR},'%')
+                and zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh,jdbcType=VARCHAR}, '%')
             </if>
-
         </where>
         limit #{page},#{limit}
     </select>
     <select id="getTotal" parameterType="com.glxp.udidl.admin.req.udid.DeviceSearchRequest" resultType="Long">
-        select count(zxxsdycpbs) from device
+        select count(zxxsdycpbs)
+        from device
 
         <where>
-
+            <if test="zxxsdycpbs != '' and zxxsdycpbs != null">
-            <if test="zxxsdycpbs != '' and zxxsdycpbs!=null">
+                and zxxsdycpbs LIKE concat(#{zxxsdycpbs,jdbcType=VARCHAR}, '%')
-                and zxxsdycpbs LIKE concat(#{zxxsdycpbs,jdbcType=VARCHAR},'%')
             </if>
-            <if test="cpmctymc != '' and cpmctymc!=null">
+            <if test="cpmctymc != '' and cpmctymc != null">
-                and cpmctymc LIKE concat(#{cpmctymc,jdbcType=VARCHAR},'%')
+                and cpmctymc LIKE concat(#{cpmctymc,jdbcType=VARCHAR}, '%')
             </if>
-            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc!=null">
+            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
-                and ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc,jdbcType=VARCHAR},'%')
+                and ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc,jdbcType=VARCHAR}, '%')
             </if>
-            <if test="ggxh != '' and ggxh!=null">
+            <if test="ggxh != '' and ggxh != null">
-                and ggxh LIKE concat(#{ggxh,jdbcType=VARCHAR},'%')
+                and ggxh LIKE concat(#{ggxh,jdbcType=VARCHAR}, '%')
             </if>
-            <if test="zczbhhzbapzbh != '' and zczbhhzbapzbh!=null">
+            <if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
-                and zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh,jdbcType=VARCHAR},'%')
+                and zczbhhzbapzbh LIKE concat(#{zczbhhzbapzbh,jdbcType=VARCHAR}, '%')
             </if>
-
         </where>
     </select>
     <delete id="deleteHistory" parameterType="Map">
@@ -930,7 +971,8 @@
         SELECT *
         from device
         WHERE deviceRecordKey = #{deviceRecordKey}
-        ORDER BY versionNumber DESC LIMIT 1
+        ORDER BY versionNumber DESC
+        LIMIT 1
     </select>
 
     <select id="searchByZxxscpbs" parameterType="Map" resultType="com.glxp.udidl.admin.entity.udid.Device">
@@ -939,7 +981,8 @@
 
         WHERE zxxsdycpbs = #{zxxsdycpbs}
 
-        ORDER BY versionNumber DESC LIMIT 1
+        ORDER BY versionNumber DESC
+        LIMIT 1
     </select>
     <select id="searchHistory" parameterType="Map" resultType="com.glxp.udidl.admin.entity.udid.Device">
         SELECT *
@@ -951,7 +994,8 @@
         SELECT uuid
         from device
         WHERE deviceRecordKey = #{deviceRecordKey}
-          and versionNumber = #{versionNumber} limit 1
+          and versionNumber = #{versionNumber}
+        limit 1
     </select>
 
 
@@ -959,13 +1003,15 @@
         SELECT *
         from device
         WHERE zxxsdycpbs = #{zxxsdycpbs}
-          and versionNumber = #{versionNumber} limit 1
+          and versionNumber = #{versionNumber}
+        limit 1
     </select>
 
     <select id="selectKey" parameterType="Map" resultType="java.lang.String">
         SELECT uuid
         from device
-        WHERE zxxsdycpbs = #{zxxsdycpbs} limit 1
+        WHERE zxxsdycpbs = #{zxxsdycpbs}
+        limit 1
     </select>
 
     <select id="findAllByZxxscpbs" resultType="java.lang.String">
@@ -977,23 +1023,29 @@
     <select id="findAllByZxxscpbsPage" parameterType="com.glxp.udidl.admin.req.ListPageRequest"
             resultType="java.lang.String">
         SELECT uuid
-        from device limit #{page},#{limit}
+        from device
+        limit #{page},#{limit}
     </select>
 
 
     <select id="downloadDevice" parameterType="com.glxp.udidl.admin.req.DownloadUdiRequest" resultMap="BaseResultMap">
         select *
-        from device limit #{page},#{limit}
+        from device
+        limit #{page},#{limit}
     </select>
 
 
     <update id="updateCplx" parameterType="com.glxp.udidl.admin.entity.udid.Device">
         UPDATE device
         <set>
-            <if test="hchzsb != null">hchzsb=#{hchzsb},</if>
+            <if test="hchzsb != null">
-            <if test="cplx != null">cplx=#{cplx},</if>
+                hchzsb=#{hchzsb},
+            </if>
+            <if test="cplx != null">
+                cplx=#{cplx},
+            </if>
         </set>
-        WHERE devicerecordkey=#{devicerecordkey}
+        WHERE devicerecordkey = #{devicerecordkey}
     </update>
 
     <insert id="updateDevice" parameterType="com.glxp.udidl.admin.entity.udid.Device">
@@ -1014,8 +1066,7 @@
                              zdcfsycs, zxxsdycpbs, bszt,
                              sfyzcbayz, zcbacpbs, zxxsdyzsydydsl,
                              deviceHistoryRecordKey, bssjzt, lastModifyTime, requestDate, hchzsb, cplx)
-        values (
+        values (#{uuid,jdbcType=VARCHAR},
-        #{uuid,jdbcType=VARCHAR},
                 #{devicerecordkey,jdbcType=VARCHAR},
                 #{btcpbs,jdbcType=VARCHAR},
                 #{btcpbsyzxxsdycpbssfyz,jdbcType=VARCHAR},
@@ -1065,8 +1116,14 @@
                 #{lastModifyTime,jdbcType=VARCHAR},
                 #{requestDate},
                 #{hchzsb},
-        #{cplx}
+                #{cplx})
-        )
     </insert>
 
+
+    <select id="selectNew" parameterType="Map" resultType="com.glxp.udidl.admin.entity.udid.Device">
+        SELECT	a.deviceRecordKey,a.versionNumber FROM
+                ( SELECT deviceRecordKey, max( lastModifyTime ) modifyTime,versionNumber FROM device  GROUP BY deviceRecordKey ) a
+                        JOIN device b ON a.deviceRecordKey = b.deviceRecordKey AND a.modifyTime = b.lastModifyTime
+
+    </select>
 </mapper>