Commit 001a90d8 authored by ZWT's avatar ZWT

feat(吉林演示): 松原

1.天气数据接收定时任务,解决代码扫描问题,修改文件读取相关代码,解决资源未关流问题;
2.修改登录验证码生成工具类,解决代码扫描问题,修复随机数不安全问题;
3.删除除主程序启动类外其他启动类模块,解决代码扫描问题;
4.删除自定义httputlis类,解决代码扫描问题,替换部分代码远程调用方法;
5.重构光伏预测模块下载电站实际发电数据导入模板接口,解决代码扫描问题;
6.重构光伏预测模块导入电站实际发电数据接口,解决代码扫描问题;
7.删除公用excel导入导出工具类及poi相关pom依赖,解决代码扫描问题;
8.光伏功率预测模块,增加查询线路列表接口,解决页面接口报错问题;
9.增加测试用历史数据导入接口;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent 88b46332
......@@ -808,6 +808,9 @@ public class BaseWeatherCloudServiceImpl implements IBaseWeatherCloudService {
int count = 0;
for (JSONObject jsonObject : jsonObjectList) {
this.dataFractionation(jsonObject, plantMap, deleteList, batchList);
if (CollUtil.isEmpty(batchList)) {
continue;
}
if (count == 0) {
batchList.sort(Comparator.comparing(PlantPredictedPowerDataEnt::getDataDate));
create = DateUtil.offsetMinute(DateUtil.parse(batchList.get(0).getDataDate()), -5);
......@@ -1142,7 +1145,7 @@ public class BaseWeatherCloudServiceImpl implements IBaseWeatherCloudService {
private BigDecimal getPrecipitation(List<String> stringList, int i) {
BigDecimal result;
if (CollUtil.isNotEmpty(stringList) && i < stringList.size() &&
CharSequenceUtil.isNotBlank(stringList.get(i)) && CharSequenceUtil.equals(stringList.get(i), "无降水")) {
CharSequenceUtil.isNotBlank(stringList.get(i)) && !CharSequenceUtil.equals(stringList.get(i), "无降水")) {
result = new BigDecimal(CharSequenceUtil.replace(stringList.get(i), "mm", ""));
} else {
result = BigDecimal.ZERO;
......
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