Commit 8d430a99 authored by ZWT's avatar ZWT

feat(能源管理系统): 基础信息配置

1.修改基础信息配置--输电线路配置模块查询井口列表接口,增加返回结果参数,修改查询逻辑,完成接口冒烟测试同时修改接口文档;
2.修改基础信息配置模块业务工具类,增加匹配查询字典名称方法;
3.修改基础信息配置模块业务工具类,增加匹配查询地区名称方法;
4.修改基础信息配置模块业务工具类,增加匹配查询组织名称方法;
5.修改基础信息配置--市电峰谷配置模块详情接口,增加时段类型值返回结果字段;
6.修改基础信息配置--市电峰谷配置模块表结构字段类型,同时更新相应代码,修改部分接口业务处理逻辑,重新完成接口冒烟测试;
7.修改基础信息配置--输电线路配置模块表结构字段类型,同时更新相应代码,修改部分接口业务处理逻辑,重新完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 00642993
...@@ -35,6 +35,7 @@ import xstartup.feature.api.annotation.XApiGet; ...@@ -35,6 +35,7 @@ import xstartup.feature.api.annotation.XApiGet;
import xstartup.feature.api.annotation.XApiPost; import xstartup.feature.api.annotation.XApiPost;
import xstartup.helper.XTransactionHelper; import xstartup.helper.XTransactionHelper;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
...@@ -159,6 +160,8 @@ public class BasePowerLineService { ...@@ -159,6 +160,8 @@ public class BasePowerLineService {
.build()); .build());
if (CollUtil.isNotEmpty(wellheadViewList)) { if (CollUtil.isNotEmpty(wellheadViewList)) {
output.setWellheadInputs(XCopyUtils.copyNewList(wellheadViewList, GetBasePowerLineWellheadViewOutput.class)); output.setWellheadInputs(XCopyUtils.copyNewList(wellheadViewList, GetBasePowerLineWellheadViewOutput.class));
} else {
output.setWellheadInputs(new ArrayList<>(0));
} }
//设置关联光伏 //设置关联光伏
BasePowerLinePlantViewMapper plantViewMapper = context.getBean(BasePowerLinePlantViewMapper.class); BasePowerLinePlantViewMapper plantViewMapper = context.getBean(BasePowerLinePlantViewMapper.class);
...@@ -167,6 +170,8 @@ public class BasePowerLineService { ...@@ -167,6 +170,8 @@ public class BasePowerLineService {
.build()); .build());
if (CollUtil.isNotEmpty(plantViewList)) { if (CollUtil.isNotEmpty(plantViewList)) {
output.setPlantInputs(XCopyUtils.copyNewList(plantViewList, GetBasePowerLinePlantViewOutput.class)); output.setPlantInputs(XCopyUtils.copyNewList(plantViewList, GetBasePowerLinePlantViewOutput.class));
} else {
output.setPlantInputs(new ArrayList<>(0));
} }
//设置关联储能 //设置关联储能
BasePowerLineStorageViewMapper storageViewMapper = context.getBean(BasePowerLineStorageViewMapper.class); BasePowerLineStorageViewMapper storageViewMapper = context.getBean(BasePowerLineStorageViewMapper.class);
...@@ -175,6 +180,8 @@ public class BasePowerLineService { ...@@ -175,6 +180,8 @@ public class BasePowerLineService {
.build()); .build());
if (CollUtil.isNotEmpty(storageViewList)) { if (CollUtil.isNotEmpty(storageViewList)) {
output.setStorageInputs(XCopyUtils.copyNewList(storageViewList, GetBasePowerLineStorageViewOutput.class)); output.setStorageInputs(XCopyUtils.copyNewList(storageViewList, GetBasePowerLineStorageViewOutput.class));
} else {
output.setStorageInputs(new ArrayList<>(0));
} }
//设置关联柴发 //设置关联柴发
BasePowerLineDieselViewMapper dieselViewMapper = context.getBean(BasePowerLineDieselViewMapper.class); BasePowerLineDieselViewMapper dieselViewMapper = context.getBean(BasePowerLineDieselViewMapper.class);
...@@ -183,6 +190,8 @@ public class BasePowerLineService { ...@@ -183,6 +190,8 @@ public class BasePowerLineService {
.build()); .build());
if (CollUtil.isNotEmpty(dieselViewList)) { if (CollUtil.isNotEmpty(dieselViewList)) {
output.setDieselInputs(XCopyUtils.copyNewList(dieselViewList, GetBasePowerLineDieselViewOutput.class)); output.setDieselInputs(XCopyUtils.copyNewList(dieselViewList, GetBasePowerLineDieselViewOutput.class));
} else {
output.setDieselInputs(new ArrayList<>(0));
} }
List<QuerySysDictionaryViewOutput> gridTypeList = DictUtils.getDictList(context, DictTypeConstant.GRID_TYPE); List<QuerySysDictionaryViewOutput> gridTypeList = DictUtils.getDictList(context, DictTypeConstant.GRID_TYPE);
List<QuerySysDictionaryViewOutput> lineTypeList = DictUtils.getDictList(context, DictTypeConstant.LINE_TYPE); List<QuerySysDictionaryViewOutput> lineTypeList = DictUtils.getDictList(context, DictTypeConstant.LINE_TYPE);
......
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