1.技术监督试运行，不通过整体预告警单流程

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

@@ -23,19 +23,21 @@ public interface BusinessCommonFeignClient {
 
     /**
      * 根据流程key,业务id去实时更新流程状态
+     *
      * @param processKey 流程定义key
      * @param businessId 业务id
-     * @param status 目标状态
+     * @param status     目标状态
      */
     @GetMapping("/updateProcessStatus")
-    HttpResult<Object> updateProcessStatus(@RequestParam("processKey") String processKey,@RequestParam("businessId") String businessId, @RequestParam("status")Integer status);
+    HttpResult<Object> updateProcessStatus(@RequestParam("processKey") String processKey, @RequestParam("businessId") String businessId, @RequestParam("reason") String reason, @RequestParam("status") Integer status);
 
 
     /**
      * 根据流程key,业务id去实时更新流程状态
+     *
      * @param processKey 流程定义key
      * @param businessId 业务id
      */
     @GetMapping("/getInstanceInfo")
-     HttpResult<BpmInstanceInfo> getInstanceInfo(@RequestParam("processKey") String processKey, @RequestParam("businessId")String businessId);
+    HttpResult<BpmInstanceInfo> getInstanceInfo(@RequestParam("processKey") String processKey, @RequestParam("businessId") String businessId);
 }

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

@@ -25,7 +25,7 @@ public class BusinessCommonFeignClientFallbackFactory implements FallbackFactory
         Enum<?> finalExceptionEnum = exceptionEnum;
         return new BusinessCommonFeignClient() {
             @Override
-            public HttpResult<Object> updateProcessStatus(String processKey,String businessId, Integer status) {
+            public HttpResult<Object> updateProcessStatus(String processKey, String businessId, String reason, Integer status) {
                 log.error("{}异常，降级处理，异常为：{}", "更新流程状态", throwable.toString());
                 throw new BusinessException(finalExceptionEnum);
             }

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/leaflet/WarningAddParam.java

@@ -23,4 +23,16 @@ public class WarningAddParam {
      */
     @ApiModelProperty(value = "整改意见")
     private String reformAdvice;
+
+    @Data
+    public static class Extend extends WarningAddParam{
+        @ApiModelProperty(name = "type", value = "1:预警单 2:告警单")
+        private Integer type;
+
+        @ApiModelProperty(name = "type", value = "预警单Id")
+        private String problemId;
+
+        @ApiModelProperty(name = "issueDetail", value = "问题描述")
+        private String issueDetail;
+    }
 }

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

@@ -44,7 +44,6 @@ public class CheckDevice extends BaseEntity implements Serializable {
     /**
      * 本次定检时间
      */
-    @MppMultiId("now_check_time")
     private LocalDate nowCheckTime;
 
     /**
@@ -75,6 +74,7 @@ public class CheckDevice extends BaseEntity implements Serializable {
     /**
      * 状态 0：未处理 1：已处理
      */
+    @MppMultiId("state")
     private Integer state;
 
     /**

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

@@ -0,0 +1,44 @@
+package com.njcn.supervision.pojo.po.device;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.njcn.db.bo.BaseEntity;
+import lombok.Data;
+
+/**
+ * 
+ * @TableName supervision_temp_line_run_test_warning
+ */
+@TableName(value ="supervision_temp_line_run_test_warning")
+@Data
+public class TempLineRunTestWarning extends BaseEntity implements Serializable{
+
+    private static final long serialVersionUID = 1L;
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.INPUT)
+    private String id;
+
+    /**
+     * 试运行表主键
+     */
+    @TableField(value = "line_run_id")
+    private String lineRunId;
+
+    /**
+     * 试运行成功报告地址
+     */
+    private String testRunReport;
+
+    /**
+     * 试运行表主键
+     */
+    @TableField(value = "reason")
+    private String reason;
+}

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

@@ -17,7 +17,6 @@ public class SupervisionTempLineDebugVO extends BaseEntity {
 
     private String id;
 
-
     @ApiModelProperty(value = "监测点编号")
     private String lineId;
 
@@ -39,35 +38,40 @@ public class SupervisionTempLineDebugVO extends BaseEntity {
     @ApiModelProperty(value = "电网侧变电站")
     private String powerSubstationName;
 
+    @ApiModelProperty(value = "调试原因")
     private String reason;
 
+    @ApiModelProperty(value = "流程实例的编号")
     private String processInstanceId;
 
-
-    @ApiModelProperty(value = "流程实例的编号")
+    @ApiModelProperty(value = "历史流程实列")
     private String historyInstanceId;
 
+    @ApiModelProperty(value = "1:审批中；2：审批通过；3：审批不通过；4：已取消,5数据同步完成")
     private Integer status;
-    /**
-     * 0:未试运行 1：试运行中 2.试运行成功 3.试运行异常
-     */
+
+    @ApiModelProperty(value = "0:未试运行 1：试运行中 2.试运行成功 3.试运行异常")
     private Integer testRunState;
 
-    /**
-     * 试运行时间范围
-     */
+    @ApiModelProperty(value = "试运行时间范围")
     private String testRunTime;
 
-     /**
-      * 试运行成功报告地址
-      */
-     @ApiModelProperty(value = "试运行成功报告地址")
-     private String testRunReport;
+    @ApiModelProperty(value = "试运行成功报告地址")
+    private String testRunReport;
+
+    @ApiModelProperty(value = "审核不通过原因")
+    private String problemReason;
+
+    @ApiModelProperty(value = "1：技术监督管理；2：在线监测超标问题；3：用户投诉；4：试运行监测点问题")
+    private Integer problemType;
+
+    @ApiModelProperty(value = "预告警单问题Id")
+    private String problemId;
 
     public void setTestRunReport(String testRunReport) {
-        if(StrUtil.isNotBlank(testRunReport)){
-            this.testRunReport = "/"+testRunReport;
-        }else {
+        if (StrUtil.isNotBlank(testRunReport)) {
+            this.testRunReport = "/" + testRunReport;
+        } else {
             this.testRunReport = testRunReport;
 
         }

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

@@ -77,8 +77,14 @@ public class SupervisionTempLineRunTestVO extends BaseEntity{
 
     private String lineName;
     private String userName;
+    /**
+     * 母线
+     */
     private String connectedBus;
     private String monitoringTerminalCode;
+    /**
+     * 终端名称
+     */
     private String monitoringTerminalName;
     private String powerSubstationName;
     private String reason;
@@ -98,6 +104,5 @@ public class SupervisionTempLineRunTestVO extends BaseEntity{
             this.testRunReport = testRunReport;
 
         }
-
     }
 }

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

@@ -0,0 +1,31 @@
+package com.njcn.supervision.pojo.vo.device;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author wr
+ * @description
+ * @date 2024/7/4 12:31
+ */
+@ApiModel(description="告警信息")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TempLineRunTestWarningVO {
+
+    @ApiModelProperty(value = "试运行id")
+    private String id;
+
+    @ApiModelProperty(value = "告警单Id")
+    private String warningId;
+
+    @ApiModelProperty(value = "审批类型 1:审批中；2：审批通过；3：审批不通过；4：已取消；5：待反馈")
+    private Integer status;
+
+    @ApiModelProperty(value = "不通过时间")
+    private String time;
+}