Commit 5d28912a authored by ZWT's avatar ZWT

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

1.修改基础信息配置--组织机构管理模块,通过组织机构ID查询下级组织机构及线路列表接口,增加查询线路类型逻辑,添加返回值,修改接口文档并完成接口冒烟测试;
2.修改基础信息配置--基础间开配置模块,设为基础制度接口,添加限制条件,不能优化结束日期在当天之前的数据;
3.修改间开制度管理--长期/中短期间开优化功能,添加通过线路ID查询线路下储能设备列表接口,修改离网型制度优化逻辑;
4.修改基础信息配置--基础间开配置模块设为基础间开/重新校准接口,修改离网型制度优化逻辑;
5.修改间开制度管理--长期/中短期/短期间开优化功能,相关井口记录表新增启动顺序字段,修改优化功能代码逻辑,添加启动顺序,相关详情接口增加按照启动顺序排序功能;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent adb11fd2
...@@ -339,6 +339,10 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService { ...@@ -339,6 +339,10 @@ public class SpaceInstitutionDetailService extends SpaceOptimizeBaseService {
@XApiPost @XApiPost
@XText("校准历史--重新优化") @XText("校准历史--重新优化")
public XServiceResult anewOptimizeInstitution(XContext context, UpdateSpaceInstitutionDetailInput input) { public XServiceResult anewOptimizeInstitution(XContext context, UpdateSpaceInstitutionDetailInput input) {
String historyId = input.getHistoryId();
if (StringUtils.isEmpty(historyId)) {
return XServiceResult.error(context, XError.NotFound);
}
PpsUserSession session = context.getSession(PpsUserSession.class); PpsUserSession session = context.getSession(PpsUserSession.class);
String institutionId = input.getId(); String institutionId = input.getId();
SpaceInstitutionDetailMapper mapper = context.getBean(SpaceInstitutionDetailMapper.class); SpaceInstitutionDetailMapper mapper = context.getBean(SpaceInstitutionDetailMapper.class);
......
...@@ -48,4 +48,10 @@ public class UpdateSpaceInstitutionDetailInput { ...@@ -48,4 +48,10 @@ public class UpdateSpaceInstitutionDetailInput {
*/ */
@XText("间开制度井口配置") @XText("间开制度井口配置")
List<UpdateSpaceInstitutionWellheadInput> wellheadList; List<UpdateSpaceInstitutionWellheadInput> wellheadList;
/**
* 校准历史ID
*/
@XText("校准历史ID")
private String historyId;
} }
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