1、修改预制角色

src/main/java/com/dk/mdm/mapper/mst/RoleMapper.xml

@@ -18,9 +18,9 @@
         <result column="remarks" property="remarks"/>
         <result column="flg_valid" property="flgValid"/>
         <result column="op_create_time" property="opCreateTime" typeHandler="TimestampTypeHandler"/>
-        <result column="op_create_user_id" property="opCreateUserId"/>
+        <result column="op_create_user_id" property="opCreateUserId" typeHandler="UuidTypeHandler"/>
         <result column="op_update_time" property="opUpdateTime" typeHandler="TimestampTypeHandler"/>
-        <result column="op_update_user_id" property="opUpdateUserId"/>
+        <result column="op_update_user_id" property="opUpdateUserId" typeHandler="UuidTypeHandler"/>
         <result column="op_app_code" property="opAppCode"/>
         <result column="op_timestamp" property="opTimestamp" typeHandler="TimestampTypeHandler"/>
         <result column="op_db_user" property="opDbUser"/>
@@ -81,7 +81,7 @@
     <select id="selectByCond" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM dkic_m.t_mst_role
+        FROM dkic_b.t_mst_role
         <include refid="Condition"/>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
@@ -92,17 +92,17 @@
     <select id="countByCond" resultType="Long">
         SELECT
         count(1)
-        FROM dkic_m.t_mst_role
+        FROM dkic_b.t_mst_role
         <include refid="Condition"/>
     </select>
 
     <!--编码是否重复-->
     <select id="selectByCode" resultType="Long">
         select count(1)
-        from dkic_m.t_mst_role
+        from dkic_b.t_mst_role
         where #{roleCode} = role_code
         <if test="roleId != null">
-            and role_id != #{roleId}
+            and role_id != #{roleId} ::uuid
         </if>
     </select>
 
@@ -110,50 +110,7 @@
     <select id="selectById" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM dkic_m.t_mst_role
+        FROM dkic_b.t_mst_role
         WHERE role_id = #{roleId}::uuid
     </select>
-
-    <!-- 根据主键锁定表t_mst_role的一行数据 -->
-    <select id="selectByIdForUpdate" resultMap="BaseResultMap">
-        SELECT
-        <include refid="Base_Column_List"/>
-        FROM t_mst_role
-        WHERE role_id = #{roleId}
-        for update
-    </select>
-
-    <!-- 根据主键锁定表t_mst_role的多行数据 -->
-    <select id="selectByIdsForUpdate" resultMap="BaseResultMap">
-        SELECT
-        <include refid="Base_Column_List"/>
-        FROM t_mst_role
-        <include refid="idsForeach"/>
-        for update
-    </select>
-
-    <insert id="insertBatch">
-        insert into t_mst_role
-        (
-        <trim suffixOverrides=",">
-            role_name,
-            display_no,
-            remarks,
-            op_app_code,
-            flg_nolimit_fun,
-        </trim>
-        )
-        values
-        <foreach collection="list" index="index" item="item" separator=",">
-            (
-            <trim suffixOverrides=",">
-                #{item.roleName},
-                #{item.displayNo},
-                #{item.remarks},
-                #{item.opAppCode},
-                #{item.flgNolimitFun},
-            </trim>
-            )
-        </foreach>
-    </insert>
 </mapper>

src/main/java/com/dk/mdm/model/pojo/mst/Role.java

@@ -29,7 +29,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("角色")
-@TableName(value = "t_mst_role", autoResultMap = true, schema =  "dkic_m")
+@TableName(value = "t_mst_role", autoResultMap = true, schema =  "dkic_b")
 @ApiModel(value="实体类：角色", description="表名：t_mst_role")
 public class Role extends PageInfo<Role> implements Serializable {
 
@@ -100,7 +100,8 @@ public class Role extends PageInfo<Role> implements Serializable {
      */
     @Excel(name = "创建用户 (触发器自动处理)")
     @ApiModelProperty(value = "创建用户 (触发器自动处理)")
-    private Long opCreateUserId;
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String opCreateUserId;
 
 
     /**
@@ -118,7 +119,8 @@ public class Role extends PageInfo<Role> implements Serializable {
      */
     @Excel(name = "修改用户 (触发器自动处理)")
     @ApiModelProperty(value = "修改用户 (触发器自动处理)")
-    private Long opUpdateUserId;
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String opUpdateUserId;
 
 
     /**
@@ -150,6 +152,8 @@ public class Role extends PageInfo<Role> implements Serializable {
     @ApiModelProperty(value = "")
     private Boolean flgNolimitFun;
 
+    private Integer cpId;
+
 
     /*
      * 相关属性

src/main/java/com/dk/mdm/model/query/mst/RoleQuery.java

@@ -98,7 +98,8 @@ public class RoleQuery extends PageInfo<RoleQuery> implements Serializable {
      */
     @Excel(name = "创建用户 (触发器自动处理)")
     @ApiModelProperty(value = "创建用户 (触发器自动处理)")
-    private Long opCreateUserId;
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String opCreateUserId;
 
 
     /**
@@ -116,7 +117,8 @@ public class RoleQuery extends PageInfo<RoleQuery> implements Serializable {
      */
     @Excel(name = "修改用户 (触发器自动处理)")
     @ApiModelProperty(value = "修改用户 (触发器自动处理)")
-    private Long opUpdateUserId;
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String opUpdateUserId;
 
 
     /**
@@ -148,6 +150,8 @@ public class RoleQuery extends PageInfo<RoleQuery> implements Serializable {
     @ApiModelProperty(value = "")
     private Boolean flgNolimitFun;
 
+    private Integer cpId;
+
 
     /*
      * 相关属性

src/main/java/com/dk/mdm/model/response/mst/RoleResponse.java

@@ -98,7 +98,8 @@ public class RoleResponse extends PageInfo<RoleResponse> implements Serializable
      */
     @Excel(name = "创建用户 (触发器自动处理)")
     @ApiModelProperty(value = "创建用户 (触发器自动处理)")
-    private Long opCreateUserId;
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String opCreateUserId;
 
 
     /**
@@ -116,7 +117,8 @@ public class RoleResponse extends PageInfo<RoleResponse> implements Serializable
      */
     @Excel(name = "修改用户 (触发器自动处理)")
     @ApiModelProperty(value = "修改用户 (触发器自动处理)")
-    private Long opUpdateUserId;
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String opUpdateUserId;
 
 
     /**
@@ -148,6 +150,8 @@ public class RoleResponse extends PageInfo<RoleResponse> implements Serializable
     @ApiModelProperty(value = "")
     private Boolean flgNolimitFun;
 
+    private Integer cpId;
+
 
     /*
      * 相关属性

src/main/java/com/dk/mdm/model/vo/mst/RoleVO.java

@@ -94,13 +94,13 @@ public class RoleVO extends PageInfo<RoleVO> implements Serializable {
     @TableField(typeHandler = TimestampTypeHandler.class)
     private LocalDateTime opCreateTime;
 
-
     /**
      * 创建用户 (触发器自动处理)
      */
     @Excel(name = "创建用户 (触发器自动处理)")
     @ApiModelProperty(value = "创建用户 (触发器自动处理)")
-    private Long opCreateUserId;
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String opCreateUserId;
 
 
     /**
@@ -118,7 +118,8 @@ public class RoleVO extends PageInfo<RoleVO> implements Serializable {
      */
     @Excel(name = "修改用户 (触发器自动处理)")
     @ApiModelProperty(value = "修改用户 (触发器自动处理)")
-    private Long opUpdateUserId;
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String opUpdateUserId;
 
 
     /**
@@ -152,6 +153,8 @@ public class RoleVO extends PageInfo<RoleVO> implements Serializable {
 
     private List<RoleFun> roleFunList;
 
+    private Integer cpId;
+
 
     /*
      * 相关属性

src/main/java/com/dk/mdm/service/mst/RoleService.java

@@ -125,6 +125,7 @@ public class RoleService extends BaseService<Role> {
 		// 获取显示顺序
 		Integer displayNo =commonService.getMaxDisplayNo(Constant.DisplayNoTable.ROLE);
 		role.setDisplayNo(displayNo);
+		role.setCpId(0);
 		//新建
 		roleMapper.insert(role);
 		return ResponseResultUtil.success();