From a99c915235c4a14f3923c11bddc80409bfdc37ff Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Wed, 15 May 2024 13:34:51 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/SupervisionDevMainReportParam.java | 18 +++++--- .../po/device/SupervisionDevMainReportPO.java | 10 +++++ .../SupervisionGeneralSurveyPlanVO.java | 1 + .../device/QuitRunningDeviceController.java | 2 +- .../survey/GeneralSurveyController.java | 11 +++++ ...SupervisionDevMainReportPOServiceImpl.java | 6 ++- ...SupervisionGeneralSurveyPlanPOService.java | 5 ++- ...rvisionGeneralSurveyPlanPOServiceImpl.java | 43 +++++++++++++++++-- 8 files changed, 85 insertions(+), 11 deletions(-) diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionDevMainReportParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionDevMainReportParam.java index 5c1d22b46..b5c0bf3fe 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionDevMainReportParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionDevMainReportParam.java @@ -21,11 +21,7 @@ import java.util.Map; @AllArgsConstructor @NoArgsConstructor public class SupervisionDevMainReportParam { - /** - * id - */ - @ApiModelProperty(value = "id") - private String id; + /** * 填报人 @@ -78,6 +74,18 @@ public class SupervisionDevMainReportParam { @ApiModelProperty(value = "用户名称") private String userName; + /** + *监测点台账信息 + */ + @ApiModelProperty(value = "监测点台账信息") + private String lineFilePath; + /** + * 台终端账信息文件 + */ + @ApiModelProperty(value = "监测点台账信息") + private String deviceFilePath; + + /** * 验收检验报告 */ diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionDevMainReportPO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionDevMainReportPO.java index f64c048bf..4cc447733 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionDevMainReportPO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionDevMainReportPO.java @@ -75,6 +75,16 @@ public class SupervisionDevMainReportPO extends BaseEntity { */ @TableField(value = "user_name") private String userName; + /** + *监测点台账信息 + */ + @TableField(value = "line_file_path") + private String lineFilePath; + /** + * 台终端账信息文件 + */ + @TableField(value = "device_file_path") + private String deviceFilePath; /** * 验收检验报告 diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/survey/SupervisionGeneralSurveyPlanVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/survey/SupervisionGeneralSurveyPlanVO.java index d9b5f3e59..cabc374db 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/survey/SupervisionGeneralSurveyPlanVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/survey/SupervisionGeneralSurveyPlanVO.java @@ -24,6 +24,7 @@ import java.util.Map; @NoArgsConstructor public class SupervisionGeneralSurveyPlanVO extends BaseEntity { + private String planNo; /** * 单位ID diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/QuitRunningDeviceController.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/QuitRunningDeviceController.java index 839d61328..8fc42d711 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/QuitRunningDeviceController.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/controller/device/QuitRunningDeviceController.java @@ -33,7 +33,7 @@ import org.springframework.web.bind.annotation.*; @Slf4j @RestController @RequestMapping("/quitRunningDevice") -@Api(tags = "干扰源用户管理") +@Api(tags = "设备退运管理") @AllArgsConstructor public class QuitRunningDeviceController extends BaseController { 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 cbed1439e..09e6300e6 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 @@ -1,6 +1,7 @@ package com.njcn.supervision.controller.survey; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.constant.OperateType; import com.njcn.common.pojo.enums.common.LogEnum; @@ -111,5 +112,15 @@ public class GeneralSurveyController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD) + @PostMapping("/cancel") + @ApiOperation("取消普测计划") + @ApiImplicitParam(name = "cancelReqVO", value = "取消原因", required = true) + public HttpResult cancelGeneralSurvey(@Validated @RequestBody BpmProcessInstanceCancelParam cancelReqVO) { + String methodDescribe = getMethodDescribe("cancelGeneralSurvey"); + String id = supervisionGeneralSurveyPlanPOService.cancelGeneralSurvey(cancelReqVO); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, id, methodDescribe); + } + } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java index d06818f75..89098f7cc 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java @@ -50,6 +50,8 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl list = this.baseMapper.selectList(lambdaQueryWrapper); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/SupervisionGeneralSurveyPlanPOService.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/SupervisionGeneralSurveyPlanPOService.java index f20be31a2..a612d7e35 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/SupervisionGeneralSurveyPlanPOService.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/SupervisionGeneralSurveyPlanPOService.java @@ -2,6 +2,7 @@ package com.njcn.supervision.service.survey; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam; import com.njcn.supervision.pojo.param.survey.SupervisionGeneralSurveyPlanParm; import com.njcn.supervision.pojo.po.survey.SupervisionGeneralSurveyPlanPO; import com.njcn.supervision.pojo.vo.survey.DeptSubstationVO; @@ -32,5 +33,7 @@ public interface SupervisionGeneralSurveyPlanPOService extends IService initDetpStataionTree(String orgId); - void updateStatus(String businessKey, Integer status); + void updateStatus(String businessKey, Integer status); + + String cancelGeneralSurvey(BpmProcessInstanceCancelParam cancelReqVO); } diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SupervisionGeneralSurveyPlanPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SupervisionGeneralSurveyPlanPOServiceImpl.java index 27f6fd3f8..e0bc467cf 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SupervisionGeneralSurveyPlanPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/survey/impl/SupervisionGeneralSurveyPlanPOServiceImpl.java @@ -7,13 +7,17 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.bpm.api.BpmProcessFeignClient; +import com.njcn.bpm.enums.BpmProcessInstanceStatusEnum; import com.njcn.bpm.enums.BpmTaskStatusEnum; import com.njcn.bpm.pojo.dto.BpmProcessInstanceCreateReqDTO; +import com.njcn.bpm.pojo.param.instance.BpmProcessInstanceCancelParam; import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.device.biz.commApi.CommTerminalGeneralClient; import com.njcn.device.biz.pojo.dto.SubGetBase; import com.njcn.device.biz.pojo.param.SubstationParam; +import com.njcn.device.pq.api.LineFeignClient; +import com.njcn.device.pq.pojo.vo.LineDetailDataVO; import com.njcn.supervision.enums.FlowStatusEnum; import com.njcn.supervision.mapper.survey.SupervisionGeneralSurveyPlanPOMapper; import com.njcn.supervision.pojo.param.survey.SupervisionGeneralSurveyPlanParm; @@ -56,6 +60,7 @@ public class SupervisionGeneralSurveyPlanPOServiceImpl extends ServiceImpl data = lineFeignClient.getLineDetailList(unitChildrenList).getData(); + String subList = data.stream().map(LineDetailDataVO::getLineName).collect(Collectors.joining(",")); supervisionGeneralSurveyPlanDetailPO.setMeasurementPointId(subList); supervisionGeneralSurveyPlanDetailPO.setIsSurvey(0); } @@ -127,7 +133,8 @@ public class SupervisionGeneralSurveyPlanPOServiceImpl extends ServiceImpl stationList = commTerminalGeneralClient.tagOrIdGetSub(param).getData(); @@ -145,7 +152,9 @@ public class SupervisionGeneralSurveyPlanPOServiceImpl extends ServiceImpl data = lineFeignClient.getLineDetailList(unitChildrenList).getData(); + + String subList = data.stream().map(LineDetailDataVO::getLineName).collect(Collectors.joining(",")); supervisionGeneralSurveyPlanDetailPO.setMeasurementPointId(subList); supervisionGeneralSurveyPlanDetailPO.setIsSurvey(1); } @@ -155,6 +164,18 @@ public class SupervisionGeneralSurveyPlanPOServiceImpl extends ServiceImpl().lambda().eq(SupervisionGeneralSurveyPlanDetailPO::getPlanNo,planNo)); supervisionGeneralSurveyPlanDetailPOService.saveOrUpdateBatchByMultiId(supervisionGeneralSurveyPlanDetailPOS, 500); + // 发起 BPM 流程 + Map processInstanceVariables = new HashMap<>(); + BpmProcessInstanceCreateReqDTO bpmProcessInstanceCreateReqDTO = new BpmProcessInstanceCreateReqDTO(); + bpmProcessInstanceCreateReqDTO.setProcessDefinitionKey(PROCESS_KEY); + bpmProcessInstanceCreateReqDTO.setBusinessKey(planNo); + bpmProcessInstanceCreateReqDTO.setStartUserSelectAssignees(supervisionGeneralSurveyPlanUpdate.getStartUserSelectAssignees()); + bpmProcessInstanceCreateReqDTO.setVariables(processInstanceVariables); + String processInstanceId = bpmProcessFeignClient.createProcessInstance(RequestUtil.getUserIndex(),bpmProcessInstanceCreateReqDTO).getData(); + // 将工作流的编号，更新到流程单中 + byId.setProcessInstanceId(processInstanceId); + this.baseMapper.updateById(byId); + return true; } @@ -188,6 +209,10 @@ public class SupervisionGeneralSurveyPlanPOServiceImpl extends ServiceImpl{ temp.setOrgName((deptFeignClient.getDeptById(temp.getOrgNo()).getData().getName())); + //获取普测下电站详情 + List list = supervisionGeneralSurveyPlanDetailPOService.lambdaQuery().eq(SupervisionGeneralSurveyPlanDetailPO::getPlanNo, temp.getPlanNo()).list(); + temp.setSupervisionGeneralSurveyPlanDetailPOS(list); + temp.setSubIds(list.stream().map(SupervisionGeneralSurveyPlanDetailPO::getSubId).collect(Collectors.toList())); }); return page; @@ -255,6 +280,18 @@ public class SupervisionGeneralSurveyPlanPOServiceImpl extends ServiceImpl recursion(DeptSubstationVO result, String orgdid) { List deptSubstationVOList = new ArrayList<>();