From b1f86e251c9b8ab28b61b5aa0bc29da611d6e302 Mon Sep 17 00:00:00 2001 From: wangli Date: Sat, 22 Feb 2025 21:28:20 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-3581)=20-=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91=E4=B8=AD?= =?UTF-8?q?=EF=BC=8C=E5=AF=B9=E6=8C=87=E5=AE=9A=E7=9A=84=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=20ID=20=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessInstanceAllEventHandler.java | 21 +++++++++++++++++-- .../task/ProcessTaskAllEventHandler.java | 8 +++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/ProcessInstanceAllEventHandler.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/ProcessInstanceAllEventHandler.java index 23ef2965..e0671c21 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/ProcessInstanceAllEventHandler.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/ProcessInstanceAllEventHandler.java @@ -1,5 +1,7 @@ package cn.axzo.nanopart.visa.server.mq.listener.workflow.process; +import cn.axzo.framework.rocketmq.Event; +import cn.axzo.framework.rocketmq.EventConsumer; import cn.axzo.framework.rocketmq.EventProducer; import cn.axzo.nanopart.visa.api.enums.VisaStatusEnum; import cn.axzo.nanopart.visa.api.enums.VisaTypeEnum; @@ -17,16 +19,21 @@ import cn.axzo.workflow.common.enums.BpmnProcessInstanceResultEnum; import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskDelegateAssigner; import cn.axzo.workflow.common.model.response.mq.ProcessInstanceDTO; import cn.axzo.workflow.starter.handler.ProcessInstanceEventHandler; +import com.google.common.collect.Lists; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; import java.util.Date; +import java.util.List; import java.util.Objects; import static cn.axzo.nanopart.visa.api.constant.VisaConstant.WORKFLOW_VAR_VISA_TYPE_KEY; import static cn.axzo.nanopart.visa.api.enums.VisaLogTypeEnum.REJECT_APPROVE; import static cn.axzo.nanopart.visa.api.enums.VisaLogTypeEnum.REVERT_APPROVE; import static cn.axzo.nanopart.visa.api.enums.VisaRelationFieldEnum.PROCESS_INSTANCE_OF_VISA; +import static cn.axzo.nanopart.visa.api.enums.VisaTypeEnum.DESIGN_CHANGE; +import static cn.axzo.nanopart.visa.api.enums.VisaTypeEnum.PROJECT_VISA; +import static cn.axzo.nanopart.visa.api.enums.VisaTypeEnum.TECHNOLOGY_APPROVED; /** * 工作流广播的实例维度的所有事件类型 @@ -39,6 +46,11 @@ public class ProcessInstanceAllEventHandler extends BasicLogSupport implements P protected final ChangeRecordService changeRecordService; protected final ChangeRecordRelationService changeRecordRelationService; protected final ChangeRecordBillService changeRecordBillService; + public static List SUPPORTED_DEFINITION_KEYS = Lists.newArrayList( + DESIGN_CHANGE.getProcessDefinitionKey(), + TECHNOLOGY_APPROVED.getProcessDefinitionKey(), + PROJECT_VISA.getProcessDefinitionKey() + ); public ProcessInstanceAllEventHandler(EventProducer eventProducer, VisaOrganizationalNodeUserGateway visaOrganizationalNodeUserGateway, @@ -56,6 +68,11 @@ public class ProcessInstanceAllEventHandler extends BasicLogSupport implements P return Integer.MIN_VALUE; } + @Override + public boolean accept(ProcessInstanceDTO dto, Event event, EventConsumer.Context context) { + return SUPPORTED_DEFINITION_KEYS.contains(dto.getProcessDefinitionKey()); + } + @Override public void onCreated(ProcessInstanceDTO dto) { ProcessInstanceEventHandler.super.onCreated(dto); @@ -160,7 +177,7 @@ public class ProcessInstanceAllEventHandler extends BasicLogSupport implements P .ouId(Long.valueOf(lastOperationAssigner.getOuId())) .workspaceId(Long.valueOf(lastOperationAssigner.getTenantId())) .updateStatus(VisaStatusEnum.COMPLETED) - .editFormFlag(false) + .editFormFlag(false) .build()); return; } @@ -171,7 +188,7 @@ public class ProcessInstanceAllEventHandler extends BasicLogSupport implements P .ouId(Long.valueOf(lastOperationAssigner.getOuId())) .workspaceId(Long.valueOf(lastOperationAssigner.getTenantId())) .updateStatus(Objects.isNull(visa.getImGroupId()) ? VisaStatusEnum.REPORT_FROM_APPROVE : VisaStatusEnum.DECIDING_FROM_APPROVE) - .editFormFlag(false) + .editFormFlag(false) .build()); // 取消当前主单据关联的其他单据的关联状态 diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/task/ProcessTaskAllEventHandler.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/task/ProcessTaskAllEventHandler.java index cb227dcf..821e7416 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/task/ProcessTaskAllEventHandler.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/task/ProcessTaskAllEventHandler.java @@ -1,5 +1,7 @@ package cn.axzo.nanopart.visa.server.mq.listener.workflow.task; +import cn.axzo.framework.rocketmq.Event; +import cn.axzo.framework.rocketmq.EventConsumer; import cn.axzo.framework.rocketmq.EventProducer; import cn.axzo.maokai.api.vo.response.OrgNodeUserBriefInfoResp; import cn.axzo.nanopart.visa.server.domain.ChangeRecordLog; @@ -14,6 +16,7 @@ import java.util.Objects; import static cn.axzo.nanopart.visa.api.enums.VisaLogTypeEnum.APPROVED_AGRESS; import static cn.axzo.nanopart.visa.api.enums.VisaLogTypeEnum.TRANSMIT_APPROVE; +import static cn.axzo.nanopart.visa.server.mq.listener.workflow.process.ProcessInstanceAllEventHandler.SUPPORTED_DEFINITION_KEYS; /** * 工作流广播的任务维度的所有事件类型 @@ -33,6 +36,11 @@ public class ProcessTaskAllEventHandler extends BasicLogSupport implements Proce return Integer.MAX_VALUE; } + @Override + public boolean accept(ProcessTaskDTO dto, Event event, EventConsumer.Context context) { + return SUPPORTED_DEFINITION_KEYS.contains(dto.getProcessDefinitionKey()); + } + @Override public void onAssigned(ProcessTaskDTO dto) { ProcessTaskEventHandler.super.onAssigned(dto);