登录用户添加拓展数据

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{" +
+        final StringBuilder sb = new StringBuilder("{");
-                "userId='" + userId + '\'' +
+        sb.append("\"userId\":\"")
-                ", userName='" + userName + '\'' +
+                .append(userId).append('\"');
-                ", userPhone='" + userPhone + '\'' +
+        sb.append(",\"userName\":\"")
-                ", userAvatar='" + userAvatar + '\'' +
+                .append(userName).append('\"');
-                ", userEmail='" + userEmail + '\'' +
+        sb.append(",\"userPhone\":\"")
-                ", userUKey='" + userUKey + '\'' +
+                .append(userPhone).append('\"');
-                ", loginType=" + loginType +
+        sb.append(",\"userAvatar\":\"")
-                ", dataAuthority='" + dataRight + '\'' +
+                .append(userAvatar).append('\"');
-                ", baseDepartmentIds=" + baseDepartmentIds +
+        sb.append(",\"userEmail\":\"")
-                ", dataAuthorityUserIds=" + dataRightUserIds +
+                .append(userEmail).append('\"');
-                ", roles=" + roles +
+        sb.append(",\"userUKey\":\"")
-                ", groups=" + groups +
+                .append(userUKey).append('\"');
-                ", departments=" + departments +
+        sb.append(",\"loginType\":")
-                ", positions=" + positions +
+                .append(loginType);
-                ", roleIdAndNamesValue='" + roleIdAndNamesValue + '\'' +
+        sb.append(",\"dataRight\":\"")
-                ", groupIdAndNamesValue='" + groupIdAndNamesValue + '\'' +
+                .append(dataRight).append('\"');
-                ", departmentIdAndNamesValue='" + departmentIdAndNamesValue + '\'' +
+        sb.append(",\"baseDepartmentIds\":")
-                ", positionIdAndNamesValue='" + positionIdAndNamesValue + '\'' +
+                .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();
     }
 }

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{" +
+        final StringBuilder sb = new StringBuilder("{");
-                "userId='" + userId + '\'' +
+        sb.append("\"userId\":\"")
-                ", userUsername='" + userUsername + '\'' +
+                .append(userId).append('\"');
-                ", userName='" + userName + '\'' +
+        sb.append(",\"userUsername\":\"")
-                ", userPhone='" + userPhone + '\'' +
+                .append(userUsername).append('\"');
-                ", userAvatar='" + userAvatar + '\'' +
+        sb.append(",\"userName\":\"")
-                ", userEmail='" + userEmail + '\'' +
+                .append(userName).append('\"');
-                ", dataAuthority='" + dataRight + '\'' +
+        sb.append(",\"userPhone\":\"")
-                ", dataAuthorityUserIds=" + dataUserIds +
+                .append(userPhone).append('\"');
-                ", baseDepartmentIds=" + rootDepartmentIds +
+        sb.append(",\"userAvatar\":\"")
-                ", departments=" + departments +
+                .append(userAvatar).append('\"');
-                ", roles=" + roles +
+        sb.append(",\"userEmail\":\"")
-                ", groups=" + groups +
+                .append(userEmail).append('\"');
-                ", positions=" + positions +
+        sb.append(",\"dataRight\":\"")
-                ", roleIdAndNamesValue='" + roleIdAndNamesValue + '\'' +
+                .append(dataRight).append('\"');
-                ", groupIdAndNamesValue='" + groupIdAndNamesValue + '\'' +
+        sb.append(",\"dataUserIds\":")
-                ", departmentIdAndNamesValue='" + departmentIdAndNamesValue + '\'' +
+                .append(dataUserIds);
-                ", positionIdAndNamesValue='" + positionIdAndNamesValue + '\'' +
+        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();
     }
 }