Update 数据上传模块xxj-job 升级

VB_DSM_V2.0/vbdsm-data-upload/pom.xml

@@ -39,7 +39,7 @@
         <swagger.version>2.7.0</swagger.version>
         <pagehelper.version>1.2.5</pagehelper.version>
         <ttl.version>2.10.0</ttl.version>
-        <xxl-job.version>1.9.1</xxl-job.version>
+        <xxl-job.version>2.4.0</xxl-job.version>
         <poi-tl.version>1.4.2</poi-tl.version>
         <jfreechart.version>1.0.19</jfreechart.version>
         <commons-csv.version>1.6</commons-csv.version>

VB_DSM_V2.0/vbdsm-data-upload/vbdsm-datacollect/src/main/java/cn/vbdsm/datacollect/config/XxlJobConfig.java

@@ -1,5 +1,7 @@
 package cn.vbdsm.datacollect.config;
 
+import com.xxl.job.core.executor.XxlJobExecutor;
+import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -7,8 +9,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
-import com.xxl.job.core.executor.XxlJobExecutor;
-
 /**
  * xxl-job config
  *
@@ -17,7 +17,7 @@ import com.xxl.job.core.executor.XxlJobExecutor;
 @Configuration
 @ComponentScan(basePackages = "cn.vbdsm.datacollect.jobhandler")
 public class XxlJobConfig {
-    private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
+    private final Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
 
     @Value("${xxl.job.admin.addresses}")
     private String adminAddresses;
@@ -44,9 +44,9 @@ public class XxlJobConfig {
     @Bean(initMethod = "start", destroyMethod = "destroy")
     public XxlJobExecutor xxlJobExecutor() {
         logger.info(">>>>>>>>>>> xxl-job config init.");
-        XxlJobExecutor xxlJobExecutor = new XxlJobExecutor();
+        XxlJobSpringExecutor xxlJobExecutor = new XxlJobSpringExecutor();
         xxlJobExecutor.setAdminAddresses(adminAddresses);
-        xxlJobExecutor.setAppName(appName);
+        xxlJobExecutor.setAppname(appName);
         xxlJobExecutor.setIp(ip);
         xxlJobExecutor.setPort(port);
         xxlJobExecutor.setAccessToken(accessToken);

VB_DSM_V2.0/vbdsm-data-upload/vbdsm-datacollect/src/main/java/cn/vbdsm/datacollect/jobhandler/SyncMonitorJobHandler.java

@@ -2,22 +2,20 @@ package cn.vbdsm.datacollect.jobhandler;
 
 import cn.vbdsm.datacollect.biz.IMonitorBiz;
 import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.IJobHandler;
-import com.xxl.job.core.handler.annotation.JobHandler;
+import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-@JobHandler(value = "syncMonitorJobHandler")
 @Service
-public class SyncMonitorJobHandler extends IJobHandler {
+public class SyncMonitorJobHandler {
 
     @Autowired
     private IMonitorBiz monitorBiz;
 
 
-    @Override
+    @XxlJob(value = "syncMonitorJobHandler")
     public ReturnT<String> execute(String param) throws Exception {
         monitorBiz.syncMonitor();
-        return SUCCESS;
+        return new ReturnT<String>("success");
     }
 }

VB_DSM_V2.0/vbdsm-data-upload/vbdsm-datacollect/src/main/java/cn/vbdsm/datacollect/jobhandler/SyncOnlineDataHandler.java

@@ -2,19 +2,17 @@ package cn.vbdsm.datacollect.jobhandler;
 
 import cn.vbdsm.datacollect.biz.IOnlineDataEnergyBiz;
 import com.xxl.job.core.biz.model.ReturnT;
-import com.xxl.job.core.handler.IJobHandler;
-import com.xxl.job.core.handler.annotation.JobHandler;
+import com.xxl.job.core.handler.annotation.XxlJob;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-@JobHandler(value = "syncOnlineDataHandler")
 @Service
-public class SyncOnlineDataHandler extends IJobHandler {
+public class SyncOnlineDataHandler {
 
     @Autowired
     private IOnlineDataEnergyBiz biz;
 
-    @Override
+    @XxlJob(value = "syncOnlineDataHandler")
     public ReturnT<String> execute(String param) throws Exception {
         if (param == null || param.isEmpty()) {
             biz.syncData2Mysql(null);
@@ -24,6 +22,6 @@ public class SyncOnlineDataHandler extends IJobHandler {
                 biz.syncData2Mysql(time);
             }
         }
-        return SUCCESS;
+        return new ReturnT<String>("success");
     }
 }

VB_DSM_V2.0/vbdsm-statistics/src/main/java/cn/vbdsm/statistics/config/XxlJobConfig.java

@@ -1,6 +1,7 @@
 package cn.vbdsm.statistics.config;
 
 import com.xxl.job.core.executor.XxlJobExecutor;
+import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -43,7 +44,7 @@ public class XxlJobConfig {
     @Bean(initMethod = "start", destroyMethod = "destroy")
     public XxlJobExecutor xxlJobExecutor() {
         logger.info(">>>>>>>>>>> xxl-job config init.");
-        XxlJobExecutor xxlJobExecutor = new XxlJobExecutor();
+        XxlJobSpringExecutor xxlJobExecutor = new XxlJobSpringExecutor();
         xxlJobExecutor.setAdminAddresses(adminAddresses);
         xxlJobExecutor.setAppname(appName);
         xxlJobExecutor.setIp(ip);