楼宇同步接口修改

project-zcustom/src/main/java/com/project/zcustom/domain/addional/LargeBuildingControl.java

@@ -154,7 +154,7 @@ public class LargeBuildingControl {
     public LargeBuildingControl() {
     }
 
-    public LargeBuildingControl(String weekElectricity, String controlElevator, String roomElectricity, String todayElectricity, String monthElectricityOne, String monthElectricityTwo, String monthElectricityThree, String roomLoadOne, String roomLoadTwo, String roomLoadThree, String warnDevice, Long waterControlNormalNum, Long waterControlAbnormalNum, String warnEventStatistics, String waterStateOne, String waterStateTwo, String photovoltaicPower) {
+    public LargeBuildingControl(String weekElectricity, String controlElevator, String roomElectricity, String todayElectricity, String monthElectricityOne, String monthElectricityTwo, String monthElectricityThree, String roomLoadOne, String roomLoadTwo, String roomLoadThree, String warnDevice, Long waterControlNormalNum, Long waterControlAbnormalNum, String warnEventStatistics, String waterStateOne, String waterStateTwo, String photovoltaicPower, String abnormalPointOne, String abnormalPointTwo, String abnormalPointThree, String abnormalPointFour) {
         this.weekElectricity = weekElectricity;
         this.controlElevator = controlElevator;
         this.roomElectricity = roomElectricity;
@@ -172,5 +172,9 @@ public class LargeBuildingControl {
         this.waterStateOne = waterStateOne;
         this.waterStateTwo = waterStateTwo;
         this.photovoltaicPower = photovoltaicPower;
+        this.abnormalPointOne = abnormalPointOne;
+        this.abnormalPointTwo = abnormalPointTwo;
+        this.abnormalPointThree = abnormalPointThree;
+        this.abnormalPointFour = abnormalPointFour;
     }
 }

project-zcustom/src/main/java/com/project/zcustom/tools/BuildingService.java

@@ -58,7 +58,11 @@ public class BuildingService {
                 repeat(ApiUrlConfig.getControlAlarm(), null),
                 repeat(ApiUrlConfig.getControlWater(), "position=23F"),
                 repeat(ApiUrlConfig.getControlWater(), "position=负二"),
-                repeat(ApiUrlConfig.getPhotovoltaicPower(), null)
+                repeat(ApiUrlConfig.getPhotovoltaicPower(), null),
+                repeat(ApiUrlConfig.getControlAlertDetails(), "type=电表"),
+                repeat(ApiUrlConfig.getControlAlertDetails(), "type=水浸"),
+                repeat(ApiUrlConfig.getControlAlertDetails(), "type=烟雾"),
+                repeat(ApiUrlConfig.getControlAlertDetails(), "type=液位")
                 );
         if (platBuildingMapper.getExist() > 0){
             platBuildingMapper.updateBuildingControl(largeBuildingControl);
@@ -70,16 +74,6 @@ public class BuildingService {
      * 电表、异常、负载明细
      */
     public void getLeftBuildingDataDetail(){
-        LargeBuildingControl largeBuildingControl = new LargeBuildingControl();
-        largeBuildingControl.setAbnormalPointOne(repeat(ApiUrlConfig.getControlAlertDetails(), "type=电表"));
-        largeBuildingControl.setAbnormalPointTwo(repeat(ApiUrlConfig.getControlAlertDetails(), "type=水浸"));
-        largeBuildingControl.setAbnormalPointThree(repeat(ApiUrlConfig.getControlAlertDetails(), "type=烟雾"));
-        largeBuildingControl.setAbnormalPointFour(repeat(ApiUrlConfig.getControlAlertDetails(), "type=液位"));
-        if (platBuildingMapper.getExist() > 0){
-            platBuildingMapper.updateBuildingControl(largeBuildingControl);
-        }
-        else platBuildingMapper.addBuildingControl(largeBuildingControl);
-
 
         platBuildingMapper.deleteAmmeterDetails();
         String[] arr = {

project-zcustom/src/main/resources/mapper/zcustom/unit/LargeProjectMapper.xml

@@ -149,6 +149,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             a.id,
             a.project_name,
+            a.construction_unit,
+            a.supervision_unit,
             COUNT(
                     IF
                         ( a.del_flag = 0 AND b.del_flag = 0, 1, NULL )) AS cameraNum