diff --git a/src/main/java/com/youlai/system/converter/MenuConverter.java b/src/main/java/com/youlai/system/converter/MenuConverter.java index d0dcf743..485027f2 100644 --- a/src/main/java/com/youlai/system/converter/MenuConverter.java +++ b/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; - /** * 菜单对象转换器 * diff --git a/src/main/java/com/youlai/system/converter/UserConverter.java b/src/main/java/com/youlai/system/converter/UserConverter.java index 51779798..e11be797 100644 --- a/src/main/java/com/youlai/system/converter/UserConverter.java +++ b/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.po.UserPO; +import com.youlai.system.pojo.bo.UserFormBO; 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 po2Vo(Page po); + Page po2Vo(Page po); - UserForm po2Form(UserFormPO po); + UserForm po2Form(UserFormBO po); UserForm entity2Form(SysUser entity); diff --git a/src/main/java/com/youlai/system/mapper/SysMenuMapper.java b/src/main/java/com/youlai/system/mapper/SysMenuMapper.java index 10670788..5ec408d1 100644 --- a/src/main/java/com/youlai/system/mapper/SysMenuMapper.java +++ b/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 { - List listRoutes(); + List listRoutes(); /** * 获取角色权限集合 diff --git a/src/main/java/com/youlai/system/mapper/SysUserMapper.java b/src/main/java/com/youlai/system/mapper/SysUserMapper.java index ba316e56..b2528d1c 100644 --- a/src/main/java/com/youlai/system/mapper/SysUserMapper.java +++ b/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.po.UserFormPO; -import com.youlai.system.pojo.po.UserPO; +import com.youlai.system.pojo.bo.UserAuthInfo; +import com.youlai.system.pojo.bo.UserFormBO; 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 { * @param queryParams 查询参数 * @return */ - Page listUserPages(Page page, UserPageQuery queryParams); + Page listUserPages(Page page, UserPageQuery queryParams); /** * 获取用户表单详情 @@ -36,7 +36,7 @@ public interface SysUserMapper extends BaseMapper { * @param userId 用户ID * @return */ - UserFormPO getUserDetail(Long userId); + UserFormBO getUserDetail(Long userId); /** * 根据用户名获取认证信息 diff --git a/src/main/java/com/youlai/system/pojo/po/RoutePO.java b/src/main/java/com/youlai/system/pojo/bo/RouteBO.java similarity index 87% rename from src/main/java/com/youlai/system/pojo/po/RoutePO.java rename to src/main/java/com/youlai/system/pojo/bo/RouteBO.java index 70c99efc..2af90dc2 100644 --- a/src/main/java/com/youlai/system/pojo/po/RoutePO.java +++ b/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 { /** * */ diff --git a/src/main/java/com/youlai/system/pojo/po/UserAuthInfo.java b/src/main/java/com/youlai/system/pojo/bo/UserAuthInfo.java similarity index 91% rename from src/main/java/com/youlai/system/pojo/po/UserAuthInfo.java rename to src/main/java/com/youlai/system/pojo/bo/UserAuthInfo.java index f8dcda3e..4c3dfe3f 100644 --- a/src/main/java/com/youlai/system/pojo/po/UserAuthInfo.java +++ b/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; diff --git a/src/main/java/com/youlai/system/pojo/po/UserPO.java b/src/main/java/com/youlai/system/pojo/bo/UserBO.java similarity index 94% rename from src/main/java/com/youlai/system/pojo/po/UserPO.java rename to src/main/java/com/youlai/system/pojo/bo/UserBO.java index 9e80a9b1..4933123a 100644 --- a/src/main/java/com/youlai/system/pojo/po/UserPO.java +++ b/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 diff --git a/src/main/java/com/youlai/system/pojo/po/UserFormPO.java b/src/main/java/com/youlai/system/pojo/bo/UserFormBO.java similarity index 92% rename from src/main/java/com/youlai/system/pojo/po/UserFormPO.java rename to src/main/java/com/youlai/system/pojo/bo/UserFormBO.java index 5e53f524..e342161b 100644 --- a/src/main/java/com/youlai/system/pojo/po/UserFormPO.java +++ b/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 diff --git a/src/main/java/com/youlai/system/security/userdetails/SysUserDetails.java b/src/main/java/com/youlai/system/security/userdetails/SysUserDetails.java index 35bfee79..798553b2 100644 --- a/src/main/java/com/youlai/system/security/userdetails/SysUserDetails.java +++ b/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.po.UserAuthInfo; +import com.youlai.system.pojo.bo.UserAuthInfo; import lombok.Data; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/src/main/java/com/youlai/system/security/userdetails/SysUserDetailsServiceImpl.java b/src/main/java/com/youlai/system/security/userdetails/SysUserDetailsServiceImpl.java index bd5f1f4c..d7c66ae0 100644 --- a/src/main/java/com/youlai/system/security/userdetails/SysUserDetailsServiceImpl.java +++ b/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; diff --git a/src/main/java/com/youlai/system/service/SysUserService.java b/src/main/java/com/youlai/system/service/SysUserService.java index e8ec4ade..44a07bb7 100644 --- a/src/main/java/com/youlai/system/service/SysUserService.java +++ b/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; diff --git a/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java index e42e8ee6..8887b762 100644 --- a/src/main/java/com/youlai/system/service/impl/SysMenuServiceImpl.java +++ b/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 impl return list; } - /** * 保存菜单 */ @@ -102,7 +101,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl @Override @Cacheable(cacheNames = "system", key = "'routes'") public List listRoutes() { - List menuList = this.baseMapper.listRoutes(); + List menuList = this.baseMapper.listRoutes(); List routeList = recurRoutes(SystemConstants.ROOT_NODE_ID, menuList); return routeList; } @@ -114,7 +113,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl * @param menuList 菜单列表 * @return */ - private List recurRoutes(Long parentId, List menuList) { + private List recurRoutes(Long parentId, List menuList) { List list = new ArrayList<>(); Optional.ofNullable(menuList).ifPresent(menus -> menus.stream() .filter(menu -> menu.getParentId().equals(parentId)) diff --git a/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java index 4b1e138a..58ab614b 100644 --- a/src/main/java/com/youlai/system/service/impl/SysUserServiceImpl.java +++ b/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.po.UserFormPO; -import com.youlai.system.pojo.po.UserPO; +import com.youlai.system.pojo.bo.UserAuthInfo; +import com.youlai.system.pojo.bo.UserFormBO; 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 impl // 参数构建 int pageNum = queryParams.getPageNum(); int pageSize = queryParams.getPageSize(); - Page page = new Page<>(pageNum, pageSize); + Page page = new Page<>(pageNum, pageSize); // 查询数据 - Page userPoPage = this.baseMapper.listUserPages(page, queryParams); + Page userPoPage = this.baseMapper.listUserPages(page, queryParams); // 实体转换 Page userVoPage = userConverter.po2Vo(userPoPage); @@ -99,9 +98,9 @@ public class SysUserServiceImpl extends ServiceImpl 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; } diff --git a/src/main/resources/mapper/SysMenuMapper.xml b/src/main/resources/mapper/SysMenuMapper.xml index d2754c90..8ed68d9e 100644 --- a/src/main/resources/mapper/SysMenuMapper.xml +++ b/src/main/resources/mapper/SysMenuMapper.xml @@ -5,7 +5,7 @@ - + diff --git a/src/main/resources/mapper/SysUserMapper.xml b/src/main/resources/mapper/SysUserMapper.xml index 032ea9f8..826e661e 100644 --- a/src/main/resources/mapper/SysUserMapper.xml +++ b/src/main/resources/mapper/SysUserMapper.xml @@ -5,7 +5,7 @@ - SELECT u.id, u.username, @@ -42,7 +42,7 @@ - + @@ -77,7 +77,7 @@ - +