Optimize the process

gaoyan1998 · Oct 21, 2023 · 18d4216 · 18d4216
1 parent b9b1396
commit 18d4216
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/dinky-admin/src/main/java/org/dinky/aop/ProcessAspect.java b/dinky-admin/src/main/java/org/dinky/aop/ProcessAspect.java
@@ -19,6 +19,7 @@
 
 package org.dinky.aop;
 
+import org.apache.http.util.TextUtils;
 import org.dinky.context.ConsoleContextHolder;
 import org.dinky.process.annotations.ExecuteProcess;
 import org.dinky.process.annotations.ProcessId;
@@ -82,6 +83,12 @@ public Object processAround(ProceedingJoinPoint joinPoint, ExecuteProcess execut
     @Around(value = "@annotation(processStep)")
     public Object processStepAround(ProceedingJoinPoint joinPoint, ProcessStep processStep) throws Throwable {
 
+        String processName = MDC.get(PROCESS_NAME);
+        if (TextUtils.isEmpty(processName)){
+            log.warn("Process {} does not exist, This registration step {} was abandoned", processName,processStep.type());
+            return joinPoint.proceed();
+        }
+
         Object result;
         // Record the current step and restore it after the execution is completed
         String parentStep = MDC.get(PROCESS_STEP);

diff --git a/dinky-admin/src/main/java/org/dinky/service/impl/TaskServiceImpl.java b/dinky-admin/src/main/java/org/dinky/service/impl/TaskServiceImpl.java
@@ -207,6 +207,7 @@ public JobResult executeJob(TaskDTO task) throws Exception {
         return jobResult;
     }
 
+    @ProcessStep(type = ProcessStepType.SUBMIT_BUILD_CONFIG)
     public JobConfig buildJobConfig(TaskDTO task) {
         task.setStatement(buildEnvSql(task) + task.getStatement());
         JobConfig config = task.getJobConfig();