预告警单增加问题详细描述

pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmModelController.java

@@ -98,7 +98,7 @@ public class BpmModelController extends BaseController {
     }
 
     @GetMapping("/getById")
-    @Operation(summary = "获得模型")
+    @ApiOperation("根据id获取模型")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @Parameter(name = "id", description = "编号", required = true)
     public HttpResult<BpmModelRespVO> getById(String id) {
@@ -111,7 +111,6 @@ public class BpmModelController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, BpmModelConvert.INSTANCE.buildModel(model, bpmnBytes), methodDescribe);
     }
 
-    @Operation(summary = "新建模型")
     @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
     @PostMapping("/add")
     @ApiOperation("新建模型")
@@ -146,7 +145,7 @@ public class BpmModelController extends BaseController {
 
 
     @PostMapping("/deploy")
-    @Operation(summary = "部署模型")
+    @ApiOperation("部署模型")
     @Parameter(name = "id", description = "编号", required = true)
     public HttpResult<Boolean> deployModel(String id) {
         String methodDescribe = getMethodDescribe("deployModel");
@@ -164,7 +163,7 @@ public class BpmModelController extends BaseController {
 //    }
 //
     @GetMapping("/delete")
-    @Operation(summary = "删除模型")
+    @ApiOperation("删除模型")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     public HttpResult<Boolean> deleteModel(String id) {
         String methodDescribe = getMethodDescribe("deleteModel");

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

@@ -69,6 +69,12 @@ public class WarningLeafletParam extends BaseEntity implements Serializable{
     @ApiModelProperty(value = "设备编号")
     private String processInstanceId;
 
+    /**
+     * 问题详细描述
+     */
+    @ApiModelProperty(value = "问题详细描述")
+    private String issueDetail;
+
 
     @Data
     @EqualsAndHashCode(callSuper = true)

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/leaflet/WarningLeaflet.java

@@ -63,6 +63,11 @@ public class WarningLeaflet extends BaseEntity implements Serializable{
      */
     private String processInstanceId;
 
+    /**
+     * 问题详细描述
+     */
+    private String issueDetail;
+
 
     /**
      * 采取措施

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/leaflet/WarningLeafletVO.java

@@ -1,6 +1,7 @@
 package com.njcn.supervision.pojo.vo.leaflet;
 
 import com.njcn.db.bo.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -69,4 +70,9 @@ public class WarningLeafletVO extends BaseEntity implements Serializable{
      */
     private String processInstanceId;
 
+    /**
+     * 问题详细描述
+     */
+    private String issueDetail;
+
 }

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/IWarningLeafletService.java

@@ -22,9 +22,10 @@ public interface IWarningLeafletService extends IService<WarningLeaflet> {
      * code：预告警编号暂时随机by yxb
      * id：对应问题源id，用于查询详细数据
      * problemType：问题类型：1：技术监督管理；2：在线监测超标问题；3：用户投诉；4：现场测试超标，此处是现场测试超标
-     * leaflet:单子类型：1：预警单；2：告警单
+     * leaflet：单子类型：1：预警单；2：告警单
+     * issueDetail：问题详细描述
      */
-    void createLeaflet(String name, String code, String id, Integer problemType, Integer leaflet);
+    void createLeaflet(String name, String code, String id, Integer problemType, Integer leaflet,String issueDetail);
 
     Page<WarningLeafletVO> alarmPageData(WarningLeafletParam.WarningLeafletQueryParam warningLeafletQueryParam);
 

pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java

@@ -39,13 +39,14 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
      * 不创建工作流，只是创建一个告警单，需要待用户反馈后才会进入流程
      */
     @Override
-    public void createLeaflet(String name, String code, String id, Integer problemType, Integer leaflet) {
+    public void createLeaflet(String name, String code, String id, Integer problemType, Integer leaflet,String issueDetail) {
         WarningLeaflet warningLeaflet = new WarningLeaflet();
         warningLeaflet.setLeafletName(name);
         warningLeaflet.setLeafletNo(code);
         warningLeaflet.setProblemType(problemType);
         warningLeaflet.setProblemId(id);
         warningLeaflet.setLeafletType(leaflet);
+        warningLeaflet.setIssueDetail(issueDetail);
         warningLeaflet.setState(DataStateEnum.ENABLE.getCode());
         warningLeaflet.setStatus(FlowStatusEnum.NO_FEEDBACK.getCode());
         this.baseMapper.insert(warningLeaflet);

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

@@ -1,8 +1,10 @@
 package com.njcn.supervision.service.survey.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.text.StrPool;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -341,13 +343,15 @@ public class SupervisionGeneralSurveyPlanPOServiceImpl extends ServiceImpl<Super
          * 3、问题类型：1：技术监督管理；2：在线监测超标问题；3：用户投诉；4：现场测试超标，此处是现场测试超标
          * 4、对应问题源id，用于查询详细数据
          * 5、单子类型：1：预警单；2：告警单
+         * 6、问题详细描述
          * */
         warningLeafletService.createLeaflet(
                 generalSurveyPlan.getPlanName().concat(StrPool.UNDERLINE).concat(detailPlan.getSubName()),
                 IdWorker.get32UUID(),
                 id,
                 ProblemTypeEnum.SITE_TEST.getCode(),
-                LeafletTypeEnum.ALARM.getCode()
+                LeafletTypeEnum.ALARM.getCode(),
+                assembleIssueDetail(detailPlan,generalSurveyPlan)
         );
         //将当前的问题记录是否告警修改为已告警
         LambdaUpdateWrapper<SupervisionGeneralSurveyPlanDetailPO> detailPOLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
@@ -357,6 +361,25 @@ public class SupervisionGeneralSurveyPlanPOServiceImpl extends ServiceImpl<Super
         supervisionGeneralSurveyPlanDetailPOService.update(detailPOLambdaUpdateWrapper);
     }
 
+    /**
+     * 组装谐波普测的问题
+     * 格式：planCreateTime发起的planName普测计划，由负责人leader测试后，于planComplateTime完成，其中subName在本次普测计划测试中存在电能质量问题，详细请查看附件
+     */
+    private String assembleIssueDetail(SupervisionGeneralSurveyPlanDetailPO detailPlan, SupervisionGeneralSurveyPlanPO generalSurveyPlan) {
+        String issueDetail = "于"
+                .concat(LocalDateTimeUtil.format(generalSurveyPlan.getPlanCreateTime(), DatePattern.CHINESE_DATE_PATTERN))
+                .concat("发起的")
+                .concat(generalSurveyPlan.getPlanName())
+                .concat("普测计划，由负责人")
+                .concat(generalSurveyPlan.getLeader())
+                .concat("测试后，于")
+                .concat(LocalDateTimeUtil.format(generalSurveyPlan.getPlanComplateTime(), DatePattern.CHINESE_DATE_PATTERN))
+                .concat("完成，其中")
+                .concat(detailPlan.getSubName())
+                .concat("在本次普测计划测试中存在电能质量问题，详细请查看问题附件");
+        return issueDetail;
+    }
+
 
     public List<DeptSubstationVO> recursion(DeptSubstationVO result, String orgdid) {
         List<DeptSubstationVO> deptSubstationVOList = new ArrayList<>();