diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmModelController.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmModelController.java index e5ce65829..779276bcf 100644 --- a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmModelController.java +++ b/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 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 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 deleteModel(String id) { String methodDescribe = getMethodDescribe("deleteModel"); diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/leaflet/WarningLeafletParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/leaflet/WarningLeafletParam.java index 4bbfb947f..6579e07fc 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/leaflet/WarningLeafletParam.java +++ b/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) diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/leaflet/WarningLeaflet.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/leaflet/WarningLeaflet.java index 53535532a..6dae0b84b 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/leaflet/WarningLeaflet.java +++ b/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; + /** * 采取措施 diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/leaflet/WarningLeafletVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/leaflet/WarningLeafletVO.java index 1c0423eef..1545f3854 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/leaflet/WarningLeafletVO.java +++ b/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; + } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/IWarningLeafletService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/IWarningLeafletService.java index e3f137a7c..227e71e70 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/IWarningLeafletService.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/IWarningLeafletService.java @@ -22,9 +22,10 @@ public interface IWarningLeafletService extends IService { * 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 alarmPageData(WarningLeafletParam.WarningLeafletQueryParam warningLeafletQueryParam); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java index 48b9f80e3..c35341573 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java @@ -39,13 +39,14 @@ public class WarningLeafletServiceImpl extends ServiceImpl detailPOLambdaUpdateWrapper = new LambdaUpdateWrapper<>(); @@ -357,6 +361,25 @@ public class SupervisionGeneralSurveyPlanPOServiceImpl extends ServiceImpl recursion(DeptSubstationVO result, String orgdid) { List deptSubstationVOList = new ArrayList<>();