ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
caozehui
2024-12-17 14:46:36 +08:00
parent 8bc21dc861
commit 861f947499
27 changed files with 239 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
user/src/main/java/com/njcn/gather/user/user/service/impl/SysFunctionServiceImpl.java
View File

@@ -20,6 +20,7 @@ import com.njcn.gather.user.user.service.ISysRoleFunctionService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.*;
@@ -45,6 +46,7 @@ public class SysFunctionServiceImpl extends ServiceImpl<SysFunctionMapper, SysFu
}
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean addFunction(SysFunctionParam functionParam) {
checkFunctionParam(functionParam, false);
SysFunction function = new SysFunction();
@@ -69,6 +71,7 @@ public class SysFunctionServiceImpl extends ServiceImpl<SysFunctionMapper, SysFu
}
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean updateFunction(SysFunctionParam.UpdateParam param) {
boolean result = false;
checkFunctionParam(param, true);
@@ -88,6 +91,7 @@ public class SysFunctionServiceImpl extends ServiceImpl<SysFunctionMapper, SysFu
}
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean deleteFunction(String id) {
boolean result1 = false;
sysRoleFunctionService.deleteRoleFunctionByFunctionIds(Collections.singletonList(id));

5
user/src/main/java/com/njcn/gather/user/user/service/impl/SysRoleFunctionServiceImpl.java
View File

@@ -10,6 +10,7 @@ import com.njcn.gather.user.user.service.ISysRoleFunctionService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Collections;
@@ -30,6 +31,7 @@ public class SysRoleFunctionServiceImpl extends ServiceImpl<SysRoleFunctionMappe
}
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean addRoleFunction(String roleId, List<String> functionIds) {
List<SysRoleFunction> roleFunctions = new ArrayList<>();
if (!CollectionUtil.isEmpty(functionIds)) {
@@ -44,6 +46,7 @@ public class SysRoleFunctionServiceImpl extends ServiceImpl<SysRoleFunctionMappe
}
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean updateRoleFunction(String roleId, List<String> functionIds) {
//删除原有关系
this.deleteRoleFunctionByRoleIds(Collections.singletonList(roleId));
@@ -59,6 +62,7 @@ public class SysRoleFunctionServiceImpl extends ServiceImpl<SysRoleFunctionMappe
}
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean deleteRoleFunctionByRoleIds(List<String> roleIds) {
LambdaQueryWrapper<SysRoleFunction> lambdaQuery = new LambdaQueryWrapper<>();
lambdaQuery.in(SysRoleFunction::getRoleId, roleIds);
@@ -66,6 +70,7 @@ public class SysRoleFunctionServiceImpl extends ServiceImpl<SysRoleFunctionMappe
}
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean deleteRoleFunctionByFunctionIds(List<String> functionIds) {
LambdaQueryWrapper<SysRoleFunction> lambdaQuery = new LambdaQueryWrapper<>();
lambdaQuery.in(SysRoleFunction::getFunctionId, functionIds);

4
user/src/main/java/com/njcn/gather/user/user/service/impl/SysRoleServiceImpl.java
View File

@@ -21,6 +21,7 @@ import com.njcn.web.factory.PageFactory;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
@@ -52,6 +53,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
}
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean addRole(SysRoleParam sysRoleParam) {
checkRepeat(sysRoleParam, false);
SysRole role = new SysRole();
@@ -62,6 +64,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
}
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean updateRole(SysRoleParam.UpdateParam updateParam) {
checkRepeat(updateParam, true);
//不能修改超级管理员角色
@@ -77,6 +80,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
}
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean deleteRole(List<String> ids) {
//不能删除超级管理员角色
Integer count = this.lambdaQuery()

5
user/src/main/java/com/njcn/gather/user/user/service/impl/SysUserRoleServiceImpl.java
View File

@@ -10,6 +10,7 @@ import com.njcn.gather.user.user.service.ISysUserRoleService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Collections;
@@ -30,6 +31,7 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
}
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean addUserRole(String userId, List<String> roleIds) {
List<SysUserRole> userRoles = new ArrayList<>();
if (!CollectionUtil.isEmpty(roleIds)) {
@@ -44,6 +46,7 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
}
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean updateUserRole(String userId, List<String> roleIds) {
//删除原有关系
this.deleteUserRoleByUserIds(Collections.singletonList(userId));
@@ -59,6 +62,7 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
}
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean deleteUserRoleByUserIds(List<String> userIds) {
LambdaQueryWrapper<SysUserRole> lambdaQuery = new LambdaQueryWrapper<>();
lambdaQuery.in(SysUserRole::getUserId, userIds);
@@ -66,6 +70,7 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
}
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean deleteUserRoleByRoleIds(List<String> roleIds) {
LambdaQueryWrapper<SysUserRole> lambdaQuery = new LambdaQueryWrapper<>();
lambdaQuery.in(SysUserRole::getRoleId, roleIds);

5
user/src/main/java/com/njcn/gather/user/user/service/impl/SysUserServiceImpl.java
View File

@@ -25,6 +25,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collections;
import java.util.List;
@@ -111,6 +112,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
}
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean addUser(SysUserParam.SysUserAddParam addUserParam) {
if (UserConst.SUPER_ADMIN.equals(addUserParam.getLoginName())) {
throw new BusinessException(UserResponseEnum.SUPER_ADMIN_REPEAT);
@@ -134,6 +136,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
}
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean updateUser(SysUserParam.SysUserUpdateParam updateUserParam) {
checkRepeat(updateUserParam, true, updateUserParam.getId());
SysUser sysUser = new SysUser();
@@ -156,6 +159,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
}
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean updatePassword(String userId, String newPassword) {
SysUser user = lambdaQuery().ne(SysUser::getState, UserConst.STATE_DELETE).eq(SysUser::getId, userId).one();
if (ObjectUtil.isNotNull(user)) {
@@ -168,6 +172,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
}
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean deleteUser(List<String> ids) {
for (String id : ids) {
List<SysRole> sysRoles = sysUserRoleService.listRoleByUserId(id);