From 48d61a3cdf4c0f119456f86d51cd770caf8645e1 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 14 四月 2021 11:19:46 +0800
Subject: [PATCH] update mp化
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java | 1
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java | 55 ---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java | 32 --
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java | 24 -
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 101 ------
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java | 50 ---
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java | 32 --
ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml | 26 -
ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml | 39 --
ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml | 26 -
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 60 ++-
ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml | 20 -
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java | 74 ----
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java | 41 +-
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java | 71 ++-
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml | 97 ------
ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml | 100 ------
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java | 69 ----
19 files changed, 112 insertions(+), 808 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
index aa60c2d..f6f6bd2 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java
@@ -35,6 +35,7 @@
private String menuName;
/** 鐖惰彍鍗曞悕绉� */
+ @TableField(exist = false)
private String parentName;
/** 鐖惰彍鍗旾D */
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
index d2c4638..aa3055e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
@@ -12,13 +12,6 @@
* @author ruoyi
*/
public interface SysMenuMapper extends BaseMapper<SysMenu> {
- /**
- * 鏌ヨ绯荤粺鑿滃崟鍒楄〃
- *
- * @param menu 鑿滃崟淇℃伅
- * @return 鑿滃崟鍒楄〃
- */
- public List<SysMenu> selectMenuList(SysMenu menu);
/**
* 鏍规嵁鐢ㄦ埛鎵�鏈夋潈闄�
@@ -67,52 +60,4 @@
*/
public List<Integer> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly);
- /**
- * 鏍规嵁鑿滃崟ID鏌ヨ淇℃伅
- *
- * @param menuId 鑿滃崟ID
- * @return 鑿滃崟淇℃伅
- */
- public SysMenu selectMenuById(Long menuId);
-
- /**
- * 鏄惁瀛樺湪鑿滃崟瀛愯妭鐐�
- *
- * @param menuId 鑿滃崟ID
- * @return 缁撴灉
- */
- public int hasChildByMenuId(Long menuId);
-
- /**
- * 鏂板鑿滃崟淇℃伅
- *
- * @param menu 鑿滃崟淇℃伅
- * @return 缁撴灉
- */
- public int insertMenu(SysMenu menu);
-
- /**
- * 淇敼鑿滃崟淇℃伅
- *
- * @param menu 鑿滃崟淇℃伅
- * @return 缁撴灉
- */
- public int updateMenu(SysMenu menu);
-
- /**
- * 鍒犻櫎鑿滃崟绠＄悊淇℃伅
- *
- * @param menuId 鑿滃崟ID
- * @return 缁撴灉
- */
- public int deleteMenuById(Long menuId);
-
- /**
- * 鏍￠獙鑿滃崟鍚嶇О鏄惁鍞竴
- *
- * @param menuName 鑿滃崟鍚嶇О
- * @param parentId 鐖惰彍鍗旾D
- * @return 缁撴灉
- */
- public SysMenu checkMenuNameUnique(@Param("menuName") String menuName, @Param("parentId") Long parentId);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java
index 159bcd8..c609a5a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java
@@ -3,43 +3,11 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.SysRoleDept;
-import java.util.List;
-
/**
* 瑙掕壊涓庨儴闂ㄥ叧鑱旇〃 鏁版嵁灞�
*
* @author ruoyi
*/
public interface SysRoleDeptMapper extends BaseMapper<SysRoleDept> {
- /**
- * 閫氳繃瑙掕壊ID鍒犻櫎瑙掕壊鍜岄儴闂ㄥ叧鑱�
- *
- * @param roleId 瑙掕壊ID
- * @return 缁撴灉
- */
- public int deleteRoleDeptByRoleId(Long roleId);
- /**
- * 鎵归噺鍒犻櫎瑙掕壊閮ㄩ棬鍏宠仈淇℃伅
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteRoleDept(Long[] ids);
-
- /**
- * 鏌ヨ閮ㄩ棬浣跨敤鏁伴噺
- *
- * @param deptId 閮ㄩ棬ID
- * @return 缁撴灉
- */
- public int selectCountRoleDeptByDeptId(Long deptId);
-
- /**
- * 鎵归噺鏂板瑙掕壊閮ㄩ棬淇℃伅
- *
- * @param roleDeptList 瑙掕壊閮ㄩ棬鍒楄〃
- * @return 缁撴灉
- */
- public int batchRoleDept(List<SysRoleDept> roleDeptList);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
index b76ce7f..1ed48b6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
@@ -11,13 +11,7 @@
* @author ruoyi
*/
public interface SysRoleMapper extends BaseMapper<SysRole> {
- /**
- * 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瑙掕壊鏁版嵁
- *
- * @param role 瑙掕壊淇℃伅
- * @return 瑙掕壊鏁版嵁闆嗗悎淇℃伅
- */
- public List<SysRole> selectRoleList(SysRole role);
+
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊
@@ -27,12 +21,6 @@
*/
public List<SysRole> selectRolePermissionByUserId(Long userId);
- /**
- * 鏌ヨ鎵�鏈夎鑹�
- *
- * @return 瑙掕壊鍒楄〃
- */
- public List<SysRole> selectRoleAll();
/**
* 鏍规嵁鐢ㄦ埛ID鑾峰彇瑙掕壊閫夋嫨妗嗗垪琛�
@@ -43,14 +31,6 @@
public List<Integer> selectRoleListByUserId(Long userId);
/**
- * 閫氳繃瑙掕壊ID鏌ヨ瑙掕壊
- *
- * @param roleId 瑙掕壊ID
- * @return 瑙掕壊瀵硅薄淇℃伅
- */
- public SysRole selectRoleById(Long roleId);
-
- /**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ瑙掕壊
*
* @param userName 鐢ㄦ埛鍚�
@@ -58,51 +38,4 @@
*/
public List<SysRole> selectRolesByUserName(String userName);
- /**
- * 鏍￠獙瑙掕壊鍚嶇О鏄惁鍞竴
- *
- * @param roleName 瑙掕壊鍚嶇О
- * @return 瑙掕壊淇℃伅
- */
- public SysRole checkRoleNameUnique(String roleName);
-
- /**
- * 鏍￠獙瑙掕壊鏉冮檺鏄惁鍞竴
- *
- * @param roleKey 瑙掕壊鏉冮檺
- * @return 瑙掕壊淇℃伅
- */
- public SysRole checkRoleKeyUnique(String roleKey);
-
- /**
- * 淇敼瑙掕壊淇℃伅
- *
- * @param role 瑙掕壊淇℃伅
- * @return 缁撴灉
- */
- public int updateRole(SysRole role);
-
- /**
- * 鏂板瑙掕壊淇℃伅
- *
- * @param role 瑙掕壊淇℃伅
- * @return 缁撴灉
- */
- public int insertRole(SysRole role);
-
- /**
- * 閫氳繃瑙掕壊ID鍒犻櫎瑙掕壊
- *
- * @param roleId 瑙掕壊ID
- * @return 缁撴灉
- */
- public int deleteRoleById(Long roleId);
-
- /**
- * 鎵归噺鍒犻櫎瑙掕壊淇℃伅
- *
- * @param roleIds 闇�瑕佸垹闄ょ殑瑙掕壊ID
- * @return 缁撴灉
- */
- public int deleteRoleByIds(Long[] roleIds);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java
index f66f200..6bc21a3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java
@@ -3,43 +3,11 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.SysRoleMenu;
-import java.util.List;
-
/**
* 瑙掕壊涓庤彍鍗曞叧鑱旇〃 鏁版嵁灞�
*
* @author ruoyi
*/
public interface SysRoleMenuMapper extends BaseMapper<SysRoleMenu> {
- /**
- * 鏌ヨ鑿滃崟浣跨敤鏁伴噺
- *
- * @param menuId 鑿滃崟ID
- * @return 缁撴灉
- */
- public int checkMenuExistRole(Long menuId);
- /**
- * 閫氳繃瑙掕壊ID鍒犻櫎瑙掕壊鍜岃彍鍗曞叧鑱�
- *
- * @param roleId 瑙掕壊ID
- * @return 缁撴灉
- */
- public int deleteRoleMenuByRoleId(Long roleId);
-
- /**
- * 鎵归噺鍒犻櫎瑙掕壊鑿滃崟鍏宠仈淇℃伅
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteRoleMenu(Long[] ids);
-
- /**
- * 鎵归噺鏂板瑙掕壊鑿滃崟淇℃伅
- *
- * @param roleMenuList 瑙掕壊鑿滃崟鍒楄〃
- * @return 缁撴灉
- */
- public int batchRoleMenu(List<SysRoleMenu> roleMenuList);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
index b4e7e7a..02d2e96 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.domain.entity.SysUser;
-import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -36,77 +35,4 @@
*/
public SysUser selectUserById(Long userId);
- /**
- * 鏂板鐢ㄦ埛淇℃伅
- *
- * @param user 鐢ㄦ埛淇℃伅
- * @return 缁撴灉
- */
- public int insertUser(SysUser user);
-
- /**
- * 淇敼鐢ㄦ埛淇℃伅
- *
- * @param user 鐢ㄦ埛淇℃伅
- * @return 缁撴灉
- */
- public int updateUser(SysUser user);
-
- /**
- * 淇敼鐢ㄦ埛澶村儚
- *
- * @param userName 鐢ㄦ埛鍚�
- * @param avatar 澶村儚鍦板潃
- * @return 缁撴灉
- */
- public int updateUserAvatar(@Param("userName") String userName, @Param("avatar") String avatar);
-
- /**
- * 閲嶇疆鐢ㄦ埛瀵嗙爜
- *
- * @param userName 鐢ㄦ埛鍚�
- * @param password 瀵嗙爜
- * @return 缁撴灉
- */
- public int resetUserPwd(@Param("userName") String userName, @Param("password") String password);
-
- /**
- * 閫氳繃鐢ㄦ埛ID鍒犻櫎鐢ㄦ埛
- *
- * @param userId 鐢ㄦ埛ID
- * @return 缁撴灉
- */
- public int deleteUserById(Long userId);
-
- /**
- * 鎵归噺鍒犻櫎鐢ㄦ埛淇℃伅
- *
- * @param userIds 闇�瑕佸垹闄ょ殑鐢ㄦ埛ID
- * @return 缁撴灉
- */
- public int deleteUserByIds(Long[] userIds);
-
- /**
- * 鏍￠獙鐢ㄦ埛鍚嶇О鏄惁鍞竴
- *
- * @param userName 鐢ㄦ埛鍚嶇О
- * @return 缁撴灉
- */
- public int checkUserNameUnique(String userName);
-
- /**
- * 鏍￠獙鎵嬫満鍙风爜鏄惁鍞竴
- *
- * @param phonenumber 鎵嬫満鍙风爜
- * @return 缁撴灉
- */
- public SysUser checkPhoneUnique(String phonenumber);
-
- /**
- * 鏍￠獙email鏄惁鍞竴
- *
- * @param email 鐢ㄦ埛閭
- * @return 缁撴灉
- */
- public SysUser checkEmailUnique(String email);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java
index 1030270..b56beaa 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java
@@ -3,35 +3,11 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.SysUserPost;
-import java.util.List;
-
/**
* 鐢ㄦ埛涓庡矖浣嶅叧鑱旇〃 鏁版嵁灞�
*
* @author ruoyi
*/
public interface SysUserPostMapper extends BaseMapper<SysUserPost> {
- /**
- * 閫氳繃鐢ㄦ埛ID鍒犻櫎鐢ㄦ埛鍜屽矖浣嶅叧鑱�
- *
- * @param userId 鐢ㄦ埛ID
- * @return 缁撴灉
- */
- public int deleteUserPostByUserId(Long userId);
- /**
- * 鎵归噺鍒犻櫎鐢ㄦ埛鍜屽矖浣嶅叧鑱�
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteUserPost(Long[] ids);
-
- /**
- * 鎵归噺鏂板鐢ㄦ埛宀椾綅淇℃伅
- *
- * @param userPostList 鐢ㄦ埛瑙掕壊鍒楄〃
- * @return 缁撴灉
- */
- public int batchUserPost(List<SysUserPost> userPostList);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java
index 62d3dbb..4bd3bca 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java
@@ -2,9 +2,6 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.domain.SysUserRole;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
/**
* 鐢ㄦ埛涓庤鑹插叧鑱旇〃 鏁版嵁灞�
@@ -12,52 +9,5 @@
* @author ruoyi
*/
public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
- /**
- * 閫氳繃鐢ㄦ埛ID鍒犻櫎鐢ㄦ埛鍜岃鑹插叧鑱�
- *
- * @param userId 鐢ㄦ埛ID
- * @return 缁撴灉
- */
- public int deleteUserRoleByUserId(Long userId);
- /**
- * 鎵归噺鍒犻櫎鐢ㄦ埛鍜岃鑹插叧鑱�
- *
- * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteUserRole(Long[] ids);
-
- /**
- * 閫氳繃瑙掕壊ID鏌ヨ瑙掕壊浣跨敤鏁伴噺
- *
- * @param roleId 瑙掕壊ID
- * @return 缁撴灉
- */
- public int countUserRoleByRoleId(Long roleId);
-
- /**
- * 鎵归噺鏂板鐢ㄦ埛瑙掕壊淇℃伅
- *
- * @param userRoleList 鐢ㄦ埛瑙掕壊鍒楄〃
- * @return 缁撴灉
- */
- public int batchUserRole(List<SysUserRole> userRoleList);
-
- /**
- * 鍒犻櫎鐢ㄦ埛鍜岃鑹插叧鑱斾俊鎭�
- *
- * @param userRole 鐢ㄦ埛鍜岃鑹插叧鑱斾俊鎭�
- * @return 缁撴灉
- */
- public int deleteUserRoleInfo(SysUserRole userRole);
-
- /**
- * 鎵归噺鍙栨秷鎺堟潈鐢ㄦ埛瑙掕壊
- *
- * @param roleId 瑙掕壊ID
- * @param userIds 闇�瑕佸垹闄ょ殑鐢ㄦ埛鏁版嵁ID
- * @return 缁撴灉
- */
- public int deleteUserRoleInfos(@Param("roleId") Long roleId, @Param("userIds") Long[] userIds);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
index e554c00..98616e8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
@@ -106,7 +106,7 @@
*/
@Override
public List<Integer> selectDeptListByRoleId(Long roleId) {
- SysRole role = roleMapper.selectRoleById(roleId);
+ SysRole role = roleMapper.selectById(roleId);
return baseMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly());
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
index aa924f9..de669b1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -2,6 +2,7 @@
import cn.hutool.core.lang.Validator;
import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.domain.TreeSelect;
@@ -9,6 +10,7 @@
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.SysRoleMenu;
import com.ruoyi.system.domain.vo.MetaVo;
import com.ruoyi.system.domain.vo.RouterVo;
import com.ruoyi.system.mapper.SysMenuMapper;
@@ -29,9 +31,6 @@
@Service
public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> implements ISysMenuService {
public static final String PREMISSION_STRING = "perms[\"{0}\"]";
-
- @Autowired
- private SysMenuMapper menuMapper;
@Autowired
private SysRoleMapper roleMapper;
@@ -61,10 +60,15 @@
List<SysMenu> menuList = null;
// 绠＄悊鍛樻樉绀烘墍鏈夎彍鍗曚俊鎭�
if (SysUser.isAdmin(userId)) {
- menuList = menuMapper.selectMenuList(menu);
+ menuList = list(new LambdaQueryWrapper<SysMenu>()
+ .like(StrUtil.isNotBlank(menu.getMenuName()),SysMenu::getMenuName,menu.getMenuName())
+ .eq(StrUtil.isNotBlank(menu.getVisible()),SysMenu::getVisible,menu.getVisible())
+ .eq(StrUtil.isNotBlank(menu.getStatus()),SysMenu::getStatus,menu.getStatus())
+ .orderByAsc(SysMenu::getParentId)
+ .orderByAsc(SysMenu::getOrderNum));
} else {
menu.getParams().put("userId", userId);
- menuList = menuMapper.selectMenuListByUserId(menu);
+ menuList = baseMapper.selectMenuListByUserId(menu);
}
return menuList;
}
@@ -77,7 +81,7 @@
*/
@Override
public Set<String> selectMenuPermsByUserId(Long userId) {
- List<String> perms = menuMapper.selectMenuPermsByUserId(userId);
+ List<String> perms = baseMapper.selectMenuPermsByUserId(userId);
Set<String> permsSet = new HashSet<>();
for (String perm : perms) {
if (Validator.isNotEmpty(perm)) {
@@ -97,9 +101,9 @@
public List<SysMenu> selectMenuTreeByUserId(Long userId) {
List<SysMenu> menus = null;
if (SecurityUtils.isAdmin(userId)) {
- menus = menuMapper.selectMenuTreeAll();
+ menus = baseMapper.selectMenuTreeAll();
} else {
- menus = menuMapper.selectMenuTreeByUserId(userId);
+ menus = baseMapper.selectMenuTreeByUserId(userId);
}
return getChildPerms(menus, 0);
}
@@ -112,8 +116,8 @@
*/
@Override
public List<Integer> selectMenuListByRoleId(Long roleId) {
- SysRole role = roleMapper.selectRoleById(roleId);
- return menuMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly());
+ SysRole role = roleMapper.selectById(roleId);
+ return baseMapper.selectMenuListByRoleId(roleId, role.isMenuCheckStrictly());
}
/**
@@ -199,7 +203,7 @@
*/
@Override
public SysMenu selectMenuById(Long menuId) {
- return menuMapper.selectMenuById(menuId);
+ return getById(menuId);
}
/**
@@ -210,7 +214,7 @@
*/
@Override
public boolean hasChildByMenuId(Long menuId) {
- int result = menuMapper.hasChildByMenuId(menuId);
+ int result = count(new LambdaQueryWrapper<SysMenu>().eq(SysMenu::getParentId,menuId));
return result > 0 ? true : false;
}
@@ -222,7 +226,7 @@
*/
@Override
public boolean checkMenuExistRole(Long menuId) {
- int result = roleMenuMapper.checkMenuExistRole(menuId);
+ int result = roleMenuMapper.selectCount(new LambdaQueryWrapper<SysRoleMenu>().eq(SysRoleMenu::getMenuId,menuId));
return result > 0 ? true : false;
}
@@ -234,7 +238,7 @@
*/
@Override
public int insertMenu(SysMenu menu) {
- return menuMapper.insertMenu(menu);
+ return baseMapper.insert(menu);
}
/**
@@ -245,7 +249,7 @@
*/
@Override
public int updateMenu(SysMenu menu) {
- return menuMapper.updateMenu(menu);
+ return baseMapper.updateById(menu);
}
/**
@@ -256,7 +260,7 @@
*/
@Override
public int deleteMenuById(Long menuId) {
- return menuMapper.deleteMenuById(menuId);
+ return baseMapper.deleteById(menuId);
}
/**
@@ -268,7 +272,10 @@
@Override
public String checkMenuNameUnique(SysMenu menu) {
Long menuId = Validator.isNull(menu.getMenuId()) ? -1L : menu.getMenuId();
- SysMenu info = menuMapper.checkMenuNameUnique(menu.getMenuName(), menu.getParentId());
+ SysMenu info = getOne(new LambdaQueryWrapper<SysMenu>()
+ .eq(SysMenu::getMenuName,menu.getMenuName())
+ .eq(SysMenu::getParentId,menu.getParentId())
+ .last("limit 1"));
if (Validator.isNotNull(info) && info.getMenuId().longValue() != menuId.longValue()) {
return UserConstants.NOT_UNIQUE;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
index e2691ab..d025dd4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
@@ -1,6 +1,8 @@
package com.ruoyi.system.service.impl;
import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.UserConstants;
@@ -9,6 +11,7 @@
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.domain.SysRoleDept;
import com.ruoyi.system.domain.SysRoleMenu;
+import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.mapper.SysRoleDeptMapper;
import com.ruoyi.system.mapper.SysRoleMapper;
import com.ruoyi.system.mapper.SysRoleMenuMapper;
@@ -27,8 +30,6 @@
*/
@Service
public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements ISysRoleService {
- @Autowired
- private SysRoleMapper roleMapper;
@Autowired
private SysRoleMenuMapper roleMenuMapper;
@@ -48,7 +49,20 @@
@Override
@DataScope(deptAlias = "d")
public List<SysRole> selectRoleList(SysRole role) {
- return roleMapper.selectRoleList(role);
+ Map<String, Object> params = role.getParams();
+ Object dataScope = params.get("dataScope");
+ return list(new LambdaQueryWrapper<SysRole>()
+ .like(StrUtil.isNotBlank(role.getRoleName()), SysRole::getRoleName, role.getRoleName())
+ .eq(StrUtil.isNotBlank(role.getStatus()), SysRole::getStatus, role.getStatus())
+ .like(StrUtil.isNotBlank(role.getRoleKey()), SysRole::getRoleKey, role.getRoleKey())
+ .apply(Validator.isNotEmpty(params.get("beginTime")),
+ "date_format(create_time,'%y%m%d') >= date_format({0},'%y%m%d')",
+ params.get("beginTime"))
+ .apply(Validator.isNotEmpty(params.get("endTime")),
+ "date_format(create_time,'%y%m%d') <= date_format({0},'%y%m%d')",
+ params.get("endTime"))
+ .apply(dataScope != null, dataScope != null ? dataScope.toString() : null)
+ .orderByAsc(SysRole::getRoleSort));
}
/**
@@ -59,7 +73,7 @@
*/
@Override
public Set<String> selectRolePermissionByUserId(Long userId) {
- List<SysRole> perms = roleMapper.selectRolePermissionByUserId(userId);
+ List<SysRole> perms = baseMapper.selectRolePermissionByUserId(userId);
Set<String> permsSet = new HashSet<>();
for (SysRole perm : perms) {
if (Validator.isNotNull(perm)) {
@@ -87,7 +101,7 @@
*/
@Override
public List<Integer> selectRoleListByUserId(Long userId) {
- return roleMapper.selectRoleListByUserId(userId);
+ return baseMapper.selectRoleListByUserId(userId);
}
/**
@@ -98,7 +112,7 @@
*/
@Override
public SysRole selectRoleById(Long roleId) {
- return roleMapper.selectRoleById(roleId);
+ return getById(roleId);
}
/**
@@ -110,7 +124,8 @@
@Override
public String checkRoleNameUnique(SysRole role) {
Long roleId = Validator.isNull(role.getRoleId()) ? -1L : role.getRoleId();
- SysRole info = roleMapper.checkRoleNameUnique(role.getRoleName());
+ SysRole info = getOne(new LambdaQueryWrapper<SysRole>()
+ .eq(SysRole::getRoleName, role.getRoleName()).last("limit 1"));
if (Validator.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) {
return UserConstants.NOT_UNIQUE;
}
@@ -126,7 +141,8 @@
@Override
public String checkRoleKeyUnique(SysRole role) {
Long roleId = Validator.isNull(role.getRoleId()) ? -1L : role.getRoleId();
- SysRole info = roleMapper.checkRoleKeyUnique(role.getRoleKey());
+ SysRole info = getOne(new LambdaQueryWrapper<SysRole>()
+ .eq(SysRole::getRoleKey, role.getRoleKey()).last("limit 1"));
if (Validator.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) {
return UserConstants.NOT_UNIQUE;
}
@@ -153,7 +169,7 @@
*/
@Override
public int countUserRoleByRoleId(Long roleId) {
- return userRoleMapper.countUserRoleByRoleId(roleId);
+ return userRoleMapper.selectCount(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getRoleId, roleId));
}
/**
@@ -166,7 +182,7 @@
@Transactional
public int insertRole(SysRole role) {
// 鏂板瑙掕壊淇℃伅
- roleMapper.insertRole(role);
+ baseMapper.insert(role);
return insertRoleMenu(role);
}
@@ -180,9 +196,9 @@
@Transactional
public int updateRole(SysRole role) {
// 淇敼瑙掕壊淇℃伅
- roleMapper.updateRole(role);
+ baseMapper.updateById(role);
// 鍒犻櫎瑙掕壊涓庤彍鍗曞叧鑱�
- roleMenuMapper.deleteRoleMenuByRoleId(role.getRoleId());
+ roleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>().eq(SysRoleMenu::getRoleId, role.getRoleId()));
return insertRoleMenu(role);
}
@@ -194,7 +210,7 @@
*/
@Override
public int updateRoleStatus(SysRole role) {
- return roleMapper.updateRole(role);
+ return baseMapper.updateById(role);
}
/**
@@ -207,9 +223,9 @@
@Transactional
public int authDataScope(SysRole role) {
// 淇敼瑙掕壊淇℃伅
- roleMapper.updateRole(role);
+ baseMapper.updateById(role);
// 鍒犻櫎瑙掕壊涓庨儴闂ㄥ叧鑱�
- roleDeptMapper.deleteRoleDeptByRoleId(role.getRoleId());
+ roleDeptMapper.delete(new LambdaQueryWrapper<SysRoleDept>().eq(SysRoleDept::getRoleId, role.getRoleId()));
// 鏂板瑙掕壊鍜岄儴闂ㄤ俊鎭紙鏁版嵁鏉冮檺锛�
return insertRoleDept(role);
}
@@ -220,7 +236,7 @@
* @param role 瑙掕壊瀵硅薄
*/
public int insertRoleMenu(SysRole role) {
- int rows = 1;
+ int rows = 0;
// 鏂板鐢ㄦ埛涓庤鑹茬鐞�
List<SysRoleMenu> list = new ArrayList<SysRoleMenu>();
for (Long menuId : role.getMenuIds()) {
@@ -230,7 +246,9 @@
list.add(rm);
}
if (list.size() > 0) {
- rows = roleMenuMapper.batchRoleMenu(list);
+ for (SysRoleMenu sysRoleMenu : list) {
+ rows += roleMenuMapper.insert(sysRoleMenu);
+ }
}
return rows;
}
@@ -241,7 +259,7 @@
* @param role 瑙掕壊瀵硅薄
*/
public int insertRoleDept(SysRole role) {
- int rows = 1;
+ int rows = 0;
// 鏂板瑙掕壊涓庨儴闂紙鏁版嵁鏉冮檺锛夌鐞�
List<SysRoleDept> list = new ArrayList<SysRoleDept>();
for (Long deptId : role.getDeptIds()) {
@@ -251,7 +269,9 @@
list.add(rd);
}
if (list.size() > 0) {
- rows = roleDeptMapper.batchRoleDept(list);
+ for (SysRoleDept sysRoleDept : list) {
+ rows += roleDeptMapper.insert(sysRoleDept);
+ }
}
return rows;
}
@@ -266,10 +286,10 @@
@Transactional
public int deleteRoleById(Long roleId) {
// 鍒犻櫎瑙掕壊涓庤彍鍗曞叧鑱�
- roleMenuMapper.deleteRoleMenuByRoleId(roleId);
+ roleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>().eq(SysRoleMenu::getRoleId, roleId));
// 鍒犻櫎瑙掕壊涓庨儴闂ㄥ叧鑱�
- roleDeptMapper.deleteRoleDeptByRoleId(roleId);
- return roleMapper.deleteRoleById(roleId);
+ roleDeptMapper.delete(new LambdaQueryWrapper<SysRoleDept>().eq(SysRoleDept::getRoleId, roleId));
+ return baseMapper.deleteById(roleId);
}
/**
@@ -288,10 +308,11 @@
throw new CustomException(String.format("%1$s宸插垎閰�,涓嶈兘鍒犻櫎", role.getRoleName()));
}
}
+ List<Long> ids = Arrays.asList(roleIds);
// 鍒犻櫎瑙掕壊涓庤彍鍗曞叧鑱�
- roleMenuMapper.deleteRoleMenu(roleIds);
+ roleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>().in(SysRoleMenu::getRoleId, ids));
// 鍒犻櫎瑙掕壊涓庨儴闂ㄥ叧鑱�
- roleDeptMapper.deleteRoleDept(roleIds);
- return roleMapper.deleteRoleByIds(roleIds);
+ roleDeptMapper.delete(new LambdaQueryWrapper<SysRoleDept>().in(SysRoleDept::getRoleId, ids));
+ return baseMapper.deleteBatchIds(ids);
}
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 73908c7..74c265c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -1,6 +1,8 @@
package com.ruoyi.system.service.impl;
import cn.hutool.core.lang.Validator;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.UserConstants;
@@ -21,6 +23,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
/**
@@ -130,7 +133,7 @@
*/
@Override
public String checkUserNameUnique(String userName) {
- int count = userMapper.checkUserNameUnique(userName);
+ int count = count(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserName, userName).last("limit 1"));
if (count > 0) {
return UserConstants.NOT_UNIQUE;
}
@@ -146,7 +149,9 @@
@Override
public String checkPhoneUnique(SysUser user) {
Long userId = Validator.isNull(user.getUserId()) ? -1L : user.getUserId();
- SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
+ SysUser info = getOne(new LambdaQueryWrapper<SysUser>()
+ .select(SysUser::getUserId, SysUser::getPhonenumber)
+ .eq(SysUser::getPhonenumber, user.getPhonenumber()).last("limit 1"));
if (Validator.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
return UserConstants.NOT_UNIQUE;
}
@@ -162,7 +167,9 @@
@Override
public String checkEmailUnique(SysUser user) {
Long userId = Validator.isNull(user.getUserId()) ? -1L : user.getUserId();
- SysUser info = userMapper.checkEmailUnique(user.getEmail());
+ SysUser info = getOne(new LambdaQueryWrapper<SysUser>()
+ .select(SysUser::getUserId, SysUser::getEmail)
+ .eq(SysUser::getEmail, user.getEmail()).last("limit 1"));
if (Validator.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
return UserConstants.NOT_UNIQUE;
}
@@ -191,7 +198,7 @@
@Transactional
public int insertUser(SysUser user) {
// 鏂板鐢ㄦ埛淇℃伅
- int rows = userMapper.insertUser(user);
+ int rows = userMapper.insert(user);
// 鏂板鐢ㄦ埛宀椾綅鍏宠仈
insertUserPost(user);
// 鏂板鐢ㄦ埛涓庤鑹茬鐞�
@@ -210,14 +217,14 @@
public int updateUser(SysUser user) {
Long userId = user.getUserId();
// 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
- userRoleMapper.deleteUserRoleByUserId(userId);
+ userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId,userId));
// 鏂板鐢ㄦ埛涓庤鑹茬鐞�
insertUserRole(user);
// 鍒犻櫎鐢ㄦ埛涓庡矖浣嶅叧鑱�
- userPostMapper.deleteUserPostByUserId(userId);
+ userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getUserId,userId));
// 鏂板鐢ㄦ埛涓庡矖浣嶇鐞�
insertUserPost(user);
- return userMapper.updateUser(user);
+ return userMapper.updateById(user);
}
/**
@@ -228,7 +235,7 @@
*/
@Override
public int updateUserStatus(SysUser user) {
- return userMapper.updateUser(user);
+ return userMapper.updateById(user);
}
/**
@@ -239,7 +246,7 @@
*/
@Override
public int updateUserProfile(SysUser user) {
- return userMapper.updateUser(user);
+ return userMapper.updateById(user);
}
/**
@@ -251,7 +258,10 @@
*/
@Override
public boolean updateUserAvatar(String userName, String avatar) {
- return userMapper.updateUserAvatar(userName, avatar) > 0;
+ return userMapper.update(null,
+ new LambdaUpdateWrapper<SysUser>()
+ .set(SysUser::getAvatar,avatar)
+ .eq(SysUser::getUserName,userName)) > 0;
}
/**
@@ -262,7 +272,7 @@
*/
@Override
public int resetPwd(SysUser user) {
- return userMapper.updateUser(user);
+ return userMapper.updateById(user);
}
/**
@@ -274,7 +284,10 @@
*/
@Override
public int resetUserPwd(String userName, String password) {
- return userMapper.resetUserPwd(userName, password);
+ return userMapper.update(null,
+ new LambdaUpdateWrapper<SysUser>()
+ .set(SysUser::getPassword,password)
+ .eq(SysUser::getUserName,userName));
}
/**
@@ -294,7 +307,9 @@
list.add(ur);
}
if (list.size() > 0) {
- userRoleMapper.batchUserRole(list);
+ for (SysUserRole sysUserRole : list) {
+ userRoleMapper.insert(sysUserRole);
+ }
}
}
}
@@ -316,7 +331,9 @@
list.add(up);
}
if (list.size() > 0) {
- userPostMapper.batchUserPost(list);
+ for (SysUserPost sysUserPost : list) {
+ userPostMapper.insert(sysUserPost);
+ }
}
}
}
@@ -331,10 +348,10 @@
@Transactional
public int deleteUserById(Long userId) {
// 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
- userRoleMapper.deleteUserRoleByUserId(userId);
+ userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId,userId));
// 鍒犻櫎鐢ㄦ埛涓庡矖浣嶈〃
- userPostMapper.deleteUserPostByUserId(userId);
- return userMapper.deleteUserById(userId);
+ userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getUserId,userId));
+ return userMapper.deleteById(userId);
}
/**
@@ -349,11 +366,12 @@
for (Long userId : userIds) {
checkUserAllowed(new SysUser(userId));
}
+ List<Long> ids = Arrays.asList(userIds);
// 鍒犻櫎鐢ㄦ埛涓庤鑹插叧鑱�
- userRoleMapper.deleteUserRole(userIds);
- // 鍒犻櫎鐢ㄦ埛涓庡矖浣嶅叧鑱�
- userPostMapper.deleteUserPost(userIds);
- return userMapper.deleteUserByIds(userIds);
+ userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().in(SysUserRole::getUserId,ids));
+ // 鍒犻櫎鐢ㄦ埛涓庡矖浣嶈〃
+ userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().in(SysUserPost::getUserId,ids));
+ return userMapper.deleteBatchIds(ids);
}
/**
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
index f31f8b2..05cf417 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -44,21 +44,6 @@
from sys_menu
</sql>
- <select id="selectMenuList" parameterType="SysMenu" resultMap="SysMenuResult">
- <include refid="selectMenuVo"/>
- <where>
- <if test="menuName != null and menuName != ''">
- AND menu_name like concat('%', #{menuName}, '%')
- </if>
- <if test="visible != null and visible != ''">
- AND visible = #{visible}
- </if>
- <if test="status != null and status != ''">
- AND status = #{status}
- </if>
- </where>
- order by parent_id, order_num
- </select>
<select id="selectMenuTreeAll" resultMap="SysMenuResult">
select distinct m.menu_id,
@@ -157,87 +142,5 @@
and r.status = '0'
and ur.user_id = #{userId}
</select>
-
- <select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult">
- <include refid="selectMenuVo"/>
- where menu_id = #{menuId}
- </select>
-
- <select id="hasChildByMenuId" resultType="Integer">
- select count(1)
- from sys_menu
- where parent_id = #{menuId}
- </select>
-
- <select id="checkMenuNameUnique" parameterType="SysMenu" resultMap="SysMenuResult">
- <include refid="selectMenuVo"/>
- where menu_name=#{menuName} and parent_id = #{parentId} limit 1
- </select>
-
- <update id="updateMenu" parameterType="SysMenu">
- update sys_menu
- <set>
- <if test="menuName != null and menuName != ''">menu_name = #{menuName},</if>
- <if test="parentId != null">parent_id = #{parentId},</if>
- <if test="orderNum != null and orderNum != ''">order_num = #{orderNum},</if>
- <if test="path != null and path != ''">path = #{path},</if>
- <if test="component != null">component = #{component},</if>
- <if test="isFrame != null and isFrame != ''">is_frame = #{isFrame},</if>
- <if test="isCache != null and isCache != ''">is_cache = #{isCache},</if>
- <if test="menuType != null and menuType != ''">menu_type = #{menuType},</if>
- <if test="visible != null">visible = #{visible},</if>
- <if test="status != null">status = #{status},</if>
- <if test="perms !=null">perms = #{perms},</if>
- <if test="icon !=null and icon != ''">icon = #{icon},</if>
- <if test="remark != null and remark != ''">remark = #{remark},</if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- update_time = sysdate()
- </set>
- where menu_id = #{menuId}
- </update>
-
- <insert id="insertMenu" parameterType="SysMenu">
- insert into sys_menu(
- <if test="menuId != null and menuId != 0">menu_id,</if>
- <if test="parentId != null and parentId != 0">parent_id,</if>
- <if test="menuName != null and menuName != ''">menu_name,</if>
- <if test="orderNum != null and orderNum != ''">order_num,</if>
- <if test="path != null and path != ''">path,</if>
- <if test="component != null and component != ''">component,</if>
- <if test="isFrame != null and isFrame != ''">is_frame,</if>
- <if test="isCache != null and isCache != ''">is_cache,</if>
- <if test="menuType != null and menuType != ''">menu_type,</if>
- <if test="visible != null">visible,</if>
- <if test="status != null">status,</if>
- <if test="perms !=null and perms != ''">perms,</if>
- <if test="icon != null and icon != ''">icon,</if>
- <if test="remark != null and remark != ''">remark,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- create_time
- )values(
- <if test="menuId != null and menuId != 0">#{menuId},</if>
- <if test="parentId != null and parentId != 0">#{parentId},</if>
- <if test="menuName != null and menuName != ''">#{menuName},</if>
- <if test="orderNum != null and orderNum != ''">#{orderNum},</if>
- <if test="path != null and path != ''">#{path},</if>
- <if test="component != null and component != ''">#{component},</if>
- <if test="isFrame != null and isFrame != ''">#{isFrame},</if>
- <if test="isCache != null and isCache != ''">#{isCache},</if>
- <if test="menuType != null and menuType != ''">#{menuType},</if>
- <if test="visible != null">#{visible},</if>
- <if test="status != null">#{status},</if>
- <if test="perms !=null and perms != ''">#{perms},</if>
- <if test="icon != null and icon != ''">#{icon},</if>
- <if test="remark != null and remark != ''">#{remark},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- sysdate()
- )
- </insert>
-
- <delete id="deleteMenuById" parameterType="Long">
- delete
- from sys_menu
- where menu_id = #{menuId}
- </delete>
</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
index f67be34..0fda682 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
@@ -9,30 +9,4 @@
<result property="deptId" column="dept_id"/>
</resultMap>
- <delete id="deleteRoleDeptByRoleId" parameterType="Long">
- delete
- from sys_role_dept
- where role_id = #{roleId}
- </delete>
-
- <select id="selectCountRoleDeptByDeptId" resultType="Integer">
- select count(1)
- from sys_role_dept
- where dept_id = #{deptId}
- </select>
-
- <delete id="deleteRoleDept" parameterType="Long">
- delete from sys_role_dept where role_id in
- <foreach collection="array" item="roleId" open="(" separator="," close=")">
- #{roleId}
- </foreach>
- </delete>
-
- <insert id="batchRoleDept">
- insert into sys_role_dept(role_id, dept_id) values
- <foreach item="item" index="index" collection="list" separator=",">
- (#{item.roleId},#{item.deptId})
- </foreach>
- </insert>
-
</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
index 6eb7711..9362ebc 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -39,36 +39,9 @@
left join sys_dept d on u.dept_id = d.dept_id
</sql>
- <select id="selectRoleList" parameterType="SysRole" resultMap="SysRoleResult">
- <include refid="selectRoleVo"/>
- where r.del_flag = '0'
- <if test="roleName != null and roleName != ''">
- AND r.role_name like concat('%', #{roleName}, '%')
- </if>
- <if test="status != null and status != ''">
- AND r.status = #{status}
- </if>
- <if test="roleKey != null and roleKey != ''">
- AND r.role_key like concat('%', #{roleKey}, '%')
- </if>
- <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
- and date_format(r.create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d')
- </if>
- <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
- and date_format(r.create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
- </if>
- <!-- 鏁版嵁鑼冨洿杩囨护 -->
- ${params.dataScope}
- order by r.role_sort
- </select>
-
<select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
WHERE r.del_flag = '0' and ur.user_id = #{userId}
- </select>
-
- <select id="selectRoleAll" resultMap="SysRoleResult">
- <include refid="selectRoleVo"/>
</select>
<select id="selectRoleListByUserId" parameterType="Long" resultType="Integer">
@@ -79,82 +52,9 @@
where u.user_id = #{userId}
</select>
- <select id="selectRoleById" parameterType="Long" resultMap="SysRoleResult">
- <include refid="selectRoleVo"/>
- where r.role_id = #{roleId}
- </select>
-
<select id="selectRolesByUserName" parameterType="String" resultMap="SysRoleResult">
<include refid="selectRoleVo"/>
WHERE r.del_flag = '0' and u.user_name = #{userName}
</select>
-
- <select id="checkRoleNameUnique" parameterType="String" resultMap="SysRoleResult">
- <include refid="selectRoleVo"/>
- where r.role_name=#{roleName} limit 1
- </select>
-
- <select id="checkRoleKeyUnique" parameterType="String" resultMap="SysRoleResult">
- <include refid="selectRoleVo"/>
- where r.role_key=#{roleKey} limit 1
- </select>
-
- <insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">
- insert into sys_role(
- <if test="roleId != null and roleId != 0">role_id,</if>
- <if test="roleName != null and roleName != ''">role_name,</if>
- <if test="roleKey != null and roleKey != ''">role_key,</if>
- <if test="roleSort != null and roleSort != ''">role_sort,</if>
- <if test="dataScope != null and dataScope != ''">data_scope,</if>
- <if test="menuCheckStrictly != null">menu_check_strictly,</if>
- <if test="deptCheckStrictly != null">dept_check_strictly,</if>
- <if test="status != null and status != ''">status,</if>
- <if test="remark != null and remark != ''">remark,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- create_time
- )values(
- <if test="roleId != null and roleId != 0">#{roleId},</if>
- <if test="roleName != null and roleName != ''">#{roleName},</if>
- <if test="roleKey != null and roleKey != ''">#{roleKey},</if>
- <if test="roleSort != null and roleSort != ''">#{roleSort},</if>
- <if test="dataScope != null and dataScope != ''">#{dataScope},</if>
- <if test="menuCheckStrictly != null">#{menuCheckStrictly},</if>
- <if test="deptCheckStrictly != null">#{deptCheckStrictly},</if>
- <if test="status != null and status != ''">#{status},</if>
- <if test="remark != null and remark != ''">#{remark},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- sysdate()
- )
- </insert>
-
- <update id="updateRole" parameterType="SysRole">
- update sys_role
- <set>
- <if test="roleName != null and roleName != ''">role_name = #{roleName},</if>
- <if test="roleKey != null and roleKey != ''">role_key = #{roleKey},</if>
- <if test="roleSort != null and roleSort != ''">role_sort = #{roleSort},</if>
- <if test="dataScope != null and dataScope != ''">data_scope = #{dataScope},</if>
- <if test="menuCheckStrictly != null">menu_check_strictly = #{menuCheckStrictly},</if>
- <if test="deptCheckStrictly != null">dept_check_strictly = #{deptCheckStrictly},</if>
- <if test="status != null and status != ''">status = #{status},</if>
- <if test="remark != null">remark = #{remark},</if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- update_time = sysdate()
- </set>
- where role_id = #{roleId}
- </update>
-
- <delete id="deleteRoleById" parameterType="Long">
- update sys_role
- set del_flag = '2'
- where role_id = #{roleId}
- </delete>
-
- <delete id="deleteRoleByIds" parameterType="Long">
- update sys_role set del_flag = '2' where role_id in
- <foreach collection="array" item="roleId" open="(" separator="," close=")">
- #{roleId}
- </foreach>
- </delete>
</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
index cc7ff96..2529a72 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
@@ -9,30 +9,4 @@
<result property="menuId" column="menu_id"/>
</resultMap>
- <select id="checkMenuExistRole" resultType="Integer">
- select count(1)
- from sys_role_menu
- where menu_id = #{menuId}
- </select>
-
- <delete id="deleteRoleMenuByRoleId" parameterType="Long">
- delete
- from sys_role_menu
- where role_id = #{roleId}
- </delete>
-
- <delete id="deleteRoleMenu" parameterType="Long">
- delete from sys_role_menu where role_id in
- <foreach collection="array" item="roleId" open="(" separator="," close=")">
- #{roleId}
- </foreach>
- </delete>
-
- <insert id="batchRoleMenu">
- insert into sys_role_menu(role_id, menu_id) values
- <foreach item="item" index="index" collection="list" separator=",">
- (#{item.roleId},#{item.menuId})
- </foreach>
- </insert>
-
</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 37db47b..fb7500d 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -119,106 +119,5 @@
where u.user_id = #{userId}
</select>
- <select id="checkUserNameUnique" parameterType="String" resultType="int">
- select count(1)
- from sys_user
- where user_name = #{userName} limit 1
- </select>
-
- <select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
- select user_id, phonenumber
- from sys_user
- where phonenumber = #{phonenumber} limit 1
- </select>
-
- <select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
- select user_id, email
- from sys_user
- where email = #{email} limit 1
- </select>
-
- <insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
- insert into sys_user(
- <if test="userId != null and userId != 0">user_id,</if>
- <if test="deptId != null and deptId != 0">dept_id,</if>
- <if test="userName != null and userName != ''">user_name,</if>
- <if test="nickName != null and nickName != ''">nick_name,</if>
- <if test="email != null and email != ''">email,</if>
- <if test="avatar != null and avatar != ''">avatar,</if>
- <if test="phonenumber != null and phonenumber != ''">phonenumber,</if>
- <if test="sex != null and sex != ''">sex,</if>
- <if test="password != null and password != ''">password,</if>
- <if test="status != null and status != ''">status,</if>
- <if test="createBy != null and createBy != ''">create_by,</if>
- <if test="remark != null and remark != ''">remark,</if>
- create_time
- )values(
- <if test="userId != null and userId != ''">#{userId},</if>
- <if test="deptId != null and deptId != ''">#{deptId},</if>
- <if test="userName != null and userName != ''">#{userName},</if>
- <if test="nickName != null and nickName != ''">#{nickName},</if>
- <if test="email != null and email != ''">#{email},</if>
- <if test="avatar != null and avatar != ''">#{avatar},</if>
- <if test="phonenumber != null and phonenumber != ''">#{phonenumber},</if>
- <if test="sex != null and sex != ''">#{sex},</if>
- <if test="password != null and password != ''">#{password},</if>
- <if test="status != null and status != ''">#{status},</if>
- <if test="createBy != null and createBy != ''">#{createBy},</if>
- <if test="remark != null and remark != ''">#{remark},</if>
- sysdate()
- )
- </insert>
-
- <update id="updateUser" parameterType="SysUser">
- update sys_user
- <set>
- <if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
- <if test="userName != null and userName != ''">user_name = #{userName},</if>
- <if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
- <if test="email != null ">email = #{email},</if>
- <if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
- <if test="sex != null and sex != ''">sex = #{sex},</if>
- <if test="avatar != null and avatar != ''">avatar = #{avatar},</if>
- <if test="password != null and password != ''">password = #{password},</if>
- <if test="status != null and status != ''">status = #{status},</if>
- <if test="loginIp != null and loginIp != ''">login_ip = #{loginIp},</if>
- <if test="loginDate != null">login_date = #{loginDate},</if>
- <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
- <if test="remark != null">remark = #{remark},</if>
- update_time = sysdate()
- </set>
- where user_id = #{userId}
- </update>
-
- <update id="updateUserStatus" parameterType="SysUser">
- update sys_user
- set status = #{status}
- where user_id = #{userId}
- </update>
-
- <update id="updateUserAvatar" parameterType="SysUser">
- update sys_user
- set avatar = #{avatar}
- where user_name = #{userName}
- </update>
-
- <update id="resetUserPwd" parameterType="SysUser">
- update sys_user
- set password = #{password}
- where user_name = #{userName}
- </update>
-
- <delete id="deleteUserById" parameterType="Long">
- update sys_user
- set del_flag = '2'
- where user_id = #{userId}
- </delete>
-
- <delete id="deleteUserByIds" parameterType="Long">
- update sys_user set del_flag = '2' where user_id in
- <foreach collection="array" item="userId" open="(" separator="," close=")">
- #{userId}
- </foreach>
- </delete>
</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml
index c893dcf..bd13ed4 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml
@@ -9,24 +9,4 @@
<result property="postId" column="post_id"/>
</resultMap>
- <delete id="deleteUserPostByUserId" parameterType="Long">
- delete
- from sys_user_post
- where user_id = #{userId}
- </delete>
-
- <delete id="deleteUserPost" parameterType="Long">
- delete from sys_user_post where user_id in
- <foreach collection="array" item="userId" open="(" separator="," close=")">
- #{userId}
- </foreach>
- </delete>
-
- <insert id="batchUserPost">
- insert into sys_user_post(user_id, post_id) values
- <foreach item="item" index="index" collection="list" separator=",">
- (#{item.userId},#{item.postId})
- </foreach>
- </insert>
-
</mapper>
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
index a49b7dc..3d41141 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
@@ -9,43 +9,4 @@
<result property="roleId" column="role_id"/>
</resultMap>
- <delete id="deleteUserRoleByUserId" parameterType="Long">
- delete
- from sys_user_role
- where user_id = #{userId}
- </delete>
-
- <select id="countUserRoleByRoleId" resultType="Integer">
- select count(1)
- from sys_user_role
- where role_id = #{roleId}
- </select>
-
- <delete id="deleteUserRole" parameterType="Long">
- delete from sys_user_role where user_id in
- <foreach collection="array" item="userId" open="(" separator="," close=")">
- #{userId}
- </foreach>
- </delete>
-
- <insert id="batchUserRole">
- insert into sys_user_role(user_id, role_id) values
- <foreach item="item" index="index" collection="list" separator=",">
- (#{item.userId},#{item.roleId})
- </foreach>
- </insert>
-
- <delete id="deleteUserRoleInfo" parameterType="SysUserRole">
- delete
- from sys_user_role
- where user_id = #{userId}
- and role_id = #{roleId}
- </delete>
-
- <delete id="deleteUserRoleInfos">
- delete from sys_user_role where role_id=#{roleId} and user_id in
- <foreach collection="userIds" item="userId" open="(" separator="," close=")">
- #{userId}
- </foreach>
- </delete>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3