Ver código fonte

fix bug:调整代码,接口返回的count值改为整数

lijie 3 anos atrás
pai
commit
dbe2a47a36

+ 2 - 2
src/main/java/com/persagy/proxy/object/controller/AdmSpaceController.java

@@ -241,10 +241,10 @@ public class AdmSpaceController {
                 List<AdmFloor> floors = building.getFloor();
                 floors.forEach(floor -> {
                     if(CollUtil.isNotEmpty(floor.getSpaceList())){
-                        floor.setCount(String.valueOf(floor.getSpaceList().size()));
+                        floor.setCount(floor.getSpaceList().size());
                         floor.setSpaceList(null);
                     }else{
-                        floor.setCount("0");
+                        floor.setCount(0);
                     }
                 });
             }

+ 1 - 1
src/main/java/com/persagy/proxy/object/model/AdmFloor.java

@@ -62,7 +62,7 @@ public class AdmFloor extends AdmBaseEntity<AdmFloor> {
     private List<ObjectNode> outline;
 
     /** 数量 */
-    private String count;
+    private Integer count;
 
     /** 自定义信息点 */
     private ObjectNode properties;

+ 5 - 5
src/main/java/com/persagy/proxy/report/controller/AdmReportEquipController.java

@@ -585,20 +585,20 @@ public class AdmReportEquipController {
             return AdmResponse.success(equipComDelList);
         }
         // 按楼层统计设备数量
-        equipList.stream().forEach(equip -> {
+        equipList.forEach(equip -> {
             String floorId = equip.get("floorId").textValue();
             if(admFloorMap.containsKey(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 汇总
-        admFloorMap.values().stream().forEach(floor -> {
+        admFloorMap.values().forEach(floor -> {
             String modelId = floor.getModelId();
             if(equipDelMap.containsKey(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);
             }
         });