userInfo，角色相关关联表添加字段roleCode

删除关联表里的roleId

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/UserInfo.java

@@ -55,6 +55,9 @@ public class UserInfo {
     @ApiModelProperty(value = "角色id")
     private Long roleId;
 
+    @ApiModelProperty(value = "角色code")
+    private String roleCode;
+
 	@ApiModelProperty(value = "创建时间")
     private LocalDateTime createTime;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/UserMappingInfoRole.java

@@ -28,8 +28,8 @@ public class UserMappingInfoRole {
 	@ApiModelProperty(value = "用户id")
     private Long userId;
 
-	@ApiModelProperty(value = "角色id")
-    private Long roleId;
+    @ApiModelProperty(value = "角色code")
+    private String roleCode;
 
 	@ApiModelProperty(value = "角色名称")
     private String roleName;

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/UserMappingRoleResource.java

@@ -25,8 +25,8 @@ public class UserMappingRoleResource {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-	@ApiModelProperty(value = "角色id")
-    private Long roleId;
+    @ApiModelProperty(value = "角色code")
+    private String roleCode;
 
 	@ApiModelProperty(value = "资源id")
     private Long resourceId;

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/UserResource.java

@@ -25,8 +25,8 @@ public class UserResource {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
-	@ApiModelProperty(value = "父资源id")
-    private Long parentId;
+	@ApiModelProperty(value = "父资源code")
+    private String parentResourceCode;
 
 	@ApiModelProperty(value = "资源code")
     private String resourceCode;
@@ -34,6 +34,9 @@ public class UserResource {
 	@ApiModelProperty(value = "资源名称")
     private String resourceName;
 
+    @ApiModelProperty(value = "资源类型 1-页面路由 2-按钮 3-查看页面")
+    private String resourceType;
+
 	@ApiModelProperty(value = "资源内容")
     private String content;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dao/entity/UserRole.java

@@ -52,6 +52,9 @@ public class UserRole {
 	@ApiModelProperty(value = "L5角色code")
     private String l5RoleCode;
 
+    @ApiModelProperty(value = "上级角色code")
+    private String parentRoleCode;
+
 	@ApiModelProperty(value = "创建时间")
     private LocalDateTime createTime;
 

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/CreateRoleReq.java

@@ -2,8 +2,13 @@ package com.abi.qms.platform.dto.req;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author:Andy.Tan
@@ -13,9 +18,16 @@ import java.io.Serializable;
 @ApiModel
 public class CreateRoleReq implements Serializable {
 
-  @ApiModelProperty("xxxID")
-  private String xxxId;
+  @ApiModelProperty(value = "角色name")
+  private String roleName;
+
+  @ApiModelProperty(value = "上级角色code")
+  private String parentRoleCode;
 
+  @ApiModelProperty(value = "角色描述")
+  private String roleDesc;
 
+  @ApiModelProperty(value = "资源列表")
+  private List<String> resourceCodeList;
 
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/infrastructure/util/UserUtil.java

@@ -1,4 +1,9 @@
 package com.abi.qms.platform.infrastructure.util;
 
+import com.abi.qms.platform.dao.entity.UserInfo;
+
 public class UserUtil {
+
+    private static final InheritableThreadLocal<UserInfo> USER_TL = new InheritableThreadLocal();
+
 }

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/UserInfoMapper.xml

@@ -15,6 +15,7 @@
         <result column="department_id" property="departmentId" />
         <result column="factory_id" property="factoryId" />
         <result column="role_id" property="roleId" />
+        <result column="role_code" property="roleCode" />
         <result column="CREATE_TIME" property="createTime" />
         <result column="CREATE_BY" property="createBy" />
         <result column="UPDATE_TIME" property="updateTime" />
@@ -23,7 +24,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, USER_NAME, EMPLOYEE_NO, PHONE, EMAIL, LOGIN_NAME, PASSWORD, is_abi, department_id, factory_id, role_id, CREATE_TIME, CREATE_BY, UPDATE_TIME, IS_DELETE
+        ID, USER_NAME, EMPLOYEE_NO, PHONE, EMAIL, LOGIN_NAME, PASSWORD, is_abi, department_id, factory_id, role_id, role_code, CREATE_TIME, CREATE_BY, UPDATE_TIME, IS_DELETE
     </sql>
 
 </mapper>

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/UserMappingInfoRoleMapper.xml

@@ -6,7 +6,7 @@
     <resultMap id="BaseResultMap" type="com.abi.qms.platform.dao.entity.UserMappingInfoRole">
         <id column="ID" property="id" />
         <result column="USER_ID" property="userId" />
-        <result column="ROLE_ID" property="roleId" />
+        <result column="role_code" property="roleCode" />
         <result column="ROLE_NAME" property="roleName" />
         <result column="CREATE_TIME" property="createTime" />
         <result column="CREATE_BY" property="createBy" />
@@ -16,7 +16,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, USER_ID, ROLE_ID, ROLE_NAME, CREATE_TIME, CREATE_BY, UPDATE_TIME, IS_DELETE
+        ID, USER_ID, role_code, ROLE_NAME, CREATE_TIME, CREATE_BY, UPDATE_TIME, IS_DELETE
     </sql>
 
 </mapper>

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/UserMappingRoleResourceMapper.xml

@@ -5,7 +5,7 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.abi.qms.platform.dao.entity.UserMappingRoleResource">
         <id column="ID" property="id" />
-        <result column="ROLE_ID" property="roleId" />
+        <result column="role_code" property="roleCode" />
         <result column="RESOURCE_ID" property="resourceId" />
         <result column="RESOURCE_NAME" property="resourceName" />
         <result column="CREATE_TIME" property="createTime" />
@@ -16,7 +16,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, ROLE_ID, RESOURCE_ID, RESOURCE_NAME, CREATE_TIME, CREATE_BY, UPDATE_TIME, IS_DELETE
+        ID, role_code, RESOURCE_ID, RESOURCE_NAME, CREATE_TIME, CREATE_BY, UPDATE_TIME, IS_DELETE
     </sql>
 
 </mapper>

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/UserResourceMapper.xml

@@ -5,9 +5,10 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.abi.qms.platform.dao.entity.UserResource">
         <id column="ID" property="id" />
-        <result column="PARENT_ID" property="parentId" />
+        <result column="parent_resource_code" property="parentResourceCode" />
         <result column="RESOURCE_CODE" property="resourceCode" />
         <result column="RESOURCE_NAME" property="resourceName" />
+        <result column="resource_type" property="resourceType" />
         <result column="CONTENT" property="content" />
         <result column="SORT" property="sort" />
         <result column="CREATE_TIME" property="createTime" />
@@ -18,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, PARENT_ID, RESOURCE_CODE, RESOURCE_NAME, CONTENT, SORT, CREATE_TIME, CREATE_BY, UPDATE_TIME, IS_DELETE
+        id, parent_resource_code, resource_code, resource_name, content, sort, create_time, create_by, update_time, is_delete
     </sql>
 
 </mapper>

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/UserRoleMapper.xml

@@ -9,6 +9,7 @@
         <result column="ROLE_NAME" property="roleName" />
         <result column="ROLE_DESC" property="roleDesc" />
         <result column="ROLE_LEVEL" property="roleLevel" />
+        <result column="parent_role_code" property="parentRoleCode" />
         <result column="L1_ROLE_CODE" property="l1RoleCode" />
         <result column="L2_ROLE_CODE" property="l2RoleCode" />
         <result column="L3_ROLE_CODE" property="l3RoleCode" />