java任务回调时携带调度时间

byit-myth-core/myth-admin-core/src/main/java/com/byit/service/mapservice/impl/JavaTaskAndLogServiceServiceImpl.java

@@ -8,6 +8,7 @@ import com.byit.model.RunRecording;
 import com.byit.service.JavaTaskService;
 import com.byit.service.mapservice.JavaTaskAndLogService;
 import com.byit.task.JavaTaskJobTask;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -18,6 +19,7 @@ import java.util.Date;
  * @author Administrator
  */
 @Service
+@Slf4j
 public class JavaTaskAndLogServiceServiceImpl implements JavaTaskAndLogService {
     private final JavaTaskService javaTaskService;
 
@@ -31,15 +33,14 @@ public class JavaTaskAndLogServiceServiceImpl implements JavaTaskAndLogService {
         try {
             BeanUtils.copyProperties(javaTask,updateJavaTask);
             updateJavaTask.setTriggerTime(new CronExpression(javaTask.getCron()).getNextValidTimeAfter(new Date(javaTask.getTriggerTime())).getTime());
-        } catch (ParseException e) {
-            javaTask.setTriggerTime(999999999999999999L);
-            e.printStackTrace();
-        }
-
-        javaTaskService.updateById(updateJavaTask);
             //保存到调度轮
             JavaTaskJobTask javaTaskJobTask = new JavaTaskJobTask(javaTask);
             WorkRoulette.addJob(javaTaskJobTask,javaTask.getTriggerTime());
-        System.out.println("-----------我执行结束了------------");
+            log.debug("-----------[{}]，被加载进调度------------",javaTask);
+            javaTaskService.updateById(updateJavaTask);
+        } catch (ParseException e) {
+            javaTask.setTriggerTime(999999999999999999L);
+            log.error("-----------出现异常{}------------",e);
+        }
     }
 }

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

@@ -54,6 +54,7 @@ public class JavaTaskJobTask implements TimerTask {
         communicationParam.setLogId(logId+"");
         communicationParam.setCallbackUrl(callbackUrl);
         communicationParam.setBody(javaTask.getParam());
+        communicationParam.setExpand2(String.valueOf(javaTask.getTriggerTime()));
 
         request.setParam(communicationParam);
         request.setExtension(logId+"");

byit-plugin-core/byit-plugin-rpc-common/src/main/java/com/byit/param/CommunicationParam.java

@@ -23,11 +23,11 @@ public class CommunicationParam implements Serializable {
      */
     private String body;
     /**
-     * 扩展字段1
+     * 扩展字段1  java立即运行任务的 logKey
      */
     private String expand1;
     /**
-     * 扩展字段2
+     * 扩展字段2  java调度任务放本次的调度时间了
      */
     private String expand2;
     /**