diff --git a/basic-pojo/src/main/java/ink/wgink/pojo/bos/LoginUser.java b/basic-pojo/src/main/java/ink/wgink/pojo/bos/LoginUser.java index 32095140..43edd5bf 100644 --- a/basic-pojo/src/main/java/ink/wgink/pojo/bos/LoginUser.java +++ b/basic-pojo/src/main/java/ink/wgink/pojo/bos/LoginUser.java @@ -7,6 +7,7 @@ import ink.wgink.pojo.pos.RolePO; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.User; +import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -38,6 +39,10 @@ public class LoginUser extends User { private String groupIdAndNamesValue; private String departmentIdAndNamesValue; private String positionIdAndNamesValue; + /** + * 拓展数据,用于自定义登录用户所拥有的权限加载 + */ + private Object expandData; public LoginUser() { super("", "", null); @@ -235,27 +240,56 @@ public class LoginUser extends User { return positionIdAndNamesValue == null ? "" : positionIdAndNamesValue.trim(); } + public Object getExpandData() { + return expandData; + } + + public void setExpandData(Object expandData) { + this.expandData = expandData; + } + @Override public String toString() { - return "UserBO{" + - "userId='" + userId + '\'' + - ", userName='" + userName + '\'' + - ", userPhone='" + userPhone + '\'' + - ", userAvatar='" + userAvatar + '\'' + - ", userEmail='" + userEmail + '\'' + - ", userUKey='" + userUKey + '\'' + - ", loginType=" + loginType + - ", dataAuthority='" + dataRight + '\'' + - ", baseDepartmentIds=" + baseDepartmentIds + - ", dataAuthorityUserIds=" + dataRightUserIds + - ", roles=" + roles + - ", groups=" + groups + - ", departments=" + departments + - ", positions=" + positions + - ", roleIdAndNamesValue='" + roleIdAndNamesValue + '\'' + - ", groupIdAndNamesValue='" + groupIdAndNamesValue + '\'' + - ", departmentIdAndNamesValue='" + departmentIdAndNamesValue + '\'' + - ", positionIdAndNamesValue='" + positionIdAndNamesValue + '\'' + - '}'; + final StringBuilder sb = new StringBuilder("{"); + sb.append("\"userId\":\"") + .append(userId).append('\"'); + sb.append(",\"userName\":\"") + .append(userName).append('\"'); + sb.append(",\"userPhone\":\"") + .append(userPhone).append('\"'); + sb.append(",\"userAvatar\":\"") + .append(userAvatar).append('\"'); + sb.append(",\"userEmail\":\"") + .append(userEmail).append('\"'); + sb.append(",\"userUKey\":\"") + .append(userUKey).append('\"'); + sb.append(",\"loginType\":") + .append(loginType); + sb.append(",\"dataRight\":\"") + .append(dataRight).append('\"'); + sb.append(",\"baseDepartmentIds\":") + .append(baseDepartmentIds); + sb.append(",\"dataRightUserIds\":") + .append(dataRightUserIds); + sb.append(",\"roles\":") + .append(roles); + sb.append(",\"groups\":") + .append(groups); + sb.append(",\"departments\":") + .append(departments); + sb.append(",\"positions\":") + .append(positions); + sb.append(",\"roleIdAndNamesValue\":\"") + .append(roleIdAndNamesValue).append('\"'); + sb.append(",\"groupIdAndNamesValue\":\"") + .append(groupIdAndNamesValue).append('\"'); + sb.append(",\"departmentIdAndNamesValue\":\"") + .append(departmentIdAndNamesValue).append('\"'); + sb.append(",\"positionIdAndNamesValue\":\"") + .append(positionIdAndNamesValue).append('\"'); + sb.append(",\"expandData\":") + .append(expandData); + sb.append('}'); + return sb.toString(); } } diff --git a/basic-pojo/src/main/java/ink/wgink/pojo/bos/UserInfoBO.java b/basic-pojo/src/main/java/ink/wgink/pojo/bos/UserInfoBO.java index d5defeb4..0870c688 100644 --- a/basic-pojo/src/main/java/ink/wgink/pojo/bos/UserInfoBO.java +++ b/basic-pojo/src/main/java/ink/wgink/pojo/bos/UserInfoBO.java @@ -34,6 +34,7 @@ public class UserInfoBO { private String groupIdAndNamesValue; private String departmentIdAndNamesValue; private String positionIdAndNamesValue; + private Object expandData; public String getUserId() { return userId == null ? "" : userId.trim(); @@ -211,26 +212,54 @@ public class UserInfoBO { return positionIdAndNamesValue == null ? "" : positionIdAndNamesValue.trim(); } + public Object getExpandData() { + return expandData; + } + + public void setExpandData(Object expandData) { + this.expandData = expandData; + } + @Override public String toString() { - return "UserInfoBO{" + - "userId='" + userId + '\'' + - ", userUsername='" + userUsername + '\'' + - ", userName='" + userName + '\'' + - ", userPhone='" + userPhone + '\'' + - ", userAvatar='" + userAvatar + '\'' + - ", userEmail='" + userEmail + '\'' + - ", dataAuthority='" + dataRight + '\'' + - ", dataAuthorityUserIds=" + dataUserIds + - ", baseDepartmentIds=" + rootDepartmentIds + - ", departments=" + departments + - ", roles=" + roles + - ", groups=" + groups + - ", positions=" + positions + - ", roleIdAndNamesValue='" + roleIdAndNamesValue + '\'' + - ", groupIdAndNamesValue='" + groupIdAndNamesValue + '\'' + - ", departmentIdAndNamesValue='" + departmentIdAndNamesValue + '\'' + - ", positionIdAndNamesValue='" + positionIdAndNamesValue + '\'' + - '}'; + final StringBuilder sb = new StringBuilder("{"); + sb.append("\"userId\":\"") + .append(userId).append('\"'); + sb.append(",\"userUsername\":\"") + .append(userUsername).append('\"'); + sb.append(",\"userName\":\"") + .append(userName).append('\"'); + sb.append(",\"userPhone\":\"") + .append(userPhone).append('\"'); + sb.append(",\"userAvatar\":\"") + .append(userAvatar).append('\"'); + sb.append(",\"userEmail\":\"") + .append(userEmail).append('\"'); + sb.append(",\"dataRight\":\"") + .append(dataRight).append('\"'); + sb.append(",\"dataUserIds\":") + .append(dataUserIds); + sb.append(",\"rootDepartmentIds\":") + .append(rootDepartmentIds); + sb.append(",\"departments\":") + .append(departments); + sb.append(",\"roles\":") + .append(roles); + sb.append(",\"groups\":") + .append(groups); + sb.append(",\"positions\":") + .append(positions); + sb.append(",\"roleIdAndNamesValue\":\"") + .append(roleIdAndNamesValue).append('\"'); + sb.append(",\"groupIdAndNamesValue\":\"") + .append(groupIdAndNamesValue).append('\"'); + sb.append(",\"departmentIdAndNamesValue\":\"") + .append(departmentIdAndNamesValue).append('\"'); + sb.append(",\"positionIdAndNamesValue\":\"") + .append(positionIdAndNamesValue).append('\"'); + sb.append(",\"expandData\":") + .append(expandData); + sb.append('}'); + return sb.toString(); } }