监督类型、告警内容

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/survey/SurveyPlanParam.java

@@ -69,6 +69,18 @@ public class SurveyPlanParam implements Serializable {
     @ApiModelProperty(value = "历史流程实例id列表")
     private String historyInstanceId;
 
+    /**
+     * 监督类型
+     */
+    @ApiModelProperty(value = "监督类型")
+    private String supvType;
+
+    /**
+     * 监督对象名称
+     */
+    @ApiModelProperty(value = "监督对象名称")
+    private String supvObjectName;
+
 
     @Data
     @EqualsAndHashCode(callSuper = true)

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/survey/SurveyPlan.java

@@ -74,6 +74,16 @@ public class SurveyPlan extends BaseEntity implements Serializable {
      */
     private String historyInstanceId;
 
+    /**
+     * 监督类型
+     */
+    private String supvType;
+
+    /**
+     * 监督对象名称
+     */
+    private String supvObjectName;
+
     /**
      * 状态：0-删除 1-正常
      */

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/survey/SurveyPlanVO.java

@@ -1,6 +1,7 @@
 package com.njcn.supervision.pojo.vo.survey;
 
 import com.njcn.db.bo.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -80,6 +81,18 @@ public class SurveyPlanVO extends BaseEntity implements Serializable {
      */
     private String historyInstanceId;
 
+    /**
+     * 监督类型
+     */
+    @ApiModelProperty(value = "监督类型")
+    private String supvType;
+
+    /**
+     * 监督对象名称
+     */
+    @ApiModelProperty(value = "监督对象名称")
+    private String supvObjectName;
+
     /**
      * 状态：0-删除 1-正常
      */

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/survey/SurveyTestVO.java

@@ -3,6 +3,7 @@ package com.njcn.supervision.pojo.vo.survey;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.bo.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -123,6 +124,18 @@ public class SurveyTestVO extends BaseEntity implements Serializable {
      */
     private Integer initiateWarningFlag;
 
+    /**
+     * 监督类型
+     */
+    @ApiModelProperty(value = "监督类型")
+    private String supvType;
+
+    /**
+     * 监督对象名称
+     */
+    @ApiModelProperty(value = "监督对象名称")
+    private String supvObjectName;
+
     /**
      * 状态：0-删除 1-正常
      */

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/survey/mapping/SurveyTestMapper.xml

@@ -8,6 +8,8 @@
                supervision_survey_plan.custom_substation_flag customSubstationFlag,
                supervision_survey_plan.substation substation,
                supervision_survey_plan.plan_start_time planStartTime,
+               supervision_survey_plan.supv_type supvType,
+               supervision_survey_plan.supv_object_name supvObjectName,
                supervision_survey_plan.plan_end_time planEndTime
         FROM supervision_survey_test supervision_survey_test
             left join supervision_survey_plan supervision_survey_plan

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/problem/impl/SupervisionUserComplaintPOServiceImpl.java

@@ -92,7 +92,7 @@ public class SupervisionUserComplaintPOServiceImpl extends ServiceImpl<Supervisi
                 id,
                 ProblemTypeEnum.USER.getCode(),
                 LeafletTypeEnum.ALARM.getCode(),
-                complainteDetail
+                byId.getComplaintText()
         );
         this.lambdaUpdate().eq(SupervisionUserComplaintPO::getId,id).set(SupervisionUserComplaintPO::getInitiateWarningFlag,1).update();
     }

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyTestServiceImpl.java

@@ -274,6 +274,8 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
         surveyTestVO.setPlanStartTime(surveyPlan.getPlanStartTime());
         surveyTestVO.setPlanEndTime(surveyPlan.getPlanEndTime());
         surveyTestVO.setPlanName(surveyPlan.getPlanName());
+        surveyTestVO.setSupvType(surveyPlan.getSupvType());
+        surveyTestVO.setSupvObjectName(surveyPlan.getSupvObjectName());
         //负责单位
         surveyTestVO.setDeptName(deptFeignClient.getDeptById(surveyTestVO.getDeptId()).getData().getName());
         //变电站名称
@@ -308,7 +310,7 @@ public class SurveyTestServiceImpl extends ServiceImpl<SurveyTestMapper, SurveyT
                 id,
                 ProblemTypeEnum.SITE_TEST.getCode(),
                 LeafletTypeEnum.ALARM.getCode(),
-                assembleIssueDetail(surveyTestVO)
+                surveyTestVO.getProblemDetail()
         );
         //将当前的测试数据改为已告警
         this.lambdaUpdate().eq(SurveyTest::getId,id).set(SurveyTest::getInitiateWarningFlag,1).update();