Merge branch 'fengcang' into busUser

api-admin/src/main/java/com/glxp/api/admin/dao/basic/ProductInfoDao.java

@@ -44,6 +44,12 @@ public interface ProductInfoDao {
 
     List<ProductInfoEntity> filterUdi(ProductInfoFilterRequest productInfoFilterRequest);
 
+
+    List<ProductInfoEntity> filterUdiNoPage(ProductInfoFilterRequest productInfoFilterRequest);
+
+    Long filterUdiNoPageCount(ProductInfoFilterRequest productInfoFilterRequest);
+
+
     List<ProductInfoEntity> syncDlUdi(ProductInfoFilterRequest productInfoFilterRequest);
 
     List<String> filterUuidByCreditNo(ProductInfoFilterRequest productInfoFilterRequest);

api-admin/src/main/java/com/glxp/api/admin/req/receipt/ProductInfoFilterRequest.java

@@ -23,4 +23,8 @@ public class ProductInfoFilterRequest extends ListPageRequest {
     private Integer isNewest;
     private String zczbhhzbapzbh;
     private String updateTime;
+
+    public String toCacheKey() {
+        return nameCode + deviceRecordKey + uuid + cpmctymc + ylqxzcrbarmc + ggxh + tyshxydm + diType + zczbhhzbapzbh + updateTime;
+    }
 }

api-admin/src/main/java/com/glxp/api/admin/service/basic/ProductInfoService.java

@@ -27,6 +27,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);

api-admin/src/main/java/com/glxp/api/admin/service/basic/SyncUdiService.java

@@ -7,6 +7,7 @@ import com.glxp.api.admin.entity.basic.UdiCompanyEntity;
 import com.glxp.api.admin.req.basic.UdiCompanyRequest;
 import com.glxp.api.admin.req.receipt.ProductInfoFilterRequest;
 import com.glxp.api.admin.res.PageSimpleResponse;
+import com.glxp.api.admin.util.RedisUtil;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import org.springframework.stereotype.Service;
@@ -24,6 +25,9 @@ public class SyncUdiService {
     @Resource
     UdiCompanyService udiCompanyService;
 
+    @Resource
+    RedisUtil redisUtil;
+
     public BaseResponse filterUdi(ProductInfoFilterRequest productInfoFilterRequest) {
 
         //过滤--1.参数不能全未空
@@ -60,10 +64,12 @@ public class SyncUdiService {
                 return ResultVOUtils.error(500, "请输入医疗器械注册备案人名称");
             }
         }
-        if (
+
-                StrUtil.isEmpty(productInfoFilterRequest.getYlqxzcrbarmc())
+
+        if ((productInfoFilterRequest.getYlqxzcrbarmc() == null || productInfoFilterRequest.getYlqxzcrbarmc().equals(""))
                 && (productInfoFilterRequest.getNameCode() == null || productInfoFilterRequest.getNameCode().equals(""))
                 && (productInfoFilterRequest.getCpmctymc() == null || productInfoFilterRequest.getCpmctymc().equals(""))
+
         ) {
             if (productInfoFilterRequest.getGgxh() != null && !productInfoFilterRequest.getGgxh().equals("")) {
                 return ResultVOUtils.error(500, "请输入医疗器械注册备案人名称");
@@ -73,13 +79,28 @@ public class SyncUdiService {
             }
         }
 
+        if (productInfoFilterRequest.getCpmctymc() != null && !productInfoFilterRequest.getCpmctymc().equals("") && productInfoFilterRequest.getCpmctymc().length() < 4) {
+            return ResultVOUtils.error(500, "请输入完整的产品通用名称！");
+        }
         productInfoFilterRequest.setIsNewest(1);
         productInfoFilterRequest.setDiType("1");
-        List<ProductInfoEntity> productInfoEntityList = productInfoService.filterUdi(productInfoFilterRequest);
+
-        PageInfo<ProductInfoEntity> pageInfo;
+        String keyCache = productInfoFilterRequest.toCacheKey();
-        pageInfo = new PageInfo<>(productInfoEntityList);
+        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);
 

api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/ProductInfoServiceImpl.java

@@ -5,6 +5,7 @@ import com.glxp.api.admin.dao.basic.ProductInfoDao;
 import com.glxp.api.admin.entity.basic.ProductInfoEntity;
 import com.glxp.api.admin.req.receipt.ProductInfoFilterRequest;
 import com.glxp.api.admin.service.basic.ProductInfoService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -112,6 +113,38 @@ 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);

api-admin/src/main/java/com/glxp/api/admin/util/RedisUtil.java

@@ -1,6 +1,7 @@
 package com.glxp.api.admin.util;
 
 
+import cn.hutool.core.collection.CollUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
@@ -574,4 +575,12 @@ public class RedisUtil {
         }
     }
 
+    //模糊匹配删除
+    public void deleteByPrex(String prex) {
+        Set<String> keys = redisTemplate.keys(prex);
+        if (CollUtil.isNotEmpty(keys)) {
+            redisTemplate.delete(keys);
+        }
+    }
+
 }

api-admin/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml

@@ -258,6 +258,103 @@
 
 
     </select>
+
+
+    <select id="filterUdiNoPage" parameterType="com.glxp.api.admin.req.receipt.ProductInfoFilterRequest"
+            resultType="com.glxp.api.admin.entity.basic.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.api.admin.req.receipt.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.api.admin.entity.basic.ProductInfoEntity">
         select *