Commit 166717f5 authored by ZWT's avatar ZWT

feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 68020392
...@@ -76,8 +76,10 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService { ...@@ -76,8 +76,10 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
List<SpaceOptimizeWellheadDTO> wellheadDTOList = new ArrayList<>(64); List<SpaceOptimizeWellheadDTO> wellheadDTOList = new ArrayList<>(64);
List<SpaceOptimizeDurationDTO> durationDTOList = new ArrayList<>(128); List<SpaceOptimizeDurationDTO> durationDTOList = new ArrayList<>(128);
List<SpaceOptimizeDurationDTO> unOptimizeDurationList = new ArrayList<>(128); List<SpaceOptimizeDurationDTO> unOptimizeDurationList = new ArrayList<>(128);
//取当前时间
DateTime startDate = DateUtil.beginOfDay(DateTime.now());
//取生效中的基础间开 //取生效中的基础间开
List<SpaceInstitutionDetailEnt> detailEntList = this.getEffectiveSpaceInstitution(context, "2024-04-02"); List<SpaceInstitutionDetailEnt> detailEntList = this.getEffectiveSpaceInstitution(context, startDate.toString());
//取线路ID和制度ID //取线路ID和制度ID
List<String> lineIds = new ArrayList<>(32); List<String> lineIds = new ArrayList<>(32);
List<String> institutionIds = new ArrayList<>(32); List<String> institutionIds = new ArrayList<>(32);
...@@ -102,9 +104,9 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService { ...@@ -102,9 +104,9 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
.lineIds(lineIds) .lineIds(lineIds)
.build()); .build());
linePlantResult.throwIfFail(); linePlantResult.throwIfFail();
//取当前时间 //取优化截至日期
DateTime startDate = DateUtil.beginOfDay(DateTime.now());
DateTime optimizeDate = DateUtil.offsetDay(startDate, 1); DateTime optimizeDate = DateUtil.offsetDay(startDate, 1);
//取当前月
int month = startDate.monthBaseOne(); int month = startDate.monthBaseOne();
//查市电峰谷 //查市电峰谷
IBasePriceStrategyCloudService strategyCloudService = context.getBean(IBasePriceStrategyCloudService.class); IBasePriceStrategyCloudService strategyCloudService = context.getBean(IBasePriceStrategyCloudService.class);
...@@ -161,7 +163,7 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService { ...@@ -161,7 +163,7 @@ public class SpaceOptimizeShortPeriodService extends SpaceOptimizeBaseService {
.endTime(optimizeDate.toString(BusinessConstant.DATE_FORMAT_DAY)) .endTime(optimizeDate.toString(BusinessConstant.DATE_FORMAT_DAY))
.dateType(BusinessConstant.ONE) .dateType(BusinessConstant.ONE)
.build()); .build());
if (!CollUtil.isEmpty(powerList)) { if (CollUtil.isEmpty(powerList)) {
//没有预测数据都不优化 //没有预测数据都不优化
this.setUnOptimizeWellheadConfig(durationDTOList, unOptimizeDurationList, wellheadDTOList, this.setUnOptimizeWellheadConfig(durationDTOList, unOptimizeDurationList, wellheadDTOList,
spaceWellheadList, durationMap.get(detail.getId()), periodId, optimizeDate); spaceWellheadList, durationMap.get(detail.getId()), periodId, optimizeDate);
......
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