权限架构变更-更新权限

This commit is contained in:
ys.git 2025-12-23 10:12:47 +08:00
parent 1ffa2ae9da
commit f6ab867a94
2 changed files with 23 additions and 14 deletions

View File

@ -4,10 +4,13 @@ import lombok.Data;
@Data @Data
public class RolePerJoinRequest { public class RolePerJoinRequest {
//角色ID 菜单name 参数ID //角色ID
private String roleId; private String roleId;
private String menuName; // private String menuName;
private String parameterId; // private String parameterId;
private String subsystem;
//零部件名称
private String partsName;
private Integer parameterPer; private Integer parameterPer;
private String userId; private String userId;
} }

View File

@ -72,6 +72,7 @@ public class ModelRoleServiceImpl implements ModelRoleService {
@Override @Override
@Transactional(rollbackFor = CommonException.class) @Transactional(rollbackFor = CommonException.class)
public void updatePerForRole(List<RolePerJoinRequest> requests) { public void updatePerForRole(List<RolePerJoinRequest> requests) {
//将老权限置为未启用 //将老权限置为未启用
List<String> roleids = requests.stream().map(x -> x.getRoleId()).distinct().collect(Collectors.toList()); List<String> roleids = requests.stream().map(x -> x.getRoleId()).distinct().collect(Collectors.toList());
for (String roleId : roleids) { for (String roleId : roleids) {
@ -85,16 +86,19 @@ public class ModelRoleServiceImpl implements ModelRoleService {
//增加新权限 //增加新权限
for (RolePerJoinRequest request : requests) { for (RolePerJoinRequest request : requests) {
String roleId = request.getRoleId(); String roleId = request.getRoleId();
String menuName = request.getMenuName(); String subsystem = request.getSubsystem();
String parameterId = request.getParameterId(); String partsName = request.getPartsName();
// String menuName = request.getMenuName();
// String parameterId = request.getParameterId();
Integer parameterPer = request.getParameterPer(); Integer parameterPer = request.getParameterPer();
if (ObjectUtils.isEmpty(parameterId) || ObjectUtils.isEmpty(parameterPer) || ObjectUtils.isEmpty(roleId) || ObjectUtils.isEmpty(menuName)) { if (ObjectUtils.isEmpty(subsystem) || ObjectUtils.isEmpty(parameterPer) || ObjectUtils.isEmpty(roleId) || ObjectUtils.isEmpty(partsName)) {
log.warn("参数不完整无法写入"); log.warn("参数不完整无法写入");
continue; continue;
} }
List<ModelMenuParameterPojo> modelMenuParameterPojos = businessDatabase.getBusinessDatabase() List<ModelMenuParameterPojo> modelMenuParameterPojos = businessDatabase.getBusinessDatabase()
.eq("menu_id", menuName) // .eq("menu_id", menuName)
.eq("parameter_id", parameterId) .eq("subsystem", subsystem)
.eq("parts_name", partsName)
.eq("parameter_per", parameterPer) .eq("parameter_per", parameterPer)
.doQuery(ModelMenuParameterPojo.class); .doQuery(ModelMenuParameterPojo.class);
@ -102,13 +106,14 @@ public class ModelRoleServiceImpl implements ModelRoleService {
String id = String.valueOf(UUID.randomUUID()); String id = String.valueOf(UUID.randomUUID());
if (ObjectUtils.isEmpty(modelMenuParameterPojos)) { if (ObjectUtils.isEmpty(modelMenuParameterPojos)) {
//查找参数 组装权限 //查找参数 组装权限
Parameter parameter = businessDatabase.getBusinessDatabase() // Parameter parameter = businessDatabase.getBusinessDatabase()
.eq("id", parameterId) // .eq("id", parameterId)
.doQuery(Parameter.class).get(0); // .doQuery(Parameter.class).get(0);
ModelMenuParameterPojo modelMenuParameterPojo = new ModelMenuParameterPojo(); ModelMenuParameterPojo modelMenuParameterPojo = new ModelMenuParameterPojo();
modelMenuParameterPojo.setMenuId(menuName); // modelMenuParameterPojo.setMenuId(menuName);
modelMenuParameterPojo.setSubsystem(parameter.getSubsystemName()); modelMenuParameterPojo.setSubsystem(subsystem);
modelMenuParameterPojo.setParameterId(parameterId); modelMenuParameterPojo.setPartsName(partsName);
// modelMenuParameterPojo.setParameterId(parameterId);
modelMenuParameterPojo.setParameterPer(parameterPer); modelMenuParameterPojo.setParameterPer(parameterPer);
modelMenuParameterPojo.setId(id); modelMenuParameterPojo.setId(id);
modelMenuParameterPojo.setCreatedBy(request.getUserId()); modelMenuParameterPojo.setCreatedBy(request.getUserId());
@ -130,6 +135,7 @@ public class ModelRoleServiceImpl implements ModelRoleService {
businessDatabase.getBusinessDatabase() businessDatabase.getBusinessDatabase()
.doInsert(pojo); .doInsert(pojo);
} }
} }
@Override @Override