Commit 83d3e4f9 authored by ZWT's avatar ZWT

feat(零碳): 长庆

1.修复登录页面登录接口验证码输入后不需要验证直接能登录的问题;
2.长庆演示,首页展示大屏功能修改,修改线路详情接口,增加查询日平均用电量逻辑,同时重构查询日产液量和日发电量逻辑,更新接口文档并完成接口冒烟测试,同时生成用例;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 28c42800
...@@ -126,8 +126,12 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService { ...@@ -126,8 +126,12 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
//初始化时间轴 //初始化时间轴
List<DateTime> rangeToList = DateUtil.rangeToList(DateUtil.offsetDay(BusinessConstant.DATE_FLAG, -1), BusinessConstant.DATE_FLAG, DateField.MINUTE, 15); List<DateTime> rangeToList = DateUtil.rangeToList(DateUtil.offsetDay(BusinessConstant.DATE_FLAG, -1), BusinessConstant.DATE_FLAG, DateField.MINUTE, 15);
//遍历 //遍历
List<DynamicQueryPlantPredictedPowerOutput> powerList;
List<GetBasePriceStrategyDetailOutput> strategyList;
List<SpaceInstitutionWellheadView> wellheadList;
for (SpaceInstitutionDetailEnt detail : detailEntList) { for (SpaceInstitutionDetailEnt detail : detailEntList) {
List<DynamicQueryPlantPredictedPowerOutput> powerList = this.getAveragePowerGenerationListByPlantIds(context, DynamicQueryPlantPredictedPowerInput.builder() //查预测光伏出力
powerList = this.getAveragePowerGenerationListByPlantIds(context, DynamicQueryPlantPredictedPowerInput.builder()
.plantIds(plantIdsMap.get(detail.getLineId())) .plantIds(plantIdsMap.get(detail.getLineId()))
.startTime(startDate.toString(BusinessConstant.DATE_FORMAT_DAY)) .startTime(startDate.toString(BusinessConstant.DATE_FORMAT_DAY))
.endTime(optimizeDate.toString(BusinessConstant.DATE_FORMAT_DAY)) .endTime(optimizeDate.toString(BusinessConstant.DATE_FORMAT_DAY))
...@@ -136,6 +140,11 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService { ...@@ -136,6 +140,11 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
if (CollUtil.isEmpty(powerList)) { if (CollUtil.isEmpty(powerList)) {
continue; continue;
} }
strategyList = strategyMap.get(lineMap.get(detail.getLineId()));
wellheadList = wellheadMap.get(detail.getId());
for (SpaceInstitutionWellheadView wellhead : wellheadList) {
}
} }
return XServiceResult.OK; return XServiceResult.OK;
} }
......
package pps.core.space.service.data;
import cn.hutool.core.date.DateTime;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
/**
* 间开优化权重
*
* @author ZWT
* @date 2024/04/11 15:40
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class SpaceOptimizeWeight {
/**
* 时间戳
*/
private DateTime timestamp;
/**
* 权重
*/
private BigDecimal weight;
/**
* 发电量
*/
private BigDecimal power;
/**
* 电量是否满足标识
*/
private Boolean batteryLowFlag;
}
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