'优化统一告警表-统计接口，综合云图界面中没有设备总数统计'

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

@@ -67,13 +67,13 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
                 .eq(DmpProductInfo::getTenantId,SecurityUtils.getTenantId());
         List<DmpProductInfo> list1 = dmpProductInfoService.list(queryWrapper);
         if(CollectionUtils.isNotEmpty(list1)){
-//            QueryWrapper<DmpDeviceInfo> queryWrapper1 = Wrappers.query();
-//            queryWrapper1.select("product_code as productCode","count(*) as count")
-//                    .in("service_status",1,2)
-//                    .eq("delete_flag",0)
-//                    .eq("tenant_id",SecurityUtils.getTenantId())
-//                    .groupBy("product_code");
-//            List<Map<String,Object>> mapList= dmpDeviceInfoService.listMaps(queryWrapper1);
+            QueryWrapper<DmpDeviceInfo> queryWrapper1 = Wrappers.query();
+            queryWrapper1.select("product_code as productCode","count(*) as count")
+                    .in("service_status",1,2)
+                    .eq("delete_flag",0)
+                    .eq("tenant_id",SecurityUtils.getTenantId())
+                    .groupBy("product_code");
+            List<Map<String,Object>> mapList= dmpDeviceInfoService.listMaps(queryWrapper1);
 
             List<String> productCodeList = list1.stream().map(s -> s.getProductCode()).collect(Collectors.toList());
             QueryWrapper<BaseAlarm> queryWrapper2 = Wrappers.query();
@@ -122,16 +122,16 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
                 responeVO.setProcessed(processed);
                 responeVO.setProcessRate(processRate);
 
-//                //设备总数
-//                responeVO.setDeviceCount(0);
-//                if(CollectionUtils.isNotEmpty(mapList)){
-//                    for(int j=0;j<mapList.size();j++){
-//                        if(list1.get(i).getProductCode().equals(mapList.get(j).get("productCode"))){
-//                            responeVO.setDeviceCount(Integer.parseInt(String.valueOf(mapList.get(j).get("count"))));
-//                            break;
-//                        }
-//                    }
-//                }
+                //设备总数
+                responeVO.setDeviceCount(0);
+                if(CollectionUtils.isNotEmpty(mapList)){
+                    for(int j=0;j<mapList.size();j++){
+                        if(list1.get(i).getProductCode().equals(mapList.get(j).get("productCode"))){
+                            responeVO.setDeviceCount(Integer.parseInt(String.valueOf(mapList.get(j).get("count"))));
+                            break;
+                        }
+                    }
+                }
 
                 //离线告警统计
                 //离线告警未处理