Commit 268d4e06 authored by ZWT's avatar ZWT

feat(吉林演示): 松原

1.修改部分第三方数据处理定时任务,修改系统来源,将固定来源按环境区分改为动态获取;
2.修改统计分析-间开效果评价新页面累节电能接口,暂时无法获取电费信息,将电费信息默认做随机数处理;
3.修改统计分析-能耗分析新页面峰谷能耗对比分析接口,暂时无法获取电费信息,将电费信息默认做随机数处理;
4.吉林首页井场用能分析模块开放井场用能分析双坐标轴接口,备用;
5.修改首页光伏实时监控接口,解决选择查看部分采油厂接口报错提示异常问题;
6.修改统计分析能耗分析新页面今日昨日同期电量信息统计接口,增加添加默认值逻辑;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 9d03982b
......@@ -424,7 +424,7 @@ public class HomePageService {
* @return {@link XSingleResult}<{@link GetSumPowerConsumptionOutput}>
*/
@XText("首页模块--累积用电")
@XApiGet
@XApiGet(anonymous = true)
public XSingleResult<GetSumPowerConsumptionOutput> getSumPowerConsumption(XContext context, GetStationViewInput input) {
String stationId = input.getStationId();
DateTime startTime = DateUtil.beginOfDay(DateUtil.yesterday());
......@@ -458,20 +458,24 @@ public class HomePageService {
List<String> lineNameList = this.getBasePowerLineListByOuIdList(context, CollUtil.list(false, stationId)).stream()
.map(DynamicQueryBasePowerLineOutput::getLineName)
.collect(Collectors.toList());
List<EnergyConsumptionAnalysisEnt> list = mapper.selectList(new QueryWrapper<EnergyConsumptionAnalysisEnt>()
.select("IFNULL( SUM( power_consumption ), 0 ) AS power_consumption", "station_name")
.lambda()
.in(EnergyConsumptionAnalysisEnt::getStationName, lineNameList)
.eq(EnergyConsumptionAnalysisEnt::getDataDate, startTime)
.groupBy(EnergyConsumptionAnalysisEnt::getStationName)
);
stationList = new ArrayList<>(list.size());
for (EnergyConsumptionAnalysisEnt ent : list) {
stationList.add(GetStationPowerConsumption.builder()
.stationName(ent.getStationName())
.powerConsumption(ent.getPowerConsumption())
.build());
powerConsumption = powerConsumption.add(ent.getPowerConsumption());
if (CollUtil.isNotEmpty(lineNameList)) {
List<EnergyConsumptionAnalysisEnt> list = mapper.selectList(new QueryWrapper<EnergyConsumptionAnalysisEnt>()
.select("IFNULL( SUM( power_consumption ), 0 ) AS power_consumption", "station_name")
.lambda()
.in(EnergyConsumptionAnalysisEnt::getStationName, lineNameList)
.eq(EnergyConsumptionAnalysisEnt::getDataDate, startTime)
.groupBy(EnergyConsumptionAnalysisEnt::getStationName)
);
stationList = new ArrayList<>(list.size());
for (EnergyConsumptionAnalysisEnt ent : list) {
stationList.add(GetStationPowerConsumption.builder()
.stationName(ent.getStationName())
.powerConsumption(ent.getPowerConsumption())
.build());
powerConsumption = powerConsumption.add(ent.getPowerConsumption());
}
} else {
stationList = Collections.emptyList();
}
}
return XSingleResult.success(GetSumPowerConsumptionOutput.builder()
......
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