diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java index bd1af6d46..fa604d78d 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java @@ -121,6 +121,17 @@ public class UserReportParam extends BaseEntity { private UserReportSubstationPO userReportSubstationPO; + /** + * 流程实例的编号 + */ + + @ApiModelProperty(value = "流程实例的编号") + private String processInstanceId; + + @ApiModelProperty(value = "历史流程实例的编号") + private String historyInstanceId; + + @Data diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempLineReport.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempLineReport.java index 38c529332..c3a5944a5 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempLineReport.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempLineReport.java @@ -118,19 +118,19 @@ public class SupervisionTempLineReport extends BaseEntity { /** * CT变比 */ - @ApiModelProperty(value="CT1") + @TableField(value = "ct_1") private Integer ct1; - @ApiModelProperty(value="CT2") + @TableField(value = "ct_2") private Integer ct2; /** * PT变比 */ - @ApiModelProperty(value="PT1") + @TableField(value = "pt_1") private Integer pt1; - @ApiModelProperty(value="PT2") + @TableField(value = "pt_2") private Integer pt2; @@ -179,7 +179,7 @@ public class SupervisionTempLineReport extends BaseEntity { * 是否参与统计 */ @TableField(value = "is_statistical") - private String isStatistical; + private Integer isStatistical; /** * 线路号 */ @@ -208,7 +208,7 @@ public class SupervisionTempLineReport extends BaseEntity { * 是否并网点 */ @TableField(value = "is_grid_connection_point") - private String isGridConnectionPoint; + private Integer isGridConnectionPoint; /** * 监测点运行状态 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 6dae0b84b..a2f462f46 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,8 @@ public class WarningLeaflet extends BaseEntity implements Serializable{ */ private String processInstanceId; + private String historyInstanceId; + /** * 问题详细描述 */ diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/QuitRunningDeviceVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/QuitRunningDeviceVO.java index a671d7817..bfd676ffc 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/QuitRunningDeviceVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/QuitRunningDeviceVO.java @@ -8,7 +8,7 @@ import java.io.Serializable; /** *

- * + * *

* * @author hongawen @@ -88,4 +88,5 @@ public class QuitRunningDeviceVO extends BaseEntity implements Serializable{ private String historyInstanceId; + private String createBy; } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionDevMainReportVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionDevMainReportVO.java index 190ccad7e..19483a13c 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionDevMainReportVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionDevMainReportVO.java @@ -173,6 +173,6 @@ public class SupervisionDevMainReportVO { private String monitoringTerminalName; - + private String createBy; } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineDebugVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineDebugVO.java index 56a1e32d9..5b9a298c3 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineDebugVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineDebugVO.java @@ -46,4 +46,7 @@ public class SupervisionTempLineDebugVO extends BaseEntity { * 试运行时间范围 */ private String testRunTime; + + + private String createBy; } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineReportVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineReportVO.java index 341b9b7fe..49d70a3d4 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineReportVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/device/SupervisionTempLineReportVO.java @@ -177,7 +177,7 @@ public class SupervisionTempLineReportVO { * 是否参与统计 */ @ApiModelProperty(value="是否参与统计") - private Boolean isStatistical; + private Integer isStatistical; /** * 监测点对象名称 @@ -195,7 +195,7 @@ public class SupervisionTempLineReportVO { * 是否并网点 */ @ApiModelProperty(value="是否并网点") - private Boolean isGridConnectionPoint; + private Integer isGridConnectionPoint; /** * 监测点运行状态 @@ -228,7 +228,8 @@ public class SupervisionTempLineReportVO { @ApiModelProperty(value = "流程实例的编号") private String processInstanceId; - + @ApiModelProperty(value = "流程实例的编号") + private String historyInstanceId; /** * 线路号 */ @@ -248,4 +249,7 @@ public class SupervisionTempLineReportVO { private Integer status; + private String createBy; + + } 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 1442c0691..1103641c4 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 @@ -85,9 +85,13 @@ public class WarningLeafletVO extends BaseEntity implements Serializable{ */ private String processInstanceId; + private String historyInstanceId; + /** * 问题详细描述 */ private String issueDetail; + private String createBy; + } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/plan/SupervisionPlanVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/plan/SupervisionPlanVO.java index 37c7dd750..367943f2f 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/plan/SupervisionPlanVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/plan/SupervisionPlanVO.java @@ -192,4 +192,10 @@ public class SupervisionPlanVO { @ApiModelProperty(value = "流程实例的编号") private String processInstanceId; + + @ApiModelProperty(value = "历史流程实例的编号") + private String historyInstanceId; + + + } diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java index 48c41d841..5a4cde5c6 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java @@ -134,6 +134,9 @@ public class UserReportVO { @TableField(value = "`status`") private Integer status; + + private String createBy; + /** * 创建时间 */ diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/leaflet/WarningLeafletController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/leaflet/WarningLeafletController.java index 715111c8d..b0ba5085c 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/leaflet/WarningLeafletController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/leaflet/WarningLeafletController.java @@ -93,6 +93,17 @@ public class WarningLeafletController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } + + @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE) + @PostMapping("/update") + @ApiOperation("重新发起反馈单申请") + @ApiImplicitParam(name = "warningLeafletUpdateParam", value = "实体参数", required = true) + public HttpResult updateFeedback(@RequestBody @Validated WarningLeafletParam.WarningLeafletUpdateParam warningLeafletUpdateParam) { + String methodDescribe = getMethodDescribe("updateFeedback"); + warningLeafletService.updateFeedback(warningLeafletUpdateParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } + @GetMapping("/getById") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("根据id获取预告警单的详细数据") diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/GeneralSurveyController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/GeneralSurveyController.java index 5557ac4a2..47cd18504 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/GeneralSurveyController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/survey/GeneralSurveyController.java @@ -37,6 +37,7 @@ import java.util.List; @RequestMapping("/generalSurvey") @Api(tags = "谐波普测计划") @AllArgsConstructor +@Deprecated public class GeneralSurveyController extends BaseController { private final SupervisionGeneralSurveyPlanPOService supervisionGeneralSurveyPlanPOService; diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineDebugPOMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineDebugPOMapper.xml index 4b7c0aebc..00996e175 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineDebugPOMapper.xml +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/device/mapping/SupervisionTempLineDebugPOMapper.xml @@ -36,7 +36,8 @@ supervision_temp_line_report.Power_Substation_Name, supervision_temp_line_debug.reason reason, supervision_temp_line_debug.process_instance_id process_instanceId, - supervision_temp_line_debug.`status` `Status` + supervision_temp_line_debug.`status` `Status`, + supervision_temp_line_debug.create_by FROM supervision_temp_line_report left JOIN supervision_temp_line_debug ON supervision_temp_line_report.id = supervision_temp_line_debug.id @@ -59,7 +60,8 @@ supervision_temp_line_run_test.process_instance_id process_instanceId, supervision_temp_line_run_test.`status` `Status`, IFNULL(supervision_temp_line_run_test.`test_run_state`,0) `testRunState`, - supervision_temp_line_run_test.test_run_time + supervision_temp_line_run_test.test_run_time, + supervision_temp_line_run_test.create_by FROM supervision_temp_line_debug inner JOIN supervision_temp_line_report ON supervision_temp_line_report.id = supervision_temp_line_debug.id diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportPOMapper.xml b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportPOMapper.xml index 19446b2ad..087ac8e6b 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportPOMapper.xml +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportPOMapper.xml @@ -50,6 +50,7 @@ supervision_user_report.process_instance_id, supervision_user_report.history_instance_id, supervision_user_report.create_time, + supervision_user_report.create_by, supervision_user_report.status FROM supervision_user_report supervision_user_report WHERE ${ew.sqlSegment} 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 a1636cbea..8bd0e99c2 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 @@ -35,6 +35,9 @@ public interface IWarningLeafletService extends IService { void addFeedback(WarningLeafletParam.WarningLeafletUpdateParam warningLeafletUpdateParam); + + String updateFeedback(WarningLeafletParam.WarningLeafletUpdateParam warningLeafletUpdateParam); + WarningLeafletVO getVOById(String id); void updateStatus(String businessKey, Integer status); 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 0d1e2d800..28c10d651 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 @@ -23,6 +23,7 @@ import com.njcn.supervision.enums.LeafletTypeEnum; import com.njcn.supervision.enums.ProblemTypeEnum; import com.njcn.supervision.mapper.leaflet.WarningLeafletMapper; import com.njcn.supervision.pojo.param.leaflet.WarningLeafletParam; +import com.njcn.supervision.pojo.po.device.SupervisionTempLineReport; import com.njcn.supervision.pojo.po.leaflet.WarningLeaflet; import com.njcn.supervision.pojo.po.survey.SupervisionGeneralSurveyPlanPO; import com.njcn.supervision.pojo.po.survey.SurveyTest; @@ -134,6 +135,36 @@ public class WarningLeafletServiceImpl extends ServiceImpl processInstanceVariables = new HashMap<>(); + BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY); + bpmProcessInstanceCreateReqDTO.setBusinessKey(warningLeaflet.getId()); + bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(warningLeafletUpdateParam.getStartUserSelectAssignees()); + bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); + String processInstanceId = bpmProcessFeignClient.createProcessInstance(warningLeaflet.getCreateBy(), bpmProcessInstanceCreateReqDTO).getData(); + // 将工作流的编号，更新到流程单中 + warningLeaflet.setProcessInstanceId(processInstanceId); + //保存历史流程id列表 + warningLeaflet.setHistoryInstanceId(historyInstanceIds); + this.baseMapper.updateById(warningLeaflet); + return warningLeaflet.getId(); + } + @Override public WarningLeafletVO getVOById(String id) { WarningLeaflet warningLeaflet = this.getById(id); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java index 019d70431..d5aaef40f 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SurveyPlanServiceImpl.java @@ -206,6 +206,7 @@ public class SurveyPlanServiceImpl extends ServiceImpl colleaguesIds = userFeignClient.getColleaguesIdByUserId(RequestUtil.getUserIndex()).getData(); userReportVOQueryWrapper.in("supervision_user_report.create_by", colleaguesIds) - .eq("supervision_user_report.state", DataStateEnum.ENABLE.getCode()); + .eq("supervision_user_report.state", DataStateEnum.ENABLE.getCode()) + .eq("supervision_user_report.data_type",0); if (Objects.nonNull(userReportQueryParam)) { if (StrUtil.isNotBlank(userReportQueryParam.getCity())) { //查询所有区域下的数据 @@ -341,6 +344,7 @@ public class UserReportPOServiceImpl extends ServiceImpl list = this.lambdaQuery() .eq(UserReportPO::getStatus, 2) + .eq(UserReportPO::getDataType,0) .in(CollectionUtil.isNotEmpty(data), UserReportPO::getOrgId, data) .list(); List collect = list.stream().map(temp -> {