From bc182f1392c1899bf66f308d3587455ef1034b2e Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 28 四月 2021 11:52:21 +0800
Subject: [PATCH] fix 日志时间问题
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java | 193 +++++++++++++++++++++++-------------------------
1 files changed, 93 insertions(+), 100 deletions(-)
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 7375691..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,9 @@
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;
import com.ruoyi.common.core.domain.entity.SysRole;
@@ -8,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;
@@ -21,14 +25,11 @@
/**
* 瑙掕壊 涓氬姟灞傚鐞�
- *
+ *
* @author ruoyi
*/
@Service
-public class SysRoleServiceImpl implements ISysRoleService
-{
- @Autowired
- private SysRoleMapper roleMapper;
+public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> implements ISysRoleService {
@Autowired
private SysRoleMenuMapper roleMenuMapper;
@@ -41,32 +42,41 @@
/**
* 鏍规嵁鏉′欢鍒嗛〉鏌ヨ瑙掕壊鏁版嵁
- *
+ *
* @param role 瑙掕壊淇℃伅
* @return 瑙掕壊鏁版嵁闆嗗悎淇℃伅
*/
@Override
@DataScope(deptAlias = "d")
- public List<SysRole> selectRoleList(SysRole role)
- {
- return roleMapper.selectRoleList(role);
+ public List<SysRole> selectRoleList(SysRole 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));
}
/**
* 鏍规嵁鐢ㄦ埛ID鏌ヨ鏉冮檺
- *
+ *
* @param userId 鐢ㄦ埛ID
* @return 鏉冮檺鍒楄〃
*/
@Override
- public Set<String> selectRolePermissionByUserId(Long userId)
- {
- List<SysRole> perms = roleMapper.selectRolePermissionByUserId(userId);
+ public Set<String> selectRolePermissionByUserId(Long userId) {
+ List<SysRole> perms = baseMapper.selectRolePermissionByUserId(userId);
Set<String> permsSet = new HashSet<>();
- for (SysRole perm : perms)
- {
- if (Validator.isNotNull(perm))
- {
+ for (SysRole perm : perms) {
+ if (Validator.isNotNull(perm)) {
permsSet.addAll(Arrays.asList(perm.getRoleKey().trim().split(",")));
}
}
@@ -75,52 +85,48 @@
/**
* 鏌ヨ鎵�鏈夎鑹�
- *
+ *
* @return 瑙掕壊鍒楄〃
*/
@Override
- public List<SysRole> selectRoleAll()
- {
+ public List<SysRole> selectRoleAll() {
return SpringUtils.getAopProxy(this).selectRoleList(new SysRole());
}
/**
* 鏍规嵁鐢ㄦ埛ID鑾峰彇瑙掕壊閫夋嫨妗嗗垪琛�
- *
+ *
* @param userId 鐢ㄦ埛ID
* @return 閫変腑瑙掕壊ID鍒楄〃
*/
@Override
- public List<Integer> selectRoleListByUserId(Long userId)
- {
- return roleMapper.selectRoleListByUserId(userId);
+ public List<Integer> selectRoleListByUserId(Long userId) {
+ return baseMapper.selectRoleListByUserId(userId);
}
/**
* 閫氳繃瑙掕壊ID鏌ヨ瑙掕壊
- *
+ *
* @param roleId 瑙掕壊ID
* @return 瑙掕壊瀵硅薄淇℃伅
*/
@Override
- public SysRole selectRoleById(Long roleId)
- {
- return roleMapper.selectRoleById(roleId);
+ public SysRole selectRoleById(Long roleId) {
+ return getById(roleId);
}
/**
* 鏍￠獙瑙掕壊鍚嶇О鏄惁鍞竴
- *
+ *
* @param role 瑙掕壊淇℃伅
* @return 缁撴灉
*/
@Override
- public String checkRoleNameUnique(SysRole role)
- {
+ public String checkRoleNameUnique(SysRole role) {
Long roleId = Validator.isNull(role.getRoleId()) ? -1L : role.getRoleId();
- SysRole info = roleMapper.checkRoleNameUnique(role.getRoleName());
- if (Validator.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue())
- {
+ 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;
}
return UserConstants.UNIQUE;
@@ -128,17 +134,16 @@
/**
* 鏍￠獙瑙掕壊鏉冮檺鏄惁鍞竴
- *
+ *
* @param role 瑙掕壊淇℃伅
* @return 缁撴灉
*/
@Override
- public String checkRoleKeyUnique(SysRole role)
- {
+ public String checkRoleKeyUnique(SysRole role) {
Long roleId = Validator.isNull(role.getRoleId()) ? -1L : role.getRoleId();
- SysRole info = roleMapper.checkRoleKeyUnique(role.getRoleKey());
- if (Validator.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue())
- {
+ 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;
}
return UserConstants.UNIQUE;
@@ -146,112 +151,104 @@
/**
* 鏍￠獙瑙掕壊鏄惁鍏佽鎿嶄綔
- *
+ *
* @param role 瑙掕壊淇℃伅
*/
@Override
- public void checkRoleAllowed(SysRole role)
- {
- if (Validator.isNotNull(role.getRoleId()) && role.isAdmin())
- {
+ public void checkRoleAllowed(SysRole role) {
+ if (Validator.isNotNull(role.getRoleId()) && role.isAdmin()) {
throw new CustomException("涓嶅厑璁告搷浣滆秴绾х鐞嗗憳瑙掕壊");
}
}
/**
* 閫氳繃瑙掕壊ID鏌ヨ瑙掕壊浣跨敤鏁伴噺
- *
+ *
* @param roleId 瑙掕壊ID
* @return 缁撴灉
*/
@Override
- public int countUserRoleByRoleId(Long roleId)
- {
- return userRoleMapper.countUserRoleByRoleId(roleId);
+ public int countUserRoleByRoleId(Long roleId) {
+ return userRoleMapper.selectCount(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getRoleId, roleId));
}
/**
* 鏂板淇濆瓨瑙掕壊淇℃伅
- *
+ *
* @param role 瑙掕壊淇℃伅
* @return 缁撴灉
*/
@Override
@Transactional
- public int insertRole(SysRole role)
- {
+ public int insertRole(SysRole role) {
// 鏂板瑙掕壊淇℃伅
- roleMapper.insertRole(role);
+ baseMapper.insert(role);
return insertRoleMenu(role);
}
/**
* 淇敼淇濆瓨瑙掕壊淇℃伅
- *
+ *
* @param role 瑙掕壊淇℃伅
* @return 缁撴灉
*/
@Override
@Transactional
- public int updateRole(SysRole role)
- {
+ 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);
}
/**
* 淇敼瑙掕壊鐘舵��
- *
+ *
* @param role 瑙掕壊淇℃伅
* @return 缁撴灉
*/
@Override
- public int updateRoleStatus(SysRole role)
- {
- return roleMapper.updateRole(role);
+ public int updateRoleStatus(SysRole role) {
+ return baseMapper.updateById(role);
}
/**
* 淇敼鏁版嵁鏉冮檺淇℃伅
- *
+ *
* @param role 瑙掕壊淇℃伅
* @return 缁撴灉
*/
@Override
@Transactional
- public int authDataScope(SysRole role)
- {
+ 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);
}
/**
* 鏂板瑙掕壊鑿滃崟淇℃伅
- *
+ *
* @param role 瑙掕壊瀵硅薄
*/
- public int insertRoleMenu(SysRole role)
- {
- int rows = 1;
+ public int insertRoleMenu(SysRole role) {
+ int rows = 0;
// 鏂板鐢ㄦ埛涓庤鑹茬鐞�
List<SysRoleMenu> list = new ArrayList<SysRoleMenu>();
- for (Long menuId : role.getMenuIds())
- {
+ for (Long menuId : role.getMenuIds()) {
SysRoleMenu rm = new SysRoleMenu();
rm.setRoleId(role.getRoleId());
rm.setMenuId(menuId);
list.add(rm);
}
- if (list.size() > 0)
- {
- rows = roleMenuMapper.batchRoleMenu(list);
+ if (list.size() > 0) {
+ for (SysRoleMenu sysRoleMenu : list) {
+ rows += roleMenuMapper.insert(sysRoleMenu);
+ }
}
return rows;
}
@@ -261,65 +258,61 @@
*
* @param role 瑙掕壊瀵硅薄
*/
- public int insertRoleDept(SysRole role)
- {
- int rows = 1;
+ public int insertRoleDept(SysRole role) {
+ int rows = 0;
// 鏂板瑙掕壊涓庨儴闂紙鏁版嵁鏉冮檺锛夌鐞�
List<SysRoleDept> list = new ArrayList<SysRoleDept>();
- for (Long deptId : role.getDeptIds())
- {
+ for (Long deptId : role.getDeptIds()) {
SysRoleDept rd = new SysRoleDept();
rd.setRoleId(role.getRoleId());
rd.setDeptId(deptId);
list.add(rd);
}
- if (list.size() > 0)
- {
- rows = roleDeptMapper.batchRoleDept(list);
+ if (list.size() > 0) {
+ for (SysRoleDept sysRoleDept : list) {
+ rows += roleDeptMapper.insert(sysRoleDept);
+ }
}
return rows;
}
/**
* 閫氳繃瑙掕壊ID鍒犻櫎瑙掕壊
- *
+ *
* @param roleId 瑙掕壊ID
* @return 缁撴灉
*/
@Override
@Transactional
- public int deleteRoleById(Long roleId)
- {
+ 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);
}
/**
* 鎵归噺鍒犻櫎瑙掕壊淇℃伅
- *
+ *
* @param roleIds 闇�瑕佸垹闄ょ殑瑙掕壊ID
* @return 缁撴灉
*/
@Override
@Transactional
- public int deleteRoleByIds(Long[] roleIds)
- {
- for (Long roleId : roleIds)
- {
+ public int deleteRoleByIds(Long[] roleIds) {
+ for (Long roleId : roleIds) {
checkRoleAllowed(new SysRole(roleId));
SysRole role = selectRoleById(roleId);
- if (countUserRoleByRoleId(roleId) > 0)
- {
+ if (countUserRoleByRoleId(roleId) > 0) {
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);
}
}
--
Gitblit v1.9.3