【fix sonar】 SysRolePermissionServiceImpl.java文件

This commit is contained in:
tianwenbo
2023-03-07 11:35:37 +08:00
parent ede495aac6
commit 6406ed1b6d
@@ -1,23 +1,18 @@
package com.jero.modules.system.service.impl; package com.jero.modules.system.service.impl;
import java.util.*; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.jero.common.constant.CacheConstant; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.util.IPUtils; import com.jero.common.util.IPUtils;
import com.jero.common.util.SpringContextUtils; import com.jero.common.util.SpringContextUtils;
import com.jero.common.util.oConvertUtils; import com.jero.common.util.oConvertUtils;
import com.jero.modules.system.entity.SysRolePermission; import com.jero.modules.system.entity.SysRolePermission;
import com.jero.modules.system.mapper.SysRolePermissionMapper; import com.jero.modules.system.mapper.SysRolePermissionMapper;
import com.jero.modules.system.service.ISysRolePermissionService; import com.jero.modules.system.service.ISysRolePermissionService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.*;
/** /**
* <p> * <p>
@@ -43,7 +38,7 @@ public class SysRolePermissionServiceImpl extends ServiceImpl<SysRolePermissionM
} }
LambdaQueryWrapper<SysRolePermission> query = new QueryWrapper<SysRolePermission>().lambda().eq(SysRolePermission::getRoleId, roleId); LambdaQueryWrapper<SysRolePermission> query = new QueryWrapper<SysRolePermission>().lambda().eq(SysRolePermission::getRoleId, roleId);
this.remove(query); this.remove(query);
List<SysRolePermission> list = new ArrayList<SysRolePermission>(); List<SysRolePermission> list = new ArrayList<>();
String[] arr = permissionIds.split(","); String[] arr = permissionIds.split(",");
for (String p : arr) { for (String p : arr) {
if(oConvertUtils.isNotEmpty(p)) { if(oConvertUtils.isNotEmpty(p)) {
@@ -68,8 +63,8 @@ public class SysRolePermissionServiceImpl extends ServiceImpl<SysRolePermissionM
ip = "127.0.0.1"; ip = "127.0.0.1";
} }
List<String> add = getDiff(lastPermissionIds,permissionIds); List<String> add = getDiff(lastPermissionIds,permissionIds);
if(add!=null && add.size()>0) { if(add!=null && !add.isEmpty()) {
List<SysRolePermission> list = new ArrayList<SysRolePermission>(); List<SysRolePermission> list = new ArrayList<>();
for (String p : add) { for (String p : add) {
if(oConvertUtils.isNotEmpty(p)) { if(oConvertUtils.isNotEmpty(p)) {
SysRolePermission rolepms = new SysRolePermission(roleId, p); SysRolePermission rolepms = new SysRolePermission(roleId, p);
@@ -80,15 +75,15 @@ public class SysRolePermissionServiceImpl extends ServiceImpl<SysRolePermissionM
} }
this.saveBatch(list); this.saveBatch(list);
} }
List<String> delete = getDiff(permissionIds,lastPermissionIds); List<String> delete = getDiff(permissionIds,lastPermissionIds);
if(delete!=null && delete.size()>0) { if(delete!=null && !delete.isEmpty()) {
for (String permissionId : delete) { for (String permissionId : delete) {
this.remove(new QueryWrapper<SysRolePermission>().lambda().eq(SysRolePermission::getRoleId, roleId).eq(SysRolePermission::getPermissionId, permissionId)); this.remove(new QueryWrapper<SysRolePermission>().lambda().eq(SysRolePermission::getRoleId, roleId).eq(SysRolePermission::getPermissionId, permissionId));
} }
} }
} }
/** /**
* 从diff中找出main中没有的元素 * 从diff中找出main中没有的元素
* @param main * @param main
@@ -102,14 +97,14 @@ public class SysRolePermissionServiceImpl extends ServiceImpl<SysRolePermissionM
if(oConvertUtils.isEmpty(main)) { if(oConvertUtils.isEmpty(main)) {
return Arrays.asList(diff.split(",")); return Arrays.asList(diff.split(","));
} }
String[] mainArr = main.split(","); String[] mainArr = main.split(",");
String[] diffArr = diff.split(","); String[] diffArr = diff.split(",");
Map<String, Integer> map = new HashMap<>(); Map<String, Integer> map = new HashMap<>();
for (String string : mainArr) { for (String string : mainArr) {
map.put(string, 1); map.put(string, 1);
} }
List<String> res = new ArrayList<String>(); List<String> res = new ArrayList<>();
for (String key : diffArr) { for (String key : diffArr) {
if(oConvertUtils.isNotEmpty(key) && !map.containsKey(key)) { if(oConvertUtils.isNotEmpty(key) && !map.containsKey(key)) {
res.add(key); res.add(key);