From c8a2c5ac2c2bfa32f2b2ff0b0855350d16cdacc9 Mon Sep 17 00:00:00 2001 From: dengqichen Date: Thu, 5 Dec 2024 16:04:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E6=AD=A3=E5=B8=B8=E5=90=AF=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deploy/backend/{ => system}/enums/LogLevelEnum.java | 2 +- .../qqchen/deploy/backend/{ => system}/enums/LogTypeEnum.java | 2 +- .../deploy/backend/{ => system}/enums/PermissionTypeEnum.java | 2 +- .../deploy/backend/workflow/api/WorkflowLogApiController.java | 2 +- .../qqchen/deploy/backend/workflow/dto/WorkflowLogDTO.java | 2 +- .../workflow/engine/context/DefaultWorkflowContext.java | 2 +- .../backend/workflow/engine/context/WorkflowContext.java | 2 +- .../backend/workflow/engine/executor/EndNodeExecutor.java | 2 +- .../backend/workflow/engine/executor/StartNodeExecutor.java | 2 +- .../backend/workflow/engine/executor/TaskNodeExecutor.java | 4 +--- .../workflow/engine/executor/task/HttpTaskExecutor.java | 2 +- .../workflow/engine/executor/task/JavaTaskExecutor.java | 3 +-- .../workflow/engine/executor/task/ShellTaskExecutor.java | 2 +- .../backend/workflow/engine/node/AbstractNodeExecutor.java | 2 +- .../workflow/engine/node/executor/ShellNodeExecutor.java | 2 +- .../workflow/engine/transition/TransitionExecutor.java | 2 +- .../qqchen/deploy/backend/workflow/entity/WorkflowLog.java | 2 +- .../deploy/backend/workflow/query/WorkflowLogQuery.java | 2 +- .../deploy/backend/workflow/service/IWorkflowLogService.java | 2 +- .../backend/workflow/service/impl/WorkflowLogServiceImpl.java | 2 +- 20 files changed, 20 insertions(+), 23 deletions(-) rename backend/src/main/java/com/qqchen/deploy/backend/{ => system}/enums/LogLevelEnum.java (81%) rename backend/src/main/java/com/qqchen/deploy/backend/{ => system}/enums/LogTypeEnum.java (94%) rename backend/src/main/java/com/qqchen/deploy/backend/{ => system}/enums/PermissionTypeEnum.java (80%) diff --git a/backend/src/main/java/com/qqchen/deploy/backend/enums/LogLevelEnum.java b/backend/src/main/java/com/qqchen/deploy/backend/system/enums/LogLevelEnum.java similarity index 81% rename from backend/src/main/java/com/qqchen/deploy/backend/enums/LogLevelEnum.java rename to backend/src/main/java/com/qqchen/deploy/backend/system/enums/LogLevelEnum.java index 3a70fbf4..6910d08b 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/enums/LogLevelEnum.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/system/enums/LogLevelEnum.java @@ -1,4 +1,4 @@ -package com.qqchen.deploy.backend.enums; +package com.qqchen.deploy.backend.system.enums; /** * 日志级别枚举 diff --git a/backend/src/main/java/com/qqchen/deploy/backend/enums/LogTypeEnum.java b/backend/src/main/java/com/qqchen/deploy/backend/system/enums/LogTypeEnum.java similarity index 94% rename from backend/src/main/java/com/qqchen/deploy/backend/enums/LogTypeEnum.java rename to backend/src/main/java/com/qqchen/deploy/backend/system/enums/LogTypeEnum.java index c68f7235..e82add2b 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/enums/LogTypeEnum.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/system/enums/LogTypeEnum.java @@ -1,4 +1,4 @@ -package com.qqchen.deploy.backend.enums; +package com.qqchen.deploy.backend.system.enums; /** * 日志类型枚举 diff --git a/backend/src/main/java/com/qqchen/deploy/backend/enums/PermissionTypeEnum.java b/backend/src/main/java/com/qqchen/deploy/backend/system/enums/PermissionTypeEnum.java similarity index 80% rename from backend/src/main/java/com/qqchen/deploy/backend/enums/PermissionTypeEnum.java rename to backend/src/main/java/com/qqchen/deploy/backend/system/enums/PermissionTypeEnum.java index c646fbdc..f212a0af 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/enums/PermissionTypeEnum.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/system/enums/PermissionTypeEnum.java @@ -1,4 +1,4 @@ -package com.qqchen.deploy.backend.enums; +package com.qqchen.deploy.backend.system.enums; /** * 权限类型枚举 diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/api/WorkflowLogApiController.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/api/WorkflowLogApiController.java index c05e822c..6a949d37 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/api/WorkflowLogApiController.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/api/WorkflowLogApiController.java @@ -1,6 +1,6 @@ package com.qqchen.deploy.backend.workflow.api; -import com.qqchen.deploy.backend.enums.LogLevelEnum; +import com.qqchen.deploy.backend.system.enums.LogLevelEnum; import com.qqchen.deploy.backend.framework.api.Response; import com.qqchen.deploy.backend.framework.controller.BaseController; import com.qqchen.deploy.backend.workflow.dto.WorkflowLogDTO; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/WorkflowLogDTO.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/WorkflowLogDTO.java index 4b88e44c..e28effc3 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/WorkflowLogDTO.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/dto/WorkflowLogDTO.java @@ -1,6 +1,6 @@ package com.qqchen.deploy.backend.workflow.dto; -import com.qqchen.deploy.backend.enums.LogLevelEnum; +import com.qqchen.deploy.backend.system.enums.LogLevelEnum; import com.qqchen.deploy.backend.framework.dto.BaseDTO; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/context/DefaultWorkflowContext.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/context/DefaultWorkflowContext.java index a25a06df..c986c0ce 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/context/DefaultWorkflowContext.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/context/DefaultWorkflowContext.java @@ -1,6 +1,6 @@ package com.qqchen.deploy.backend.workflow.engine.context; -import com.qqchen.deploy.backend.enums.LogLevelEnum; +import com.qqchen.deploy.backend.system.enums.LogLevelEnum; import com.qqchen.deploy.backend.workflow.entity.WorkflowInstance; import com.qqchen.deploy.backend.workflow.service.IWorkflowLogService; import com.qqchen.deploy.backend.workflow.service.IWorkflowVariableService; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/context/WorkflowContext.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/context/WorkflowContext.java index 11c9916c..0530d774 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/context/WorkflowContext.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/context/WorkflowContext.java @@ -1,6 +1,6 @@ package com.qqchen.deploy.backend.workflow.engine.context; -import com.qqchen.deploy.backend.enums.LogLevelEnum; +import com.qqchen.deploy.backend.system.enums.LogLevelEnum; import com.qqchen.deploy.backend.workflow.entity.WorkflowInstance; import java.util.Map; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/executor/EndNodeExecutor.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/executor/EndNodeExecutor.java index fb631d7d..411d184c 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/executor/EndNodeExecutor.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/executor/EndNodeExecutor.java @@ -1,6 +1,6 @@ package com.qqchen.deploy.backend.workflow.engine.executor; -import com.qqchen.deploy.backend.enums.LogLevelEnum; +import com.qqchen.deploy.backend.system.enums.LogLevelEnum; import com.qqchen.deploy.backend.workflow.engine.context.WorkflowContext; import com.qqchen.deploy.backend.workflow.entity.NodeInstance; import com.qqchen.deploy.backend.workflow.entity.WorkflowInstance; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/executor/StartNodeExecutor.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/executor/StartNodeExecutor.java index 331edd01..7c5d47ba 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/executor/StartNodeExecutor.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/executor/StartNodeExecutor.java @@ -1,6 +1,6 @@ package com.qqchen.deploy.backend.workflow.engine.executor; -import com.qqchen.deploy.backend.enums.LogLevelEnum; +import com.qqchen.deploy.backend.system.enums.LogLevelEnum; import com.qqchen.deploy.backend.workflow.engine.context.WorkflowContext; import com.qqchen.deploy.backend.workflow.entity.NodeInstance; import com.qqchen.deploy.backend.workflow.enums.NodeStatusEnum; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/executor/TaskNodeExecutor.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/executor/TaskNodeExecutor.java index e06daeae..c893286e 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/executor/TaskNodeExecutor.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/executor/TaskNodeExecutor.java @@ -1,7 +1,7 @@ package com.qqchen.deploy.backend.workflow.engine.executor; import com.fasterxml.jackson.databind.ObjectMapper; -import com.qqchen.deploy.backend.enums.LogLevelEnum; +import com.qqchen.deploy.backend.system.enums.LogLevelEnum; import com.qqchen.deploy.backend.framework.enums.ResponseCode; import com.qqchen.deploy.backend.workflow.engine.context.WorkflowContext; import com.qqchen.deploy.backend.workflow.engine.exception.WorkflowEngineException; @@ -12,8 +12,6 @@ import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import java.util.Map; - @Slf4j @Component public class TaskNodeExecutor implements NodeExecutor { diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/executor/task/HttpTaskExecutor.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/executor/task/HttpTaskExecutor.java index f67e0f7d..1902abb5 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/executor/task/HttpTaskExecutor.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/executor/task/HttpTaskExecutor.java @@ -1,7 +1,7 @@ package com.qqchen.deploy.backend.workflow.engine.executor.task; import com.fasterxml.jackson.databind.ObjectMapper; -import com.qqchen.deploy.backend.enums.LogLevelEnum; +import com.qqchen.deploy.backend.system.enums.LogLevelEnum; import com.qqchen.deploy.backend.framework.enums.ResponseCode; import com.qqchen.deploy.backend.workflow.engine.context.WorkflowContext; import com.qqchen.deploy.backend.workflow.engine.exception.WorkflowEngineException; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/executor/task/JavaTaskExecutor.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/executor/task/JavaTaskExecutor.java index 91219ea9..48552890 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/executor/task/JavaTaskExecutor.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/executor/task/JavaTaskExecutor.java @@ -1,7 +1,7 @@ package com.qqchen.deploy.backend.workflow.engine.executor.task; import com.fasterxml.jackson.databind.ObjectMapper; -import com.qqchen.deploy.backend.enums.LogLevelEnum; +import com.qqchen.deploy.backend.system.enums.LogLevelEnum; import com.qqchen.deploy.backend.framework.enums.ResponseCode; import com.qqchen.deploy.backend.workflow.engine.context.WorkflowContext; import com.qqchen.deploy.backend.workflow.engine.exception.WorkflowEngineException; @@ -9,7 +9,6 @@ import com.qqchen.deploy.backend.workflow.entity.NodeInstance; import lombok.extern.slf4j.Slf4j; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Component; -import org.springframework.util.ReflectionUtils; import jakarta.annotation.Resource; import java.lang.reflect.Method; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/executor/task/ShellTaskExecutor.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/executor/task/ShellTaskExecutor.java index 84bf28e2..36231e1c 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/executor/task/ShellTaskExecutor.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/executor/task/ShellTaskExecutor.java @@ -1,7 +1,7 @@ package com.qqchen.deploy.backend.workflow.engine.executor.task; import com.fasterxml.jackson.databind.ObjectMapper; -import com.qqchen.deploy.backend.enums.LogLevelEnum; +import com.qqchen.deploy.backend.system.enums.LogLevelEnum; import com.qqchen.deploy.backend.framework.enums.ResponseCode; import com.qqchen.deploy.backend.workflow.engine.context.WorkflowContext; import com.qqchen.deploy.backend.workflow.engine.exception.WorkflowEngineException; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/node/AbstractNodeExecutor.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/node/AbstractNodeExecutor.java index 38c1c76a..93325a2d 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/node/AbstractNodeExecutor.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/node/AbstractNodeExecutor.java @@ -1,6 +1,6 @@ package com.qqchen.deploy.backend.workflow.engine.node; -import com.qqchen.deploy.backend.enums.LogLevelEnum; +import com.qqchen.deploy.backend.system.enums.LogLevelEnum; import com.qqchen.deploy.backend.workflow.engine.context.WorkflowContext; import com.qqchen.deploy.backend.workflow.engine.executor.NodeExecutor; import com.qqchen.deploy.backend.workflow.entity.NodeInstance; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/node/executor/ShellNodeExecutor.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/node/executor/ShellNodeExecutor.java index 46ecc80b..1b13d2d2 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/node/executor/ShellNodeExecutor.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/node/executor/ShellNodeExecutor.java @@ -5,7 +5,7 @@ import com.qqchen.deploy.backend.workflow.engine.context.WorkflowContext; import com.qqchen.deploy.backend.workflow.engine.node.AbstractNodeExecutor; import com.qqchen.deploy.backend.workflow.enums.NodeTypeEnum; import com.qqchen.deploy.backend.workflow.entity.NodeInstance; -import com.qqchen.deploy.backend.enums.LogLevelEnum; +import com.qqchen.deploy.backend.system.enums.LogLevelEnum; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import jakarta.annotation.Resource; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/transition/TransitionExecutor.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/transition/TransitionExecutor.java index 64a7e277..5d9196b7 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/transition/TransitionExecutor.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/engine/transition/TransitionExecutor.java @@ -1,6 +1,6 @@ package com.qqchen.deploy.backend.workflow.engine.transition; -import com.qqchen.deploy.backend.enums.LogLevelEnum; +import com.qqchen.deploy.backend.system.enums.LogLevelEnum; import com.qqchen.deploy.backend.framework.enums.ResponseCode; import com.qqchen.deploy.backend.workflow.engine.context.WorkflowContext; import com.qqchen.deploy.backend.workflow.engine.exception.WorkflowEngineException; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/entity/WorkflowLog.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/entity/WorkflowLog.java index 5b4e9a3e..0076bb95 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/entity/WorkflowLog.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/entity/WorkflowLog.java @@ -1,6 +1,6 @@ package com.qqchen.deploy.backend.workflow.entity; -import com.qqchen.deploy.backend.enums.LogLevelEnum; +import com.qqchen.deploy.backend.system.enums.LogLevelEnum; import com.qqchen.deploy.backend.framework.annotation.LogicDelete; import com.qqchen.deploy.backend.framework.domain.Entity; import jakarta.persistence.Column; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/query/WorkflowLogQuery.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/query/WorkflowLogQuery.java index 1ac1a5f1..7b7b3c92 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/query/WorkflowLogQuery.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/query/WorkflowLogQuery.java @@ -1,6 +1,6 @@ package com.qqchen.deploy.backend.workflow.query; -import com.qqchen.deploy.backend.enums.LogLevelEnum; +import com.qqchen.deploy.backend.system.enums.LogLevelEnum; import com.qqchen.deploy.backend.framework.annotation.QueryField; import com.qqchen.deploy.backend.framework.enums.QueryType; import com.qqchen.deploy.backend.framework.query.BaseQuery; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/IWorkflowLogService.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/IWorkflowLogService.java index b5be735b..67932776 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/IWorkflowLogService.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/IWorkflowLogService.java @@ -1,6 +1,6 @@ package com.qqchen.deploy.backend.workflow.service; -import com.qqchen.deploy.backend.enums.LogLevelEnum; +import com.qqchen.deploy.backend.system.enums.LogLevelEnum; import com.qqchen.deploy.backend.framework.service.IBaseService; import com.qqchen.deploy.backend.workflow.dto.WorkflowLogDTO; import com.qqchen.deploy.backend.workflow.entity.WorkflowLog; diff --git a/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/impl/WorkflowLogServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/impl/WorkflowLogServiceImpl.java index 5e295b6f..9184da73 100644 --- a/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/impl/WorkflowLogServiceImpl.java +++ b/backend/src/main/java/com/qqchen/deploy/backend/workflow/service/impl/WorkflowLogServiceImpl.java @@ -1,6 +1,6 @@ package com.qqchen.deploy.backend.workflow.service.impl; -import com.qqchen.deploy.backend.enums.LogLevelEnum; +import com.qqchen.deploy.backend.system.enums.LogLevelEnum; import com.qqchen.deploy.backend.framework.service.impl.BaseServiceImpl; import com.qqchen.deploy.backend.workflow.dto.WorkflowLogDTO; import com.qqchen.deploy.backend.workflow.entity.WorkflowLog;