Commit 8556ad63 authored by ZWT's avatar ZWT

feat(零碳): 长庆演示系统新增功能

1.新建油田配置表同时生成相关代码及mapper文件,修改部分第三方数据抽取定时任务,增加针对不同井场开关控制逻辑,同时修改首页页面展示逻辑,通过油田配置功能区分不同首页展示功能;
2.新建定时任务配置表同时生成相关代码及mapper文件,定时任务模块增加mybatis配置,用以操作数据库,修改部分第三方数据抽取定时任务,修改使用方式使其脱离框架方便动态控制;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 7d7ffe25
...@@ -10,8 +10,6 @@ import xstartup.annotation.XService; ...@@ -10,8 +10,6 @@ import xstartup.annotation.XService;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import xstartup.base.XContext; import xstartup.base.XContext;
import xstartup.data.XServiceResult; import xstartup.data.XServiceResult;
import xstartup.service.job.XJob;
import xstartup.service.job.annotation.XCronTrigger;
/** /**
* 日用电趋势定时任务 * 日用电趋势定时任务
...@@ -21,7 +19,7 @@ import xstartup.service.job.annotation.XCronTrigger; ...@@ -21,7 +19,7 @@ import xstartup.service.job.annotation.XCronTrigger;
*/ */
@XText("日用电趋势定时任务") @XText("日用电趋势定时任务")
@XService @XService
public class DailyElectricityTrendJob implements XJob { public class DailyElectricityTrendJob {
/** /**
* 每天0点12执行(跑前一天数据) * 每天0点12执行(跑前一天数据)
...@@ -29,8 +27,6 @@ public class DailyElectricityTrendJob implements XJob { ...@@ -29,8 +27,6 @@ public class DailyElectricityTrendJob implements XJob {
* @param xContext x上下文 * @param xContext x上下文
* @return {@link XServiceResult} * @return {@link XServiceResult}
*/ */
@XCronTrigger(value = TaskConstant.EVERY_DAY_12)
@Override
public XServiceResult execute(XContext xContext) { public XServiceResult execute(XContext xContext) {
xContext.getLogger().info("------ DailyElectricityTrendJob start:{}", DateUtil.date()); xContext.getLogger().info("------ DailyElectricityTrendJob start:{}", DateUtil.date());
String key = TaskConstant.TASK_LOCK_KEY + "DailyElectricityTrendJob"; String key = TaskConstant.TASK_LOCK_KEY + "DailyElectricityTrendJob";
......
...@@ -10,8 +10,6 @@ import xstartup.annotation.XService; ...@@ -10,8 +10,6 @@ import xstartup.annotation.XService;
import xstartup.annotation.XText; import xstartup.annotation.XText;
import xstartup.base.XContext; import xstartup.base.XContext;
import xstartup.data.XServiceResult; import xstartup.data.XServiceResult;
import xstartup.service.job.XJob;
import xstartup.service.job.annotation.XCronTrigger;
/** /**
* 能耗分析定时任务 * 能耗分析定时任务
...@@ -21,7 +19,7 @@ import xstartup.service.job.annotation.XCronTrigger; ...@@ -21,7 +19,7 @@ import xstartup.service.job.annotation.XCronTrigger;
*/ */
@XText("能耗分析定时任务") @XText("能耗分析定时任务")
@XService @XService
public class EnergyConsumptionAnalysisJob implements XJob { public class EnergyConsumptionAnalysisJob {
/** /**
* 每天0点30执行 * 每天0点30执行
...@@ -29,8 +27,6 @@ public class EnergyConsumptionAnalysisJob implements XJob { ...@@ -29,8 +27,6 @@ public class EnergyConsumptionAnalysisJob implements XJob {
* @param xContext x上下文 * @param xContext x上下文
* @return {@link XServiceResult} * @return {@link XServiceResult}
*/ */
@XCronTrigger(value = TaskConstant.EVERY_DAY_30)
@Override
public XServiceResult execute(XContext xContext) { public XServiceResult execute(XContext xContext) {
xContext.getLogger().info("------ EnergyConsumptionAnalysisJob start:{}", DateUtil.date()); xContext.getLogger().info("------ EnergyConsumptionAnalysisJob start:{}", DateUtil.date());
String key = TaskConstant.TASK_LOCK_KEY + "EnergyConsumptionAnalysisJob"; String key = TaskConstant.TASK_LOCK_KEY + "EnergyConsumptionAnalysisJob";
......
...@@ -31,8 +31,6 @@ public class DeployPpsAllApplication { ...@@ -31,8 +31,6 @@ public class DeployPpsAllApplication {
startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceCalibrationJob.class)); 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(SpaceOptimizeUltraJob.class));
startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceOptimizeShortJob.class)); startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceOptimizeShortJob.class));
startup.enable(XJobFeature.class).config(new XJobServiceConf(DailyElectricityTrendJob.class));
startup.enable(XJobFeature.class).config(new XJobServiceConf(EnergyConsumptionAnalysisJob.class));
startup.enable(XJobFeature.class).config(new XJobServiceConf(PlantPredictedPowerLongTermDataJob.class)); startup.enable(XJobFeature.class).config(new XJobServiceConf(PlantPredictedPowerLongTermDataJob.class));
startup.run(args); startup.run(args);
} }
......
...@@ -17,8 +17,6 @@ x.job.service=pps.core.task.job.SpaceOptimizeLongJob,\ ...@@ -17,8 +17,6 @@ x.job.service=pps.core.task.job.SpaceOptimizeLongJob,\
pps.core.task.job.SpaceCalibrationJob,\ pps.core.task.job.SpaceCalibrationJob,\
pps.core.task.job.SpaceOptimizeShortJob,\ pps.core.task.job.SpaceOptimizeShortJob,\
pps.core.task.job.SpaceOptimizeUltraJob,\ pps.core.task.job.SpaceOptimizeUltraJob,\
pps.core.task.job.DailyElectricityTrendJob,\
pps.core.task.job.EnergyConsumptionAnalysisJob,\
pps.core.task.job.PlantPredictedPowerLongTermDataJob pps.core.task.job.PlantPredictedPowerLongTermDataJob
# redis # redis
x.cache.type=@x.cache.type@ x.cache.type=@x.cache.type@
......
...@@ -27,8 +27,6 @@ public class DeployPpsTaskApplication { ...@@ -27,8 +27,6 @@ public class DeployPpsTaskApplication {
startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceOptimizeUltraJob.class)); startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceOptimizeUltraJob.class));
startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceCalibrationJob.class)); startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceCalibrationJob.class));
startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceOptimizeShortJob.class)); startup.enable(XJobFeature.class).config(new XJobServiceConf(SpaceOptimizeShortJob.class));
startup.enable(XJobFeature.class).config(new XJobServiceConf(DailyElectricityTrendJob.class));
startup.enable(XJobFeature.class).config(new XJobServiceConf(EnergyConsumptionAnalysisJob.class));
startup.enable(XJobFeature.class).config(new XJobServiceConf(PlantPredictedPowerLongTermDataJob.class)); startup.enable(XJobFeature.class).config(new XJobServiceConf(PlantPredictedPowerLongTermDataJob.class));
startup.enable(XRpcFeature.class); startup.enable(XRpcFeature.class);
startup.run(args); startup.run(args);
......
...@@ -5,8 +5,6 @@ x.job.service=pps.core.task.job.SpaceOptimizeLongJob,\ ...@@ -5,8 +5,6 @@ x.job.service=pps.core.task.job.SpaceOptimizeLongJob,\
pps.core.task.job.SpaceOptimizeUltraJob,\ pps.core.task.job.SpaceOptimizeUltraJob,\
pps.core.task.job.SpaceCalibrationJob,\ pps.core.task.job.SpaceCalibrationJob,\
pps.core.task.job.SpaceOptimizeShortJob,\ pps.core.task.job.SpaceOptimizeShortJob,\
pps.core.task.job.DailyElectricityTrendJob,\
pps.core.task.job.EnergyConsumptionAnalysisJob,\
pps.core.task.job.PlantPredictedPowerLongTermDataJob pps.core.task.job.PlantPredictedPowerLongTermDataJob
x.log.level=@x.log.level@ x.log.level=@x.log.level@
x.log.directory=@x.log.directory@ x.log.directory=@x.log.directory@
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment