Browse Source

修改首页铃铛进入的详情页面信息

gao.qiang 10 months ago
parent
commit
5e7b5efcdf

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

@@ -1013,22 +1013,22 @@ public class BaseCameraManagementController extends BaseController {
      */
     @GetMapping("/getMalfunctionAndLowCameraManagement")
     public AjaxResult getMalfunctionAndLowCameraManagement() {
-        HashMap<String, Long> map = new HashMap<>();
+        HashMap<String, Integer> map = new HashMap<>();
         LambdaQueryWrapper<BaseDeviceDynamicManagement> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(BaseDeviceDynamicManagement::getIsDisable, 2);
-        long isDisable = baseDeviceDynamicManagementService.count(wrapper);
-        map.put("isDisable", isDisable);
+        List<BaseDeviceDynamicManagement> isDisable = baseDeviceDynamicManagementService.list(wrapper);
+        map.put("isDisable", isDisable.size());
         LambdaQueryWrapper<BaseDeviceDynamicManagement> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.le(BaseDeviceDynamicManagement::getElectricity, 10);
-        long electricity = baseDeviceDynamicManagementService.count(queryWrapper);
-        List<BaseDeviceDynamicManagement> list = baseDeviceDynamicManagementService.list();
-        List<BaseDeviceDynamicManagement> collect = list.stream().filter(f -> f.getFacilityState()==2).collect(Collectors.toList());
-        List<BaseDeviceDynamicManagement> collect1 = list.stream().filter(f -> f.getElectricityState()==2).collect(Collectors.toList());
+        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);
-        map.put("count", isDisable + electricity);
-        map.put("readCount", (long) (collect.size()+collect1.size()));
+
+        map.put("electricity", electricity.size());
+        map.put("count", isDisable.size() + electricity.size());
+        map.put("readCount", collect.size()+collect1.size());
         return AjaxResult.success(map);
     }