From 45ca34514f2b3f897059e192043f98f6391db017 Mon Sep 17 00:00:00 2001 From: AprilWind <2100166581@qq.com> Date: Fri, 13 Dec 2024 10:09:04 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=8A=9E=E7=90=86=E4=BA=BA=E7=BF=BB=E8=AF=91=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...mework.boot.autoconfigure.AutoConfiguration.imports | 1 - .../org/dromara/workflow}/service/AssigneeService.java | 2 +- .../workflow/service/impl/FlwTaskServiceImpl.java | 2 +- .../service}/impl/TaskAssigneeTranslationImpl.java | 10 ++++++++-- 4 files changed, 10 insertions(+), 5 deletions(-) rename {ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core => ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow}/service/AssigneeService.java (93%) rename {ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core => ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service}/impl/TaskAssigneeTranslationImpl.java (76%) diff --git a/ruoyi-common/ruoyi-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index d578b7370..ad40205ed 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/ruoyi-common/ruoyi-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -4,4 +4,3 @@ org.dromara.common.translation.core.impl.DictTypeTranslationImpl org.dromara.common.translation.core.impl.OssUrlTranslationImpl org.dromara.common.translation.core.impl.UserNameTranslationImpl org.dromara.common.translation.core.impl.NicknameTranslationImpl -org.dromara.common.translation.core.impl.TaskAssigneeTranslationImpl diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/AssigneeService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/AssigneeService.java similarity index 93% rename from ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/AssigneeService.java rename to ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/AssigneeService.java index 62450d8c1..7753a3543 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/AssigneeService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/AssigneeService.java @@ -1,4 +1,4 @@ -package org.dromara.common.core.service; +package org.dromara.workflow.service; import org.dromara.common.core.domain.dto.UserDTO; 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 9ac5ee5f4..3c14c1b9b 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 @@ -12,7 +12,7 @@ import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.domain.dto.UserDTO; import org.dromara.common.core.enums.BusinessStatusEnum; import org.dromara.common.core.exception.ServiceException; -import org.dromara.common.core.service.AssigneeService; +import org.dromara.workflow.service.AssigneeService; import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/TaskAssigneeTranslationImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TaskAssigneeTranslationImpl.java similarity index 76% rename from ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/TaskAssigneeTranslationImpl.java rename to ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TaskAssigneeTranslationImpl.java index bb55f2028..ef2f53068 100644 --- a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/TaskAssigneeTranslationImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TaskAssigneeTranslationImpl.java @@ -1,16 +1,22 @@ -package org.dromara.common.translation.core.impl; +package org.dromara.workflow.service.impl; import lombok.AllArgsConstructor; -import org.dromara.common.core.service.AssigneeService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.dromara.common.translation.annotation.TranslationType; import org.dromara.common.translation.constant.TransConstant; import org.dromara.common.translation.core.TranslationInterface; +import org.dromara.workflow.service.AssigneeService; +import org.springframework.stereotype.Service; /** * 任务办理人翻译实现 * * @author AprilWind */ +@Slf4j +@RequiredArgsConstructor +@Service @AllArgsConstructor @TranslationType(type = TransConstant.TASK_ID_TO_ASSIGNEE) public class TaskAssigneeTranslationImpl implements TranslationInterface {