Commit c2afd68d authored by ZWT's avatar ZWT

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

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 00aa8585
...@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; ...@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import pps.cloud.prediction.service.IThirdPowerCloudService; import pps.cloud.prediction.service.IThirdPowerCloudService;
import pps.cloud.prediction.service.data.third_active_power.GetThirdActivePowerInput; import pps.cloud.prediction.service.data.third_active_power.GetThirdActivePowerInput;
import pps.cloud.prediction.service.data.third_active_power.GetThirdActivePowerOutput; import pps.cloud.prediction.service.data.third_active_power.GetThirdActivePowerOutput;
...@@ -11,7 +12,9 @@ import pps.cloud.prediction.service.data.third_daily_accumulation_update.GetThir ...@@ -11,7 +12,9 @@ import pps.cloud.prediction.service.data.third_daily_accumulation_update.GetThir
import pps.cloud.prediction.service.data.third_daily_accumulation_update.GetThirdDailyAccumulationUpdateOutput; import pps.cloud.prediction.service.data.third_daily_accumulation_update.GetThirdDailyAccumulationUpdateOutput;
import pps.cloud.space.service.IDailyElectricityTrendCloudService; import pps.cloud.space.service.IDailyElectricityTrendCloudService;
import pps.core.common.constant.BusinessConstant; import pps.core.common.constant.BusinessConstant;
import pps.core.space.entity.LineDailyElectricityTrendEnt;
import pps.core.space.entity.SpaceOptimizeShortDurationView; import pps.core.space.entity.SpaceOptimizeShortDurationView;
import pps.core.space.mapper.LineDailyElectricityTrendMapper;
import pps.core.space.mapper.SpaceOptimizeShortDurationViewMapper; import pps.core.space.mapper.SpaceOptimizeShortDurationViewMapper;
import xstartup.annotation.XService; import xstartup.annotation.XService;
import xstartup.base.XContext; import xstartup.base.XContext;
...@@ -54,6 +57,8 @@ public class DailyElectricityTrendCloudServiceImpl extends SpaceOptimizeBaseServ ...@@ -54,6 +57,8 @@ public class DailyElectricityTrendCloudServiceImpl extends SpaceOptimizeBaseServ
Map<String, List<SpaceOptimizeShortDurationView>> lineMap = this.getOptimizationResult(context, yesterday); Map<String, List<SpaceOptimizeShortDurationView>> lineMap = this.getOptimizationResult(context, yesterday);
//查昨日日累计发电 //查昨日日累计发电
Map<String, BigDecimal> dailyUpdatePowerMap = this.getDailyUpdatePowerMap(context, yesterday); Map<String, BigDecimal> dailyUpdatePowerMap = this.getDailyUpdatePowerMap(context, yesterday);
//查去年同期用电趋势
Map<String, List<LineDailyElectricityTrendEnt>> lastElectricityTrendMap = this.getLastElectricityTrendMap(context, yesterday);
//遍历大的 //遍历大的
for (String stationName : powerMap.keySet()) { for (String stationName : powerMap.keySet()) {
...@@ -65,6 +70,28 @@ public class DailyElectricityTrendCloudServiceImpl extends SpaceOptimizeBaseServ ...@@ -65,6 +70,28 @@ public class DailyElectricityTrendCloudServiceImpl extends SpaceOptimizeBaseServ
/*------------------------------------- private -------------------------------------*/ /*------------------------------------- private -------------------------------------*/
/**
* 获取同期用电趋势信息
*
* @param context 上下文
* @param createDate 创建日期
* @return {@link Map }<{@link String }, {@link List }<{@link LineDailyElectricityTrendEnt }>>
*/
private Map<String, List<LineDailyElectricityTrendEnt>> getLastElectricityTrendMap(XContext context, Date createDate) {
LineDailyElectricityTrendMapper mapper = context.getBean(LineDailyElectricityTrendMapper.class);
List<LineDailyElectricityTrendEnt> list = mapper.selectList(new LambdaQueryWrapper<LineDailyElectricityTrendEnt>()
.apply("DATE( create_date ) = {0}", DateUtil.offset(createDate, DateField.YEAR, -1))
);
Map<String, List<LineDailyElectricityTrendEnt>> collect;
if (CollUtil.isEmpty(list)) {
collect = Collections.emptyMap();
} else {
collect = list.stream()
.collect(Collectors.groupingBy(LineDailyElectricityTrendEnt::getStationName));
}
return collect;
}
/** /**
* 查询每日井场日累计数据 * 查询每日井场日累计数据
* *
......
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