登录人信息useType

simulation-oauth-server/src/main/java/com/css/simulation/oauth/server/cofiguration/oauth/MyUserAuthenticationConverter.java

@@ -20,6 +20,7 @@ public class MyUserAuthenticationConverter extends DefaultUserAuthenticationConv
         response.put("id", myUserDetails.getId());
         response.put("username", authentication.getName());
         response.put("roleCode", myUserDetails.getRoleCode());
+        response.put("useType", myUserDetails.getUseType());
         response.put("createUserId", myUserDetails.getCreateUserId());
         //2 用户权限信息
         if (authentication.getAuthorities() != null && !authentication.getAuthorities().isEmpty()) {

simulation-oauth-server/src/main/java/com/css/simulation/oauth/server/cofiguration/security/MyUserDetails.java

@@ -20,6 +20,7 @@ public class MyUserDetails implements UserDetails, Serializable {
     private String username;
     private String password;
     private String roleCode;
+    private String useType;       // 占用类型
     private String createUserId;
     private Set<GrantedAuthority> authorities;
 

simulation-oauth-server/src/main/java/com/css/simulation/oauth/server/cofiguration/security/MyUserDetailsService.java

@@ -26,6 +26,7 @@ public class MyUserDetailsService implements UserDetailsService {
                 userPO.getUsername(),
                 userPO.getPassword(),
                 userPO.getRoleCode(),
+                userPO.getUseType(),
                 userPO.getCreateUserId(),
                 CollectionUtil.createHashSet(new SimpleGrantedAuthority("default11111111111"))
         );

simulation-oauth-server/src/main/java/com/css/simulation/oauth/server/mapper/UserMapper.java

@@ -14,6 +14,7 @@ public interface UserMapper {
             " username," +
             " password," +
             " role_code," +
+            " use_type," +
             " create_user_id" +
             " from system_user" +
             " where is_deleted = '0'" +

simulation-resource-server/src/main/java/com/css/simulation/resource/common/oauth/MyUserAuthenticationConverter.java

@@ -32,6 +32,7 @@ public class MyUserAuthenticationConverter extends DefaultUserAuthenticationConv
         userDetails.setId((String) map.get("id"));
         userDetails.setUsername((String) map.get("username"));
         userDetails.setRoleCode((String) map.get("roleCode"));
+        userDetails.setUseType((String) map.get("useType"));
         userDetails.setCreateUserId((String) map.get("createUserId"));
         return new UsernamePasswordAuthenticationToken(userDetails, "N/A", list);
     }

simulation-resource-server/src/main/java/com/css/simulation/resource/common/oauth/MyUserDetails.java

@@ -20,7 +20,7 @@ public class MyUserDetails implements UserDetails, Serializable {
     private String username;
     private String password;
     private String roleCode;
-    private String userType;
+    private String useType;
     private String createUserId;
     private Set<GrantedAuthority> authorities;
 

simulation-resource-server/src/main/java/com/css/simulation/resource/common/utils/AuthUtil.java

@@ -30,13 +30,13 @@ public class AuthUtil {
     }
 
     /**
-     * 获取当前登录人userType
+     * 获取当前登录人useType
      */
-    public static String getCurrentUserType(){
+    public static String getCurrentUseType(){
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         MyUserDetails userDetails = (MyUserDetails)authentication.getPrincipal();
-        String userType = userDetails.getUserType();
-        return userType;
+        String useType = userDetails.getUseType();
+        return useType;
     }
 
     /**

simulation-resource-server/src/main/java/com/css/simulation/resource/system/ctrl/ClusterCtrl.java

@@ -47,8 +47,8 @@ public class ClusterCtrl {
         }
         // 当前账户为普通账户，需要查询该账户创建的普通账户子账户，设置roleCode为3及当前创建用户id
         if(DictConstants.ROLE_CODE_UESR.equals(roleCode)){
-            String userType = AuthUtil.getCurrentUserType();
-            if("1".equals(userType)){//独占
+            String useType = AuthUtil.getCurrentUseType();
+            if("1".equals(useType)){//独占
                 clusterParam.setRoleCode(DictConstants.ROLE_CODE_SUBUESR);
                 clusterParam.setCreateUserId(AuthUtil.getCurrentUserId());
             }else {
@@ -110,8 +110,8 @@ public class ClusterCtrl {
         }
         // 当前账户为普通账户，需要查询该账户创建的普通账户子账户，设置roleCode为3及当前创建用户id
         if(DictConstants.ROLE_CODE_UESR.equals(roleCode)){
-            String userType = AuthUtil.getCurrentUserType();
-            if("1".equals(userType)){//独占
+            String useType = AuthUtil.getCurrentUseType();
+            if("1".equals(useType)){//独占
                 clusterParam.setRoleCode(DictConstants.ROLE_CODE_SUBUESR);
                 clusterParam.setCreateUserId(AuthUtil.getCurrentUserId());
             }else {