Commit e20b06f7 authored by ZWT's avatar ZWT

feat(零碳): 长庆

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

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 209fb706
......@@ -615,10 +615,36 @@ public class ExcelService {
throw new XServiceException("第[" + CollUtil.join(errorRowList, ",") + "]行,开始或结束时间输入错误!");
}
//按月份分组,按开井时间排序校验开关井时间
StringBuilder stringBuilder = new StringBuilder();
list.sort(Comparator.comparing(ExcelPriceStrategyTemplate::getStartTime));
Map<String, List<ExcelPriceStrategyTemplate>> collect = list.stream()
.collect(Collectors.groupingBy(ExcelPriceStrategyTemplate::getMonth));
Set<String> monthSet = collect.keySet();
for (String month : monthSet) {
List<ExcelPriceStrategyTemplate> templates = collect.get(month);
if (templates.size() > 1) {
ExcelPriceStrategyTemplate start = templates.get(0);
DateTime firstEnd = start.getEnd();
if (start.getStart().compareTo(firstEnd) >= 0) {
stringBuilder.append("第[").append(start.getRowNum()).append("]行,开始时间大于等于结束时间;");
}
for (int i = 1; i < templates.size(); i++) {
ExcelPriceStrategyTemplate end = templates.get(i);
DateTime secondStart = end.getStart();
DateTime secondEnd = end.getEnd();
if (secondStart.compareTo(secondEnd) >= 0) {
stringBuilder.append("第[").append(start.getRowNum()).append("]行,开始时间大于等于结束时间;");
} else if (firstEnd.compareTo(secondStart) != 0) {
stringBuilder.append("第[").append(start.getRowNum()).append("]行,结束时间和第[").append(end.getRowNum()).append("]行开始时间不连续;");
}
start = end;
firstEnd = secondEnd;
}
}
}
if (stringBuilder.length() > 0) {
throw new XServiceException(stringBuilder.toString());
}
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