migrate cal jobs with quartz

pom.xml

@@ -83,7 +83,10 @@
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-quartz</artifactId>
+        </dependency>
         <!--文件上传相关-->
         <dependency>
             <groupId>commons-io</groupId>

src/main/java/com/gct/aoid/config/AsyncTaskConfig.java

@@ -1,52 +0,0 @@
-package com.gct.aoid.config;
-
-import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.AsyncConfigurer;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-
-import java.util.concurrent.Executor;
-
-/**
- * 异步任务配置
- * @author: NewMeanning
- * @create: 2021-03-08 15:57
- **/
-@Configuration
-@EnableAsync
-public class AsyncTaskConfig implements AsyncConfigurer {
-
-    // ThredPoolTaskExcutor的处理流程
-    // 当池子大小小于corePoolSize，就新建线程，并处理请求
-    // 当池子大小等于corePoolSize，把请求放入workQueue中，池子里的空闲线程就去workQueue中取任务并处理
-    // 当workQueue放不下任务时，就新建线程入池，并处理请求，如果池子大小撑到了maximumPoolSize，就用RejectedExecutionHandler来做拒绝处理
-    // 当池子的线程数大于corePoolSize时，多余的线程会等待keepAliveTime长时间，如果无请求可处理就自行销毁
-
-    @Override
-    @Bean("dgnsAsyncExecutor")
-    public Executor getAsyncExecutor() {
-        ThreadPoolTaskExecutor threadPool = new ThreadPoolTaskExecutor();
-        //设置核心线程数
-        threadPool.setCorePoolSize(10);
-        //设置最大线程数
-        threadPool.setMaxPoolSize(50);
-        //线程池所使用的缓冲队列
-        threadPool.setQueueCapacity(10);
-        //等待任务在关机时完成--表明等待所有线程执行完
-        threadPool.setWaitForTasksToCompleteOnShutdown(true);
-        // 等待时间 （默认为0，此时立即停止），并没等待xx秒后强制停止
-        threadPool.setAwaitTerminationSeconds(60);
-        //  线程名称前缀
-        threadPool.setThreadNamePrefix("Derry-Async-");
-        // 初始化线程
-        threadPool.initialize();
-        return threadPool;
-    }
-
-    @Override
-    public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() {
-        return null;
-    }
-}

src/main/java/com/gct/aoid/config/QuartzTaskConfig.java

@@ -0,0 +1,60 @@
+package com.gct.aoid.config;
+
+import com.gct.aoid.job.CalLiqDailyJobDetail;
+import com.gct.aoid.job.JobDataKey;
+import com.gct.aoid.job.TriggerConfigProperties;
+import org.quartz.*;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Date;
+
+/**
+ * class name: QuartzTaskConfig
+ *
+ * @author lloyd
+ * @version 1.0
+ * @since 2021/5/21 上午10:21
+ */
+@Configuration
+@EnableConfigurationProperties(TriggerConfigProperties.class)
+public class QuartzTaskConfig {
+
+    @Autowired
+    private TriggerConfigProperties triggerConfigProperties;
+
+    @Bean
+    public JobDetail jobDetail1() {
+        try {
+            return JobBuilder.newJob(CalLiqDailyJobDetail.class)
+                    .withIdentity(triggerConfigProperties.getJt1().getJobName(), triggerConfigProperties.getJt1().getJobGroup())
+                    .usingJobData(JobDataKey.JobName.getDec(), triggerConfigProperties.getJt1().getJobName())
+                    .usingJobData(JobDataKey.JobGroup.getDec(), triggerConfigProperties.getJt1().getJobGroup())
+                    .storeDurably()
+                    .build();
+        } catch (Exception e) {
+            LoggerFactory.getLogger(this.getClass()).error("Create JobDetail-1 failed:{}", e.getMessage());
+            throw e;
+        }
+    }
+
+    @Bean
+    public Trigger trigger1() {
+        try {
+            SimpleScheduleBuilder scheduleBuilder = SimpleScheduleBuilder.simpleSchedule()
+                    .withIntervalInSeconds(triggerConfigProperties.getJt1().getIntervalInSeconds());
+            if (triggerConfigProperties.getJt1().getIsRepeatable())
+                scheduleBuilder.repeatForever();
+            return TriggerBuilder.newTrigger()
+                    .forJob(triggerConfigProperties.getJt1().getJobName(), triggerConfigProperties.getJt1().getJobGroup())
+                    .startAt(new Date(new Date().getTime() + triggerConfigProperties.getJt1().getDelayMilliseconds()))
+                    .withSchedule(scheduleBuilder).build();
+        } catch (Exception e) {
+            LoggerFactory.getLogger(this.getClass()).error("Create Trigger-1 failed:{}", e.getMessage());
+            throw e;
+        }
+    }
+}

src/main/java/com/gct/aoid/config/SumDataTaskConfig.java

@@ -1,20 +0,0 @@
-
-package com.gct.aoid.config;
-
-import com.gct.aoid.service.impl.SumDataTaskServiceImpl;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-/**
- * aoid_singlegt_yield　－>　aoid_daily_yield 数据合并
- * @author: gxt
- * @create: 2020-11-06 11:55
- **/
-
-@Configuration
-public class SumDataTaskConfig {
-
-    @Bean(initMethod = "doService")
-    public SumDataTaskServiceImpl SumDataTaskServiceImpl(){
-        return new SumDataTaskServiceImpl();
-    }
-}

src/main/java/com/gct/aoid/job/CalLiqDailyJobDetail.java

@@ -0,0 +1,52 @@
+package com.gct.aoid.job;
+
+import com.gct.aoid.mapper.SumDataTaskMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.quartz.Job;
+import org.quartz.JobDetail;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.quartz.JobDetailFactoryBean;
+import org.springframework.scheduling.quartz.QuartzJobBean;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * class name: CalLiqDailyJobDetail
+ *
+ * @author lloyd
+ * @version 1.0
+ * @since 2021/5/21 上午10:24
+ */
+@Slf4j
+public class CalLiqDailyJobDetail extends QuartzJobBean {
+    @Autowired
+    public SumDataTaskMapper sumDataTaskMapper;
+
+    @Override
+    protected void executeInternal(JobExecutionContext jobExecutionContext) throws JobExecutionException {
+        //sumDataTaskMapper= (SumDataTaskMapper)jobExecutionContext.getJobDetail().getJobDataMap().get("dao");
+        String jobName = jobExecutionContext.getJobDetail().getJobDataMap().getString(JobDataKey.JobName.getDec());
+        String jobGroup = jobExecutionContext.getJobDetail().getJobDataMap().getString(JobDataKey.JobGroup.getDec());
+        LocalDateTime localDateTime = LocalDateTime.now();
+        log.info("*===>CalLiqDailyJobDetail--JobName:{}--JobGroup:{},Time:{}", jobName, jobGroup, localDateTime.format(DateTimeFormatter.ISO_DATE_TIME));
+        String date = DateTimeFormatter.ofPattern("yyyy-MM-dd").format(localDateTime);
+        String dateTime = date + " 00:00:00";
+        try {
+            int int1 = sumDataTaskMapper.sumData(date, dateTime);//main logic
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException("insert error");
+        } finally {
+            log.info("<===*calLiqDailyJobDetail,Time:{}", localDateTime.format(DateTimeFormatter.ISO_DATE_TIME));
+        }
+    }
+
+}

src/main/java/com/gct/aoid/job/JobDataKey.java

@@ -0,0 +1,23 @@
+package com.gct.aoid.job;
+
+/**
+ * enum name: JobDataKey
+ *
+ * @author lloyd
+ * @version 1.0
+ * @since 2021/5/21 下午12:42
+ */
+public enum JobDataKey {
+    JobName("job-name"),
+    JobGroup("job-group");
+
+    private String dec;
+
+    JobDataKey(String dec) {
+        this.dec = dec;
+    }
+
+    public String getDec() {
+        return dec;
+    }
+}

src/main/java/com/gct/aoid/job/TriggerConfigProperties.java

@@ -0,0 +1,71 @@
+package com.gct.aoid.job;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * class name: CalLiqDailyJobTriggerConfigProperties
+ *
+ * @author lloyd
+ * @version 1.0
+ * @since 2021/5/21 上午10:35
+ */
+@ConfigurationProperties(prefix = "spring.quartz.triggers")
+public class TriggerConfigProperties {
+    private CalTaskTrigger jt1 = new CalTaskTrigger();
+
+    public CalTaskTrigger getJt1() {
+        return jt1;
+    }
+
+    public void setJt1(CalTaskTrigger jt1) {
+        this.jt1 = jt1;
+    }
+
+    public static class CalTaskTrigger {
+        private int IntervalInSeconds = 1;
+        private String JobName = "DEFAULT";
+        private String JobGroup = "DEFAULT_GROUP";
+        private long DelayMilliseconds = 0;
+        private boolean IsRepeatable = false;
+
+        public int getIntervalInSeconds() {
+            return IntervalInSeconds;
+        }
+
+        public void setIntervalInSeconds(int intervalInSeconds) {
+            IntervalInSeconds = intervalInSeconds;
+        }
+
+        public String getJobName() {
+            return JobName;
+        }
+
+        public void setJobName(String jobName) {
+            JobName = jobName;
+        }
+
+        public String getJobGroup() {
+            return JobGroup;
+        }
+
+        public void setJobGroup(String jobGroup) {
+            JobGroup = jobGroup;
+        }
+
+        public long getDelayMilliseconds() {
+            return DelayMilliseconds;
+        }
+
+        public void setDelayMilliseconds(long delayMilliseconds) {
+            DelayMilliseconds = delayMilliseconds;
+        }
+
+        public boolean getIsRepeatable() {
+            return IsRepeatable;
+        }
+
+        public void setIsRepeatable(boolean repeatable) {
+            IsRepeatable = repeatable;
+        }
+    }
+}

src/main/java/com/gct/aoid/service/impl/SumDataTaskServiceImpl.java

@@ -4,12 +4,10 @@ package com.gct.aoid.service.impl;
 import com.gct.aoid.mapper.SumDataTaskMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -19,9 +17,14 @@ import java.util.concurrent.TimeUnit;
  * @author gxt
  * @version 1.0.0
  * @createTime 2021年04月25日 17:37:00
+ *
+ * migrate this to job package by lloyd at 2021.5.21 13:06
+ *
+ *
  */
 @Service
 @Slf4j
+@Deprecated
 public class SumDataTaskServiceImpl {
 
 

src/main/resources/application-dev.yml

@@ -74,6 +74,15 @@ spring:
         - /v2/api-docs     #swagger -----------
         - /checkCode.jpg**
         - /actuator/**    #actuator
+  quartz:
+    scheduler-name: ProductionCalApplication-QuartzScheduler
+    triggers:
+      jt1:
+        IntervalInSeconds: 600
+        JobName: CalLiqDailyJobDetail
+        JobGroup: CAL_TASK
+        DelayMilliseconds: 1000
+        IsRepeatable: true
 # swagger 相关配置
 swagger:
   authorization:

src/main/resources/application-pro.yml

@@ -74,6 +74,15 @@ spring:
         - /v2/api-docs     #swagger -----------
         - /checkCode.jpg**
         - /actuator/**    #actuator
+  quartz:
+    scheduler-name: ProductionCalApplication-QuartzScheduler
+    triggers:
+      jt1:
+        IntervalInSeconds: 600
+        JobName: CalLiqDailyJobDetail
+        JobGroup: CAL_TASK
+        DelayMilliseconds: 1000
+        IsRepeatable: true
 # swagger 相关配置
 swagger:
   authorization: