Commit 5a3c123e 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 9874a6f8
package pps.core.base.service;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.text.CharSequenceUtil;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
......@@ -12,6 +11,7 @@ import pps.core.base.service.data.config_oil_field.GetProjectTitleOutput;
import pps.core.common.constant.BusinessConstant;
import xstartup.annotation.XService;
import xstartup.base.XContext;
import xstartup.base.XStartup;
import xstartup.data.XSingleResult;
import xstartup.feature.api.annotation.XApiGet;
......@@ -26,6 +26,8 @@ import java.util.List;
@XService
public class ConfigOilFieldService {
private static final String storeDir = XStartup.getCurrent().getProperty("home.image.path");
/**
* 获取当前配置
*
......@@ -39,30 +41,15 @@ public class ConfigOilFieldService {
.eq(ConfigOilFieldEnt::getIsEnable, BusinessConstant.ZERO)
.last(BusinessConstant.LAST_LIMIT)
);
String homePagePath, title;
if (ObjectUtil.isNull(ent)) {
homePagePath = "/403";
title = "零碳井场能量综合管控系统";
} else {
homePagePath = CharSequenceUtil.blankToDefault(ent.getHomePagePath(), "/403");
if (JSONUtil.isTypeJSONArray(ent.getProjectTitle())) {
List<GetProjectTitleOutput> list = JSONUtil.toList(ent.getProjectTitle(), GetProjectTitleOutput.class);
if (CollUtil.isEmpty(list)) {
title = "零碳井场能量综合管控系统";
} else {
title = list.stream()
.filter(t -> ObjectUtil.isNotNull(t.getSort()) && ObjectUtil.equals(0, t.getSort()) && CharSequenceUtil.isNotBlank(t.getTitle()))
.map(GetProjectTitleOutput::getTitle)
.findAny()
.orElse("零碳井场能量综合管控系统");
}
} else {
title = "零碳井场能量综合管控系统";
}
}
List<GetProjectTitleOutput> list = JSONUtil.toList(ent.getProjectTitle(), GetProjectTitleOutput.class);
GetProjectTitleOutput output = list.stream()
.filter(t -> ObjectUtil.isNotNull(t.getSort()) && ObjectUtil.equals(0, t.getSort()))
.findAny()
.orElse(new GetProjectTitleOutput());
return XSingleResult.success(GetConfigOilFieldOutput.builder()
.title(title)
.homePagePath(homePagePath)
.title(output.getTitle())
.homePagePath(ent.getHomePagePath())
.imagePath(storeDir + FileUtil.FILE_SEPARATOR + output.getImageRelativePath())
.build());
}
}
\ No newline at end of file
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