From 22db22db489bb27a390ae0514bfcb529be9462c3 Mon Sep 17 00:00:00 2001 From: gssong <1742057357@qq.com> Date: Sat, 16 Nov 2024 20:02:57 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=B5=81=E4=BA=BA=E5=91=98=E7=BF=BB=E8=AF=91=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/common/core}/enums/TaskAssigneeEnum.java | 2 +- .../org/dromara/common/satoken/utils/LoginHelper.java | 6 ++++-- .../core/impl/NicknameTranslationImpl.java | 11 +++++++++++ .../dromara/workflow/common/enums/TaskStatusEnum.java | 2 +- .../workflow/controller/FlwTaskController.java | 2 +- .../workflow/listener/WorkflowStartListener.java | 2 +- .../workflow/service/impl/FlwTaskServiceImpl.java | 2 +- .../service/impl/WfTaskAssigneeServiceImpl.java | 2 +- .../org/dromara/workflow/utils/WorkflowUtils.java | 4 ++-- 9 files changed, 23 insertions(+), 10 deletions(-) rename {ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common => ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core}/enums/TaskAssigneeEnum.java (98%) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/TaskAssigneeEnum.java similarity index 98% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java rename to ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/TaskAssigneeEnum.java index 42971c624..734e04914 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/TaskAssigneeEnum.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.common.enums; +package org.dromara.common.core.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java index 19557e131..01c68c676 100644 --- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java +++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java @@ -15,6 +15,8 @@ import org.dromara.common.core.enums.UserType; import java.util.Set; +import static org.dromara.common.core.enums.TaskAssigneeEnum.USER; + /** * 登录鉴权助手 *

@@ -89,10 +91,10 @@ public class LoginHelper { } /** - * 获取用户id + * 获取用户id(工作流使用) */ public static String getUserIdStr() { - return Convert.toStr(getExtra(USER_KEY)); + return USER.getCode()+Convert.toStr(getExtra(USER_KEY)); } /** diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java index b92c7f0f5..04a8d5196 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java +++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java @@ -2,10 +2,16 @@ package org.dromara.common.translation.core.impl; import lombok.AllArgsConstructor; import org.dromara.common.core.service.UserService; +import org.dromara.common.core.utils.StringUtils; import org.dromara.common.translation.annotation.TranslationType; import org.dromara.common.translation.constant.TransConstant; import org.dromara.common.translation.core.TranslationInterface; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import static org.dromara.common.core.enums.TaskAssigneeEnum.USER; + /** * 用户名称翻译实现 * @@ -22,6 +28,11 @@ public class NicknameTranslationImpl implements TranslationInterface { if (key instanceof Long id) { return userService.selectNicknameByIds(id.toString()); } else if (key instanceof String ids) { + if (StringUtils.isNotBlank(ids)) { + ids = Stream.of(ids.split(StringUtils.SEPARATOR)) + .map(userId -> userId.contains(USER.getCode()) ? userId.replaceAll(USER.getCode(), StringUtils.EMPTY) : userId) + .collect(Collectors.joining(StringUtils.SEPARATOR)); + } return userService.selectNicknameByIds(ids); } return null; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java index f6eca80cd..d18ebb01d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java @@ -55,7 +55,7 @@ public enum TaskStatusEnum { /** * 委托 */ - PENDING("pending", "委托"), + DEPUTE("depute", "委托"), /** * 抄送 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java index ba6652866..8855864c6 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java @@ -34,7 +34,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import static org.dromara.workflow.common.enums.TaskAssigneeEnum.USER; +import static org.dromara.common.core.enums.TaskAssigneeEnum.USER; /** * 任务管理 控制层 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowStartListener.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowStartListener.java index 456d81e88..7f09297cb 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowStartListener.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowStartListener.java @@ -7,7 +7,7 @@ import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.warm.flow.core.dto.FlowParams; import org.dromara.warm.flow.core.listener.Listener; import org.dromara.warm.flow.core.listener.ListenerVariable; -import org.dromara.workflow.common.enums.TaskAssigneeEnum; +import org.dromara.common.core.enums.TaskAssigneeEnum; import org.springframework.stereotype.Component; import java.util.Collection; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java index 0a41f3227..1048feffb 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java @@ -52,7 +52,7 @@ import java.util.Map; import java.util.stream.Collectors; import static org.dromara.workflow.common.constant.FlowConstant.*; -import static org.dromara.workflow.common.enums.TaskAssigneeEnum.USER; +import static org.dromara.common.core.enums.TaskAssigneeEnum.USER; /** * 任务 服务层实现 diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfTaskAssigneeServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfTaskAssigneeServiceImpl.java index 52581c198..daae27dcc 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfTaskAssigneeServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfTaskAssigneeServiceImpl.java @@ -20,7 +20,7 @@ import org.dromara.warm.flow.ui.dto.HandlerQuery; import org.dromara.warm.flow.ui.dto.TreeFunDto; import org.dromara.warm.flow.ui.service.HandlerSelectService; import org.dromara.warm.flow.ui.vo.HandlerSelectVo; -import org.dromara.workflow.common.enums.TaskAssigneeEnum; +import org.dromara.common.core.enums.TaskAssigneeEnum; import org.dromara.workflow.service.IWfTaskAssigneeService; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java index 46d853216..97dc6f953 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java @@ -9,14 +9,14 @@ import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.warm.flow.core.entity.User; import org.dromara.warm.flow.orm.entity.FlowUser; -import org.dromara.workflow.common.enums.TaskAssigneeEnum; +import org.dromara.common.core.enums.TaskAssigneeEnum; import org.dromara.workflow.service.IWfTaskAssigneeService; import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; -import static org.dromara.workflow.common.enums.TaskAssigneeEnum.USER; +import static org.dromara.common.core.enums.TaskAssigneeEnum.USER; /** * 工作流工具