楼宇 新增接口

公务用车  字段修改

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

@@ -32,6 +32,8 @@ apiurl:
   controlApiUrl: http://113.44.175.227
   # 楼宇中控 楼宇本周用电量
   controlElectricity: /electricity/init
+  # 楼宇中控 近一周电梯能量回收的总值
+  controlElevator: /psbims/office/energy/getTotalEnergyRecoveryLastWeek
   # 楼宇中控 楼宇本周用电量机房总用电量
   controlElectricityRoom: /electricity/room
   # 楼宇中控 楼宇本周用电量明细

project-zcustom/src/main/java/com/project/zcustom/controller/building/PlatBuildControlController.java

@@ -29,6 +29,12 @@ public class PlatBuildControlController {
         return AjaxResult.success("查询成功", platBuildingService.getThisWeekElectricity());
     }
 
+    /*近一周电梯能量回收的总值*/
+    @GetMapping("/controlElevator")
+    public AjaxResult getControlElevator() {
+        return AjaxResult.success("查询成功", platBuildingService.getControlElevator());
+    }
+
     /*专业所属电表明细*/
     @GetMapping("/thisAmmeterDetail")
     public AjaxResult getThisAmmeterDetail(@RequestParam String type) {

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

@@ -30,6 +30,12 @@ public class LargeBuildingControl {
     private String weekElectricity;
 
     /**
+     * 近一周电梯能量回收的总值json
+     */
+
+    private String controlElevator;
+
+    /**
      * 机房总用电量二级分类json（楼宇本周用电量）
      */
 
@@ -143,8 +149,9 @@ public class LargeBuildingControl {
     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 waterControlNormalNum, Long waterControlAbnormalNum, String warnEventStatistics, String waterStateOne, String waterStateTwo) {
+    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) {
         this.weekElectricity = weekElectricity;
+        this.controlElevator = controlElevator;
         this.roomElectricity = roomElectricity;
         this.todayElectricity = todayElectricity;
         this.monthElectricityOne = monthElectricityOne;

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

@@ -173,14 +173,14 @@ public class LargeCar extends CustomBaseEntity {
      * 派车单总数
      */
 
-    @JSONField(name = "pcdNum")
+    @JSONField(name = "gwcPcd")
     private Long pcdNum;
 
     /**
-     * 均车派车单数
+     * 均车派车单数(先录实有公务车总数，再做除法)
      */
 
-    @JSONField(name = "gwcTotal")
+    @JSONField(name = "gwcCount")
     private Long avgPcdNum;
 
     /**

project-zcustom/src/main/java/com/project/zcustom/mapper/unit/PlatBuildingMapper.java

@@ -40,6 +40,8 @@ public interface PlatBuildingMapper {
 
 
     LargeBuildingControl getThisWeekElectricity();
+
+    String getControlElevator();
     String getThisAmmeterDetail(String type);
     String getTodayElectricity();
     LargeBuildingControl getMonthElectricity();

project-zcustom/src/main/java/com/project/zcustom/service/service/smart/IPlatBuildingService.java

@@ -37,6 +37,8 @@ public interface IPlatBuildingService{
 
     Map<String, Object> getThisWeekElectricity();
 
+    JSONObject getControlElevator();
+
     JSONArray getThisAmmeterDetail(String type);
 
     List<Map<String, Object>> getTodayElectricity();

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

@@ -312,6 +312,11 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
         return map;
     }
 
+    public JSONObject getControlElevator(){
+        String result = platBuildingMapper.getControlElevator();
+        return JSONObject.parseObject(result);
+    }
+
     public JSONArray getThisAmmeterDetail(String type){
         String result = platBuildingMapper.getThisAmmeterDetail(type);
         if (StringUtils.isNotBlank(result)){

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

@@ -44,6 +44,15 @@ public class ApiUrlConfig {
         ApiUrlConfig.controlElectricity = controlElectricity;
     }
 
+    // 楼宇中控 近一周电梯能量回收的总值
+    private static String controlElevator;
+    public static String getControlElevator() {
+        return ApiUrlConfig.controlApiUrl + controlElevator;
+    }
+    public void setControlElevator(String controlElevator) {
+        ApiUrlConfig.controlElevator = controlElevator;
+    }
+
     // 楼宇中控 楼宇本周用电量机房总用电量
     private static String controlElectricityRoom;
     public static String getControlElectricityRoom() {

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

@@ -40,6 +40,7 @@ public class BuildingService {
         Long abnormalNum = Long.valueOf(jsonObject.getJSONObject("sj").getString("ycdw"));
         LargeBuildingControl largeBuildingControl = new LargeBuildingControl(
                 repeat(ApiUrlConfig.getControlElectricity(), null),
+                repeat(ApiUrlConfig.getControlElevator(), null),
                 repeat(ApiUrlConfig.getControlElectricityRoom(), null),
                 repeat(ApiUrlConfig.getControlTodaySum(), null),
                 repeat(ApiUrlConfig.getControlMonthSum(), "type=一号配电室"),

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

@@ -83,6 +83,10 @@
         select week_electricity, room_electricity from large_plat_building_control
     </select>
 
+    <select id="getControlElevator" resultType="String">
+        select control_elevator from large_plat_building_control
+    </select>
+
     <select id="getThisAmmeterDetail" parameterType="String" resultType="String">
         select ammeter_detail from large_plat_building_ammeter_detail
     </select>
@@ -246,6 +250,7 @@
 
     <insert id="addBuildingControl" parameterType="LargeBuildingControl">
         insert into large_plat_building_control (week_electricity,
+                                                 control_elevator,
                                                  room_electricity,
                                                  today_electricity,
                                                  month_electricity_one,
@@ -263,6 +268,7 @@
                                                  water_state_two)
         values (
                    #{weekElectricity},
+                   #{controlElevator},
                    #{roomElectricity},
                    #{todayElectricity},
                    #{monthElectricityOne},
@@ -284,6 +290,7 @@
     <update id="updateBuildingControl" parameterType="LargeBuildingControl">
         UPDATE large_plat_building_control
         SET week_electricity = #{weekElectricity},
+            control_elevator = #{controlElevator},
             room_electricity = #{roomElectricity},
             today_electricity = #{todayElectricity},
             month_electricity_one = #{monthElectricityOne},