Commit 94eb9fc4 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 a1703569
...@@ -27,7 +27,7 @@ public enum LoginError implements XError { ...@@ -27,7 +27,7 @@ public enum LoginError implements XError {
Trade_IpWhiteError(100205, "非法来源"), Trade_IpWhiteError(100205, "非法来源"),
Already_Exists_IAM(1008, "Iam登录账户已存在"), Already_Exists_IAM(1008, "Iam登录账户已存在"),
Missing_Pd(1009, "缺少必填项"), Missing_Pd(1009, "缺少必填项"),
Account_Already_Exists(1010, "Iam登录账户已存在"), Account_Already_Exists(1010, "登录账户已存在"),
; ;
private int code; private int code;
......
...@@ -152,7 +152,7 @@ public class SysUserService { ...@@ -152,7 +152,7 @@ public class SysUserService {
queryWrapper.lambda().eq(SysUserEnt::getLoginName, input.getLoginName()); queryWrapper.lambda().eq(SysUserEnt::getLoginName, input.getLoginName());
List<SysUserEnt> isExit = mapper.selectList(queryWrapper); List<SysUserEnt> isExit = mapper.selectList(queryWrapper);
if (CollUtil.isNotEmpty(isExit) && (isExit.size() > 1 || !CharSequenceUtil.equals(isExit.get(0).getId(), input.getId()))) { if (CollUtil.isNotEmpty(isExit) && (isExit.size() > 1 || !CharSequenceUtil.equals(isExit.get(0).getId(), input.getId()))) {
return XServiceResult.error(993, "登录账户已存在!"); return XServiceResult.error(context, LoginError.Account_Already_Exists);
} }
//查询是否存在有相同的Iam登录名,如果存在,提示错误信息 //查询是否存在有相同的Iam登录名,如果存在,提示错误信息
if (CharSequenceUtil.isNotBlank(input.getIamLoginName())) { if (CharSequenceUtil.isNotBlank(input.getIamLoginName())) {
...@@ -160,7 +160,7 @@ public class SysUserService { ...@@ -160,7 +160,7 @@ public class SysUserService {
queryWrapper.lambda().eq(SysUserEnt::getIamLoginName, input.getIamLoginName()); queryWrapper.lambda().eq(SysUserEnt::getIamLoginName, input.getIamLoginName());
List<SysUserEnt> isIamExit = mapper.selectList(queryWrapper); List<SysUserEnt> isIamExit = mapper.selectList(queryWrapper);
if (CollUtil.isNotEmpty(isIamExit) && (isIamExit.size() > 1 || !CharSequenceUtil.equals(isIamExit.get(0).getId(), input.getId()))) { if (CollUtil.isNotEmpty(isIamExit) && (isIamExit.size() > 1 || !CharSequenceUtil.equals(isIamExit.get(0).getId(), input.getId()))) {
return XServiceResult.error(993, "Iam登录账户已存在!"); return XServiceResult.error(context, LoginError.Already_Exists_IAM);
} }
} }
XCopyUtils.copyObject(input, entity); XCopyUtils.copyObject(input, entity);
...@@ -174,7 +174,6 @@ public class SysUserService { ...@@ -174,7 +174,6 @@ public class SysUserService {
entity.setModifyByName(session.getUserName()); entity.setModifyByName(session.getUserName());
} }
//加密敏感信息 //加密敏感信息
if (CharSequenceUtil.isNotBlank(input.getPhone()) && !CharSequenceUtil.contains(input.getPhone(), '*')) { if (CharSequenceUtil.isNotBlank(input.getPhone()) && !CharSequenceUtil.contains(input.getPhone(), '*')) {
entity.setPhone(UserInfoUtil.encrypt(input.getPhone())); entity.setPhone(UserInfoUtil.encrypt(input.getPhone()));
} else { } else {
......
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