yuanhao 2 gadi atpakaļ
vecāks
revīzija
91fdad3033

+ 8 - 0
in-cloud/src/main/java/com/jiayue/insu/incloud/constants/CommonStant.java

@@ -59,4 +59,12 @@ public interface CommonStant {
      * 下午
      */
     String PM_DAY = "PM";
+    /**
+     * 定时任务类型:公有
+     */
+    String JOB_TYPE_PUBLIC= "PUBLIC";
+    /**
+     * 定时任务类型:私有 (公司所有)
+     */
+    String JOB_TYPE_PRIVATE= "PRIVATE";
 }

+ 5 - 3
in-cloud/src/main/java/com/jiayue/insu/incloud/entity/Quartz.java

@@ -43,11 +43,13 @@ public class Quartz extends BaseEntity{
      */
     private String stationCode;
 
-    @TableField(value = "false")
+    @TableField(exist = false)
+    private String operate; //操作
+    @TableField(exist = false)
     private Date nextFireTime;//下次执行时间
-    @TableField(value = "false")
+    @TableField(exist = false)
     private Date prevFireTime;//上次执行时间
-    @TableField(value = "false")
+    @TableField(exist = false)
     private Date laetFireTime;//最后执行时间
 
 

+ 16 - 0
in-cloud/src/main/java/com/jiayue/insu/incloud/job/TestJob.java

@@ -0,0 +1,16 @@
+package com.jiayue.insu.incloud.job;
+
+import org.quartz.Job;
+import org.quartz.JobDataMap;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+
+import java.time.LocalDateTime;
+
+public class TestJob implements Job {
+    @Override
+    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
+        JobDataMap jobDataMap = jobExecutionContext.getTrigger().getJobDataMap();
+        System.out.println("test:"+ LocalDateTime.now());
+    }
+}

+ 1 - 0
in-cloud/src/main/java/com/jiayue/insu/incloud/job/data/pull/PullInitDataJob.java

@@ -19,6 +19,7 @@ public class PullInitDataJob implements Job {
     @Override
     public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
         String stationCode  = jobExecutionContext.getTrigger().getJobKey().getName();
+
         Station one = stationService.findByStationCode(stationCode);
         if (one != null) {
             pullInitData.pullDQAndNWPData(one);

+ 1 - 1
in-cloud/src/main/java/com/jiayue/insu/incloud/quartz/ScheduledTask.java

@@ -196,7 +196,7 @@ public class ScheduledTask {
      * @return 任务下次执行时间
      * @throws SchedulerException 获取任务下次执行时间异常
      */
-    Date getJobNextFireTime( final String jobCode) throws SchedulerException {
+   public Date getJobNextFireTime( final String jobCode) throws SchedulerException {
         TriggerKey triggerKey = new TriggerKey(jobCode);
         Trigger trigger = this.scheduler.getTrigger(triggerKey);
         if (trigger == null)