zhanghao пре 3 месеци
родитељ
комит
c9f536d739

+ 13 - 2
project-zcustom/src/main/java/com/project/zcustom/controller/crontab/PlatCrontabTaskController.java

@@ -71,10 +71,21 @@ public class PlatCrontabTaskController extends BaseController {
     /**
      * 楼宇运行监控
      */
-    public void buildingData() {
+    public void buildingDataFirstHalf() {
         synchronized (this) {
             logger.info("开始楼宇运行获取接口数据");
-            dataTools.getBuildingData();
+            dataTools.getBuildingDataFirstHalf();
+            logger.info("楼宇运行获取接口数据完成");
+        }
+    }
+
+    /**
+     * 楼宇运行监控(空气质量)
+     */
+    public void buildingDataSecondHalf() {
+        synchronized (this) {
+            logger.info("开始楼宇运行获取接口数据");
+            dataTools.getBuildingDataSecondHalf();
             logger.info("楼宇运行获取接口数据完成");
         }
     }

+ 12 - 2
project-zcustom/src/main/java/com/project/zcustom/tools/DataTools.java

@@ -109,13 +109,12 @@ public class DataTools {
 
 
 
-    public void getBuildingData(){
+    public void getBuildingDataFirstHalf(){
         LargeBuilding largeBuilding = new LargeBuilding();
         largeBuilding.setJsonFrequency(repeat(ApiUrlConfig.getJsonFrequency(), null));
         largeBuilding.setJsonPatrol(repeat(ApiUrlConfig.getJsonPatrol(), null));
         largeBuilding.setJsonPatrolPoint(repeat(ApiUrlConfig.getJsonPatrolPoint(), null));
         largeBuilding.setJsonPowerWaterMonth((repeat(ApiUrlConfig.getJsonPowerWaterMonth(), null)));
-        largeBuilding.setJsonAir(repeat(ApiUrlConfig.getJsonAir(), null));
         largeBuilding.setJsonTarget(repeat(ApiUrlConfig.getJsonTarget(), null));
         largeBuilding.setJsonUseElectricity(repeat(ApiUrlConfig.getJsonUseElectricity(), null));
         largeBuilding.setJsonGreenElectricity(repeat(ApiUrlConfig.getJsonGreenElectricity(), null));
@@ -131,6 +130,17 @@ public class DataTools {
         }
     }
 
+    public void getBuildingDataSecondHalf(){
+        LargeBuilding largeBuilding = new LargeBuilding();
+        largeBuilding.setJsonAir(repeat(ApiUrlConfig.getJsonAir(), null));
+        if (platBuildingMapper.getCount() > 0){
+            platBuildingMapper.updateBuilding(largeBuilding);
+        }
+        else {
+            platBuildingMapper.insertBuilding(largeBuilding);
+        }
+    }
+
     public String repeat(String url, String params){
         String result = null;
         if (StringUtils.isNotBlank(params)){