首页铃铛修改

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -1020,17 +1020,17 @@ public class BaseCameraManagementController extends BaseController {
         LambdaQueryWrapper<BaseDeviceDynamicManagement> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(BaseDeviceDynamicManagement::getIsDisable, 2);
         List<BaseDeviceDynamicManagement> isDisable = baseDeviceDynamicManagementService.list(wrapper);
-        map.put("isDisable", isDisable.size());
+        List<BaseDeviceDynamicManagement> collect = isDisable.stream().filter(f -> f.getFacilityState()==2).collect(Collectors.toList());
+        map.put("isDisable", collect.size());
         LambdaQueryWrapper<BaseDeviceDynamicManagement> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.le(BaseDeviceDynamicManagement::getElectricity, 10);
         List<BaseDeviceDynamicManagement> electricity = baseDeviceDynamicManagementService.list(queryWrapper);
 
-        List<BaseDeviceDynamicManagement> collect = isDisable.stream().filter(f -> f.getFacilityState()==2).collect(Collectors.toList());
         List<BaseDeviceDynamicManagement> collect1 = electricity.stream().filter(f -> f.getElectricityState()==2).collect(Collectors.toList());
 
 
-        map.put("electricity", electricity.size());
-        map.put("count", isDisable.size() + electricity.size());
+        map.put("electricity", collect1.size());
+        map.put("count", collect.size()+collect1.size());
         map.put("readCount", collect.size()+collect1.size());
         return AjaxResult.success(map);
     }