参数包装

byit-myth-core/myth-admin-core/src/main/java/com/byit/strategy/task/ParamWrappedCallback.java

+package com.byit.strategy.task;
+
+import com.alibaba.fastjson.JSON;
+import com.byit.annotations.MythRankOrder;
+import com.byit.dto.executor.RunParamWrapped;
+import com.byit.model.JobTaskSchedule;
+import com.byit.strategy.TaskRunTheLifeCycleCallback;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * 参数对象包装
+ *
+ * @author huangfu
+ * @date 2020年12月15日15:15:29
+ */
+@Component
+@Slf4j
+@MythRankOrder(1)
+public class ParamWrappedCallback implements TaskRunTheLifeCycleCallback {
+
+    /**
+     * 实例执行前
+     *
+     * @param jobTaskSchedule 任务对象
+     */
+    @Override
+    public void postProcessAfterInitialization(JobTaskSchedule jobTaskSchedule) {
+        String runParam = jobTaskSchedule.getRunParam();
+        RunParamWrapped runParamWrapped = new RunParamWrapped();
+        runParamWrapped.setPrivateParam(runParam);
+        jobTaskSchedule.setRunParam(JSON.toJSONString(runParamWrapped));
+    }
+
+    /**
+     * 判断是否匹配类型
+     *
+     * @param jobTaskSchedule 任务对象
+     * @return 是否匹配本次的执行对象
+     */
+    @Override
+    public boolean matchType(JobTaskSchedule jobTaskSchedule) {
+        return true;
+    }
+}

byit-myth-core/myth-admin-core/src/main/java/com/byit/strategy/task/ScriptSpecialParametersTaskRunTheLifeCycleCallback.java

@@ -30,7 +30,7 @@ import java.util.Map;
  */
 @Component
 @Slf4j
-@MythRankOrder(1)
+@MythRankOrder(2)
 public class ScriptSpecialParametersTaskRunTheLifeCycleCallback implements TaskRunTheLifeCycleCallback {
     /**
      * 脚本类型的数据
@@ -69,8 +69,9 @@ public class ScriptSpecialParametersTaskRunTheLifeCycleCallback implements TaskR
     public void postProcessAfterInitialization(JobTaskSchedule jobTaskSchedule) {
         String runParam = jobTaskSchedule.getRunParam();
         //转换参数对象为参数包装体
-        ScriptParamAndPlaceholderDto scriptParamAndPlaceholderDto = JSON.parseObject(runParam, ScriptParamAndPlaceholderDto.class);
-        RunParamWrapped runParamWrapped = new RunParamWrapped();
+        RunParamWrapped runParamWrapped = JSON.parseObject(runParam, RunParamWrapped.class);
+        String privateParam = runParamWrapped.getPrivateParam();
+        ScriptParamAndPlaceholderDto scriptParamAndPlaceholderDto = JSON.parseObject(privateParam, ScriptParamAndPlaceholderDto.class);
         //处理私有参数
         if (scriptParamAndPlaceholderDto == null) {
             scriptParamAndPlaceholderDto = new ScriptParamAndPlaceholderDto();