Commit 28055cfe authored by ZWT's avatar ZWT

feat(零碳): 长庆

1.添加easy excel配置,增加转换器,增加全局excel导出样式,增加场站下拉选解析器;
2.开发光伏电站模板导出接口,增加模板导出类,并完成接口冒烟测试及接口文档;
3.间开制度管理模块新增设为基础制度开关接口,添加线上接口文档并完成接口冒烟测试;

BREAKING CHANGE: 无

Closes 无

[skip ci]
parent a3c6615a
package pps.core.system.service; package pps.core.system.service;
import cn.hutool.core.text.CharSequenceUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
...@@ -50,6 +51,7 @@ import java.util.stream.Collectors; ...@@ -50,6 +51,7 @@ import java.util.stream.Collectors;
import static pps.core.common.constant.LoginConstant.LOGIN_FLAG_SIMULATE; import static pps.core.common.constant.LoginConstant.LOGIN_FLAG_SIMULATE;
import static pps.core.common.constant.LoginConstant.LOGIN_FLAG_TRADE; import static pps.core.common.constant.LoginConstant.LOGIN_FLAG_TRADE;
import static pps.core.system.error.LoginError.NotExistUserName; import static pps.core.system.error.LoginError.NotExistUserName;
import static pps.core.system.error.LoginError.Trade_IpWhiteError;
@XService @XService
public class LoginService { public class LoginService {
...@@ -235,12 +237,14 @@ public class LoginService { ...@@ -235,12 +237,14 @@ public class LoginService {
*/ */
@XText("模拟用户登陆") @XText("模拟用户登陆")
@XApiGet(anonymous = true) @XApiGet(anonymous = true)
public XSingleResult<LoginBySimulateOutput> loginBySimulate(XContext context, LoginBySimulateInput input) { public XSingleResult<LoginBySimulateOutput> thirdToken(XContext context, LoginBySimulateInput input) {
String loginName = input.getLoginName(); if (!CharSequenceUtil.equals(input.getAuthKey(), "66b500fcaff049dca77f66733d9bb172")) {
return XSingleResult.error(context, Trade_IpWhiteError);
}
SysUserMapper mapper = context.getBean(SysUserMapper.class); SysUserMapper mapper = context.getBean(SysUserMapper.class);
SysUserEnt sysUserEnt = mapper.selectOne( SysUserEnt sysUserEnt = mapper.selectOne(
new LambdaQueryWrapper<SysUserEnt>() new LambdaQueryWrapper<SysUserEnt>()
.eq(SysUserEnt::getLoginName, loginName) .eq(SysUserEnt::getLoginName, "cqyanshi")
); );
if (ObjectUtil.isNull(sysUserEnt)) { if (ObjectUtil.isNull(sysUserEnt)) {
return XSingleResult.error(context, NotExistUserName); return XSingleResult.error(context, NotExistUserName);
...@@ -252,7 +256,7 @@ public class LoginService { ...@@ -252,7 +256,7 @@ public class LoginService {
new Long[]{1L, 1L}, new Long[]{1L, 1L},
IdWorker.getId(), IdWorker.getId(),
sysUserEnt.getId(), sysUserEnt.getId(),
loginName, "cqyanshi",
sysUserEnt.getUserName(), sysUserEnt.getUserName(),
new XSsoAuth(XUuidUtils.randomUUID(), null, null)) new XSsoAuth(XUuidUtils.randomUUID(), null, null))
, expiresIn); , expiresIn);
...@@ -398,7 +402,7 @@ public class LoginService { ...@@ -398,7 +402,7 @@ public class LoginService {
String clientIp = context.getWebRequest().getClientIp(); String clientIp = context.getWebRequest().getClientIp();
String ipWhiteValue = LoginConfig.ipWhite.findValue(context); String ipWhiteValue = LoginConfig.ipWhite.findValue(context);
if (StringUtils.isNotBlank(ipWhiteValue) && !ipWhiteValue.contains(clientIp)) { if (StringUtils.isNotBlank(ipWhiteValue) && !ipWhiteValue.contains(clientIp)) {
return XSingleResult.error(context, LoginError.Trade_IpWhiteError); return XSingleResult.error(context, Trade_IpWhiteError);
} }
} }
String loginParam = input.getLoginParam(); String loginParam = input.getLoginParam();
......
package pps.core.system.service.data.sys_login; package pps.core.system.service.data.sys_login;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import lombok.Data;
import xstartup.annotation.XText; import xstartup.annotation.XText;
/**
* 模拟登录
*
* @author ZWT
* @date 2024/05/08
*/
@Data
public class LoginBySimulateInput { public class LoginBySimulateInput {
@XText("账号")
@NotBlank
private String loginName;
public String getLoginName() { @XText("认证key")
return loginName; @NotBlank(message = "缺少认证key")
} private String authKey;
public void setLoginName(String loginName) {
this.loginName = loginName;
}
} }
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