|
@@ -1022,13 +1022,13 @@ public class BaseCameraManagementController extends BaseController {
|
|
|
queryWrapper.le(BaseDeviceDynamicManagement::getElectricity, 10);
|
|
|
long electricity = baseDeviceDynamicManagementService.count(queryWrapper);
|
|
|
List<BaseDeviceDynamicManagement> list = baseDeviceDynamicManagementService.list();
|
|
|
- List<BaseDeviceDynamicManagement> collect = list.stream().filter(f -> f.getFacilityState()==1).collect(Collectors.toList());
|
|
|
- List<BaseDeviceDynamicManagement> collect1 = list.stream().filter(f -> f.getElectricityState()==1).collect(Collectors.toList());
|
|
|
+ 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());
|
|
|
|
|
|
|
|
|
map.put("electricity", electricity);
|
|
|
map.put("count", isDisable + electricity);
|
|
|
- map.put("category", (long) (collect.size()+collect1.size()));
|
|
|
+ map.put("readCount", (long) (collect.size()+collect1.size()));
|
|
|
return AjaxResult.success(map);
|
|
|
}
|
|
|
|