Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseAlarmServiceImpl.java

@@ -54,47 +54,17 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
 
         List<BaseAlarmResponeVO> list = new ArrayList<>();
 
-        QueryWrapper<BaseAlarm> wrapper = new QueryWrapper<>();
-        if(StringUtils.isNotBlank(baseAlarmRequestVO.getProductName())){
-            LambdaQueryWrapper<DmpProductInfo> queryWrapper = Wrappers.lambdaQuery();
-            queryWrapper.eq(DmpProductInfo::getDeleteFlag,0)
-                    .like(DmpProductInfo::getProductName,baseAlarmRequestVO.getProductName())
-                    .eq(DmpProductInfo::getTenantId,SecurityUtils.getTenantId());
-            List<DmpProductInfo> list1 = dmpProductInfoService.list(queryWrapper);
-            List<String> productCodeList = new ArrayList<>();
-            if(list1.size() > 0){
-                for(int i=0;i<list1.size();i++){
-                    productCodeList.add(list1.get(i).getProductCode());
-                }
-            }
-
-            if(productCodeList.size() > 0){
-                wrapper.select("distinct product_code as productCode")
-                        .in("product_code",productCodeList)
-                        .eq("tenant_id",SecurityUtils.getTenantId());
-            }else{
-                wrapper.eq("product_code","");
-            }
-
-        }else{
-            wrapper.select("distinct product_code as productCode")
-                    .eq("tenant_id",SecurityUtils.getTenantId());
-        }
-        List<BaseAlarm> list1 = this.list(wrapper);
+        LambdaQueryWrapper<DmpProductInfo> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(DmpProductInfo::getDeleteFlag,0)
+                .like(StringUtils.isNotBlank(baseAlarmRequestVO.getProductName()),DmpProductInfo::getProductName,baseAlarmRequestVO.getProductName())
+                .eq(DmpProductInfo::getTenantId,SecurityUtils.getTenantId());
+        List<DmpProductInfo> list1 = dmpProductInfoService.list(queryWrapper);
         if(CollectionUtils.isNotEmpty(list1)){
             for(int i=0;i<list1.size();i++){
                 BaseAlarmResponeVO responeVO = new BaseAlarmResponeVO();
                 responeVO.setProductCode(list1.get(i).getProductCode());
-
-                LambdaQueryWrapper<DmpProductInfo> queryWrapper = Wrappers.lambdaQuery();
-                queryWrapper.eq(DmpProductInfo::getDeleteFlag,0)
-                        .eq(DmpProductInfo::getProductCode,list1.get(i).getProductCode())
-                        .eq(DmpProductInfo::getTenantId,SecurityUtils.getTenantId());
-                DmpProductInfo one = dmpProductInfoService.getOne(queryWrapper);
-                if(one != null){
-                    responeVO.setProductName(one.getProductName());
-                    responeVO.setDeviceType(one.getDeviceType());
-                }
+                responeVO.setProductName(list1.get(i).getProductName());
+                responeVO.setDeviceType(list1.get(i).getDeviceType());
 
                 //未处理
                 int untreated = 0;