铃铛数量修改

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

@@ -1013,6 +1013,7 @@ public class BaseCameraManagementController extends BaseController {
 
     /**
      * 视频服务页面,报警信息列表点击查看 报警记录回放视频
+     *
      * @param alarmId
      * @return
      */
@@ -1143,14 +1144,14 @@ public class BaseCameraManagementController extends BaseController {
     public AjaxResult getMalfunctionAndLowCameraManagement() {
         HashMap<String, Integer> map = new HashMap<>();
         DeviceStateResp deviceStateResp1 = new DeviceStateResp();
-        DeviceStateResp deviceStateResp = (DeviceStateResp) dataScoreUtil.setDataScore(getUserId(),deviceStateResp1);
+        DeviceStateResp deviceStateResp = (DeviceStateResp) dataScoreUtil.setDataScore(getUserId(), deviceStateResp1);
         List<DeviceStateResp> deviceStateRespList = baseCameraManagementService.deviceStateRespList(deviceStateResp);
         List<DeviceStateResp> isDisable = deviceStateRespList.stream().filter(f -> f.getIsDisable().equals("故障")).collect(Collectors.toList());
         map.put("isDisable", isDisable.size());
-        List<DeviceStateResp> electricity = deviceStateRespList.stream().filter(f -> f.getElectricity()<=10).collect(Collectors.toList());
+        List<DeviceStateResp> electricity = deviceStateRespList.stream().filter(f -> f.getElectricity() <= 10 && f.getElectricity() != -1).collect(Collectors.toList());
         map.put("electricity", electricity.size());
         map.put("count", isDisable.size() + electricity.size());
-        map.put("readCount", isDisable.size()+electricity.size());
+        map.put("readCount", isDisable.size() + electricity.size());
         return AjaxResult.success(map);
     }
 
@@ -1173,10 +1174,9 @@ public class BaseCameraManagementController extends BaseController {
 //    }
 
 
-
-
     /**
      * 首页设备状态
+     *
      * @return
      */
     @GetMapping("cameraStateTotal")
@@ -1188,6 +1188,7 @@ public class BaseCameraManagementController extends BaseController {
 
     /**
      * 首页设备状态列表
+     *
      * @return
      */
     @GetMapping("cameraStateList")