修改干扰源用户状态

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/UserReportFeignClient.java

@@ -19,4 +19,7 @@ public interface UserReportFeignClient {
     @GetMapping("/updateUserReportStatus")
     HttpResult<Object> updateUserReportStatus(@RequestParam("businessKey") String businessKey, @RequestParam("status")Integer status);
 
+    @GetMapping("/updateUserStatus")
+    HttpResult<Object> updateUserStatus(String businessKey,Integer userStatus) ;
+
 }

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/UserReportFeignClientFallbackFactory.java

@@ -32,6 +32,12 @@ public class UserReportFeignClientFallbackFactory implements FallbackFactory<Use
                 log.error("{}异常，降级处理，异常为：{}", "更新用户数据流程状态", throwable.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<Object> updateUserStatus(String businessKey, Integer userStatus) {
+                log.error("{}异常，降级处理，异常为：{}", "更新干扰源用户状态", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempDeviceReportParam.java

@@ -32,6 +32,19 @@ public class SupervisionTempDeviceReportParam {
     @ApiModelProperty(value="所属供电公司")
     private String powerCompany;
 
+    /**
+     * 0 关联系统内变电站;1用户手动输入变电站
+     */
+    @ApiModelProperty(value = " 0 关联系统内变电站;1用户手动输入变电站")
+    private Integer customubstaionlag;
+
+    /**
+     * 所属变电站
+     */
+    @ApiModelProperty(value = "所属变电站名称")
+    private String substationName;
+
+
     /**
      * 所属变电站
      */

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempLineReportParam.java

@@ -222,7 +222,7 @@ public class SupervisionTempLineReportParam {
     private Integer num;
 
     /**
-     * 线路号
+     * 接线方式
      */
     private Integer ptType;
 

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempDeviceReport.java

@@ -32,12 +32,23 @@ public class SupervisionTempDeviceReport {
      */
     @TableField(value = "power_company")
     private String powerCompany;
+    /**
+     * 0 关联系统内变电站;1用户手动输入变电站
+     */
+    @TableField(value = "custom_substaion_flag")
+    private Integer customubstaionlag;
+
 
     /**
      * 所属变电站
      */
     @TableField(value = "substation")
     private String substation;
+    /**
+     * 所属变电站
+     */
+    @TableField(value = "substation_name")
+    private String substationName;
 
     /**
      * 变电站电压等级

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineReportVO.java

@@ -223,6 +223,18 @@ public class SupervisionTempLineReportVO {
     private String processInstanceId;
 
 
+    /**
+     * 线路号
+     */
+    private Integer num;
+
+    /**
+     * 接线方式
+     */
+    private Integer ptType;
+
+
+
     /**
      * 1:审批中；2：审批通过；3：审批不通过；4：已取消
      */