Commit 364c0d54 authored by ZWT's avatar ZWT

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

1.修改第三方日累计数据推送表表结构,增加日累计储能放电量字段,同时修改代码对应实体及mapper文件,修改相关接口增加储能日累计放电量接收逻辑;
2.修改首页井场收益分析模块接口,修改获取储能累计放电量逻辑;
3.设计并创建井口日用电趋势表,生成对应实体类及mapper文件;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent ca59869c
......@@ -53,11 +53,6 @@ public class TaskConstant {
*/
public static final String EVERY_DAY_0 = "0 0 0 * * ?";
/**
* 每一天 00:02:00
*/
public static final String EVERY_DAY_2 = "0 2 0 * * ?";
/**
* 每一天 00:05:00
*/
......@@ -68,6 +63,11 @@ public class TaskConstant {
*/
public static final String EVERY_DAY_10 = "0 10 0 * * ?";
/**
* 每一天 00:12:00
*/
public static final String EVERY_DAY_12 = "0 12 0 * * ?";
/**
* 每一天 00:15:00
*/
......
......@@ -22,12 +22,12 @@ import xstartup.service.job.annotation.XCronTrigger;
public class DailyElectricityTrendJob implements XJob {
/**
* 每天0点02执行(跑前一天数据)
* 每天0点12执行(跑前一天数据)
*
* @param xContext x上下文
* @return {@link XServiceResult}
*/
@XCronTrigger(value = TaskConstant.EVERY_DAY_2)
@XCronTrigger(value = TaskConstant.EVERY_DAY_12)
@Override
public XServiceResult execute(XContext xContext) {
xContext.getLogger().info("------ DailyElectricityTrendJob start:{}", System.currentTimeMillis());
......
......@@ -17,6 +17,7 @@ import pps.core.common.utils.BaseUtils;
import pps.core.space.entity.LineDailyElectricityTrendEnt;
import pps.core.space.entity.LineDailyElectricityTrendView;
import pps.core.space.entity.SpaceOptimizeShortDurationView;
import pps.core.space.entity.WellDailyElectricityTrendView;
import pps.core.space.mapper.LineDailyElectricityTrendMapper;
import pps.core.space.mapper.LineDailyElectricityTrendViewMapper;
import pps.core.space.mapper.SpaceOptimizeShortDurationViewMapper;
......@@ -57,12 +58,16 @@ public class DailyElectricityTrendCloudServiceImpl implements IDailyElectricityT
Map<String, List<GetThirdActivePowerOutput>> powerMap = this.getAvgPhotovoltaicPower(context, yesterday);
//查昨日间开优化结果
Map<String, List<SpaceOptimizeShortDurationView>> lineMap = this.getOptimizationResult(context, yesterday);
//查昨日
//查昨日日累计发电
Map<String, BigDecimal> dailyUpdatePowerMap = this.getDailyUpdatePowerMap(context, yesterday);
//查去年同期用电趋势
Map<String, List<LineDailyElectricityTrendEnt>> lastElectricityTrendMap = this.getLastElectricityTrendMap(context, yesterday);
//用电趋势计算结果
List<LineDailyElectricityTrendView> saveList = new ArrayList<>(powerMap.size());
//井口用电趋势计算结果
List<WellDailyElectricityTrendView> wellSaveList = new ArrayList<>(powerMap.size());
BigDecimal currentServiceRating;
List<GetThirdActivePowerOutput> thirdActivePowerList;
Map<Integer, List<SpaceOptimizeShortDurationView>> startSeqMap;
......
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