Commit 8bce30d7 authored by ZWT's avatar ZWT

feat(零碳): 长庆

1.长庆演示首页功能开发,新增查询井场/场站列表接口,添加接口文档并完成接口冒烟测试;
2.长庆演示首页功能开发,新增总览信息统计接口,添加接口文档并完成接口冒烟测试;
3.长庆演示首页功能开发,新增用能分析统计接口,添加接口文档并完成接口冒烟测试;
4.长庆演示首页功能开发,新增累计用电统计接口,添加接口文档并完成接口冒烟测试;
5.长庆演示首页功能开发,新增光伏实时监控统计接口,添加接口文档并完成接口冒烟测试;
6.长庆演示首页功能开发,新增先导实验井间开制度统计接口,添加接口文档并完成接口冒烟测试;
7.长庆演示首页功能开发,新增零碳井场收益分析统计接口,添加接口文档并完成接口冒烟测试;
8.长庆演示首页功能开发,新增零碳井场实时监控接口,添加接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent f108e6be
......@@ -224,9 +224,7 @@ public class HomePageService {
@XApiGet
public XSingleResult<GetSumPowerConsumptionOutput> getSumPowerConsumption(XContext context, GetStationViewInput input) {
String stationId = input.getStationId();
DateTime startTime = DateUtil.beginOfDay(DateUtil.date());
DateTime beginTime = DateUtil.offsetDay(startTime, -7);
DateTime endTime = DateUtil.offsetDay(startTime, -1);
DateTime startTime = DateUtil.beginOfDay(DateUtil.yesterday());
List<GetStationPowerConsumption> stationList;
BigDecimal powerConsumption = BigDecimal.ZERO;
EnergyConsumptionAnalysisMapper mapper = context.getBean(EnergyConsumptionAnalysisMapper.class);
......@@ -245,7 +243,7 @@ public class HomePageService {
.select("IFNULL( SUM( power_consumption ), 0 ) AS power_consumption")
.lambda()
.in(EnergyConsumptionAnalysisEnt::getLineId, lineIdList)
.between(EnergyConsumptionAnalysisEnt::getDataDate, beginTime, endTime)
.eq(EnergyConsumptionAnalysisEnt::getDataDate, startTime)
);
stationList.add(GetStationPowerConsumption.builder()
.stationName(collect.get(entry.getKey()))
......@@ -259,7 +257,7 @@ public class HomePageService {
.select("IFNULL( SUM( power_consumption ), 0 ) AS power_consumption", "station_name")
.lambda()
.in(EnergyConsumptionAnalysisEnt::getLineId, lineIdList)
.between(EnergyConsumptionAnalysisEnt::getDataDate, beginTime, endTime)
.eq(EnergyConsumptionAnalysisEnt::getDataDate, startTime)
.groupBy(EnergyConsumptionAnalysisEnt::getStationName)
);
stationList = new ArrayList<>(list.size());
......
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