refactor: 类名优化

src/main/java/com/youlai/system/converter/MenuConverter.java

@@ -1,13 +1,9 @@
 package com.youlai.system.converter;
 
 import com.youlai.system.pojo.entity.SysMenu;
-import com.youlai.system.pojo.po.RoutePO;
 import com.youlai.system.pojo.vo.menu.MenuVO;
-import com.youlai.system.pojo.vo.menu.RouteVO;
 import org.mapstruct.Mapper;
 
-import java.util.List;
-
 /**
  * 菜单对象转换器
  *

src/main/java/com/youlai/system/converter/UserConverter.java

@@ -1,10 +1,10 @@
 package com.youlai.system.converter;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.youlai.system.pojo.bo.UserBO;
 import com.youlai.system.pojo.entity.SysUser;
 import com.youlai.system.pojo.form.UserForm;
-import com.youlai.system.pojo.po.UserFormPO;
+import com.youlai.system.pojo.bo.UserFormBO;
-import com.youlai.system.pojo.po.UserPO;
 import com.youlai.system.pojo.vo.user.UserLoginVO;
 import com.youlai.system.pojo.vo.user.UserVO;
 import org.mapstruct.InheritInverseConfiguration;
@@ -24,11 +24,11 @@ public interface UserConverter {
     @Mappings({
             @Mapping(target = "genderLabel", expression = "java(com.youlai.system.common.base.IBaseEnum.getLabelByValue(po.getGender(), com.youlai.system.common.enums.GenderEnum.class))")
     })
-    UserVO po2Vo(UserPO po);
+    UserVO po2Vo(UserBO po);
 
-    Page<UserVO> po2Vo(Page<UserPO> po);
+    Page<UserVO> po2Vo(Page<UserBO> po);
 
-    UserForm po2Form(UserFormPO po);
+    UserForm po2Form(UserFormBO po);
 
     UserForm entity2Form(SysUser entity);
 

src/main/java/com/youlai/system/mapper/SysMenuMapper.java

@@ -9,7 +9,7 @@ package com.youlai.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.youlai.system.pojo.entity.SysMenu;
-import com.youlai.system.pojo.po.RoutePO;
+import com.youlai.system.pojo.bo.RouteBO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -18,7 +18,7 @@ import java.util.Set;
 @Mapper
 public interface SysMenuMapper extends BaseMapper<SysMenu> {
 
-    List<RoutePO> listRoutes();
+    List<RouteBO> listRoutes();
 
     /**
      * 获取角色权限集合

src/main/java/com/youlai/system/mapper/SysUserMapper.java

@@ -2,10 +2,10 @@ package com.youlai.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.youlai.system.pojo.bo.UserBO;
 import com.youlai.system.pojo.entity.SysUser;
-import com.youlai.system.pojo.po.UserAuthInfo;
+import com.youlai.system.pojo.bo.UserAuthInfo;
-import com.youlai.system.pojo.po.UserFormPO;
+import com.youlai.system.pojo.bo.UserFormBO;
-import com.youlai.system.pojo.po.UserPO;
 import com.youlai.system.pojo.query.UserPageQuery;
 import com.youlai.system.pojo.vo.user.UserExportVO;
 import org.apache.ibatis.annotations.Mapper;
@@ -28,7 +28,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @param queryParams 查询参数
      * @return
      */
-    Page<UserPO> listUserPages(Page<UserPO> page, UserPageQuery queryParams);
+    Page<UserBO> listUserPages(Page<UserBO> page, UserPageQuery queryParams);
 
     /**
      * 获取用户表单详情
@@ -36,7 +36,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @param userId 用户ID
      * @return
      */
-    UserFormPO getUserDetail(Long userId);
+    UserFormBO getUserDetail(Long userId);
 
     /**
      * 根据用户名获取认证信息

src/main/java/com/youlai/system/pojo/bo/RouteBO.java

@@ -1,9 +1,7 @@
-package com.youlai.system.pojo.po;
+package com.youlai.system.pojo.bo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.youlai.system.common.base.BaseEntity;
 import com.youlai.system.common.enums.MenuTypeEnum;
 import lombok.Data;
 
@@ -13,7 +11,7 @@ import java.util.List;
  * 路由
  */
 @Data
-public class RoutePO {
+public class RouteBO {
     /**
      * 
      */

src/main/java/com/youlai/system/pojo/bo/UserAuthInfo.java

@@ -1,4 +1,4 @@
-package com.youlai.system.pojo.po;
+package com.youlai.system.pojo.bo;
 
 import lombok.Data;
 

src/main/java/com/youlai/system/pojo/bo/UserBO.java

@@ -1,4 +1,4 @@
-package com.youlai.system.pojo.po;
+package com.youlai.system.pojo.bo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
@@ -12,7 +12,7 @@ import java.util.Date;
  * @date 2022/6/10
  */
 @Data
-public class UserPO {
+public class UserBO {
 
     /**
      * 用户ID

src/main/java/com/youlai/system/pojo/bo/UserFormBO.java

@@ -1,4 +1,4 @@
-package com.youlai.system.pojo.po;
+package com.youlai.system.pojo.bo;
 
 import lombok.Data;
 
@@ -11,7 +11,7 @@ import java.util.List;
  * @date 2022/6/10
  */
 @Data
-public class UserFormPO {
+public class UserFormBO {
 
     /**
      * 用户ID

src/main/java/com/youlai/system/security/userdetails/SysUserDetails.java

@@ -2,8 +2,7 @@ package com.youlai.system.security.userdetails;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
+import com.youlai.system.pojo.bo.UserAuthInfo;
-import com.youlai.system.pojo.po.UserAuthInfo;
 import lombok.Data;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;

src/main/java/com/youlai/system/security/userdetails/SysUserDetailsServiceImpl.java

@@ -1,6 +1,6 @@
 package com.youlai.system.security.userdetails;
 
-import com.youlai.system.pojo.po.UserAuthInfo;
+import com.youlai.system.pojo.bo.UserAuthInfo;
 import com.youlai.system.service.SysUserService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.userdetails.UserDetails;

src/main/java/com/youlai/system/service/SysUserService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.youlai.system.pojo.dto.UserImportDTO;
 import com.youlai.system.pojo.entity.SysUser;
 import com.youlai.system.pojo.form.UserForm;
-import com.youlai.system.pojo.po.UserAuthInfo;
+import com.youlai.system.pojo.bo.UserAuthInfo;
 import com.youlai.system.pojo.query.UserPageQuery;
 import com.youlai.system.pojo.vo.user.UserExportVO;
 import com.youlai.system.pojo.vo.user.UserLoginVO;

src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java

@@ -13,7 +13,7 @@ import com.youlai.system.common.model.Option;
 import com.youlai.system.converter.MenuConverter;
 import com.youlai.system.mapper.SysMenuMapper;
 import com.youlai.system.pojo.entity.SysMenu;
-import com.youlai.system.pojo.po.RoutePO;
+import com.youlai.system.pojo.bo.RouteBO;
 import com.youlai.system.pojo.query.MenuQuery;
 import com.youlai.system.pojo.vo.menu.MenuVO;
 import com.youlai.system.pojo.vo.menu.ResourceVO;
@@ -63,7 +63,6 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
         return list;
     }
 
-
     /**
      * 保存菜单
      */
@@ -102,7 +101,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
     @Override
     @Cacheable(cacheNames = "system", key = "'routes'")
     public List<RouteVO> listRoutes() {
-        List<RoutePO> menuList = this.baseMapper.listRoutes();
+        List<RouteBO> menuList = this.baseMapper.listRoutes();
         List<RouteVO> routeList = recurRoutes(SystemConstants.ROOT_NODE_ID, menuList);
         return routeList;
     }
@@ -114,7 +113,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
      * @param menuList 菜单列表
      * @return
      */
-    private List<RouteVO> recurRoutes(Long parentId, List<RoutePO> menuList) {
+    private List<RouteVO> recurRoutes(Long parentId, List<RouteBO> menuList) {
         List<RouteVO> list = new ArrayList<>();
         Optional.ofNullable(menuList).ifPresent(menus -> menus.stream()
                 .filter(menu -> menu.getParentId().equals(parentId))

src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java

@@ -19,13 +19,13 @@ import com.youlai.system.common.enums.GenderEnum;
 import com.youlai.system.converter.UserConverter;
 import com.youlai.system.listener.UserImportListener;
 import com.youlai.system.mapper.SysUserMapper;
+import com.youlai.system.pojo.bo.UserBO;
 import com.youlai.system.pojo.dto.UserImportDTO;
 import com.youlai.system.pojo.entity.SysUser;
 import com.youlai.system.pojo.entity.SysUserRole;
 import com.youlai.system.pojo.form.UserForm;
-import com.youlai.system.pojo.po.UserAuthInfo;
+import com.youlai.system.pojo.bo.UserAuthInfo;
-import com.youlai.system.pojo.po.UserFormPO;
+import com.youlai.system.pojo.bo.UserFormBO;
-import com.youlai.system.pojo.po.UserPO;
 import com.youlai.system.pojo.query.UserPageQuery;
 import com.youlai.system.pojo.vo.user.UserExportVO;
 import com.youlai.system.pojo.vo.user.UserLoginVO;
@@ -35,7 +35,6 @@ import com.youlai.system.service.SysUserRoleService;
 import com.youlai.system.service.SysUserService;
 import com.youlai.system.util.SecurityUtils;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -80,10 +79,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         // 参数构建
         int pageNum = queryParams.getPageNum();
         int pageSize = queryParams.getPageSize();
-        Page<UserPO> page = new Page<>(pageNum, pageSize);
+        Page<UserBO> page = new Page<>(pageNum, pageSize);
 
         // 查询数据
-        Page<UserPO> userPoPage = this.baseMapper.listUserPages(page, queryParams);
+        Page<UserBO> userPoPage = this.baseMapper.listUserPages(page, queryParams);
 
         // 实体转换
         Page<UserVO> userVoPage = userConverter.po2Vo(userPoPage);
@@ -99,9 +98,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      */
     @Override
     public UserForm getUserFormData(Long userId) {
-        UserFormPO userFormPO = this.baseMapper.getUserDetail(userId);
+        UserFormBO userFormBO = this.baseMapper.getUserDetail(userId);
         // 实体转换po->form
-        UserForm userForm = userConverter.po2Form(userFormPO);
+        UserForm userForm = userConverter.po2Form(userFormBO);
         return userForm;
     }
 

src/main/resources/mapper/SysMenuMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.youlai.system.mapper.SysMenuMapper">
 
     <!-- 菜单路由映射 -->
-    <resultMap id="RouteMap" type="com.youlai.system.pojo.po.RoutePO">
+    <resultMap id="RouteMap" type="com.youlai.system.pojo.bo.RouteBO">
         <id property="id" column="id" jdbcType="BIGINT"/>
         <result property="name" column="name" jdbcType="VARCHAR"/>
         <result property="parentId" column="parent_id" jdbcType="BIGINT"/>

src/main/resources/mapper/SysUserMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.youlai.system.mapper.SysUserMapper">
 
     <!-- 用户分页列表 -->
-    <select id="listUserPages" resultType="com.youlai.system.pojo.po.UserPO">
+    <select id="listUserPages" resultType="com.youlai.system.pojo.bo.UserBO">
         SELECT
             u.id,
             u.username,
@@ -42,7 +42,7 @@
     </select>
 
     <!-- 用户表单信息映射 -->
-    <resultMap id="UserFormMap" type="com.youlai.system.pojo.po.UserFormPO">
+    <resultMap id="UserFormMap" type="com.youlai.system.pojo.bo.UserFormBO">
         <id property="id" column="id" jdbcType="BIGINT"/>
         <result property="username" column="username" jdbcType="VARCHAR"/>
         <result property="nickname" column="nickname" jdbcType="VARCHAR"/>
@@ -77,7 +77,7 @@
     </select>
 
     <!-- 用户认证信息映射 -->
-    <resultMap id="UserAuthMap" type="com.youlai.system.pojo.po.UserAuthInfo">
+    <resultMap id="UserAuthMap" type="com.youlai.system.pojo.bo.UserAuthInfo">
         <id property="userId" column="userId" jdbcType="BIGINT"/>
         <result property="username" column="username" jdbcType="VARCHAR"/>
         <result property="password" column="password" jdbcType="VARCHAR"/>