diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java index b5d1d7cb6e835c930718f3a988100a09fa1d9a1d..604299f227ad375397af80516af5049398992b04 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java @@ -65,13 +65,8 @@ import neatlogic.framework.process.exception.processtask.task.ProcessTaskStepTas import neatlogic.framework.process.fulltextindex.ProcessFullTextIndexType; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; import neatlogic.framework.process.operationauth.core.ProcessAuthManager; -import neatlogic.framework.process.stephandler.core.IProcessStepHandler; -import neatlogic.framework.process.stephandler.core.IProcessStepInternalHandler; -import neatlogic.framework.process.stephandler.core.ProcessStepHandlerFactory; -import neatlogic.framework.process.stephandler.core.ProcessStepInternalHandlerFactory; +import neatlogic.framework.process.stephandler.core.*; import neatlogic.framework.process.stepremind.core.ProcessTaskStepRemindTypeFactory; -import neatlogic.framework.process.steptaskhandler.core.IProcessStepTaskHandler; -import neatlogic.framework.process.steptaskhandler.core.ProcessStepTaskHandlerFactory; import neatlogic.framework.process.task.TaskConfigManager; import neatlogic.framework.process.workerpolicy.core.IWorkerPolicyHandler; import neatlogic.framework.process.workerpolicy.core.WorkerPolicyHandlerFactory; @@ -1610,9 +1605,9 @@ public class ProcessTaskServiceImpl implements ProcessTaskService, IProcessTaskC .add(new NotifyReceiverVo(GroupSearch.USER.getValue(), processTaskStepUserVo.getUserUuid())); } - IProcessStepTaskHandler processStepTaskHandler = ProcessStepTaskHandlerFactory.getHandler(currentProcessTaskStepVo.getHandler()); - if (processStepTaskHandler != null) { - List minorUserList = processStepTaskHandler.getMinorUserListForNotifyReceiver(currentProcessTaskStepVo); + IProcessStepAssistantHandler processStepAssistantHandler = ProcessStepAssistantHandlerFactory.getHandler(currentProcessTaskStepVo.getHandler()); + if (processStepAssistantHandler != null) { + List minorUserList = processStepAssistantHandler.getMinorUserListForNotifyReceiver(currentProcessTaskStepVo); for (ProcessTaskStepUserVo processTaskStepUserVo : minorUserList) { receiverMap.computeIfAbsent(ProcessUserType.MINOR.getValue(), k -> new ArrayList<>()) .add(new NotifyReceiverVo(GroupSearch.USER.getValue(), processTaskStepUserVo.getUserUuid())); diff --git a/src/main/java/neatlogic/module/process/stephandler/utilhandler/OmnipotentProcessUtilHandler.java b/src/main/java/neatlogic/module/process/stephandler/utilhandler/OmnipotentProcessUtilHandler.java index 00d9affd1ee92683080f57ea20e5981ba400a6cd..f787533d8c4bd42db3fe7dbc1392317736e1080f 100644 --- a/src/main/java/neatlogic/module/process/stephandler/utilhandler/OmnipotentProcessUtilHandler.java +++ b/src/main/java/neatlogic/module/process/stephandler/utilhandler/OmnipotentProcessUtilHandler.java @@ -8,12 +8,11 @@ import neatlogic.framework.notify.crossover.INotifyServiceCrossoverService; import neatlogic.framework.notify.dto.InvokeNotifyPolicyConfigVo; import neatlogic.framework.process.constvalue.ProcessStepHandlerType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.dto.ProcessStepTaskConfigVo; -import neatlogic.framework.process.dto.ProcessStepVo; -import neatlogic.framework.process.dto.ProcessStepWorkerPolicyVo; -import neatlogic.framework.process.dto.ProcessTaskStepVo; +import neatlogic.framework.process.constvalue.ProcessUserType; +import neatlogic.framework.process.dto.*; import neatlogic.framework.process.dto.processconfig.ActionConfigActionVo; import neatlogic.framework.process.dto.processconfig.ActionConfigVo; +import neatlogic.framework.process.stephandler.core.IProcessStepAssistantHandler; import neatlogic.framework.process.stephandler.core.ProcessStepInternalHandlerBase; import neatlogic.framework.process.util.ProcessConfigUtil; import neatlogic.module.process.notify.handler.OmnipotentNotifyPolicyHandler; @@ -27,7 +26,7 @@ import java.util.List; import java.util.Objects; @Service -public class OmnipotentProcessUtilHandler extends ProcessStepInternalHandlerBase { +public class OmnipotentProcessUtilHandler extends ProcessStepInternalHandlerBase implements IProcessStepAssistantHandler { @Override public String getHandler() { @@ -274,4 +273,24 @@ public class OmnipotentProcessUtilHandler extends ProcessStepInternalHandlerBase return resultObj; } + @Override + public List getMinorUserListForNotifyReceiver(ProcessTaskStepVo currentProcessTaskStepVo) { + List resultList = new ArrayList<>(); + /* 当前任务处理人 */ + ProcessTaskStepTaskVo stepTaskVo = currentProcessTaskStepVo.getProcessTaskStepTaskVo(); + if (stepTaskVo != null) { + List taskUserVoList = stepTaskVo.getStepTaskUserVoList(); + if (CollectionUtils.isNotEmpty(taskUserVoList)) { + for (ProcessTaskStepTaskUserVo taskUserVo : taskUserVoList) { + ProcessTaskStepUserVo processTaskStepUserVo = new ProcessTaskStepUserVo(); + processTaskStepUserVo.setProcessTaskId(currentProcessTaskStepVo.getProcessTaskId()); + processTaskStepUserVo.setProcessTaskStepId(currentProcessTaskStepVo.getId()); + processTaskStepUserVo.setUserType(ProcessUserType.MINOR.getValue()); + processTaskStepUserVo.setUserUuid(taskUserVo.getUserUuid()); + resultList.add(processTaskStepUserVo); + } + } + } + return resultList; + } } diff --git a/src/main/java/neatlogic/module/process/steptaskhandler/component/SubTaskHandler.java b/src/main/java/neatlogic/module/process/steptaskhandler/component/SubTaskHandler.java deleted file mode 100644 index ca908bfb74ea9b6cf95451d685e5d2c6d11b9ef6..0000000000000000000000000000000000000000 --- a/src/main/java/neatlogic/module/process/steptaskhandler/component/SubTaskHandler.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (C) 2024 深圳极向量科技有限公司 All Rights Reserved. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -package neatlogic.module.process.steptaskhandler.component; - -import neatlogic.framework.process.constvalue.ProcessStepHandlerType; -import neatlogic.framework.process.constvalue.ProcessUserType; -import neatlogic.framework.process.dto.ProcessTaskStepTaskUserVo; -import neatlogic.framework.process.dto.ProcessTaskStepTaskVo; -import neatlogic.framework.process.dto.ProcessTaskStepUserVo; -import neatlogic.framework.process.dto.ProcessTaskStepVo; -import neatlogic.framework.process.steptaskhandler.core.ProcessStepTaskHandlerBase; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.stereotype.Component; - -import java.util.ArrayList; -import java.util.List; - -@Component -public class SubTaskHandler extends ProcessStepTaskHandlerBase { - @Override - public List getHandlerList() { - List list = new ArrayList<>(); - list.add(ProcessStepHandlerType.OMNIPOTENT.getHandler()); - list.add("event"); - return list; - } - - @Override - public List getMinorUserListForNotifyReceiver(ProcessTaskStepVo currentProcessTaskStepVo) { - List resultList = new ArrayList<>(); - /* 当前任务处理人 */ - ProcessTaskStepTaskVo stepTaskVo = currentProcessTaskStepVo.getProcessTaskStepTaskVo(); - if (stepTaskVo != null) { - List taskUserVoList = stepTaskVo.getStepTaskUserVoList(); - if (CollectionUtils.isNotEmpty(taskUserVoList)) { - for (ProcessTaskStepTaskUserVo taskUserVo : taskUserVoList) { - ProcessTaskStepUserVo processTaskStepUserVo = new ProcessTaskStepUserVo(); - processTaskStepUserVo.setProcessTaskId(currentProcessTaskStepVo.getProcessTaskId()); - processTaskStepUserVo.setProcessTaskStepId(currentProcessTaskStepVo.getId()); - processTaskStepUserVo.setUserType(ProcessUserType.MINOR.getValue()); - processTaskStepUserVo.setUserUuid(taskUserVo.getUserUuid()); - resultList.add(processTaskStepUserVo); - } - } - } - return resultList; - } -}