楼宇中控接口修改

project-zcustom/src/main/java/com/project/zcustom/service/logistics/impl/LargePlatAssetServiceImpl.java

@@ -23,8 +23,10 @@ public class LargePlatAssetServiceImpl implements ILargePlatAssetService {
         List<LargeAssetDirs> list1 = platLogisticsMapper.getBuildingAssetRate(appOrg);
         if (list1.size() > 0){
             largeLogistics.setBuildingAssetList(list1);
+            largeLogistics.setBuildingAssetNum(platLogisticsMapper.getBuildingAssetNum(appOrg));
         }
         else {
+            largeLogistics.setBuildingAssetNum(0L);
             List<LargeAssetDirs> list2 = new ArrayList<>();
             LargeAssetDirs largeAssetDirs1 = new LargeAssetDirs();
             LargeAssetDirs largeAssetDirs2 = new LargeAssetDirs();
@@ -56,7 +58,6 @@ public class LargePlatAssetServiceImpl implements ILargePlatAssetService {
             list2.add(largeAssetDirs7);
             largeLogistics.setBuildingAssetList(list2);
         }
-        largeLogistics.setBuildingAssetNum(platLogisticsMapper.getBuildingAssetNum(appOrg));
         return largeLogistics;
     }
 
@@ -65,8 +66,10 @@ public class LargePlatAssetServiceImpl implements ILargePlatAssetService {
         List<LargeAssetDirs> list1 = platLogisticsMapper.getServiceAssetRate(appOrg);
         if (list1.size() > 0){
             largeLogistics.setServiceAssetList(list1);
+            largeLogistics.setServiceAssetNum(platLogisticsMapper.getServiceAssetNum(appOrg));
         }
         else {
+            largeLogistics.setServiceAssetNum(0L);
             List<LargeAssetDirs> list2 = new ArrayList<>();
             LargeAssetDirs largeAssetDirs1 = new LargeAssetDirs();
             LargeAssetDirs largeAssetDirs2 = new LargeAssetDirs();
@@ -78,7 +81,7 @@ public class LargePlatAssetServiceImpl implements ILargePlatAssetService {
             list2.add(largeAssetDirs2);
             largeLogistics.setServiceAssetList(list2);
         }
-        largeLogistics.setServiceAssetNum(platLogisticsMapper.getServiceAssetNum(appOrg));
+
         return largeLogistics;
     }
 
@@ -87,8 +90,10 @@ public class LargePlatAssetServiceImpl implements ILargePlatAssetService {
         List<LargeAssetDirs> list1 = platLogisticsMapper.getOfficeAssetRate(appOrg);
         if (list1.size() > 0){
             largeLogistics.setOfficeAssetList(list1);
+            largeLogistics.setOfficeAssetNum(platLogisticsMapper.getOfficeAssetNum(appOrg));
         }
         else {
+            largeLogistics.setOfficeAssetNum(0L);
             List<LargeAssetDirs> list2 = new ArrayList<>();
             LargeAssetDirs largeAssetDirs1 = new LargeAssetDirs();
             LargeAssetDirs largeAssetDirs2 = new LargeAssetDirs();

project-zcustom/src/main/java/com/project/zcustom/service/smart/impl/PlatBuildingServiceImpl.java

@@ -304,6 +304,7 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
     }
 
     public JSONArray getThisAmmeterDetail(){
+        // TODO
         String str = "[\n" +
                 "        {\n" +
                 "            \"number\": \"1# 1-3\",\n" +
@@ -395,7 +396,7 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
         JSONObject jsonObject = JSONObject.parseObject(largeBuildingControl.getWarnDevice());
         Map<String, Object> map = new HashMap<>();
         JSONObject water = jsonObject.getJSONObject("sj");
-        water.put("normal", largeBuildingControl.getWaterControlNormalNum() + largeBuildingControl.getWaterDeviceAirNum());
+        water.put("zcdw", largeBuildingControl.getWaterControlNormalNum() + largeBuildingControl.getWaterDeviceAirNum());
         water.put("air", largeBuildingControl.getWaterDeviceAirNum());
         water.put("control", largeBuildingControl.getWaterControlNormalNum() + largeBuildingControl.getWaterControlAbnormalNum());
         map.put("db", repeatWarnDevice(jsonObject.getJSONObject("db")));
@@ -406,6 +407,7 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
     }
 
     public JSONArray getAbnormalPoint(){
+        // TODO
         String str = "[\n" +
                 "        {\n" +
                 "            \"alertTime\": \"2025-01-01 15:12:11\",\n" +