feat(能源管理系统): 间开优化定时任务

1.开发间开优化定期校准定时任务,配置表达式修改定时任务配置文件,创建cloud模块方法;

BREAKING CHANGE: 无

Closes 无

[skip ci]

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

@@ -17,4 +17,9 @@ public class CronConstant {
      * 每周一 00:00:00
      */
     public static final String EVERY_MONDAY = "0 0 0 ? * 2";
+
+    /**
+     * 每一天 00:15:00
+     */
+    public static final String EVERY_DAY = "0 15 0 * * ?";
 }

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

+package pps.core.task.job;
+
+import pps.cloud.space.service.ISpaceCalibrationCloudService;
+import pps.core.task.constant.CronConstant;
+import xstartup.annotation.XService;
+import xstartup.annotation.XText;
+import xstartup.base.XContext;
+import xstartup.base.tool.XLoggerTool;
+import xstartup.data.XServiceResult;
+import xstartup.service.job.XJob;
+import xstartup.service.job.annotation.XCronTrigger;
+
+/**
+ * 定期校准定时任务
+ *
+ * @author ZWT
+ * @date 2023/09/20 09:20
+ */
+@XText("长期间开优化定时任务")
+@XService
+public class SpaceCalibrationJob implements XJob {
+
+    /**
+     * 处决
+     *
+     * @param xContext x上下文
+     * @return {@link XServiceResult}
+     */
+    @XCronTrigger(value = CronConstant.EVERY_DAY)
+    @Override
+    public XServiceResult execute(XContext xContext) {
+        XLoggerTool logger = xContext.getLogger();
+        logger.info("------ SpaceCalibrationJob start:{}", System.currentTimeMillis());
+        ISpaceCalibrationCloudService service = xContext.getBean(ISpaceCalibrationCloudService.class);
+        XServiceResult result = service.calibrateJob(xContext);
+        result.throwIfFail();
+        logger.info("------ SpaceCalibrationJob end:{}", System.currentTimeMillis());
+        return XServiceResult.OK;
+    }
+}

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

@@ -32,7 +32,7 @@ public class SpaceOptimizeMidJob implements XJob {
         XLoggerTool logger = xContext.getLogger();
         logger.info("------ SpaceOptimizeMidJob start:{}", System.currentTimeMillis());
         ISpaceOptimizeMidCloudService service = xContext.getBean(ISpaceOptimizeMidCloudService.class);
-        XServiceResult result = service.optimizeLongJob(xContext);
+        XServiceResult result = service.optimizeMidJob(xContext);
         result.throwIfFail();
         logger.info("------ SpaceOptimizeMidJob end:{}", System.currentTimeMillis());
         return XServiceResult.OK;

C11-space/pps-cloud-space/src/main/java/pps/cloud/space/service/ISpaceCalibrationCloudService.java

+package pps.cloud.space.service;
+
+import xstartup.annotation.XService;
+import xstartup.annotation.XText;
+import xstartup.base.XContext;
+import xstartup.data.XServiceResult;
+
+/**
+ * 定期校准Cloud模块
+ *
+ * @author ZWT
+ * @date 2023/09/20 09:36
+ */
+@XService
+@XText("定期校准Cloud模块")
+public interface ISpaceCalibrationCloudService {
+
+    /**
+     * 定期校准Cloud模块--定时任务
+     *
+     * @param context 上下文
+     * @return {@link XServiceResult}
+     */
+    @XText("定期校准Cloud模块--定时任务")
+    XServiceResult calibrateJob(XContext context);
+}

C11-space/pps-cloud-space/src/main/java/pps/cloud/space/service/ISpaceOptimizeMidCloudService.java

@@ -22,5 +22,5 @@ public interface ISpaceOptimizeMidCloudService {
      * @return {@link XServiceResult}
      */
     @XText("中短期间开优化Cloud模块--定时任务")
-    XServiceResult optimizeLongJob(XContext context);
+    XServiceResult optimizeMidJob(XContext context);
 }
\ No newline at end of file

C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceCalibrationCloudServiceImpl.java

+package pps.core.space.service;
+
+import pps.cloud.space.service.ISpaceCalibrationCloudService;
+import xstartup.annotation.XService;
+import xstartup.base.XContext;
+import xstartup.data.XServiceResult;
+
+/**
+ * 定期校准Cloud模块
+ *
+ * @author ZWT
+ * @date 2023/09/20 09:40
+ */
+@XService
+public class SpaceCalibrationCloudServiceImpl implements ISpaceCalibrationCloudService {
+
+    @Override
+    public XServiceResult calibrateJob(XContext context) {
+        return null;
+    }
+}

C11-space/pps-core-space/src/main/java/pps/core/space/service/SpaceOptimizeMidCloudServiceImpl.java

@@ -37,7 +37,7 @@ public class SpaceOptimizeMidCloudServiceImpl extends SpaceOptimizeBaseService i
      * @return {@link XServiceResult}
      */
     @Override
-    public XServiceResult optimizeLongJob(XContext context) {
+    public XServiceResult optimizeMidJob(XContext context) {
         //取当前时间
         DateTime date = DateUtil.date();
         String startWeek = date.toString(BusinessConstant.DATE_FORMAT_DAY);

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

 package app;
 
-import pps.core.task.job.SpaceOptimizeLongJob;
-import pps.core.task.job.SpaceOptimizeMidJob;
-import pps.core.task.job.TestJob;
-import pps.core.task.job.WeatherJob;
+import pps.core.task.job.*;
 import xstartup.base.XStartup;
 import xstartup.base.conf.XServerConf;
 import xstartup.base.conf.XServiceConf;
@@ -36,6 +33,7 @@ public class DeployPpsAllApplication {
         startup.enable(XJobFeature.class).config(new XJobServiceConf(WeatherJob.class));
         startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceOptimizeLongJob.class));
         startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceOptimizeMidJob.class));
+        startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceCalibrationJob.class));
         //startup.enable(XCloudHuaweiCseFeature.class);
         startup.run(args);
     }

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

@@ -56,6 +56,7 @@ x.server.host=127.0.0.1
 x.job.service=pps.core.task.job.TestJob,\
   pps.core.task.job.SpaceOptimizeLongJob,\
   pps.core.task.job.SpaceOptimizeMidJob,\
+  pps.core.task.job.SpaceCalibrationJob,\
   pps.core.task.job.WeatherJob
 
 # redis

D03-deploy/deploy-pps-task/src/main/java/app/DeployPpsTaskApplication.java

 package app;
 
 //import pps.core.common.job.CounterJob;
+
 import pps.core.common.utils.CounterBuilder;
 import pps.core.task.job.*;
 import xstartup.base.XStartup;
@@ -26,13 +27,14 @@ public class DeployPpsTaskApplication {
         startup.config(new XServerConf(22062).naming("pps-task"))
                 .config(new XServiceConf("pps"));
         startup.enable(XApiFeature.class)
-                .config(new XApiCookieConf("%4bH8s9&",43200));
+                .config(new XApiCookieConf("%4bH8s9&", 43200));
         startup.enable(XCorsFeature.class);
         startup.enable(XMybatisFeature.class);
         startup.enable(XJobFeature.class).config(new XJobServiceConf(TestJob.class));
         startup.enable(XJobFeature.class).config(new XJobServiceConf(WeatherJob.class));
         startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceOptimizeLongJob.class));
         startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceOptimizeMidJob.class));
+        startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceCalibrationJob.class));
 
         startup.enable(XRpcFeature.class);
         startup.enable(XCloudHuaweiCseFeature.class)

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

@@ -10,6 +10,7 @@ pps.core.common.mq-config.ackImsMq=@pps.core.common.mq-config.ackImsMq@
 x.job.service=pps.core.task.job.TestJob,\
   pps.core.task.job.SpaceOptimizeLongJob,\
   pps.core.task.job.SpaceOptimizeMidJob,\
+  pps.core.task.job.SpaceCalibrationJob,\
   pps.core.task.job.WeatherJob
 
 #\uFFFD\uFFFD\u05BE\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD