feat: 使用JacksonTypeHandler实现roles合并

cadecode · cadecode · commit ac3c629a1b4d · 2023-05-10T14:32:34.000+08:00
diff --git a/system/src/main/java/top/cadecode/uniboot/system/bean/vo/SysMenuVo.java b/system/src/main/java/top/cadecode/uniboot/system/bean/vo/SysMenuVo.java
@@ -1,6 +1,5 @@
 package top.cadecode.uniboot.system.bean.vo;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.util.ArrayList;
@@ -66,7 +65,5 @@ public static class SysMenuRolesVo {
 
         private String updateUser;
 
-        @JsonIgnore
-        private String rolesJson;
     }
 }
diff --git a/system/src/main/java/top/cadecode/uniboot/system/bean/vo/SysUserVo.java b/system/src/main/java/top/cadecode/uniboot/system/bean/vo/SysUserVo.java
@@ -45,8 +45,5 @@ public static class SysUserRolesVo {
         private String updateUser;
 
         private List<String> roles;
-
-        @JsonIgnore
-        private String rolesJson;
     }
 }
diff --git a/system/src/main/java/top/cadecode/uniboot/system/serviceimpl/SysMenuServiceImpl.java b/system/src/main/java/top/cadecode/uniboot/system/serviceimpl/SysMenuServiceImpl.java
@@ -2,12 +2,10 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import top.cadecode.uniboot.common.util.JacksonUtil;
 import top.cadecode.uniboot.system.bean.po.SysMenu;
 import top.cadecode.uniboot.system.bean.vo.SysMenuVo.SysMenuRolesVo;
 import top.cadecode.uniboot.system.bean.vo.SysMenuVo.SysMenuTreeVo;
@@ -49,9 +47,7 @@ public List<SysMenuTreeVo> listTreeVoByRoles(List<String> roleCodes) {
 
     @Override
     public List<SysMenuRolesVo> listRolesVo(SysMenuRolesRequest request) {
-        return sysMenuMapper.selectRolesVo(request).stream()
-                .peek(o -> o.setRoles(JacksonUtil.toBean(o.getRolesJson(), new TypeReference<List<String>>() {})))
-                .collect(Collectors.toList());
+        return sysMenuMapper.selectRolesVo(request);
     }
 
     @Override
@@ -62,9 +58,7 @@ public PageInfo<SysMenuRolesVo> pageRolesVo(SysMenuRolesRequest request) {
 
     @Override
     public List<SysMenuRolesVo> listRolesVoByMenuIds(List<Long> menuIds) {
-        return sysMenuMapper.selectRolesVoByMenuIds(menuIds).stream()
-                .peek(o -> o.setRoles(JacksonUtil.toBean(o.getRolesJson(), new TypeReference<List<String>>() {})))
-                .collect(Collectors.toList());
+        return sysMenuMapper.selectRolesVoByMenuIds(menuIds);
     }
 
     private List<SysMenuTreeVo> generateMenuTree(List<SysMenuTreeVo> menus, Long rootId) {
diff --git a/system/src/main/java/top/cadecode/uniboot/system/serviceimpl/SysUserServiceImpl.java b/system/src/main/java/top/cadecode/uniboot/system/serviceimpl/SysUserServiceImpl.java
@@ -2,14 +2,12 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Service;
 import top.cadecode.uniboot.common.exception.UniException;
-import top.cadecode.uniboot.common.util.JacksonUtil;
 import top.cadecode.uniboot.system.bean.po.SysUser;
 import top.cadecode.uniboot.system.bean.vo.SysUserVo.SysUserRolesVo;
 import top.cadecode.uniboot.system.convert.SysUserConvert;
@@ -18,7 +16,6 @@
 import top.cadecode.uniboot.system.service.SysUserService;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 系统用户服务实现
@@ -52,17 +49,12 @@ public UserDetails loadUserByUsername(String username) {
 
     @Override
     public List<SysUserRolesVo> listRolesVoByUserIds(List<Long> userIds) {
-        // 通过rolesJson转换
-        return sysUserMapper.selectRolesVoByUserIds(userIds).stream()
-                .peek(o -> o.setRoles(JacksonUtil.toBean(o.getRolesJson(), new TypeReference<List<String>>() {})))
-                .collect(Collectors.toList());
+        return sysUserMapper.selectRolesVoByUserIds(userIds);
     }
 
     @Override
     public List<SysUserRolesVo> listRolesVo(SysUserRolesRequest request) {
-        return sysUserMapper.selectRolesVo(request).stream()
-                .peek(o -> o.setRoles(JacksonUtil.toBean(o.getRolesJson(), new TypeReference<List<String>>() {})))
-                .collect(Collectors.toList());
+        return sysUserMapper.selectRolesVo(request);
     }
 
     @Override
diff --git a/system/src/main/resources/mapper/SysMenuMapper.xml b/system/src/main/resources/mapper/SysMenuMapper.xml
@@ -15,10 +15,7 @@
         <result column="create_time" property="createTime"/>
         <result column="update_time" property="updateTime"/>
         <result column="update_user" property="updateUser"/>
-        <result column="r_code" property="rolesJson"/>
-        <collection property="roles" ofType="string">
-            <result column="r_code"/>
-        </collection>
+        <result column="r_code" property="roles" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
     </resultMap>
     <select id="selectByRoles" resultType="top.cadecode.uniboot.system.bean.po.SysMenu">
         SELECT DISTINCT sm.*
@@ -38,10 +35,10 @@
         <if test="request != null">
             <where>
                 <if test="request.routeName != null and request.routeName.length > 0">
-                    sm.route_name like CONCAT(#{request.routeName}, '%')
+                    sm.route_name like CONCAT('%', #{request.routeName}, '%')
                 </if>
                 <if test="request.menuName != null and request.menuName.length > 0">
-                    AND sm.menu_name like CONCAT(#{request.menuName}, '%')
+                    AND sm.menu_name like CONCAT('%', #{request.menuName}, '%')
                 </if>
                 <if test="request.enableFlag != null">
                     AND sm.enable_flag = #{request.enableFlag}
diff --git a/system/src/main/resources/mapper/SysUserMapper.xml b/system/src/main/resources/mapper/SysUserMapper.xml
@@ -15,10 +15,7 @@
         <result column="create_time" property="createTime"/>
         <result column="update_time" property="updateTime"/>
         <result column="update_user" property="updateUser"/>
-        <result column="r_code" property="rolesJson"/>
-        <collection property="roles" ofType="string">
-            <result column="r_code"/>
-        </collection>
+        <result column="r_code" property="roles" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
     </resultMap>
     <select id="selectRolesVoByUserIds" resultMap="SysUserRolesVoMap">
         SELECT su.*, JSON_ARRAYAGG(sr.code) r_code
@@ -36,11 +33,12 @@
         ORDER BY su.create_time DESC
     </select>
     <select id="selectRolesVoByUsername" resultMap="SysUserRolesVoMap">
-        SELECT su.*, sr.code r_code
+        SELECT su.*, JSON_ARRAYAGG(sr.code) r_code
         FROM sys_user su
         LEFT JOIN sys_role_user sru ON sru.user_id = su.id
         LEFT JOIN sys_role sr ON sru.role_id = sr.id
         WHERE su.username = #{username}
+        GROUP BY su.id
     </select>
     <select id="selectRolesVo" resultMap="SysUserRolesVoMap">
         SELECT su.*, JSON_ARRAYAGG(sr.code) r_code
@@ -50,10 +48,10 @@
         <if test="request != null">
             <where>
                 <if test="request.username != null and request.username.length > 0">
-                    su.username like CONCAT(#{request.username}, '%')
+                    su.username like CONCAT('%', #{request.username}, '%')
                 </if>
                 <if test="request.nickName != null and request.nickName.length > 0">
-                    AND su.nick_name like CONCAT(#{request.nickName}, '%')
+                    AND su.nick_name like CONCAT('%', #{request.nickName}, '%')
                 </if>
                 <if test="request.enableFlag != null">
                     AND su.enable_flag = #{request.enableFlag}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`package top.cadecode.uniboot.system.bean.vo;`
`2`	`2`
`3`		`-import com.fasterxml.jackson.annotation.JsonIgnore;`
`4`	`3`	`import lombok.Data;`
`5`	`4`
`6`	`5`	`import java.util.ArrayList;`
`@@ -66,7 +65,5 @@ public static class SysMenuRolesVo {`
`66`	`65`
`67`	`66`	`private String updateUser;`
`68`	`67`
`69`		`- @JsonIgnore`
`70`		`- private String rolesJson;`
`71`	`68`	`}`
`72`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,5 @@ public static class SysUserRolesVo {`
`45`	`45`	`private String updateUser;`
`46`	`46`
`47`	`47`	`private List<String> roles;`
`48`		`-`
`49`		`- @JsonIgnore`
`50`		`- private String rolesJson;`
`51`	`48`	`}`
`52`	`49`	`}`