From dec591426523223ddda96016cc88bef65e861ac9 Mon Sep 17 00:00:00 2001 From: hongawen <83944980@qq.com> Date: Wed, 19 Jun 2024 10:17:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E5=BF=83=E4=BF=A1=E6=81=AF=E6=8F=90?= =?UTF-8?q?=E5=8F=96,=E5=B9=B6=E4=B8=94=E5=BA=94=E7=94=A8=E5=88=B0?= =?UTF-8?q?=E3=80=90=E6=88=91=E7=9A=84=E5=B7=A5=E4=BD=9C=E3=80=91=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E4=B8=89=E4=B8=AAtab?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bpm/pojo/vo/instance/BpmProcessInstanceVO.java | 10 ++++++++++ .../controller/BpmProcessInstanceController.java | 4 ++-- .../com/njcn/bpm/controller/BpmTaskController.java | 4 ++-- .../njcn/bpm/utils/BpmProcessInstanceConvert.java | 14 +++++++++++++- .../java/com/njcn/bpm/utils/BpmTaskConvert.java | 12 +++++++++++- .../device/impl/QuitRunningDeviceServiceImpl.java | 4 ++-- .../SupervisionDevMainReportPOServiceImpl.java | 4 ++-- .../leaflet/impl/WarningLeafletServiceImpl.java | 8 ++++---- .../service/survey/impl/SurveyPlanServiceImpl.java | 2 +- .../service/survey/impl/SurveyTestServiceImpl.java | 2 +- 10 files changed, 48 insertions(+), 16 deletions(-) diff --git a/pqs-bpm/bpm-api/src/main/java/com/njcn/bpm/pojo/vo/instance/BpmProcessInstanceVO.java b/pqs-bpm/bpm-api/src/main/java/com/njcn/bpm/pojo/vo/instance/BpmProcessInstanceVO.java index e713b064b..ea472499f 100644 --- a/pqs-bpm/bpm-api/src/main/java/com/njcn/bpm/pojo/vo/instance/BpmProcessInstanceVO.java +++ b/pqs-bpm/bpm-api/src/main/java/com/njcn/bpm/pojo/vo/instance/BpmProcessInstanceVO.java @@ -43,6 +43,16 @@ public class BpmProcessInstanceVO { @ApiModelProperty("业务的唯一标识") private String businessKey; + /** + * 历史流程实例编号 + */ + private String historyInstanceId; + + /** + * 业务流程重要信息 + */ + private String instanceSign; + /** * 发起流程的用户 */ diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmProcessInstanceController.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmProcessInstanceController.java index f4fc399fc..cf18deae8 100644 --- a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmProcessInstanceController.java +++ b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmProcessInstanceController.java @@ -92,7 +92,7 @@ public class BpmProcessInstanceController extends BaseController { convertSet(pageResult.getList(), HistoricProcessInstance::getProcessDefinitionId)); Map categoryMap = categoryService.getCategoryMap( convertSet(processDefinitionMap.values(), ProcessDefinition::getCategory)); - PageResult bpmProcessInstanceVOPageResult = BpmProcessInstanceConvert.INSTANCE.buildProcessInstancePage(pageResult, processDefinitionMap, categoryMap, taskMap, null, null); + PageResult bpmProcessInstanceVOPageResult = BpmProcessInstanceConvert.INSTANCE.buildProcessInstancePage(pageResult, processDefinitionMap, categoryMap, taskMap, null, null,businessCommonFeignClient); //封装调整为当前系统的格式 Page page = new Page<>(); page.setRecords(bpmProcessInstanceVOPageResult.getList()); @@ -129,7 +129,7 @@ public class BpmProcessInstanceController extends BaseController { Map deptMap = CollectionUtils.convertMap(deptList, Dept::getId); PageResult bpmProcessInstanceVOPageResult = BpmProcessInstanceConvert.INSTANCE.buildProcessInstancePage(pageResult, - processDefinitionMap, categoryMap, taskMap, userMap, deptMap); + processDefinitionMap, categoryMap, taskMap, userMap, deptMap,businessCommonFeignClient); //封装调整为当前系统的格式 Page page = new Page<>(); page.setRecords(bpmProcessInstanceVOPageResult.getList()); diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmTaskController.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmTaskController.java index e5abf18af..50b39b348 100644 --- a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmTaskController.java +++ b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/controller/BpmTaskController.java @@ -117,7 +117,7 @@ public class BpmTaskController extends BaseController { convertSet(pageResult.getList(), HistoricTaskInstance::getProcessInstanceId)); List userList = userFeignClient.getUserVOByIdList(convertList(processInstanceMap.values(), HistoricProcessInstance::getStartUserId)).getData(); Map userMap = CollectionUtils.convertMap(userList, UserVO::getId); - PageResult bpmTaskRespVOPageResult = BpmTaskConvert.INSTANCE.buildTaskPage(pageResult, processInstanceMap, userMap, null); + PageResult bpmTaskRespVOPageResult = BpmTaskConvert.INSTANCE.buildTaskPage(pageResult, processInstanceMap, userMap, null,businessCommonFeignClient); //封装调整为当前系统的格式 Page page = new Page<>(); page.setRecords(bpmTaskRespVOPageResult.getList()); @@ -150,7 +150,7 @@ public class BpmTaskController extends BaseController { Map userMap = CollectionUtils.convertMap(userList, UserVO::getId); List deptList = deptFeignClient.getDeptInfoListByIds(convertList(userMap.values(), UserVO::getDeptId)).getData(); Map deptMap = CollectionUtils.convertMap(deptList, Dept::getId); - PageResult bpmTaskVOPageResult = BpmTaskConvert.INSTANCE.buildTaskPage(pageResult, processInstanceMap, userMap, deptMap); + PageResult bpmTaskVOPageResult = BpmTaskConvert.INSTANCE.buildTaskPage(pageResult, processInstanceMap, userMap, deptMap,businessCommonFeignClient); //封装调整为当前系统的格式 Page page = new Page<>(); diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/utils/BpmProcessInstanceConvert.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/utils/BpmProcessInstanceConvert.java index 1b262ba62..a16cd65f9 100644 --- a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/utils/BpmProcessInstanceConvert.java +++ b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/utils/BpmProcessInstanceConvert.java @@ -1,6 +1,7 @@ package com.njcn.bpm.utils; import com.njcn.bpm.listener.BpmProcessInstanceStatusEvent; +import com.njcn.bpm.pojo.dto.BpmInstanceInfo; import com.njcn.bpm.pojo.dto.BpmMessageSendWhenProcessInstanceApproveReqDTO; import com.njcn.bpm.pojo.dto.BpmMessageSendWhenProcessInstanceRejectReqDTO; import com.njcn.bpm.pojo.dto.PageResult; @@ -8,6 +9,7 @@ import com.njcn.bpm.pojo.po.BpmCategory; import com.njcn.bpm.pojo.po.BpmProcessDefinitionInfo; import com.njcn.bpm.pojo.vo.BpmProcessDefinitionInfoVO; import com.njcn.bpm.pojo.vo.instance.BpmProcessInstanceVO; +import com.njcn.supervision.api.BusinessCommonFeignClient; import com.njcn.user.pojo.po.Dept; import com.njcn.user.pojo.vo.UserVO; import org.flowable.engine.history.HistoricProcessInstance; @@ -21,6 +23,7 @@ import org.mapstruct.factory.Mappers; import java.util.List; import java.util.Map; +import java.util.Objects; /** * 流程实例 Convert @@ -37,7 +40,8 @@ public interface BpmProcessInstanceConvert { Map categoryMap, Map> taskMap, Map userMap, - Map deptMap) { + Map deptMap, + BusinessCommonFeignClient businessCommonFeignClient) { PageResult vpPageResult = BeanUtils.toBean(pageResult, BpmProcessInstanceVO.class); for (int i = 0; i < pageResult.getList().size(); i++) { BpmProcessInstanceVO respVO = vpPageResult.getList().get(i); @@ -54,6 +58,14 @@ public interface BpmProcessInstanceConvert { MapUtils.findAndThen(deptMap, startUser.getDeptId(), dept -> respVO.getStartUser().setDeptName(dept.getName())); } } + String processDefinitionId = respVO.getProcessDefinitionId(); + String key = processDefinitionId.substring(0,processDefinitionId.lastIndexOf(":")); + key = key.substring(0,key.lastIndexOf(":")); + BpmInstanceInfo instanceInfo = businessCommonFeignClient.getInstanceInfo(key, respVO.getBusinessKey()).getData(); + if(Objects.nonNull(instanceInfo)){ + respVO.setHistoryInstanceId(instanceInfo.getHistoryInstanceId()); + respVO.setInstanceSign(instanceInfo.getInstanceSign()); + } } return vpPageResult; } diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/utils/BpmTaskConvert.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/utils/BpmTaskConvert.java index ac3a07885..b93479263 100644 --- a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/utils/BpmTaskConvert.java +++ b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/utils/BpmTaskConvert.java @@ -78,7 +78,8 @@ public interface BpmTaskConvert { default PageResult buildTaskPage(PageResult pageResult, Map processInstanceMap, Map userMap, - Map deptMap) { + Map deptMap, + BusinessCommonFeignClient businessCommonFeignClient) { List taskVOList = convertList(pageResult.getList(), task -> { BpmTaskVO taskVO = BeanUtils.toBean(task, BpmTaskVO.class); taskVO.setStatus(FlowableUtils.getTaskStatus(task)); @@ -96,6 +97,15 @@ public interface BpmTaskConvert { taskVO.setProcessInstance(BeanUtils.toBean(processInstance, BpmTaskVO.ProcessInstance.class)); taskVO.getProcessInstance().setStartUser(BeanUtils.toBean(startUser, BpmProcessInstanceVO.User.class)); } + //处理额外信息 + String processDefinitionId = taskVO.getProcessInstance().getProcessDefinitionId(); + String key = processDefinitionId.substring(0,processDefinitionId.lastIndexOf(":")); + key = key.substring(0,key.lastIndexOf(":")); + BpmInstanceInfo instanceInfo = businessCommonFeignClient.getInstanceInfo(key, processInstance.getBusinessKey()).getData(); + if(Objects.nonNull(instanceInfo)){ + taskVO.setHistoryInstanceId(instanceInfo.getHistoryInstanceId()); + taskVO.setInstanceSign(instanceInfo.getInstanceSign()); + } return taskVO; }); return new PageResult<>(taskVOList, pageResult.getTotal()); diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java index 06eb55142..789f9f4ba 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/QuitRunningDeviceServiceImpl.java @@ -212,9 +212,9 @@ public class QuitRunningDeviceServiceImpl extends ServiceImpl