From cded35f41ad91432d3aa48d63f9fc31ef5378986 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 14 Nov 2024 18:53:18 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20it=E6=9C=8D=E5=8A=A1-?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E8=8A=82=E7=82=B9=E9=80=9A=E7=9F=A5=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1280397936132096]it服务-审批节点通知优化 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1280397936132096 --- .../core/IProcessStepAssistantHandler.java} | 15 ++++++------ .../ProcessStepAssistantHandlerFactory.java} | 23 ++++++++----------- .../core/ProcessStepTaskHandlerBase.java | 21 ----------------- 3 files changed, 16 insertions(+), 43 deletions(-) rename src/main/java/neatlogic/framework/process/{steptaskhandler/core/IProcessStepTaskHandler.java => stephandler/core/IProcessStepAssistantHandler.java} (84%) rename src/main/java/neatlogic/framework/process/{steptaskhandler/core/ProcessStepTaskHandlerFactory.java => stephandler/core/ProcessStepAssistantHandlerFactory.java} (59%) delete mode 100644 src/main/java/neatlogic/framework/process/steptaskhandler/core/ProcessStepTaskHandlerBase.java diff --git a/src/main/java/neatlogic/framework/process/steptaskhandler/core/IProcessStepTaskHandler.java b/src/main/java/neatlogic/framework/process/stephandler/core/IProcessStepAssistantHandler.java similarity index 84% rename from src/main/java/neatlogic/framework/process/steptaskhandler/core/IProcessStepTaskHandler.java rename to src/main/java/neatlogic/framework/process/stephandler/core/IProcessStepAssistantHandler.java index b8c8b97b..5a64c917 100644 --- a/src/main/java/neatlogic/framework/process/steptaskhandler/core/IProcessStepTaskHandler.java +++ b/src/main/java/neatlogic/framework/process/stephandler/core/IProcessStepAssistantHandler.java @@ -15,20 +15,19 @@ * along with this program. If not, see . */ -package neatlogic.framework.process.steptaskhandler.core; +package neatlogic.framework.process.stephandler.core; import neatlogic.framework.process.dto.ProcessTaskStepUserVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import java.util.List; -public interface IProcessStepTaskHandler { - /** - * 返回控件 - * - * @return 控件名 - */ - List getHandlerList(); +/** + * 用于获取步骤任务的协助处理人 + */ +public interface IProcessStepAssistantHandler { + + String getHandler(); /** * 获取协助处理人列表，用于通知接收人 diff --git a/src/main/java/neatlogic/framework/process/steptaskhandler/core/ProcessStepTaskHandlerFactory.java b/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepAssistantHandlerFactory.java similarity index 59% rename from src/main/java/neatlogic/framework/process/steptaskhandler/core/ProcessStepTaskHandlerFactory.java rename to src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepAssistantHandlerFactory.java index 406609b5..6982cc38 100644 --- a/src/main/java/neatlogic/framework/process/steptaskhandler/core/ProcessStepTaskHandlerFactory.java +++ b/src/main/java/neatlogic/framework/process/stephandler/core/ProcessStepAssistantHandlerFactory.java @@ -15,37 +15,32 @@ * along with this program. If not, see . */ -package neatlogic.framework.process.steptaskhandler.core; +package neatlogic.framework.process.stephandler.core; import neatlogic.framework.applicationlistener.core.ModuleInitializedListenerBase; import neatlogic.framework.bootstrap.NeatLogicWebApplicationContext; import neatlogic.framework.common.RootComponent; -import org.apache.commons.collections4.CollectionUtils; import org.springframework.core.annotation.Order; import java.util.HashMap; -import java.util.List; import java.util.Map; @RootComponent @Order(10) -public class ProcessStepTaskHandlerFactory extends ModuleInitializedListenerBase { - private static final Map componentMap = new HashMap<>(); +public class ProcessStepAssistantHandlerFactory extends ModuleInitializedListenerBase { + private static Map componentMap = new HashMap<>(); - public static IProcessStepTaskHandler getHandler(String handler) { + public static IProcessStepAssistantHandler getHandler(String handler) { return componentMap.get(handler); } @Override protected void onInitialized(NeatLogicWebApplicationContext context) { - Map myMap = context.getBeansOfType(IProcessStepTaskHandler.class); - for (Map.Entry entry : myMap.entrySet()) { - IProcessStepTaskHandler component = entry.getValue(); - List handlerList = component.getHandlerList(); - if (CollectionUtils.isNotEmpty(handlerList)) { - for (String handler : handlerList) { - componentMap.put(handler, component); - } + Map myMap = context.getBeansOfType(IProcessStepAssistantHandler.class); + for (Map.Entry entry : myMap.entrySet()) { + IProcessStepAssistantHandler component = entry.getValue(); + if (component.getHandler() != null) { + componentMap.put(component.getHandler(), component); } } } diff --git a/src/main/java/neatlogic/framework/process/steptaskhandler/core/ProcessStepTaskHandlerBase.java b/src/main/java/neatlogic/framework/process/steptaskhandler/core/ProcessStepTaskHandlerBase.java deleted file mode 100644 index bafeb55a..00000000 --- a/src/main/java/neatlogic/framework/process/steptaskhandler/core/ProcessStepTaskHandlerBase.java +++ /dev/null @@ -1,21 +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.framework.process.steptaskhandler.core; - -public abstract class ProcessStepTaskHandlerBase implements IProcessStepTaskHandler { -} -- Gitee