Commit cae8d91d 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 32f37567
......@@ -25,6 +25,9 @@ public enum LoginError implements XError {
Trade_ParamFormatError(100203, "参数格式有误"),
Trade_LoginError(100204, "账号信息有误"),
Trade_IpWhiteError(100205, "非法来源"),
Already_Exists_IAM(1008, "Iam登录账户已存在"),
Missing_Pd(1009, "缺少必填项"),
Account_Already_Exists(1010, "Iam登录账户已存在"),
;
private int code;
......
......@@ -12,6 +12,7 @@ import pps.core.common.constant.BusinessConstant;
import pps.core.common.session.PpsUserSession;
import pps.core.common.utils.BaseUtils;
import pps.core.system.entity.*;
import pps.core.system.error.LoginError;
import pps.core.system.mapper.*;
import pps.core.system.service.data.sys_user.*;
import pps.core.system.utils.UserInfoUtil;
......@@ -77,20 +78,20 @@ public class SysUserService {
List<SysUserEnt> isExit = mapper.selectList(new LambdaQueryWrapper<SysUserEnt>()
.eq(SysUserEnt::getLoginName, input.getLoginName()));
if (CollUtil.isNotEmpty(isExit)) {
return XServiceResult.error(993, "登录账户已存在!");
return XServiceResult.error(context, LoginError.Account_Already_Exists);
}
//查询是否存在有相同的Iam登录名,如果存在,提示错误信息
if (CharSequenceUtil.isNotBlank(input.getIamLoginName())) {
List<SysUserEnt> isIamExit = mapper.selectList(new LambdaQueryWrapper<SysUserEnt>()
.eq(SysUserEnt::getIamLoginName, input.getIamLoginName()));
if (CollUtil.isNotEmpty(isIamExit)) {
return XServiceResult.error(993, "Iam登录账户已存在!");
return XServiceResult.error(context, LoginError.Already_Exists_IAM);
}
}
SysUserEnt entity = new SysUserEnt();
XCopyUtils.copyObject(input, entity);
if (CharSequenceUtil.isNotBlank(input.getPassword())) {
return XServiceResult.error(993, "请输入密码!");
return XServiceResult.error(context, LoginError.Missing_Pd);
}
entity.setPassword(input.getPassword());
String uuid = BaseUtils.randomUUIDString();
......
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