Commit e8f65e16 authored by ZWT's avatar ZWT

feat(能源管理系统): 基础信息配置,间开制度管理

1.优化基础信息配置-柴发设备模块新增,修改,删除,查询接口,优化代码结构增加事务处理;
2.优化基础信息配置-储能设备模块新增,修改,删除,查询接口,优化代码结构增加事务处理;
3.优化基础信息配置-井口设备模块新增,修改,删除,查询接口,优化代码结构增加事务处理;
4.优化基础信息配置-光伏电站模块新增,修改,删除,查询接口,优化代码结构增加事务处理;
5.修改间开制度管理-长期间开优化模块详情接口,增加查询已优化时间周期逻辑,修改接口文档完成冒烟测试;
6.修改间开制度管理-中短期间开优化模块详情接口,增加查询已优化时间周期逻辑,修改接口文档完成冒烟测试;
7.修改间开制度管理业务操作工具类,增加通过开始时间和结束时间获取时间区间的方法;
8.添加业务异常枚举;
9.修改间开制度管理-长期间开优化模块详情接口,添加电网类型返回值,修改接口文档完成冒烟测试;
10.修改间开制度管理-中短期间开优化模块详情接口,添加电网类型返回值,修改接口文档完成冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 5426311b
...@@ -107,6 +107,7 @@ public class SpaceOptimizeLongPeriodService { ...@@ -107,6 +107,7 @@ public class SpaceOptimizeLongPeriodService {
.strategyMonth(String.valueOf(calendar.get(Calendar.MONTH) + 1)) .strategyMonth(String.valueOf(calendar.get(Calendar.MONTH) + 1))
.build())); .build()));
} }
output.setGridTypeKey(detailEnt.getGridTypeKey());
//查井口列表 //查井口列表
SpaceOptimizeLongWellheadMapper wellheadMapper = context.getBean(SpaceOptimizeLongWellheadMapper.class); SpaceOptimizeLongWellheadMapper wellheadMapper = context.getBean(SpaceOptimizeLongWellheadMapper.class);
List<SpaceOptimizeLongWellheadEnt> wellheadList = wellheadMapper.selectList(new LambdaQueryWrapper<SpaceOptimizeLongWellheadEnt>() List<SpaceOptimizeLongWellheadEnt> wellheadList = wellheadMapper.selectList(new LambdaQueryWrapper<SpaceOptimizeLongWellheadEnt>()
......
...@@ -107,6 +107,7 @@ public class SpaceOptimizeMidPeriodService { ...@@ -107,6 +107,7 @@ public class SpaceOptimizeMidPeriodService {
.strategyMonth(String.valueOf(calendar.get(Calendar.MONTH) + 1)) .strategyMonth(String.valueOf(calendar.get(Calendar.MONTH) + 1))
.build())); .build()));
} }
output.setGridTypeKey(detailEnt.getGridTypeKey());
//查井口列表 //查井口列表
SpaceOptimizeMidWellheadMapper wellheadMapper = context.getBean(SpaceOptimizeMidWellheadMapper.class); SpaceOptimizeMidWellheadMapper wellheadMapper = context.getBean(SpaceOptimizeMidWellheadMapper.class);
List<SpaceOptimizeMidWellheadEnt> wellheadList = wellheadMapper.selectList(new LambdaQueryWrapper<SpaceOptimizeMidWellheadEnt>() List<SpaceOptimizeMidWellheadEnt> wellheadList = wellheadMapper.selectList(new LambdaQueryWrapper<SpaceOptimizeMidWellheadEnt>()
......
...@@ -36,6 +36,12 @@ public class GetSpaceOptimizeLongPeriodViewOutput { ...@@ -36,6 +36,12 @@ public class GetSpaceOptimizeLongPeriodViewOutput {
@XText("优化截止日期") @XText("优化截止日期")
private Date optimizeDeadline; private Date optimizeDeadline;
/**
* 电网类型key
*/
@XText("电网类型key(字典获取)")
private String gridTypeKey;
/** /**
* 已优化日期列表 * 已优化日期列表
*/ */
......
...@@ -36,6 +36,12 @@ public class GetSpaceOptimizeMidPeriodViewOutput { ...@@ -36,6 +36,12 @@ public class GetSpaceOptimizeMidPeriodViewOutput {
@XText("优化截止日期") @XText("优化截止日期")
private Date optimizeDeadline; private Date optimizeDeadline;
/**
* 电网类型key
*/
@XText("电网类型key(字典获取)")
private String gridTypeKey;
/** /**
* 已优化日期列表 * 已优化日期列表
*/ */
......
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