Commit 022ead65 authored by ZWT's avatar ZWT

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

1.修改第三方日累计数据推送表表结构,增加日累计储能放电量字段,同时修改代码对应实体及mapper文件,修改相关接口增加储能日累计放电量接收逻辑;
2.修改首页井场收益分析模块接口,修改获取储能累计放电量逻辑;
3.设计并创建井口日用电趋势表,生成对应实体类及mapper文件;
4.统计分析模块,新增本月累计节电经济效益查询接口,添加线上接口文档并完成接口冒烟测试;
5.统计分析模块,新增本月累计减碳量查询接口,添加线上接口文档并完成接口冒烟测试;
6.统计分析模块,新增光伏发电趋势查询接口,添加线上接口文档并完成接口冒烟测试;
7.统计分析模块,新增月度总览查询接口,添加线上接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 0b3647d9
...@@ -19,7 +19,7 @@ import xstartup.service.job.annotation.XCronTrigger; ...@@ -19,7 +19,7 @@ import xstartup.service.job.annotation.XCronTrigger;
*/ */
@XText("第三方有功功率定时任务") @XText("第三方有功功率定时任务")
@XService @XService
public class ThirdActivePowerJob implements XJob { public class ThirdActivePowerJob extends JobCommonService implements XJob {
/** /**
* 十分钟一次 * 十分钟一次
...@@ -30,6 +30,10 @@ public class ThirdActivePowerJob implements XJob { ...@@ -30,6 +30,10 @@ public class ThirdActivePowerJob implements XJob {
@XCronTrigger(value = TaskConstant.TEN_MINUTES) @XCronTrigger(value = TaskConstant.TEN_MINUTES)
@Override @Override
public XServiceResult execute(XContext xContext) { public XServiceResult execute(XContext xContext) {
if (this.isClosed(this.getCurrentConfig(xContext))) {
xContext.getLogger().info("------ ThirdActivePowerJob not enabled");
return XServiceResult.OK;
}
xContext.getLogger().info("------ ThirdActivePowerJob start:{}", System.currentTimeMillis()); xContext.getLogger().info("------ ThirdActivePowerJob start:{}", System.currentTimeMillis());
String key = TaskConstant.TASK_LOCK_KEY + "ThirdActivePowerJob"; String key = TaskConstant.TASK_LOCK_KEY + "ThirdActivePowerJob";
TaskLockCache exist = TaskLockCache.exist(xContext, key); TaskLockCache exist = TaskLockCache.exist(xContext, key);
......
...@@ -19,7 +19,7 @@ import xstartup.service.job.annotation.XCronTrigger; ...@@ -19,7 +19,7 @@ import xstartup.service.job.annotation.XCronTrigger;
*/ */
@XText("第三方当日油井状态定时任务") @XText("第三方当日油井状态定时任务")
@XService @XService
public class ThirdCurrentWellConditionJob implements XJob { public class ThirdCurrentWellConditionJob extends JobCommonService implements XJob {
/** /**
* 十分钟一次,隔9分钟 * 十分钟一次,隔9分钟
...@@ -30,6 +30,10 @@ public class ThirdCurrentWellConditionJob implements XJob { ...@@ -30,6 +30,10 @@ public class ThirdCurrentWellConditionJob implements XJob {
@XCronTrigger(value = TaskConstant.TEN_MINUTES_9) @XCronTrigger(value = TaskConstant.TEN_MINUTES_9)
@Override @Override
public XServiceResult execute(XContext xContext) { public XServiceResult execute(XContext xContext) {
if (this.isClosed(this.getCurrentConfig(xContext))) {
xContext.getLogger().info("------ ThirdCurrentWellConditionJob not enabled");
return XServiceResult.OK;
}
xContext.getLogger().info("------ ThirdCurrentWellConditionJob start:{}", System.currentTimeMillis()); xContext.getLogger().info("------ ThirdCurrentWellConditionJob start:{}", System.currentTimeMillis());
String key = TaskConstant.TASK_LOCK_KEY + "ThirdCurrentWellConditionJob"; String key = TaskConstant.TASK_LOCK_KEY + "ThirdCurrentWellConditionJob";
TaskLockCache exist = TaskLockCache.exist(xContext, key); TaskLockCache exist = TaskLockCache.exist(xContext, key);
......
...@@ -19,7 +19,7 @@ import xstartup.service.job.annotation.XCronTrigger; ...@@ -19,7 +19,7 @@ import xstartup.service.job.annotation.XCronTrigger;
*/ */
@XText("第三方井场日累计数据定时任务") @XText("第三方井场日累计数据定时任务")
@XService @XService
public class ThirdDailyAccumulationJob implements XJob { public class ThirdDailyAccumulationJob extends JobCommonService implements XJob {
/** /**
* 十分钟一次,隔7分钟 * 十分钟一次,隔7分钟
...@@ -30,6 +30,10 @@ public class ThirdDailyAccumulationJob implements XJob { ...@@ -30,6 +30,10 @@ public class ThirdDailyAccumulationJob implements XJob {
@XCronTrigger(value = TaskConstant.TEN_MINUTES_7) @XCronTrigger(value = TaskConstant.TEN_MINUTES_7)
@Override @Override
public XServiceResult execute(XContext xContext) { public XServiceResult execute(XContext xContext) {
if (this.isClosed(this.getCurrentConfig(xContext))) {
xContext.getLogger().info("------ ThirdDailyAccumulationJob not enabled");
return XServiceResult.OK;
}
xContext.getLogger().info("------ ThirdDailyAccumulationJob start:{}", System.currentTimeMillis()); xContext.getLogger().info("------ ThirdDailyAccumulationJob start:{}", System.currentTimeMillis());
String key = TaskConstant.TASK_LOCK_KEY + "ThirdDailyAccumulationJob"; String key = TaskConstant.TASK_LOCK_KEY + "ThirdDailyAccumulationJob";
TaskLockCache exist = TaskLockCache.exist(xContext, key); TaskLockCache exist = TaskLockCache.exist(xContext, key);
......
...@@ -19,7 +19,7 @@ import xstartup.service.job.annotation.XCronTrigger; ...@@ -19,7 +19,7 @@ import xstartup.service.job.annotation.XCronTrigger;
*/ */
@XText("第三方光伏日发电量定时任务") @XText("第三方光伏日发电量定时任务")
@XService @XService
public class ThirdPhotovoltaicPowerJob implements XJob { public class ThirdPhotovoltaicPowerJob extends JobCommonService implements XJob {
/** /**
* 每天00:05 * 每天00:05
...@@ -30,6 +30,10 @@ public class ThirdPhotovoltaicPowerJob implements XJob { ...@@ -30,6 +30,10 @@ public class ThirdPhotovoltaicPowerJob implements XJob {
@XCronTrigger(value = TaskConstant.EVERY_DAY_5) @XCronTrigger(value = TaskConstant.EVERY_DAY_5)
@Override @Override
public XServiceResult execute(XContext xContext) { public XServiceResult execute(XContext xContext) {
if (this.isClosed(this.getCurrentConfig(xContext))) {
xContext.getLogger().info("------ ThirdPhotovoltaicPowerJob not enabled");
return XServiceResult.OK;
}
xContext.getLogger().info("------ ThirdPhotovoltaicPowerJob start:{}", System.currentTimeMillis()); xContext.getLogger().info("------ ThirdPhotovoltaicPowerJob start:{}", System.currentTimeMillis());
String key = TaskConstant.TASK_LOCK_KEY + "ThirdPhotovoltaicPowerJob"; String key = TaskConstant.TASK_LOCK_KEY + "ThirdPhotovoltaicPowerJob";
TaskLockCache exist = TaskLockCache.exist(xContext, key); TaskLockCache exist = TaskLockCache.exist(xContext, key);
......
...@@ -19,7 +19,7 @@ import xstartup.service.job.annotation.XCronTrigger; ...@@ -19,7 +19,7 @@ import xstartup.service.job.annotation.XCronTrigger;
*/ */
@XText("第三方单井平均有功功率定时任务") @XText("第三方单井平均有功功率定时任务")
@XService @XService
public class ThirdWellAvgActivePowerJob implements XJob { public class ThirdWellAvgActivePowerJob extends JobCommonService implements XJob {
/** /**
* 十分钟一次隔3分钟 * 十分钟一次隔3分钟
...@@ -30,6 +30,10 @@ public class ThirdWellAvgActivePowerJob implements XJob { ...@@ -30,6 +30,10 @@ public class ThirdWellAvgActivePowerJob implements XJob {
@XCronTrigger(value = TaskConstant.TEN_MINUTES_3) @XCronTrigger(value = TaskConstant.TEN_MINUTES_3)
@Override @Override
public XServiceResult execute(XContext xContext) { public XServiceResult execute(XContext xContext) {
if (this.isClosed(this.getCurrentConfig(xContext))) {
xContext.getLogger().info("------ ThirdWellAvgActivePowerJob not enabled");
return XServiceResult.OK;
}
xContext.getLogger().info("------ ThirdWellAvgActivePowerJob start:{}", System.currentTimeMillis()); xContext.getLogger().info("------ ThirdWellAvgActivePowerJob start:{}", System.currentTimeMillis());
String key = TaskConstant.TASK_LOCK_KEY + "ThirdWellAvgActivePowerJob"; String key = TaskConstant.TASK_LOCK_KEY + "ThirdWellAvgActivePowerJob";
TaskLockCache exist = TaskLockCache.exist(xContext, key); TaskLockCache exist = TaskLockCache.exist(xContext, key);
......
...@@ -19,7 +19,7 @@ import xstartup.service.job.annotation.XCronTrigger; ...@@ -19,7 +19,7 @@ import xstartup.service.job.annotation.XCronTrigger;
*/ */
@XText("日耗电日产液信息定时任务") @XText("日耗电日产液信息定时任务")
@XService @XService
public class WellTechDailyJob implements XJob { public class WellTechDailyJob extends JobCommonService implements XJob {
/** /**
* 每天0点执行 * 每天0点执行
...@@ -30,6 +30,10 @@ public class WellTechDailyJob implements XJob { ...@@ -30,6 +30,10 @@ public class WellTechDailyJob implements XJob {
@XCronTrigger(value = TaskConstant.EVERY_DAY_0) @XCronTrigger(value = TaskConstant.EVERY_DAY_0)
@Override @Override
public XServiceResult execute(XContext xContext) { public XServiceResult execute(XContext xContext) {
if (this.isClosed(this.getCurrentConfig(xContext))) {
xContext.getLogger().info("------ WellTechDailyJob not enabled");
return XServiceResult.OK;
}
xContext.getLogger().info("------ WellTechDailyJob start:{}", System.currentTimeMillis()); xContext.getLogger().info("------ WellTechDailyJob start:{}", System.currentTimeMillis());
String key = TaskConstant.TASK_LOCK_KEY + "WellTechDailyJob"; String key = TaskConstant.TASK_LOCK_KEY + "WellTechDailyJob";
TaskLockCache exist = TaskLockCache.exist(xContext, key); TaskLockCache exist = TaskLockCache.exist(xContext, key);
......
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