|
|
|
@ -41,9 +41,6 @@ import java.util.ArrayList;
|
|
|
|
import java.util.Arrays;
|
|
|
|
import java.util.Arrays;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.Map;
|
|
|
|
import java.util.Map;
|
|
|
|
import java.util.concurrent.CompletableFuture;
|
|
|
|
|
|
|
|
import java.util.function.Function;
|
|
|
|
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import static cn.estsh.i3plus.platform.common.util.CommonConstWords.RESOURCE_PREFIX_MENU;
|
|
|
|
import static cn.estsh.i3plus.platform.common.util.CommonConstWords.RESOURCE_PREFIX_MENU;
|
|
|
|
import static cn.estsh.i3plus.platform.common.util.PlatformConstWords.IMPP_REQUEST_ID;
|
|
|
|
import static cn.estsh.i3plus.platform.common.util.PlatformConstWords.IMPP_REQUEST_ID;
|
|
|
|
@ -191,14 +188,6 @@ public class SysRoleService extends CrudService<SysRole> implements ISysRoleServ
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public void updateRoleMenuChangeRoleNameRdd(Long roleId, String roleName) {
|
|
|
|
|
|
|
|
if (StringUtil.isEmpty(roleId) || StringUtil.isEmpty(roleName)) {
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
refRoleMenuRDao.updateByProperties("roleId",roleId,"roleNameRdd",roleName);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
|
|
|
public void refreshSysRoleRef(Long roleId, Integer softType, List<Long> idList, String userName) {
|
|
|
|
public void refreshSysRoleRef(Long roleId, Integer softType, List<Long> idList, String userName) {
|
|
|
|
SysRole role = roleRDao.getById(roleId);
|
|
|
|
SysRole role = roleRDao.getById(roleId);
|
|
|
|
ValidatorBean.checkNotNull(role, "不存在的角色信息");
|
|
|
|
ValidatorBean.checkNotNull(role, "不存在的角色信息");
|
|
|
|
@ -206,70 +195,76 @@ public class SysRoleService extends CrudService<SysRole> implements ISysRoleServ
|
|
|
|
|
|
|
|
|
|
|
|
SysMenu menu = new SysMenu();
|
|
|
|
SysMenu menu = new SysMenu();
|
|
|
|
menu.setSoftType(softType);
|
|
|
|
menu.setSoftType(softType);
|
|
|
|
/**
|
|
|
|
List<SysMenu> menuList = menuService.findAllByBean(menu);
|
|
|
|
* 2024/7/19 性能修复,不查询出当前softType,改为校验是否在数据库存在
|
|
|
|
//查询修改前角色对应的菜单
|
|
|
|
*/
|
|
|
|
List<SysRefRoleMenu> menus = refRoleMenuRDao.findByProperty(new String[]{"roleId", "softType"}, new Object[]{roleId, softType});
|
|
|
|
List<SysMenu> menuList = menuService.findByIdList(idList);
|
|
|
|
|
|
|
|
Map<Long, SysMenu> menuMap = menuList.stream().collect(Collectors.toMap(SysMenu::getId, Function.identity()));
|
|
|
|
|
|
|
|
refRoleMenuRDao.deleteByProperties(new String[]{"roleId", "softType"}, new Object[]{roleId, softType});
|
|
|
|
refRoleMenuRDao.deleteByProperties(new String[]{"roleId", "softType"}, new Object[]{roleId, softType});
|
|
|
|
if (CollectionUtils.isNotEmpty(idList)) {
|
|
|
|
if (CollectionUtils.isNotEmpty(idList)) {
|
|
|
|
List<SysRefRoleMenu> refs = new ArrayList<>();
|
|
|
|
List<SysRefRoleMenu> refs = new ArrayList<>();
|
|
|
|
SysRefRoleMenu ref = null;
|
|
|
|
SysRefRoleMenu ref = null;
|
|
|
|
|
|
|
|
|
|
|
|
for (Long id : idList) {
|
|
|
|
for (Long id : idList) {
|
|
|
|
SysMenu sysMenu = menuMap.get(id);
|
|
|
|
if (CollectionUtils.isNotEmpty(menuList)) {
|
|
|
|
if (sysMenu != null) {
|
|
|
|
for (SysMenu sysMenu : menuList) {
|
|
|
|
ref = new SysRefRoleMenu();
|
|
|
|
if (sysMenu.getId().equals(id)) {
|
|
|
|
ref.setRoleId(role.getId());
|
|
|
|
ref = new SysRefRoleMenu();
|
|
|
|
ref.setRoleNameRdd(role.getName());
|
|
|
|
ref.setRoleId(role.getId());
|
|
|
|
ref.setSoftType(sysMenu.getSoftType());
|
|
|
|
ref.setRoleNameRdd(role.getName());
|
|
|
|
ref.setMenuNameRdd(sysMenu.getName());
|
|
|
|
ref.setSoftType(sysMenu.getSoftType());
|
|
|
|
ref.setMenuId(sysMenu.getId());
|
|
|
|
ref.setMenuNameRdd(sysMenu.getName());
|
|
|
|
ref.setMenuTypeRdd(sysMenu.getMenuType());
|
|
|
|
ref.setMenuId(sysMenu.getId());
|
|
|
|
ConvertBean.serviceModelInitialize(ref, AuthUtil.getSessionUser());
|
|
|
|
ref.setMenuTypeRdd(sysMenu.getMenuType());
|
|
|
|
refs.add(ref);
|
|
|
|
ConvertBean.serviceModelInitialize(ref, AuthUtil.getSessionUser());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
refs.add(ref);
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (CollectionUtils.isNotEmpty(refs)) {
|
|
|
|
if (CollectionUtils.isNotEmpty(refs)) {
|
|
|
|
refRoleMenuRDao.saveAll(refs);
|
|
|
|
refRoleMenuRDao.saveAll(refs);
|
|
|
|
CompletableFuture.runAsync(() -> {
|
|
|
|
//记录角色权限变更日志
|
|
|
|
//记录角色权限变更日志
|
|
|
|
String newAuthority = "";
|
|
|
|
//查询修改前角色对应的菜单
|
|
|
|
String delAuthority = "";
|
|
|
|
List<SysRefRoleMenu> menus = refRoleMenuRDao.findByProperty(new String[]{"roleId", "softType"}, new Object[]{roleId, softType});
|
|
|
|
ArrayList<Long> menuIds = new ArrayList<>();
|
|
|
|
StringBuilder newAuthority = new StringBuilder();
|
|
|
|
menus.stream().forEach(m -> {
|
|
|
|
StringBuilder delAuthority = new StringBuilder();
|
|
|
|
menuIds.add(m.getMenuId());
|
|
|
|
List<Long> menuIds = menus.stream().map(SysRefRoleMenu::getMenuId).collect(Collectors.toList());
|
|
|
|
});
|
|
|
|
List<Long> newAuthorityList = getAddaListThanbList(idList,menuIds);
|
|
|
|
List<Long> newAuthorityList = getAddaListThanbList(idList,menuIds);
|
|
|
|
List<Long> delAuthorityList = getReduceaListThanbList(idList,menuIds);
|
|
|
|
List<Long> delAuthorityList = getReduceaListThanbList(idList,menuIds);
|
|
|
|
|
|
|
|
if (newAuthorityList != null) {
|
|
|
|
for (Long id : newAuthorityList) {
|
|
|
|
for (Long id : newAuthorityList) {
|
|
|
|
String menuTreeName = "";
|
|
|
|
String menuTreeName = "";
|
|
|
|
List<String> newAuthoritys = new ArrayList<>();
|
|
|
|
List<String> newAuthoritys = new ArrayList<>();
|
|
|
|
getParentName(id, newAuthoritys);
|
|
|
|
getParentName(id, newAuthoritys);
|
|
|
|
if (!CollectionUtils.isEmpty(newAuthoritys) && !newAuthoritys.get(0).isEmpty()) {
|
|
|
|
if (newAuthoritys.get(0).length()>0) {
|
|
|
|
menuTreeName = newAuthoritys.get(0).substring(1);
|
|
|
|
menuTreeName = newAuthoritys.get(0).substring(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
newAuthority.append(menuTreeName).append("\n");
|
|
|
|
newAuthority += menuTreeName + "\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (delAuthorityList != null) {
|
|
|
|
for (Long id : delAuthorityList) {
|
|
|
|
for (Long id : delAuthorityList) {
|
|
|
|
List<String> delAuthoritys = new ArrayList<>();
|
|
|
|
List<String> delAuthoritys = new ArrayList<>();
|
|
|
|
String menuTreeName = "";
|
|
|
|
String menuTreeName = "";
|
|
|
|
getParentName(id, delAuthoritys);
|
|
|
|
getParentName(id,delAuthoritys);
|
|
|
|
if (!CollectionUtils.isEmpty(delAuthoritys) && !delAuthoritys.get(0).isEmpty()) {
|
|
|
|
if (delAuthoritys.get(0).length()>0) {
|
|
|
|
menuTreeName = delAuthoritys.get(0).substring(1);
|
|
|
|
menuTreeName = delAuthoritys.get(0).substring(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
delAuthority.append(menuTreeName).append("\n");
|
|
|
|
delAuthority += menuTreeName + "\n";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
SysLogRoleMenuChange sysLogRoleMenuChange = new SysLogRoleMenuChange();
|
|
|
|
}
|
|
|
|
sysLogRoleMenuChange.setRoleId(roleId);
|
|
|
|
SysLogRoleMenuChange sysLogRoleMenuChange = new SysLogRoleMenuChange();
|
|
|
|
sysLogRoleMenuChange.setRoleName(role.getName());
|
|
|
|
sysLogRoleMenuChange.setRoleId(roleId);
|
|
|
|
sysLogRoleMenuChange.setNewAuthority(newAuthority.toString());
|
|
|
|
sysLogRoleMenuChange.setRoleName(role.getName());
|
|
|
|
sysLogRoleMenuChange.setDelAuthority(delAuthority.toString());
|
|
|
|
sysLogRoleMenuChange.setNewAuthority(newAuthority);
|
|
|
|
insertSysLogRoleMenuChange(sysLogRoleMenuChange);
|
|
|
|
sysLogRoleMenuChange.setDelAuthority(delAuthority);
|
|
|
|
//更新角色
|
|
|
|
insertSysLogRoleMenuChange(sysLogRoleMenuChange);
|
|
|
|
ConvertBean.serviceModelUpdate(role,AuthUtil.getSessionUser().getUserName());
|
|
|
|
//更新角色
|
|
|
|
roleRDao.update(role);
|
|
|
|
ConvertBean.serviceModelUpdate(role,AuthUtil.getSessionUser().getUserName());
|
|
|
|
});
|
|
|
|
roleRDao.update(role);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|