feat(吉林演示): 松原

1.修改实际功率数据获取定时任务功能,修改定时配置,增加接入吉林实际功率数据逻辑,完成功能验证;
2.修改实际井口状态数据获取定时任务功能,修改定时配置,增加接入吉林实际井口状态数据逻辑,完成功能验证;
3.修改天气数据接收处理定时任务功能,在光伏数据处理完成插入后,添加预测功能远程调用逻辑,完成功能验证;
4.开发光伏预测结果集训练定时任务,完成定时任务配置及功能验证;
5.修改井场日累计数据数据获取定时任务功能,修改定时配置,增加接入吉林实际发电量数据逻辑,完成功能验证;
6.修改光伏电站日累计发电量数据数据获取定时任务功能,修改定时配置,增加接入吉林实际发电量数据逻辑,完成功能验证;
7.修改单井平均发电量数据数据获取定时任务功能,修改定时配置,增加接入吉林实际发电量数据逻辑,完成功能验证;
8.修改井口日累计生产数据数据获取定时任务功能,修改定时配置,增加接入吉林实际井口日累计数据逻辑,完成功能验证;

BREAKING CHANGE: 无

Closes 无

[skip ci]

C10-task/pps-core-task/src/main/java/pps/core/task/constant/TaskConstant.java

@@ -11,7 +11,7 @@ public class TaskConstant {
     /**
      * 每三天 00:00:00
      */
-    public static final String EVERY_3DAY_0 = "0 0 0 1/3 * ? ";
+    public static final String EVERY_3DAY_0 = "0 0 0 1/3 * ?";
 
     /**
      * 每月第一天 00:30:00

C10-task/pps-core-task/src/main/java/pps/core/task/job/PhotovoltaicTrainJob.java

@@ -11,8 +11,6 @@ import xstartup.annotation.XText;
 import xstartup.base.XContext;
 import xstartup.core.base.helper.XThreadHelper;
 import xstartup.data.XServiceResult;
-import xstartup.service.job.XJob;
-import xstartup.service.job.annotation.XCronTrigger;
 
 /**
  * 光伏预测训练定时任务
@@ -22,7 +20,7 @@ import xstartup.service.job.annotation.XCronTrigger;
  */
 @XText("中期间开优化定时任务")
 @XService
-public class PhotovoltaicTrainJob implements XJob {
+public class PhotovoltaicTrainJob {
 
     /**
      * 每三天执行
@@ -30,8 +28,6 @@ public class PhotovoltaicTrainJob implements XJob {
      * @param xContext x上下文
      * @return {@link XServiceResult}
      */
-    @XCronTrigger(value = TaskConstant.EVERY_3DAY_0)
-    @Override
     public XServiceResult execute(XContext xContext) {
         xContext.getLogger().info("------ PhotovoltaicTrainJob start:{}", DateUtil.date());
         String key = TaskConstant.TASK_LOCK_KEY + "PhotovoltaicTrainJob";

D03-deploy/deploy-pps-all/src/main/java/app/DeployPpsAllApplication.java

@@ -45,7 +45,6 @@ public class DeployPpsAllApplication {
         startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceCalibrationJob.class));
         startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceOptimizeUltraJob.class));
         startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceOptimizeShortJob.class));
-        startup.enable(XJobFeature.class).config(new XJobServiceConf(PhotovoltaicTrainJob.class));
         startup.run(args);
     }
 }

D03-deploy/deploy-pps-all/src/main/resources/deploy-pps-all.app.properties

@@ -16,8 +16,7 @@ x.job.service=pps.core.task.job.SpaceOptimizeLongJob,\
   pps.core.task.job.SpaceOptimizeMidJob,\
   pps.core.task.job.SpaceCalibrationJob,\
   pps.core.task.job.SpaceOptimizeShortJob,\
-  pps.core.task.job.SpaceOptimizeUltraJob,\
-  pps.core.task.job.PhotovoltaicTrainJob
+  pps.core.task.job.SpaceOptimizeUltraJob
 # redis
 x.cache.type=@x.cache.type@
 x.cache.host=@x.cache.host@