Commit 8270ae72 authored by ZWT's avatar ZWT

feat(能源管理系统): 测试问题修复

1.修改基础信息配置--井口配置模块,新增/修改接口,增加井口编号重复校验及必填项校验逻辑;
2.修改基础信息配置--井口配置模块,修改接口,解决部分字段丢失导致数据未更新问题;
3.修改基础信息配置--柴发设备配置模块,新增/修改接口,增加出场编号重复校验及必填项校验逻辑;
4.修改基础信息配置--储能设备配置模块,新增/修改接口,增加出场编号重复校验及必填项校验逻辑;
5.修改基础信息配置--光伏电站配置模块,新增/修改接口,增加出场编号重复校验及必填项校验逻辑;
6.修改基础信息配置--间开制度管理模块,设为基础制度/重新优化接口,增加业务逻辑初始化校准周期;
7.修改间开制度管理--定期校准模块重新优化接口,解决离网型线路优化时间超过一天问题;
8.修改系统管理Cloud模块,查询子集组织列表接口,增加查询逻辑,解决查询出重复数据问题;
9.修改间开制度管理--定期校准模块重新优化接口,解决离网型线路优化跨月导致数据异常问题;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 6898cecd
...@@ -122,7 +122,7 @@ public class BaseUtils { ...@@ -122,7 +122,7 @@ public class BaseUtils {
StringBuilder stringBuilder = new StringBuilder(); StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append(DateUtil.format(date, BusinessConstant.DATE_FORMAT_DAY_C)) stringBuilder.append(DateUtil.format(date, BusinessConstant.DATE_FORMAT_DAY_C))
.append('-') .append('-')
.append(DateUtil.format(DateUtil.offsetDay(date, offset), BusinessConstant.DATE_FORMAT_DAY_C)); .append(DateUtil.format(DateUtil.offsetDay(date, offset - 1), BusinessConstant.DATE_FORMAT_DAY_C));
return stringBuilder.toString(); return stringBuilder.toString();
} }
......
...@@ -356,7 +356,7 @@ public class SpaceCalibrationService { ...@@ -356,7 +356,7 @@ public class SpaceCalibrationService {
historyView.setLineId(lineId); historyView.setLineId(lineId);
historyView.setInstitutionId(institutionId); historyView.setInstitutionId(institutionId);
historyView.setExecutionCycle(BaseUtils.getExecutionCycleForCalibration(date, dayNumber)); historyView.setExecutionCycle(BaseUtils.getExecutionCycleForCalibration(date, dayNumber));
historyView.setCalibrationDate(DateUtil.beginOfDay(DateUtil.offsetDay(date, dayNumber + 1))); historyView.setCalibrationDate(DateUtil.beginOfDay(DateUtil.offsetDay(date, dayNumber)));
historyViewList.add(historyView); historyViewList.add(historyView);
} }
} }
\ No newline at end of file
...@@ -191,16 +191,6 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService { ...@@ -191,16 +191,6 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
.map(SpaceInstitutionWellheadEnt::getWellheadId) .map(SpaceInstitutionWellheadEnt::getWellheadId)
.collect(Collectors.toList())); .collect(Collectors.toList()));
} }
// List<DynamicQueryBasePowerLineWellheadViewOutput> powerLineWellheadList = this.getPowerLineWellheadList(context, wellheadInput);
// if (CollUtil.isNotEmpty(powerLineWellheadList)) {
// powerLineWellheadList.forEach(wellhead -> {
// SpaceInstitutionWellheadEnt ent = new SpaceInstitutionWellheadEnt();
// ent.setWellheadId(wellhead.getWellheadId());
// ent.setWellNumber(wellhead.getWellNumber());
// ent.setRunTypeKey(wellhead.getRunTypeKey());
// wellheadEntList.add(ent);
// });
// }
if (CollUtil.isNotEmpty(wellheadEntList)) { if (CollUtil.isNotEmpty(wellheadEntList)) {
List<GetSpaceInstitutionWellheadViewOutput> wellheadViewOutputs = XCopyUtils.copyNewList(wellheadEntList, GetSpaceInstitutionWellheadViewOutput.class); List<GetSpaceInstitutionWellheadViewOutput> wellheadViewOutputs = XCopyUtils.copyNewList(wellheadEntList, GetSpaceInstitutionWellheadViewOutput.class);
Map<String, String> runTypeMap = ServiceUtil.getDictMap(context, BusinessConstant.RUN_TYPE); Map<String, String> runTypeMap = ServiceUtil.getDictMap(context, BusinessConstant.RUN_TYPE);
...@@ -644,7 +634,7 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService { ...@@ -644,7 +634,7 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
historyEnt.setLineId(detail.getLineId()); historyEnt.setLineId(detail.getLineId());
historyEnt.setInstitutionId(detail.getId()); historyEnt.setInstitutionId(detail.getId());
historyEnt.setExecutionCycle(BaseUtils.getExecutionCycleForCalibration(date, dayNumber)); historyEnt.setExecutionCycle(BaseUtils.getExecutionCycleForCalibration(date, dayNumber));
historyEnt.setCalibrationDate(DateUtil.beginOfDay(DateUtil.offsetDay(date, dayNumber + 1))); historyEnt.setCalibrationDate(DateUtil.beginOfDay(DateUtil.offsetDay(date, dayNumber)));
return historyEnt; return historyEnt;
} }
......
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