接口调整及表名称调整---

project-admin/src/main/resources/application-dev.yml

@@ -25,7 +25,7 @@ apiurl:
 
   # 楼宇运行监控 接口前缀
   buildPrefix: http://113.44.175.227:8081/psbims
-  # 楼宇运行监控 巡更次数统计(近6月)
+  # 大楼安防监控信息 巡更次数统计(近6月)
   jsonFrequency: /screen/patrol/frequency/statistics
   # 办公能耗情况接口 巡更及时率
   jsonPatrol: /screen/patrol/timeliness

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

@@ -69,25 +69,35 @@ public class PlatCrontabTaskController extends BaseController {
         }
     }
 
+    /**
+     * 楼宇运行监控(左)
+     */
+    public void leftBuildingData() {
+        synchronized (this) {
+            logger.info("开始楼宇运行获取接口数据");
+            buildingService.getLeftBuildingData();
+            logger.info("楼宇运行获取接口数据完成");
+        }
+    }
 
     /**
-     * 楼宇运行监控
+     * 楼宇运行监控(右)
      */
-    public void buildingDataFirstHalf() {
+    public void rightBuildingDataFirstHalf() {
         synchronized (this) {
             logger.info("开始楼宇运行获取接口数据");
-            buildingService.getBuildingDataFirstHalf();
+            buildingService.getRightBuildingDataFirstHalf();
             logger.info("楼宇运行获取接口数据完成");
         }
     }
 
     /**
-     * 楼宇运行监控(空气质量)
+     * 楼宇运行监控(右：空气质量)
      */
-    public void buildingDataSecondHalf() {
+    public void rightBuildingDataSecondHalf() {
         synchronized (this) {
             logger.info("开始楼宇运行获取接口数据");
-            buildingService.getBuildingDataSecondHalf();
+            buildingService.getRightBuildingDataSecondHalf();
             logger.info("楼宇运行获取接口数据完成");
         }
     }

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

@@ -0,0 +1,145 @@
+package com.project.zcustom.domain.addional;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = false)
+@TableName("large_plat_building_control")
+@ApiModel(value = "large_plat_building_control实体类")
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class LargeBuildingControl {
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    @ApiModelProperty("id")
+    private Long id;
+
+    /**
+     * 分类用电初始化数据json（楼宇本周用电量）
+     */
+    @ApiModelProperty("分类用电初始化数据json（楼宇本周用电量）")
+    private String weekElectricity;
+
+    /**
+     * 机房总用电量二级分类json（楼宇本周用电量）
+     */
+    @ApiModelProperty("机房总用电量二级分类json（楼宇本周用电量）")
+    private String roomElectricity;
+
+    /**
+     * 楼宇今日用电量json
+     */
+    @ApiModelProperty("楼宇今日用电量json")
+    private String todayElectricity;
+
+    /**
+     * 楼宇每月用电量json (配电室1)
+     */
+    @ApiModelProperty("楼宇每月用电量json (配电室1)")
+    private String monthElectricityOne;
+
+    /**
+     * 楼宇每月用电量json (配电室2)
+     */
+    @ApiModelProperty("楼宇每月用电量json (配电室2)")
+    private String monthElectricityTwo;
+
+    /**
+     * 楼宇每月用电量json (配电室3)
+     */
+    @ApiModelProperty("楼宇每月用电量json (配电室3)")
+    private String monthElectricityThree;
+
+    /**
+     * 配电室重要回路负荷情况json (配电室1)
+     */
+    @ApiModelProperty("配电室重要回路负荷情况json (配电室1)")
+    private String roomLoadOne;
+
+    /**
+     * 配电室重要回路负荷情况json (配电室2)
+     */
+    @ApiModelProperty("配电室重要回路负荷情况json (配电室2)")
+    private String roomLoadTwo;
+
+    /**
+     * 配电室重要回路负荷情况json (配电室3)
+     */
+    @ApiModelProperty("配电室重要回路负荷情况json (配电室3)")
+    private String roomLoadThree;
+
+    /**
+     * 楼宇中当前告警的设备json
+     */
+    @ApiModelProperty("楼宇中当前告警的设备json")
+    private String warnDevice;
+
+    /**
+     * 空调水浸总数
+     */
+    @ApiModelProperty("空调水浸总数")
+    private Long waterDeviceAirNum;
+
+    /**
+     * 水箱水位情况json（23层）
+     */
+    @ApiModelProperty("水箱水位情况json（23层）")
+    private String waterStateOne;
+
+    /**
+     * 水箱水位情况json（-2层）
+     */
+    @ApiModelProperty("水箱水位情况json（-2层）")
+    private String waterStateTwo;
+
+    /**
+     * 中控水浸正常数
+     */
+    @ApiModelProperty("中控水浸正常数")
+    private Long waterControlNormalNum;
+
+    /**
+     * 中控水浸异常数
+     */
+    @ApiModelProperty("中控水浸异常数")
+    private Long waterControlAbnormalNum;
+
+    /**
+     * 告警事件的历史统计json
+     */
+    @ApiModelProperty("告警事件的历史统计json")
+    private String warnEventStatistics;
+
+    public LargeBuildingControl() {
+    }
+
+    public LargeBuildingControl(String weekElectricity, String roomElectricity, String todayElectricity, String monthElectricityOne, String monthElectricityTwo, String monthElectricityThree, String roomLoadOne, String roomLoadTwo, String roomLoadThree, String warnDevice, Long waterDeviceAirNum, String waterStateOne, String waterStateTwo, Long waterControlNormalNum, Long waterControlAbnormalNum, String warnEventStatistics) {
+        this.weekElectricity = weekElectricity;
+        this.roomElectricity = roomElectricity;
+        this.todayElectricity = todayElectricity;
+        this.monthElectricityOne = monthElectricityOne;
+        this.monthElectricityTwo = monthElectricityTwo;
+        this.monthElectricityThree = monthElectricityThree;
+        this.roomLoadOne = roomLoadOne;
+        this.roomLoadTwo = roomLoadTwo;
+        this.roomLoadThree = roomLoadThree;
+        this.warnDevice = warnDevice;
+        this.waterDeviceAirNum = waterDeviceAirNum;
+        this.waterStateOne = waterStateOne;
+        this.waterStateTwo = waterStateTwo;
+        this.waterControlNormalNum = waterControlNormalNum;
+        this.waterControlAbnormalNum = waterControlAbnormalNum;
+        this.warnEventStatistics = warnEventStatistics;
+    }
+}

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

@@ -24,7 +24,97 @@ public class ApiUrlConfig {
         ApiUrlConfig.logisticsUrl = logisticsUrl;
     }
 
-    // 楼宇运行监控 接口前缀
+    // 楼宇运行监控左半部 接口前缀
+    private static String controlApiUrl;
+    public static String getControlApiUrl() {
+        return controlApiUrl;
+    }
+    public static void setControlApiUrl(String controlApiUrl) {
+        ApiUrlConfig.controlApiUrl = controlApiUrl;
+    }
+
+    // 楼宇中控 楼宇本周用电量
+    private static String controlElectricity;
+    public static String getControlElectricity() {
+        return ApiUrlConfig.controlApiUrl + controlElectricity;
+    }
+    public static void setControlElectricity(String controlElectricity) {
+        ApiUrlConfig.controlElectricity = controlElectricity;
+    }
+
+    // 楼宇中控 楼宇本周用电量机房总用电量
+    private static String controlElectricityRoom;
+    public static String getControlElectricityRoom() {
+        return ApiUrlConfig.controlApiUrl + controlElectricityRoom;
+    }
+    public static void setControlElectricityRoom(String controlElectricityRoom) {
+        ApiUrlConfig.controlElectricityRoom = controlElectricityRoom;
+    }
+
+    // 楼宇中控 楼宇本周用电量明细
+    private static String controlElectricityDetail;
+    public static String getControlElectricityDetail() {
+        return ApiUrlConfig.controlApiUrl + controlElectricityDetail;
+    }
+    public static void setControlElectricityDetail(String controlElectricityDetail) {
+        ApiUrlConfig.controlElectricityDetail = controlElectricityDetail;
+    }
+
+    // 楼宇中控 楼宇今日总用电量
+    private static String controlTodaySum;
+    public static String getControlTodaySum() {
+        return ApiUrlConfig.controlApiUrl + controlTodaySum;
+    }
+    public static void setControlTodaySum(String controlTodaySum) {
+        ApiUrlConfig.controlTodaySum = controlTodaySum;
+    }
+
+    // 楼宇中控 楼宇每月用电量
+    private static String controlMonthSum;
+    public static String getControlMonthSum() {
+        return ApiUrlConfig.controlApiUrl + controlMonthSum;
+    }
+    public static void setControlMonthSum(String controlMonthSum) {
+        ApiUrlConfig.controlMonthSum = controlMonthSum;
+    }
+
+    // 楼宇中控 配电室重要回路负荷情况
+    private static String controlImportantSum;
+    public static String getControlImportantSum() {
+        return ApiUrlConfig.controlApiUrl + controlImportantSum;
+    }
+    public static void setControlImportantSum(String controlImportantSum) {
+        ApiUrlConfig.controlImportantSum = controlImportantSum;
+    }
+
+    // 楼宇中控 楼宇中当前告警的设备
+    private static String controlEquipment;
+    public static String getControlEquipment() {
+        return ApiUrlConfig.controlApiUrl + controlEquipment;
+    }
+    public static void setControlEquipment(String controlEquipment) {
+        ApiUrlConfig.controlEquipment = controlEquipment;
+    }
+
+    // 楼宇中控 告警事件的历史统计
+    private static String controlAlarm;
+    public static String getControlAlarm() {
+        return ApiUrlConfig.controlApiUrl + controlAlarm;
+    }
+    public static void setControlAlarm(String controlAlarm) {
+        ApiUrlConfig.controlAlarm = controlAlarm;
+    }
+
+    // 楼宇中控 水箱水位情况
+    private static String controlWater;
+    public static String getControlWater() {
+        return ApiUrlConfig.controlApiUrl + controlWater;
+    }
+    public static void setControlWater(String controlWater) {
+        ApiUrlConfig.controlWater = controlWater;
+    }
+
+    // 楼宇运行监控右半部 接口前缀
     private static String buildPrefix;
     public static String getBuildPrefix() {
         return buildPrefix;
@@ -33,7 +123,7 @@ public class ApiUrlConfig {
         ApiUrlConfig.buildPrefix = buildPrefix;
     }
 
-    // 楼宇运行监控 巡更次数统计(近6月)
+    // 大楼安防监控信息 巡更次数统计(近6月)
     private static String jsonFrequency;
     public static String getJsonFrequency() {
         return ApiUrlConfig.buildPrefix + jsonFrequency;

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.project.common.utils.StringUtils;
 import com.project.common.utils.http.HttpUtils;
 import com.project.zcustom.domain.addional.LargeBuilding;
+import com.project.zcustom.domain.addional.LargeBuildingControl;
 import com.project.zcustom.mapper.unit.PlatBuildingMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -21,9 +22,17 @@ public class BuildingService {
     private PlatBuildingMapper platBuildingMapper;
 
     /**
+     *  楼宇中控 接口数据同步
+     */
+    public void getLeftBuildingData(){
+        LargeBuildingControl largeBuildingControl = new LargeBuildingControl();
+        String res = repeat(ApiUrlConfig.getControlEquipment(), null);
+    }
+
+    /**
      *  办公能耗 / 大楼安防 接口数据同步
      */
-    public void getBuildingDataFirstHalf(){
+    public void getRightBuildingDataFirstHalf(){
         LargeBuilding largeBuilding = new LargeBuilding();
         largeBuilding.setJsonFrequency(repeat(ApiUrlConfig.getJsonFrequency(), null));
         largeBuilding.setJsonPatrol(repeat(ApiUrlConfig.getJsonPatrol(), null));
@@ -48,7 +57,7 @@ public class BuildingService {
      * 办公能耗 空气概况
      *  该接口请求频率 5分钟一次
      */
-    public void getBuildingDataSecondHalf(){
+    public void getRightBuildingDataSecondHalf(){
         LargeBuilding largeBuilding = new LargeBuilding();
         largeBuilding.setJsonAir(repeat(ApiUrlConfig.getJsonAir(), null));
         if (platBuildingMapper.getCount() > 0){

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

@@ -92,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             a.del_flag = '0'
           AND b.del_flag = '0'
-        <if test="appOrg != '10001'">AND ( c.app_parent_org = #{appOrg} OR c.app_org = #{appOrg} )</if>
+        <if test="appOrg != '10001'">AND ( b.app_parent_org = #{appOrg} OR b.app_org = #{appOrg} )</if>
     </select>
 
     <select id="getProjectNumX" parameterType="String" resultMap="LargeProjectResult">
@@ -105,7 +105,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             a.del_flag = '0'
           AND b.del_flag = '0'
-        <if test="appOrg != '10001'">AND ( c.app_parent_org = #{appOrg} OR c.app_org = #{appOrg} )</if>
+        <if test="appOrg != '10001'">AND ( b.app_parent_org = #{appOrg} OR b.app_org = #{appOrg} )</if>
           AND subdivision &lt;= 10
         GROUP BY
             subdivision
@@ -121,7 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             a.del_flag = '0'
           AND b.del_flag = '0'
-        <if test="appOrg != '10001'">AND ( c.app_parent_org = #{appOrg} OR c.app_org = #{appOrg} )</if>
+        <if test="appOrg != '10001'">AND ( b.app_parent_org = #{appOrg} OR b.app_org = #{appOrg} )</if>
           AND subdivision >= 10
         GROUP BY
             subdivision