目录结构调整2

src/main/java/com/caimei365/manager/config/security/UserDetailsServiceImpl.java

@@ -1,6 +1,6 @@
 package com.caimei365.manager.config.security;
 
-import com.caimei365.manager.dao.SysUserDao;
+import com.caimei365.manager.dao.SysDao;
 import com.caimei365.manager.entity.sys.SysUser;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.User;
@@ -23,15 +23,15 @@ import java.util.List;
 @Service
 public class UserDetailsServiceImpl implements UserDetailsService {
     @Resource
-    private SysUserDao sysUserDao;
+    private SysDao sysDao;
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-        SysUser user = sysUserDao.findByUsername(username);
+        SysUser user = sysDao.findByUsername(username);
         if(user == null){
             throw new UsernameNotFoundException("用户" + username + "不存在!");
         }
         // 获取用户角色列表
-        List<String> roleNames = sysUserDao.getRoleNamesByUserId(user.getId());
+        List<String> roleNames = sysDao.getRoleNamesByUserId(user.getId());
         // 设置权限和角色
         ArrayList<GrantedAuthority> authorities = new ArrayList<>();
         for (String role : roleNames) {

src/main/java/com/caimei365/manager/dao/SysUserDao.java → src/main/java/com/caimei365/manager/dao/SysDao.java

@@ -16,7 +16,7 @@ import java.util.List;
  * @date : 2021/12/2
  */
 @Mapper
-public interface SysUserDao {
+public interface SysDao {
     /**
      * 根据用户名称查找可登录用户
      */

src/main/java/com/caimei365/manager/service/sys/impl/SysMenuServiceImpl.java

@@ -1,6 +1,6 @@
 package com.caimei365.manager.service.sys.impl;
 
-import com.caimei365.manager.dao.SysUserDao;
+import com.caimei365.manager.dao.SysDao;
 import com.caimei365.manager.entity.PaginationVo;
 import com.caimei365.manager.entity.ResponseJson;
 import com.caimei365.manager.entity.sys.SysMenu;
@@ -25,7 +25,7 @@ import java.util.List;
 public class SysMenuServiceImpl implements SysMenuService {
 
     @Resource
-    private SysUserDao sysUserDao;
+    private SysDao sysDao;
 
     /**
      * 获取菜单列表
@@ -38,7 +38,7 @@ public class SysMenuServiceImpl implements SysMenuService {
     @Override
     public ResponseJson<PaginationVo<SysMenu>> getMenuList(Integer parentId, Integer status, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        List<SysMenu> menus = sysUserDao.getMenuList(parentId, status);
+        List<SysMenu> menus = sysDao.getMenuList(parentId, status);
         PaginationVo<SysMenu> pageData = new PaginationVo<>(menus);
         return ResponseJson.success(pageData);
     }
@@ -48,7 +48,7 @@ public class SysMenuServiceImpl implements SysMenuService {
      */
     @Override
     public ResponseJson<List<SysMenu>> getMenuTree() {
-        List<SysMenu> menus = sysUserDao.getMenuList(0, 0);
+        List<SysMenu> menus = sysDao.getMenuList(0, 0);
         // 递归设置子菜单
         setSubMenusData(menus);
         return ResponseJson.success(menus);
@@ -60,7 +60,7 @@ public class SysMenuServiceImpl implements SysMenuService {
     private void setSubMenusData(List<SysMenu> menus) {
         if (!CollectionUtils.isEmpty(menus)) {
             for (SysMenu menu : menus) {
-                List<SysMenu> submenus = sysUserDao.getMenuList(menu.getId(), 0);
+                List<SysMenu> submenus = sysDao.getMenuList(menu.getId(), 0);
                 if (!CollectionUtils.isEmpty(submenus)) {
                     setSubMenusData(submenus);
                     menu.setSubMenus(submenus);
@@ -74,7 +74,7 @@ public class SysMenuServiceImpl implements SysMenuService {
      */
     @Override
     public ResponseJson<SysMenu> getMenu(Integer id) {
-        SysMenu menu = sysUserDao.getMenu(id);
+        SysMenu menu = sysDao.getMenu(id);
         return ResponseJson.success(menu);
     }
 
@@ -85,7 +85,7 @@ public class SysMenuServiceImpl implements SysMenuService {
     public ResponseJson<Void> updateMenu(Integer id, SysMenu menu) {
         menu.setId(id);
         menu.setDelFlag(0);
-        sysUserDao.updateMenu(menu);
+        sysDao.updateMenu(menu);
         return ResponseJson.success();
     }
 
@@ -94,7 +94,7 @@ public class SysMenuServiceImpl implements SysMenuService {
      */
     @Override
     public ResponseJson<Void> updateMenuSelective(Integer id, SysMenu menu) {
-        SysMenu dbMenu = sysUserDao.getMenu(id);
+        SysMenu dbMenu = sysDao.getMenu(id);
         if (StringUtils.hasLength(menu.getTitle())){
             dbMenu.setTitle(menu.getTitle());
         }
@@ -116,7 +116,7 @@ public class SysMenuServiceImpl implements SysMenuService {
         if (null != menu.getStatus()){
             dbMenu.setStatus(menu.getStatus());
         }
-        sysUserDao.updateMenu(dbMenu);
+        sysDao.updateMenu(dbMenu);
         return ResponseJson.success();
     }
 
@@ -135,9 +135,9 @@ public class SysMenuServiceImpl implements SysMenuService {
             return ResponseJson.error("菜单名称不能为空！", null);
         }
         // 根据路由名称查询菜单
-        SysMenu dbMenu = sysUserDao.getMenuByName(menu.getName());
+        SysMenu dbMenu = sysDao.getMenuByName(menu.getName());
         if (null == dbMenu) {
-            sysUserDao.insertMenu(menu);
+            sysDao.insertMenu(menu);
         } else if (!Integer.valueOf(0).equals(dbMenu.getDelFlag())){
             // 更新已删除菜单
             return updateMenu(dbMenu.getId(), menu);
@@ -152,7 +152,7 @@ public class SysMenuServiceImpl implements SysMenuService {
      */
     @Override
     public ResponseJson<Void> deleteMenu(Integer id) {
-        sysUserDao.deleteMenu(id);
+        sysDao.deleteMenu(id);
         return ResponseJson.success();
     }
 }

src/main/java/com/caimei365/manager/service/sys/impl/SysRoleServiceImpl.java

@@ -1,6 +1,6 @@
 package com.caimei365.manager.service.sys.impl;
 
-import com.caimei365.manager.dao.SysUserDao;
+import com.caimei365.manager.dao.SysDao;
 import com.caimei365.manager.entity.PaginationVo;
 import com.caimei365.manager.entity.ResponseJson;
 import com.caimei365.manager.entity.sys.SysRole;
@@ -25,7 +25,7 @@ import java.util.List;
 public class SysRoleServiceImpl implements SysRoleService {
 
     @Resource
-    private SysUserDao sysUserDao;
+    private SysDao sysDao;
 
     /**
      * 获取角色列表
@@ -36,7 +36,7 @@ public class SysRoleServiceImpl implements SysRoleService {
     @Override
     public ResponseJson<PaginationVo<SysRole>> getRoleList(int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        List<SysRole> roles = sysUserDao.getRoleList();
+        List<SysRole> roles = sysDao.getRoleList();
         PaginationVo<SysRole> pageData = new PaginationVo<>(roles);
         return ResponseJson.success(pageData);
     }
@@ -49,7 +49,7 @@ public class SysRoleServiceImpl implements SysRoleService {
         SysRole sysRole = getRole(id);
         if (null != sysRole) {
             // 根据角色ID获取菜单Ids
-            List<String> menuIdList = sysUserDao.getMenuIdsByRoleId(id);
+            List<String> menuIdList = sysDao.getMenuIdsByRoleId(id);
             String menuIds = CommonUtil.listToString(menuIdList, ",");
             sysRole.setMenuIds(menuIds);
         }
@@ -57,7 +57,7 @@ public class SysRoleServiceImpl implements SysRoleService {
     }
 
     private SysRole getRole(Integer id) {
-        return sysUserDao.getRole(id);
+        return sysDao.getRole(id);
     }
 
     /**
@@ -68,10 +68,10 @@ public class SysRoleServiceImpl implements SysRoleService {
         sysRole.setId(id);
         sysRole.setDelFlag(0);
         // 删除原有角色菜单关联
-        sysUserDao.deleteRoleMenuRelation(id);
+        sysDao.deleteRoleMenuRelation(id);
         // 菜单Ids，用","隔开
         String menuIds = sysRole.getMenuIds();
-        sysUserDao.updateRole(sysRole);
+        sysDao.updateRole(sysRole);
         // 保存角色菜单关系
         saveRoleMenuRelation(sysRole.getId(), menuIds);
         return ResponseJson.success();
@@ -84,11 +84,11 @@ public class SysRoleServiceImpl implements SysRoleService {
     public ResponseJson<Void> addRole(SysRole sysRole) {
         if (StringUtils.hasLength(sysRole.getRoleName())) {
             // 查询是否存在当前角色
-            SysRole dbRole  = sysUserDao.getRoleByRoleName(sysRole.getRoleName());
+            SysRole dbRole  = sysDao.getRoleByRoleName(sysRole.getRoleName());
             if (null == dbRole) {
                 String menuIds = sysRole.getMenuIds();
                 // 保存角色
-                sysUserDao.insertRole(sysRole);
+                sysDao.insertRole(sysRole);
                 // 保存角色菜单关系
                 saveRoleMenuRelation(sysRole.getId(), menuIds);
                 return ResponseJson.success();
@@ -108,9 +108,9 @@ public class SysRoleServiceImpl implements SysRoleService {
     @Override
     public ResponseJson<Void> deleteRole(Integer id) {
         // 删除角色菜单关联
-        sysUserDao.deleteRoleMenuRelation(id);
+        sysDao.deleteRoleMenuRelation(id);
         // 删除角色
-        sysUserDao.deleteRole(id);
+        sysDao.deleteRole(id);
         return ResponseJson.success();
     }
 
@@ -120,7 +120,7 @@ public class SysRoleServiceImpl implements SysRoleService {
     @Override
     public ResponseJson<Void> setRoleMenu(Integer id, SysRole sysRole) {
         // 删除原有角色菜单关联
-        sysUserDao.deleteRoleMenuRelation(id);
+        sysDao.deleteRoleMenuRelation(id);
         // 保存角色菜单关系
         String menuIds = sysRole.getMenuIds();
         saveRoleMenuRelation(id, menuIds);
@@ -137,7 +137,7 @@ public class SysRoleServiceImpl implements SysRoleService {
             for (String s : split) {
                 if (StringUtils.hasLength(s)) {
                     // 保存角色菜单关系
-                    sysUserDao.insertRoleMenuRelation(roleId, Integer.valueOf(s));
+                    sysDao.insertRoleMenuRelation(roleId, Integer.valueOf(s));
                 }
             }
         }

src/main/java/com/caimei365/manager/service/sys/impl/SysUserServiceImpl.java

@@ -1,6 +1,6 @@
 package com.caimei365.manager.service.sys.impl;
 
-import com.caimei365.manager.dao.SysUserDao;
+import com.caimei365.manager.dao.SysDao;
 import com.caimei365.manager.entity.PaginationVo;
 import com.caimei365.manager.entity.ResponseJson;
 import com.caimei365.manager.entity.sys.SysMenu;
@@ -30,7 +30,7 @@ import java.util.List;
 public class SysUserServiceImpl implements SysUserService {
 
     @Resource
-    private SysUserDao sysUserDao;
+    private SysDao sysDao;
 
     @Resource
     private BCryptPasswordEncoder passwordEncoder;
@@ -44,13 +44,13 @@ public class SysUserServiceImpl implements SysUserService {
     @Override
     public ResponseJson<SysUser> getInfoByUsername(String username) {
         if (StringUtils.hasLength(username)) {
-            SysUser sysUser = sysUserDao.findByUsername(username);
+            SysUser sysUser = sysDao.findByUsername(username);
             if (null != sysUser) {
                 List<String> roleNames = new ArrayList<>();
                 List<Integer> roleIds = new ArrayList<>();
                 StringBuilder roleDesc = new StringBuilder();
                 // 根据用户Id获取用户角色列表
-                List<SysRole> roleList = sysUserDao.getRoleListByUserId(sysUser.getId());
+                List<SysRole> roleList = sysDao.getRoleListByUserId(sysUser.getId());
                 if (!CollectionUtils.isEmpty(roleList)) {
                     for (SysRole role : roleList) {
                         if (null != role) {
@@ -65,7 +65,7 @@ public class SysUserServiceImpl implements SysUserService {
                 List<SysMenu> menus = null;
                 if (!CollectionUtils.isEmpty(roleIds)) {
                     // 根据角色Id获取菜单列表
-                    menus = sysUserDao.getMenusByRoleIds(roleIds);
+                    menus = sysDao.getMenusByRoleIds(roleIds);
                 }
                 sysUser.setMenus(menus);
             }
@@ -97,7 +97,7 @@ public class SysUserServiceImpl implements SysUserService {
     @Override
     public ResponseJson<PaginationVo<SysUser>> getUserList(String username, String fullName, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        List<SysUser> menus = sysUserDao.getUserList(username, fullName);
+        List<SysUser> menus = sysDao.getUserList(username, fullName);
         PaginationVo<SysUser> pageData = new PaginationVo<>(menus);
         return ResponseJson.success(pageData);
     }
@@ -107,10 +107,10 @@ public class SysUserServiceImpl implements SysUserService {
      */
     @Override
     public ResponseJson<SysUser> getUser(Integer id) {
-        SysUser sysUser = sysUserDao.getUser(id);
+        SysUser sysUser = sysDao.getUser(id);
         if (null != sysUser) {
             // 根据用户ID获取角色Ids
-            List<String> roleIdList = sysUserDao.getRoleIdsByUserId(id);
+            List<String> roleIdList = sysDao.getRoleIdsByUserId(id);
             String roleIds = CommonUtil.listToString(roleIdList, ",");
             sysUser.setRoleIds(roleIds);
         }
@@ -130,12 +130,12 @@ public class SysUserServiceImpl implements SysUserService {
             sysUser.setPassword(encodePassword);
         }
         // 删除原有角色关联
-        sysUserDao.deleteUserRoleRelation(id);
+        sysDao.deleteUserRoleRelation(id);
         // 前端传入角色Ids，用","隔开
         String roleIds = sysUser.getRoleIds();
         // 保存用户角色关系
         saveRoleRelation(sysUser.getId(), roleIds);
-        sysUserDao.updateSysUser(sysUser);
+        sysDao.updateSysUser(sysUser);
         return ResponseJson.success();
     }
 
@@ -146,13 +146,13 @@ public class SysUserServiceImpl implements SysUserService {
     public ResponseJson<Void> addUser(SysUser sysUser) {
         if (StringUtils.hasLength(sysUser.getUsername()) && StringUtils.hasLength(sysUser.getPassword())) {
             // 查询是否存在当前用户名的用户
-            SysUser dbUser = sysUserDao.findByUsername(sysUser.getUsername());
+            SysUser dbUser = sysDao.findByUsername(sysUser.getUsername());
             if (null == dbUser || dbUser.getDelFlag() != 0) {
                 // 密码加密
                 String encodePassword = passwordEncoder.encode(sysUser.getPassword());
                 sysUser.setPassword(encodePassword);
                 // 新增用户
-                sysUserDao.insertSysUser(sysUser);
+                sysDao.insertSysUser(sysUser);
                 // 角色Ids，用","隔开
                 String roleIds = sysUser.getRoleIds();
                 // 保存用户角色关系
@@ -174,9 +174,9 @@ public class SysUserServiceImpl implements SysUserService {
     @Override
     public ResponseJson<Void> deleteUser(Integer id) {
         // 删除用户角色关联
-        sysUserDao.deleteUserRoleRelation(id);
+        sysDao.deleteUserRoleRelation(id);
         // 删除用户
-        sysUserDao.deleteSysUser(id);
+        sysDao.deleteSysUser(id);
         return ResponseJson.success();
     }
 
@@ -190,7 +190,7 @@ public class SysUserServiceImpl implements SysUserService {
             for (String s : split) {
                 if (StringUtils.hasLength(s)) {
                     // 保存用户角色关系
-                    sysUserDao.insertUserRoleRelation(userId, Integer.valueOf(s));
+                    sysDao.insertUserRoleRelation(userId, Integer.valueOf(s));
                 }
             }
         }
@@ -201,7 +201,7 @@ public class SysUserServiceImpl implements SysUserService {
      */
     @Override
     public ResponseJson<Void> updateUserProfile(UserProfile profile) {
-        SysUser sysUser = sysUserDao.getUser(profile.getUserId());
+        SysUser sysUser = sysDao.getUser(profile.getUserId());
         if (null == sysUser) {
             return ResponseJson.error("用户异常！", null);
         }
@@ -217,7 +217,7 @@ public class SysUserServiceImpl implements SysUserService {
         if (StringUtils.hasLength(profile.getAvatar())){
             sysUser.setAvatar(profile.getAvatar());
         }
-        sysUserDao.updateSysUser(sysUser);
+        sysDao.updateSysUser(sysUser);
         return ResponseJson.success();
     }
 
@@ -226,7 +226,7 @@ public class SysUserServiceImpl implements SysUserService {
      */
     @Override
     public ResponseJson<Void> updateUserPassword(UserProfile profile) {
-        SysUser sysUser = sysUserDao.getUser(profile.getUserId());
+        SysUser sysUser = sysDao.getUser(profile.getUserId());
         if (null == sysUser) {
             return ResponseJson.error("用户异常！", null);
         }
@@ -242,7 +242,7 @@ public class SysUserServiceImpl implements SysUserService {
         // 密码加密
         String encodePassword = passwordEncoder.encode(profile.getPassword());
         sysUser.setPassword(encodePassword);
-        sysUserDao.updateSysUser(sysUser);
+        sysDao.updateSysUser(sysUser);
         return ResponseJson.success();
     }
 }

src/main/java/com/caimei365/manager/service/wechat/impl/WechatMenuServiceImpl.java

@@ -2,7 +2,7 @@ package com.caimei365.manager.service.wechat.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.caimei365.manager.dao.SysUserDao;
+import com.caimei365.manager.dao.SysDao;
 import com.caimei365.manager.dao.WeChatDao;
 import com.caimei365.manager.entity.ResponseJson;
 import com.caimei365.manager.entity.wechat.WechatMenu;
@@ -53,7 +53,7 @@ public class WechatMenuServiceImpl implements WechatMenuService {
     @Resource
     private WeChatDao weChatDao;
     @Resource
-    private SysUserDao sysUserDao;
+    private SysDao sysDao;
 
     /**
      * 获取微信公众号菜单列表
@@ -175,7 +175,7 @@ public class WechatMenuServiceImpl implements WechatMenuService {
      * @param username 操作人登录名
      */
     private void setParentIds(WechatMenu menu, WechatMenu parentMenu, String username) {
-        Integer userId = sysUserDao.getUserIdByUsername(username);
+        Integer userId = sysDao.getUserIdByUsername(username);
         menu.setUserId(userId);
         String parentIds = "0,";
         if (null != parentMenu && StringUtils.hasLength(parentMenu.getParentIds())) {

src/main/resources/mapper/SysUserDao.xml → src/main/resources/mapper/SysDao.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.caimei365.manager.dao.SysUserDao">
+<mapper namespace="com.caimei365.manager.dao.SysDao">
     <select id="findByUsername" resultType="com.caimei365.manager.entity.sys.SysUser">
         SELECT id, username, PASSWORD, avatar, fullName, phone, login_flag AS loginFlag, del_flag AS delFlag
         FROM sys_user WHERE login_flag=0 AND username=#{username}