工程现场 问题处理 接口修改

办公能耗  接口地址修改

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

@@ -32,8 +32,6 @@ apiurl:
   controlApiUrl: http://113.44.175.227
   # 楼宇中控 楼宇本周用电量
   controlElectricity: /electricity/init
-  # 楼宇中控 近一周电梯能量回收的总值
-  controlElevator: /psbims/office/energy/getTotalEnergyRecoveryLastWeek
   # 楼宇中控 楼宇本周用电量机房总用电量
   controlElectricityRoom: /electricity/room
   # 楼宇中控 楼宇本周用电量明细
@@ -58,6 +56,8 @@ apiurl:
   buildPrefix: http://113.44.175.227:8081/psbims
   # 大楼安防监控信息 巡更次数统计(近6月)
   jsonFrequency: /screen/patrol/frequency/statistics
+  # 办公能耗情况接口 近一周电梯能量回收的总值
+  controlElevator: /office/energy/getTotalEnergyRecoveryLastWeek
   # 办公能耗情况接口 巡更及时率
   jsonPatrol: /screen/patrol/timeliness
   # 办公能耗情况接口 巡更点统计

project-zcustom/src/main/java/com/project/zcustom/controller/engineering/PlatProjectCheckController.java

@@ -94,7 +94,7 @@ public class PlatProjectCheckController extends BaseController {
      * 更改问题状态
      * */
     @PostMapping("changeIssueStatus")
-    public AjaxResult changeIssueStatus(@RequestBody LargeIssue entity) {
+    public AjaxResult changeIssueStatus(@RequestBody LargeIssue entity, @RequestParam("file") MultipartFile multipartFile) {
         return toAjax(largeIssueService.updateById(entity));
     }
 

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

@@ -33,11 +33,10 @@ public class LargeIssue extends CustomBaseEntity {
      * 问题id
      */
     @TableId(value = "id")
-
     private Long id;
 
     /**
-     * 问题标题
+     * 问题标题(处理标题)
      */
 
     private String title;
@@ -51,8 +50,6 @@ public class LargeIssue extends CustomBaseEntity {
     /**
      * 问题描述
      */
-    @Excel(name = "问题描述")
-
     private String description;
 
     /**
@@ -62,6 +59,12 @@ public class LargeIssue extends CustomBaseEntity {
     private String need;
 
     /**
+     * 内容
+     */
+    @TableField(exist = false)
+    private String content;
+
+    /**
      * 发起人
      */
 
@@ -83,7 +86,18 @@ public class LargeIssue extends CustomBaseEntity {
     @Excel(name = "问题状态", readConverterExp = "0=代表未解决,1=代表已解决")
     private String status;
 
+
+    /**
+     * 创建日期
+     */
     @TableField(exist = false)
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createDate;
+
+    /**
+     * 处理日期
+     */
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date dealDate;
 }

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

@@ -41,7 +41,7 @@ public class PlatBuildingServiceImpl implements IPlatBuildingService {
             String value = dataItem.getString("value");
             Map<String, Object> data = new HashMap<>();
             data.put("name", key);
-            data.put("value", value);
+            data.put("value", new BigDecimal(value));
             resultList.add(data);
         }
         return resultList;

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

@@ -44,15 +44,6 @@ 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() {
@@ -152,6 +143,15 @@ public class ApiUrlConfig {
         ApiUrlConfig.jsonFrequency = jsonFrequency;
     }
 
+    // 办公能耗情况接口 近一周电梯能量回收的总值
+    private static String controlElevator;
+    public static String getControlElevator() {
+        return ApiUrlConfig.buildPrefix + controlElevator;
+    }
+    public void setControlElevator(String controlElevator) {
+        ApiUrlConfig.controlElevator = controlElevator;
+    }
+
     // 办公能耗情况接口 年度累计综合能耗
     private static String jsonPatrol;
     public static String getJsonPatrol() {