小杨查询优化

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

@@ -1,5 +1,6 @@
 package com.glxp.udidl.admin.controller.device;
 
+import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.udidl.admin.annotation.AuthRuleAnnotation;
 import com.glxp.udidl.admin.entity.udi.ProductInfoEntity;
@@ -48,6 +49,9 @@ public class ProductInfoController {
             key = FilterUdiUtils.getDiStr(key);
             productInfoFilterRequest.setNameCode(key);
         }
+        if (StrUtil.isEmpty(productInfoFilterRequest.getNameCode())) {
+            return ResultVOUtils.error(500, "UDI码不能为空");
+        }
         List<ProductInfoEntity> productInfoEntityList = productInfoService.findAll(productInfoFilterRequest);
         ProductInfoResponse productInfoResponse = new ProductInfoResponse();
         if (productInfoEntityList != null && productInfoEntityList.size() > 0) {
@@ -83,7 +87,6 @@ public class ProductInfoController {
         if (key != null) {
             udiEntity = FilterUdiUtils.getUdi(key);
             key = udiEntity.getUdi();// FilterUdiUtils.getDiStr(key);
-
             productInfoFilterRequest.setNameCode(key);
         }
         List<ProductInfoEntity> productInfoEntityList = productInfoService.findAll(productInfoFilterRequest);
@@ -136,7 +139,6 @@ public class ProductInfoController {
         return ResultVOUtils.success(udiCompanyEntities);
     }
 
-    //开放查询 查询只查询主DI，
     @ApiOperation(value = "根据主DI查询产品信息", response = ProductInfoEntity.class)
     @AuthRuleAnnotation("udidl/device/filterUdi")
     @GetMapping("udidl/device/filterUdi")
@@ -190,7 +192,6 @@ public class ProductInfoController {
     }
 
 
-    //开放查询 查询全部，不会过滤只显示主
     @ApiOperation(value = "查询全部产品信息接口", response = ProductInfoEntity.class)
     @AuthRuleAnnotation("udidl/device/filterAllUdi")
     @GetMapping("udidl/device/filterAllUdi")
@@ -243,7 +244,6 @@ public class ProductInfoController {
     }
 
 
-    //开放查询 查询全部，不会过滤只显示主
     @ApiOperation(value = "赋码系统下载全部产品信息接口", response = ProductInfoEntity.class)
     @AuthRuleAnnotation("udidl/device/dlDiByPc")
     @GetMapping("udidl/device/dlDiByPc")
@@ -260,6 +260,9 @@ public class ProductInfoController {
             return ResultVOUtils.error(500, "参数不能为空！");
         }
 
+
+
+
         if (productInfoFilterRequest.getNameCode() != null && !productInfoFilterRequest.getNameCode().equals("") && productInfoFilterRequest.getNameCode().length() < 10) {
             return ResultVOUtils.error(500, "请输入完整的最小销售单元标识！");
         }
@@ -268,11 +271,8 @@ public class ProductInfoController {
             return ResultVOUtils.error(500, "请输入完整的医疗器械注册备案人名称！");
         }
 
-
-        if ((productInfoFilterRequest.getYlqxzcrbarmc() == null || productInfoFilterRequest.getYlqxzcrbarmc().equals(""))
-                && (productInfoFilterRequest.getNameCode() == null || productInfoFilterRequest.getNameCode().equals(""))
-                && (productInfoFilterRequest.getCpmctymc() == null || productInfoFilterRequest.getCpmctymc().equals(""))
-
+        if (StrUtil.isEmpty(productInfoFilterRequest.getYlqxzcrbarmc()) && StrUtil.isEmpty(productInfoFilterRequest.getCpmctymc())
+                && StrUtil.isEmpty(productInfoFilterRequest.getNameCode()) && StrUtil.isEmpty(productInfoFilterRequest.getTyshxydm())
         ) {
             if (productInfoFilterRequest.getGgxh() != null && !productInfoFilterRequest.getGgxh().equals("")) {
                 return ResultVOUtils.error(500, "请输入医疗器械注册备案人名称");
@@ -281,8 +281,7 @@ public class ProductInfoController {
                 return ResultVOUtils.error(500, "请输入医疗器械注册备案人名称");
             }
         }
-
-        if (productInfoFilterRequest.getCpmctymc() != null && !productInfoFilterRequest.getCpmctymc().equals("") && productInfoFilterRequest.getCpmctymc().length() < 4) {
+        if (StrUtil.isNotEmpty(productInfoFilterRequest.getCpmctymc()) && productInfoFilterRequest.getCpmctymc().length() < 4) {
             return ResultVOUtils.error(500, "请输入完整的产品通用名称！");
         }
         productInfoFilterRequest.setIsNewest(1);

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

@@ -1,5 +1,6 @@
 package com.glxp.udidl.admin.service.inout.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageHelper;
 import com.glxp.udidl.admin.dao.udi.ProductInfoMapper;
 import com.glxp.udidl.admin.entity.udi.ProductInfoEntity;
@@ -114,6 +115,13 @@ public class ProductInfoServiceImpl implements ProductInfoService {
 
     @Override
     public List<ProductInfoEntity> findAll(ProductInfoFilterRequest productInfoFilterRequest) {
+
+        if (StrUtil.isEmpty(productInfoFilterRequest.getTyshxydm()) && StrUtil.isEmpty(productInfoFilterRequest.getNameCode())
+                && StrUtil.isEmpty(productInfoFilterRequest.getYlqxzcrbarmc()) && StrUtil.isEmpty(productInfoFilterRequest.getDeviceRecordKey())
+                && StrUtil.isEmpty(productInfoFilterRequest.getUuid())) {
+            return Collections.emptyList();
+        }
+
         List<ProductInfoEntity> data = productInfoDao.filterProductInfo(productInfoFilterRequest);
         return data;
     }