取消异常

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

@@ -25,6 +25,7 @@ import com.byit.util.SpringUtil;
 import io.netty.util.Timeout;
 import io.netty.util.TimerTask;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.redis.core.StringRedisTemplate;
 
 import java.util.*;
@@ -101,11 +102,13 @@ public class ScriptExecutorJobTask implements TimerTask {
                 privateParam = PlaceholderUtils.formatBizDateParam(privateParam, PlaceholderEnum.DATE_PLACEHOLDER.getName(), 1);
                 ScriptParamAndPlaceholderDto scriptParamAndPlaceholderDto = JSON.parseObject(runParam,ScriptParamAndPlaceholderDto.class);
                 Map<String, String> placeholder = scriptParamAndPlaceholderDto.getPlaceholder();
+                if(CollectionUtil.isNotEmpty(placeholder)) {
                     if(placeholder.containsKey(PlaceholderEnum.NOW_DATE_PLACEHOLDER.getName())){
                         String nowDateFormatName = placeholder.get(PlaceholderEnum.NOW_DATE_PLACEHOLDER.getName());
                         String dateFormat = DateUtil.dateFormat(new Date(), nowDateFormatName);
                         privateParam = PlaceholderUtils.formatBizDateParam(privateParam, PlaceholderEnum.NOW_DATE_PLACEHOLDER.getName(), dateFormat,0);
                     }
+                }
 
                 runParamWrapped.setPrivateParam(privateParam);
                 mythJobTaskSchedule.setRunParam(JSON.toJSONString(runParamWrapped));
@@ -113,7 +116,10 @@ public class ScriptExecutorJobTask implements TimerTask {
             //获取到公有参数
             Map<String,String> publicParam = runParamWrapped.getPublicParamMap();
             //将私有参数转换为对应的参数DTO
-            ScriptParamAndPlaceholderDto scriptParamAndPlaceholderDto = JSON.parseObject(privateParam,ScriptParamAndPlaceholderDto.class);
+            ScriptParamAndPlaceholderDto scriptParamAndPlaceholderDto = null;
+            if(StringUtils.isNoneBlank(privateParam)){
+                scriptParamAndPlaceholderDto = JSON.parseObject(privateParam,ScriptParamAndPlaceholderDto.class);
+            }
             //脚本参数不为空的时候
             if(scriptParamAndPlaceholderDto != null) {
                 Map<String, String> param = scriptParamAndPlaceholderDto.getParam();