From a0673be74640bd06139f799448fec6e47ff942fc Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Mon, 17 Feb 2025 16:54:03 +0800 Subject: [PATCH] sql --- .../com/bonus/system/api/domain/SysRole.java | 3 ++ .../com/bonus/system/api/domain/SysUser.java | 19 ++++++- .../auth/controller/TokenController.java | 8 +-- .../common/security/service/TokenService.java | 52 +++++++++---------- .../resources/mapper/system/SysUserMapper.xml | 3 +- 5 files changed, 50 insertions(+), 35 deletions(-) diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java index 83570b2..8df3a4d 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java @@ -4,6 +4,8 @@ import java.util.Set; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; + +import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.bonus.common.core.annotation.Excel; @@ -25,6 +27,7 @@ public class SysRole extends BaseEntity /** 角色ID */ @Excel(name = "角色序号", cellType = ColumnType.NUMERIC) + @JsonFormat(shape = JsonFormat.Shape.STRING) private Long roleId; /** 角色名称 */ diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java index b4d190d..2ea9fa5 100644 --- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java +++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java @@ -46,9 +46,16 @@ public class SysUser extends BaseEntity { /** * 公司ID */ - @Excel(name = "公司编号", type = Type.IMPORT) + //@Excel(name = "公司编号", type = Type.IMPORT) + @JsonFormat(shape = JsonFormat.Shape.STRING) private Long companyId; + /** + * 区域id（源自送变电公司下面的管辖区域，可以用来划分数据范围） + */ + @JsonFormat(shape = JsonFormat.Shape.STRING) + private Long areaId; + /** * 用户账号 */ @@ -144,6 +151,7 @@ public class SysUser extends BaseEntity { /** * 角色ID */ + @JsonFormat(shape = JsonFormat.Shape.STRING) private Long roleId; /** @@ -166,6 +174,7 @@ public class SysUser extends BaseEntity { @ApiModelProperty("客户端人员id") @JsonFormat(shape = JsonFormat.Shape.STRING) private Long custId; + @ApiModelProperty("客户端人员编号") private String custNum; @@ -211,6 +220,14 @@ public class SysUser extends BaseEntity { this.companyId = companyId; } + public Long getAreaId() { + return areaId; + } + + public void setAreaId(Long areaId) { + this.areaId = areaId; + } + @Xss(message = "用户昵称不能包含脚本字符") @Size(min = 0, max = 200, message = "用户昵称长度不能超过200个字符") public String getNickName() { diff --git a/bonus-auth/src/main/java/com/bonus/auth/controller/TokenController.java b/bonus-auth/src/main/java/com/bonus/auth/controller/TokenController.java index d1eba2d..f355ec8 100644 --- a/bonus-auth/src/main/java/com/bonus/auth/controller/TokenController.java +++ b/bonus-auth/src/main/java/com/bonus/auth/controller/TokenController.java @@ -150,13 +150,7 @@ public class TokenController { LoginUser login = strategy.login(form.getUsername(), form.getPassword()); logService.saveLogin(form.getUsername(), "登录", "登录成功", null, "成功"); - if (LoginType.CUST_PHONE_PASSWORD.equals(form.getLoginType()) || LoginType.CUST_PHONE_OPT.equals(form.getLoginType())) { - Map map = tokenService.createCustToken(login); - login.setToken((String) map.get("access_token")); - login.setExpireIn((Long) map.get("expires_in")); - login.setLogin((boolean) map.get("isLogin")); - return R.ok(login); - } else if (LoginType.PHONE_PASSWORD.equals(form.getLoginType()) || LoginType.PHONE_OTP.equals(form.getLoginType())) { + if (LoginType.PHONE_PASSWORD.equals(form.getLoginType()) || LoginType.PHONE_OTP.equals(form.getLoginType())) { Map map = tokenService.createToken(login); login.setToken((String) map.get("access_token")); login.setExpireIn((Long) map.get("expires_in")); diff --git a/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/service/TokenService.java b/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/service/TokenService.java index 9994301..b522593 100644 --- a/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/service/TokenService.java +++ b/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/service/TokenService.java @@ -100,32 +100,32 @@ public class TokenService { /** * 创建客户令牌 */ - public Map createCustToken(LoginUser loginUser) { - // 检查并删除已有的token - delExistingToken(loginUser.getCustId()); - String token = IdUtils.fastUUID(); - Long custId = loginUser.getCustId(); - String phoneNumber = Sm4Utils.decrypt(loginUser.getSysUser().getPhonenumber()); - loginUser.setToken(token); - loginUser.setCustId(custId); - loginUser.setIpaddr(IpUtils.getIpAddr()); - loginUser.getSysUser().setPhonenumber(phoneNumber); - refreshToken(loginUser); - // Jwt存储信息 - Map claimsMap = new HashMap(16); - claimsMap.put(SecurityConstants.USER_KEY, token); - claimsMap.put(SecurityConstants.DETAILS_USER_ID, custId); - claimsMap.put(SecurityConstants.DETAILS_USERNAME, phoneNumber); - String accessToken = JwtUtils.createToken(claimsMap); - Map rspMap = new HashMap(16); - rspMap.put("access_token", accessToken); - rspMap.put("expires_in", EXPIRETIME); - rspMap.put("isLogin", isLogin(String.valueOf(custId))); - long tokenTime = getTokenTime(); - //对token进行存储 - redisService.setCacheObject(LOGIN_USER_KEY + custId, token, tokenTime, TimeUnit.MINUTES); - return rspMap; - } +// public Map createCustToken(LoginUser loginUser) { +// // 检查并删除已有的token +// delExistingToken(loginUser.getCustId()); +// String token = IdUtils.fastUUID(); +// Long custId = loginUser.getCustId(); +// String phoneNumber = Sm4Utils.decrypt(loginUser.getSysUser().getPhonenumber()); +// loginUser.setToken(token); +// loginUser.setCustId(custId); +// loginUser.setIpaddr(IpUtils.getIpAddr()); +// loginUser.getSysUser().setPhonenumber(phoneNumber); +// refreshToken(loginUser); +// // Jwt存储信息 +// Map claimsMap = new HashMap(16); +// claimsMap.put(SecurityConstants.USER_KEY, token); +// claimsMap.put(SecurityConstants.DETAILS_USER_ID, custId); +// claimsMap.put(SecurityConstants.DETAILS_USERNAME, phoneNumber); +// String accessToken = JwtUtils.createToken(claimsMap); +// Map rspMap = new HashMap(16); +// rspMap.put("access_token", accessToken); +// rspMap.put("expires_in", EXPIRETIME); +// rspMap.put("isLogin", isLogin(String.valueOf(custId))); +// long tokenTime = getTokenTime(); +// //对token进行存储 +// redisService.setCacheObject(LOGIN_USER_KEY + custId, token, tokenTime, TimeUnit.MINUTES); +// return rspMap; +// } public boolean isLogin(String userId) { String existingTokenKey = redisService.getCacheObject(LOGIN_USER_KEY + userId); diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml index 0948636..be5898d 100644 --- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -8,6 +8,7 @@ + @@ -32,7 +33,6 @@ - @@ -63,6 +63,7 @@ ELSE SUBSTRING_INDEX(SUBSTRING_INDEX(d.ancestors, ',', 2), ',', -1) END as company_id, + u.area_id, u.user_name, u.nick_name, u.email,