|
@@ -585,20 +585,20 @@ public class AdmReportEquipController {
|
|
return AdmResponse.success(equipComDelList);
|
|
return AdmResponse.success(equipComDelList);
|
|
}
|
|
}
|
|
// 按楼层统计设备数量
|
|
// 按楼层统计设备数量
|
|
- equipList.stream().forEach(equip -> {
|
|
|
|
|
|
+ equipList.forEach(equip -> {
|
|
String floorId = equip.get("floorId").textValue();
|
|
String floorId = equip.get("floorId").textValue();
|
|
if(admFloorMap.containsKey(floorId)){
|
|
if(admFloorMap.containsKey(floorId)){
|
|
AdmFloor floor = admFloorMap.get(floorId);
|
|
AdmFloor floor = admFloorMap.get(floorId);
|
|
- Integer count = floor.getCount() == null ? 0 : Integer.parseInt(floor.getCount());
|
|
|
|
- floor.setCount(String.valueOf(count+1));
|
|
|
|
|
|
+ int count = floor.getCount() == null ? 0 : floor.getCount();
|
|
|
|
+ floor.setCount(count+1);
|
|
}
|
|
}
|
|
});
|
|
});
|
|
// 3 根据floorId,modelId 汇总
|
|
// 3 根据floorId,modelId 汇总
|
|
- admFloorMap.values().stream().forEach(floor -> {
|
|
|
|
|
|
+ admFloorMap.values().forEach(floor -> {
|
|
String modelId = floor.getModelId();
|
|
String modelId = floor.getModelId();
|
|
if(equipDelMap.containsKey(modelId)){
|
|
if(equipDelMap.containsKey(modelId)){
|
|
ObjectNode delCounter = equipDelMap.get(modelId);
|
|
ObjectNode delCounter = equipDelMap.get(modelId);
|
|
- int count = delCounter.get("count").intValue() + Integer.parseInt(floor.getCount());
|
|
|
|
|
|
+ int count = delCounter.get("count").intValue() + (floor.getCount() == null ? 0 : floor.getCount());
|
|
delCounter.put("count", count);
|
|
delCounter.put("count", count);
|
|
}
|
|
}
|
|
});
|
|
});
|