Skip to content

G
gf_back
Commit 2d8c9844 authored by ZWT's avatar ZWT
Browse files
Options

feat(零碳): 长庆 

1.系统管理模块,查询线路及组织机构树接口修改,增加查询逻辑,通过线路名称模糊查询树列表,完成接口冒烟测试并同步线上接口文档;
2.系统管理模块,查询光伏电站及组织机构树接口修改,增加查询逻辑,通过电站名称模糊查询树列表,完成接口冒烟测试并同步线上接口文档;
3.基础信息配置模块,新增市电峰谷导入模板下载接口,完成接口冒烟测试并同步线上接口文档;
4.基础信息配置模块,市电峰谷模板下载接口修改,增加多选月份导出配置数据逻辑,修改线上接口文档并完成接口冒烟测试;
5.基础信息配置模块,新增市电峰谷数据导入接口,增加导入数据校验逻辑,完成接口冒烟测试并添加线上接口文档;
6.基础间开配置模块,新增编辑制度模板导出接口,添加线上接口文档并完成接口冒烟测试;
7.基础间开配置模块,新增编制制度导入接口,添加线上接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 7acce0dc
Show whitespace changes
Inline Side-by-side
Showing with 16 additions and 28 deletions
C09-base/pps-core-base/src/main/java/pps/core/base/service/ExcelService.java
View file @ 2d8c9844
......@@ -352,17 +352,14 @@ public class ExcelService {
).stream()
.map(BasePhotovoltaicPlantEnt::getStationName)
.collect(Collectors.toSet());
StringBuilder stringBuilder = new StringBuilder();
List<Integer> errorRowList = new ArrayList<>(list.size());
List<BasePhotovoltaicPlantView> insertList = new ArrayList<>(list.size());
int rowNum = 2;
PpsUserSession session = context.getSession(PpsUserSession.class);
for (ExcelPhotovoltaicPlantTemplate ent : list) {
//检查名称是否重复
if (collect.contains(ent.getStationName())) {
if (0 == stringBuilder.length()) {
stringBuilder.append("数据导入成功: ");
}
stringBuilder.append("第").append(rowNum).append("行,[电站名称重复]");
errorRowList.add(rowNum);
} else {
//数据封装
BasePhotovoltaicPlantView build = BasePhotovoltaicPlantView.builder()
......@@ -389,8 +386,8 @@ public class ExcelService {
BasePhotovoltaicPlantViewMapper viewMapper = context.getBean(BasePhotovoltaicPlantViewMapper.class);
viewMapper.batchInsertList(insertList);
}
if (stringBuilder.length() > 0) {
return XServiceResult.error(-1, stringBuilder.toString());
if (CollUtil.isNotEmpty(errorRowList)) {
return XServiceResult.error(-1, "数据导入成功,第[" + CollUtil.join(errorRowList, ",") + "]行,电站已存在!");
}
return XServiceResult.OK;
});
......@@ -422,17 +419,14 @@ public class ExcelService {
).stream()
.map(BaseWellheadEnt::getWellNumber)
.collect(Collectors.toSet());
StringBuilder stringBuilder = new StringBuilder();
List<Integer> errorRowList = new ArrayList<>(list.size());
List<BaseWellheadView> insertList = new ArrayList<>(list.size());
int rowNum = 2;
PpsUserSession session = context.getSession(PpsUserSession.class);
for (ExcelWellheadTemplate ent : list) {
//检查名称是否重复
if (collect.contains(ent.getWellNumber())) {
if (0 == stringBuilder.length()) {
stringBuilder.append("数据导入成功: ");
}
stringBuilder.append("第").append(rowNum).append("行,[井号重复]");
errorRowList.add(rowNum);
} else {
//数据封装
BaseWellheadView build = BaseWellheadView.builder()
......@@ -454,8 +448,8 @@ public class ExcelService {
BaseWellheadViewMapper viewMapper = context.getBean(BaseWellheadViewMapper.class);
viewMapper.batchInsertList(insertList);
}
if (stringBuilder.length() > 0) {
return XServiceResult.error(-1, stringBuilder.toString());
if (CollUtil.isNotEmpty(errorRowList)) {
return XServiceResult.error(-1, "数据导入成功,第[" + CollUtil.join(errorRowList, ",") + "]行,井号已存在!");
}
return XServiceResult.OK;
});
......@@ -485,17 +479,14 @@ public class ExcelService {
).stream()
.map(BaseDieselGeneratorEnt::getDeviceName)
.collect(Collectors.toSet());
StringBuilder stringBuilder = new StringBuilder();
List<Integer> errorRowList = new ArrayList<>(list.size());
List<BaseDieselGeneratorView> insertList = new ArrayList<>(list.size());
int rowNum = 2;
PpsUserSession session = context.getSession(PpsUserSession.class);
for (ExcelDieselGeneratorTemplate ent : list) {
//检查名称是否重复
if (collect.contains(ent.getDeviceName())) {
if (0 == stringBuilder.length()) {
stringBuilder.append("数据导入成功: ");
}
stringBuilder.append("第").append(rowNum).append("行,[设备名称重复]");
errorRowList.add(rowNum);
} else {
//数据封装
BaseDieselGeneratorView build = BaseDieselGeneratorView.builder()
......@@ -517,8 +508,8 @@ public class ExcelService {
BaseDieselGeneratorViewMapper viewMapper = context.getBean(BaseDieselGeneratorViewMapper.class);
viewMapper.batchInsertList(insertList);
}
if (stringBuilder.length() > 0) {
return XServiceResult.error(-1, stringBuilder.toString());
if (CollUtil.isNotEmpty(errorRowList)) {
return XServiceResult.error(-1, "数据导入成功,第[" + CollUtil.join(errorRowList, ",") + "]行,设备名称已存在!");
}
return XServiceResult.OK;
});
......@@ -548,17 +539,14 @@ public class ExcelService {
).stream()
.map(BaseEnergyStorageDeviceEnt::getDeviceName)
.collect(Collectors.toSet());
StringBuilder stringBuilder = new StringBuilder();
List<Integer> errorRowList = new ArrayList<>(list.size());
List<BaseEnergyStorageDeviceView> insertList = new ArrayList<>(list.size());
int rowNum = 2;
PpsUserSession session = context.getSession(PpsUserSession.class);
for (ExcelEnergyStorageDeviceTemplate ent : list) {
//检查名称是否重复
if (collect.contains(ent.getDeviceName())) {
if (0 == stringBuilder.length()) {
stringBuilder.append("数据导入成功: ");
}
stringBuilder.append("第").append(rowNum).append("行,[设备名称重复]");
errorRowList.add(rowNum);
} else {
//数据封装
BaseEnergyStorageDeviceView build = BaseEnergyStorageDeviceView.builder()
......@@ -583,8 +571,8 @@ public class ExcelService {
BaseEnergyStorageDeviceViewMapper viewMapper = context.getBean(BaseEnergyStorageDeviceViewMapper.class);
viewMapper.batchInsertList(insertList);
}
if (stringBuilder.length() > 0) {
return XServiceResult.error(-1, stringBuilder.toString());
if (CollUtil.isNotEmpty(errorRowList)) {
return XServiceResult.error(-1, "数据导入成功,第[" + CollUtil.join(errorRowList, ",") + "]行,设备名称已存在!");
}
return XServiceResult.OK;
});
......
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