UDI本体标识转换错误，下级产品标识转换产品标识，PC端查询端下载优化

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

@@ -17,6 +17,7 @@ import com.glxp.udidl.admin.service.inout.ProductInfoService;
 import com.glxp.udidl.admin.service.udi.UdiCompanyService;
 import com.glxp.udidl.admin.util.BeanUtils;
 import com.glxp.udidl.admin.util.FilterUdiUtils;
+import com.glxp.udidl.admin.util.RedisUtil;
 import com.glxp.udidl.admin.util.ResultVOUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -39,12 +40,15 @@ public class ProductInfoController {
     ProductInfoService productInfoService;
     @Resource
     UdiCompanyService udiCompanyService;
+    @Resource
+    RedisUtil redisUtil;
 
     //手持枪扫码查询
     @ApiOperation(value = "手持枪扫码查询", response = ProductInfoEntity.class)
     @AuthRuleAnnotation("udidl/device/findBydi")
     @ApiImplicitParams({@ApiImplicitParam(name = "nameCode", value = "UDI码", required = true)})
     @GetMapping("udidl/device/findBydi")
+
     public BaseResponse findProductInfo(String nameCode) {
         ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest();
         String key = nameCode;
@@ -200,6 +204,8 @@ public class ProductInfoController {
     @AuthRuleAnnotation("udidl/device/filterAllUdi")
     @GetMapping("udidl/device/filterAllUdi")
     public BaseResponse filterAllUdi(ProductInfoFilterRequest productInfoFilterRequest) {
+
+
         //过滤--1.参数不能全未空
         if ((productInfoFilterRequest.getYlqxzcrbarmc() == null || productInfoFilterRequest.getYlqxzcrbarmc().equals("")) &&
                 (productInfoFilterRequest.getCpmctymc() == null || productInfoFilterRequest.getCpmctymc().equals("")) &&
@@ -238,11 +244,23 @@ public class ProductInfoController {
             return ResultVOUtils.error(500, "请输入完整的产品通用名称！");
         }
         productInfoFilterRequest.setIsNewest(1);
-        List<ProductInfoEntity> productInfoEntityList = productInfoService.filterUdi(productInfoFilterRequest);
-        PageInfo<ProductInfoEntity> pageInfo;
-        pageInfo = new PageInfo<>(productInfoEntityList);
+
+        String keyCache = productInfoFilterRequest.toCacheKey();
+        if (StrUtil.isEmpty(keyCache)) {
+            return ResultVOUtils.error(500, "查询条件不能为空！");
+        }
+        String totalStr = (String) redisUtil.get(keyCache);
+        long total = 0;
+        if (StrUtil.isEmpty(totalStr)) {
+            total = productInfoService.filterUdiNoPageCount(productInfoFilterRequest);
+            redisUtil.set(keyCache, total + "");
+        } else {
+            total = Long.parseLong(totalStr);
+        }
+
+        List<ProductInfoEntity> productInfoEntityList = productInfoService.filterUdiNoPage(productInfoFilterRequest);
         PageSimpleResponse<ProductInfoEntity> pageSimpleResponse = new PageSimpleResponse<>();
-        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setTotal(total);
         pageSimpleResponse.setList(productInfoEntityList);
         return ResultVOUtils.success(pageSimpleResponse);
     }
@@ -287,11 +305,22 @@ public class ProductInfoController {
             return ResultVOUtils.error(500, "请输入完整的产品通用名称！");
         }
         productInfoFilterRequest.setIsNewest(1);
-        List<ProductInfoEntity> productInfoEntityList = productInfoService.filterUdi(productInfoFilterRequest);
-        PageInfo<ProductInfoEntity> pageInfo;
-        pageInfo = new PageInfo<>(productInfoEntityList);
+
+        String keyCache = productInfoFilterRequest.toCacheKey();
+        if (StrUtil.isEmpty(keyCache)) {
+            return ResultVOUtils.error(500, "查询条件不能为空！");
+        }
+        String totalStr = (String) redisUtil.get(keyCache);
+        long total = 0;
+        if (StrUtil.isEmpty(totalStr)) {
+            total = productInfoService.filterUdiNoPageCount(productInfoFilterRequest);
+            redisUtil.set(keyCache, total + "");
+        } else {
+            total = Long.parseLong(totalStr);
+        }
+        List<ProductInfoEntity> productInfoEntityList = productInfoService.filterUdiNoPage(productInfoFilterRequest);
         PageSimpleResponse<ProductInfoEntity> pageSimpleResponse = new PageSimpleResponse<>();
-        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setTotal(total);
         pageSimpleResponse.setList(productInfoEntityList);
         return ResultVOUtils.success(pageSimpleResponse);
     }

src/main/java/com/glxp/udidl/admin/dao/udi/ProductInfoMapper.java

@@ -39,6 +39,10 @@ public interface ProductInfoMapper extends BaseMapper<ProductInfoEntity> {
 
     List<ProductInfoEntity> filterUdi(ProductInfoFilterRequest productInfoFilterRequest);
 
+    List<ProductInfoEntity> filterUdiNoPage(ProductInfoFilterRequest productInfoFilterRequest);
+
+    Long filterUdiNoPageCount(ProductInfoFilterRequest productInfoFilterRequest);
+
     List<ProductInfoEntity> syncDlUdi(ProductInfoFilterRequest productInfoFilterRequest);
 
     List<String> filterUuidByCreditNo(ProductInfoFilterRequest productInfoFilterRequest);

src/main/java/com/glxp/udidl/admin/req/ProductInfoFilterRequest.java

@@ -43,4 +43,9 @@ public class ProductInfoFilterRequest extends ListPageRequest {
 
     @ApiModelProperty(value = "更新时间")
     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/inout/ProductInfoService.java

@@ -24,6 +24,11 @@ public interface ProductInfoService {
 
     List<ProductInfoEntity> filterUdi(ProductInfoFilterRequest productInfoFilterRequest);
 
+
+    List<ProductInfoEntity> filterUdiNoPage(ProductInfoFilterRequest productInfoFilterRequest);
+
+    Long filterUdiNoPageCount(ProductInfoFilterRequest productInfoFilterRequest);
+
     List<ProductInfoEntity> selectByUuid(String uuid);
 
     List<ProductInfoEntity> syncDlUdi(ProductInfoFilterRequest productInfoFilterRequest);

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

@@ -6,6 +6,7 @@ import com.glxp.udidl.admin.dao.udi.ProductInfoMapper;
 import com.glxp.udidl.admin.entity.udi.ProductInfoEntity;
 import com.glxp.udidl.admin.req.ProductInfoFilterRequest;
 import com.glxp.udidl.admin.service.inout.ProductInfoService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -100,6 +101,37 @@ public class ProductInfoServiceImpl implements ProductInfoService {
         return data;
     }
 
+    @Override
+    public List<ProductInfoEntity> filterUdiNoPage(ProductInfoFilterRequest productInfoFilterRequest) {
+        if (productInfoFilterRequest == null) {
+            return Collections.emptyList();
+        }
+        if (productInfoFilterRequest.getPage() != null) {
+            int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
+            productInfoFilterRequest.setPage(offset);
+            productInfoFilterRequest.setLimit(productInfoFilterRequest.getLimit());
+        }
+
+        List<ProductInfoEntity> data = productInfoDao.filterUdiNoPage(productInfoFilterRequest);
+        return data;
+    }
+
+    @Override
+    public Long filterUdiNoPageCount(ProductInfoFilterRequest request) {
+
+
+        ProductInfoFilterRequest productInfoFilterRequest = new ProductInfoFilterRequest();
+        BeanUtils.copyProperties(request, productInfoFilterRequest);
+
+        if (productInfoFilterRequest.getPage() != null) {
+            int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
+            productInfoFilterRequest.setPage(offset);
+            productInfoFilterRequest.setLimit(productInfoFilterRequest.getLimit());
+
+        }
+        return productInfoDao.filterUdiNoPageCount(productInfoFilterRequest);
+    }
+
     @Override
     public List<ProductInfoEntity> selectByUuid(String uuid) {
         List<ProductInfoEntity> data = productInfoDao.selectByUuid(uuid);

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

@@ -128,10 +128,10 @@ public class UdiTransferUtils {
             productInfoEntity.setZxxsbzbhsydysl(0);
             productInfoEntity.setDiType(3);
             productInfoEntity.setSjcpbm(deviceEntity.getZxxsdycpbs());
-            productInfoEntity.setNameCode(deviceEntity.getSydycpbs());
+            productInfoEntity.setNameCode(deviceEntity.getBtcpbs());
             productInfoEntity.setUpdateTime(new Date());
             productInfoService.insertProductInfo(productInfoEntity);
-            productInfoEntity.setBhxjcpbm(deviceEntity.getSydycpbs());
+            productInfoEntity.setBhxjcpbm(deviceEntity.getBtcpbs());
             productInfoEntity.setBhxjsl(1);
             productInfoEntity.setPackLevel(2 + "");
             productInfoEntity.setZxxsbzbhsydysl(1);

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

@@ -1,10 +1,13 @@
 package com.glxp.udidl.admin.util;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.db.nosql.redis.RedisDS;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import redis.clients.jedis.Jedis;
 
+import java.util.Set;
+
 /**
  * redis工具类
  */
@@ -46,4 +49,16 @@ public class RedisUtil {
         return true;
     }
 
+
+    //模糊匹配删除
+    public void deleteByPrex(String prex) {
+        Set<String> keys = jedis.keys(prex);
+        if (CollUtil.isNotEmpty(keys)) {
+            for (String str : keys) {
+                jedis.del(str);
+            }
+        }
+    }
+
+
 }

src/main/resources/application.yml

@@ -2,7 +2,7 @@ server:
   port: 9994
 spring:
   profiles:
-    active: dev
+    active: pro
   jmx:
     enabled: false
 

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

@@ -230,6 +230,101 @@
             </if>
         </where>
     </select>
+
+    <select id="filterUdiNoPage" parameterType="com.glxp.udidl.admin.req.ProductInfoFilterRequest"
+            resultType="com.glxp.udidl.admin.entity.udi.ProductInfoEntity">
+        select *
+        from productinfo
+        <where>
+            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
+                AND ylqxzcrbarmc = #{ylqxzcrbarmc}
+            </if>
+
+            <if test="ylqxzcrbarmc == null and cpmctymc != '' and cpmctymc != null">
+                AND cpmctymc LIKE concat(#{cpmctymc}, '%')
+            </if>
+
+            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null and cpmctymc != '' and cpmctymc != null">
+                AND cpmctymc LIKE concat('%', #{cpmctymc}, '%')
+            </if>
+            <if test="nameCode != '' and nameCode != null">
+                AND nameCode LIKE concat(#{nameCode}, '%')
+            </if>
+            <if test="uuid != '' and uuid != null">
+                AND uuid = #{uuid}
+            </if>
+            <if test="ggxh != '' and ggxh != null">
+                AND ggxh LIKE concat('%', #{ggxh}, '%')
+            </if>
+            <if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
+                AND zczbhhzbapzbh LIKE concat('%', #{zczbhhzbapzbh}, '%')
+            </if>
+
+            <if test="deviceRecordKey != '' and deviceRecordKey != null">
+                AND deviceRecordKey = #{deviceRecordKey}
+            </if>
+            <if test="updateTime != null and updateTime != ''">
+                <![CDATA[
+                and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')
+                ]]>
+            </if>
+            <if test="isNewest != null and isNewest != ''">
+                AND isNewest = #{isNewest}
+            </if>
+            <if test="diType != '' and diType != null">
+                AND diType = #{diType}
+            </if>
+        </where>
+        limit #{page},#{limit}
+    </select>
+
+
+    <select id="filterUdiNoPageCount" parameterType="com.glxp.udidl.admin.req.ProductInfoFilterRequest"
+            resultType="java.lang.Long">
+        select count(0)
+        from productinfo
+        <where>
+            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
+                AND ylqxzcrbarmc = #{ylqxzcrbarmc}
+            </if>
+
+            <if test="ylqxzcrbarmc == null and cpmctymc != '' and cpmctymc != null">
+                AND cpmctymc LIKE concat(#{cpmctymc}, '%')
+            </if>
+
+            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null and cpmctymc != '' and cpmctymc != null">
+                AND cpmctymc LIKE concat('%', #{cpmctymc}, '%')
+            </if>
+            <if test="nameCode != '' and nameCode != null">
+                AND nameCode LIKE concat(#{nameCode}, '%')
+            </if>
+            <if test="uuid != '' and uuid != null">
+                AND uuid = #{uuid}
+            </if>
+            <if test="ggxh != '' and ggxh != null">
+                AND ggxh LIKE concat('%', #{ggxh}, '%')
+            </if>
+            <if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
+                AND zczbhhzbapzbh LIKE concat('%', #{zczbhhzbapzbh}, '%')
+            </if>
+
+            <if test="deviceRecordKey != '' and deviceRecordKey != null">
+                AND deviceRecordKey = #{deviceRecordKey}
+            </if>
+            <if test="updateTime != null and updateTime != ''">
+                <![CDATA[
+                and DATE_FORMAT(updateTime, '%Y-%m-%d %H:%i:%S') >= DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')
+                ]]>
+            </if>
+            <if test="isNewest != null and isNewest != ''">
+                AND isNewest = #{isNewest}
+            </if>
+            <if test="diType != '' and diType != null">
+                AND diType = #{diType}
+            </if>
+        </where>
+    </select>
+
     <select id="selectByUpdateTime"
             resultType="com.glxp.udidl.admin.entity.udi.ProductInfoEntity">
         select *
@@ -335,7 +430,8 @@
         #{sfwwjbz},
         #{syqsfxyjxmj},
         #{mjfs},
-        #{qtxxdwzlj},#{categoryName}
+        #{qtxxdwzlj},
+        #{categoryName}
         )
     </insert>