diff --git a/src/main/java/com/xdap/self_development/controller/request/RolePerJoinRequest.java b/src/main/java/com/xdap/self_development/controller/request/RolePerJoinRequest.java index 81cae64..0664119 100644 --- a/src/main/java/com/xdap/self_development/controller/request/RolePerJoinRequest.java +++ b/src/main/java/com/xdap/self_development/controller/request/RolePerJoinRequest.java @@ -4,10 +4,13 @@ import lombok.Data; @Data public class RolePerJoinRequest { - //角色ID 菜单name 参数ID + //角色ID private String roleId; - private String menuName; - private String parameterId; + // private String menuName; +// private String parameterId; + private String subsystem; + //零部件名称 + private String partsName; private Integer parameterPer; private String userId; } diff --git a/src/main/java/com/xdap/self_development/service/impl/ModelRoleServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/ModelRoleServiceImpl.java index 61f5c50..17884ec 100644 --- a/src/main/java/com/xdap/self_development/service/impl/ModelRoleServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/ModelRoleServiceImpl.java @@ -72,6 +72,7 @@ public class ModelRoleServiceImpl implements ModelRoleService { @Override @Transactional(rollbackFor = CommonException.class) public void updatePerForRole(List requests) { + //将老权限置为未启用 List roleids = requests.stream().map(x -> x.getRoleId()).distinct().collect(Collectors.toList()); for (String roleId : roleids) { @@ -85,16 +86,19 @@ public class ModelRoleServiceImpl implements ModelRoleService { //增加新权限 for (RolePerJoinRequest request : requests) { String roleId = request.getRoleId(); - String menuName = request.getMenuName(); - String parameterId = request.getParameterId(); + String subsystem = request.getSubsystem(); + String partsName = request.getPartsName(); +// String menuName = request.getMenuName(); +// String parameterId = request.getParameterId(); 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("参数不完整无法写入"); continue; } List modelMenuParameterPojos = businessDatabase.getBusinessDatabase() - .eq("menu_id", menuName) - .eq("parameter_id", parameterId) +// .eq("menu_id", menuName) + .eq("subsystem", subsystem) + .eq("parts_name", partsName) .eq("parameter_per", parameterPer) .doQuery(ModelMenuParameterPojo.class); @@ -102,13 +106,14 @@ public class ModelRoleServiceImpl implements ModelRoleService { String id = String.valueOf(UUID.randomUUID()); if (ObjectUtils.isEmpty(modelMenuParameterPojos)) { //查找参数 组装权限 - Parameter parameter = businessDatabase.getBusinessDatabase() - .eq("id", parameterId) - .doQuery(Parameter.class).get(0); +// Parameter parameter = businessDatabase.getBusinessDatabase() +// .eq("id", parameterId) +// .doQuery(Parameter.class).get(0); ModelMenuParameterPojo modelMenuParameterPojo = new ModelMenuParameterPojo(); - modelMenuParameterPojo.setMenuId(menuName); - modelMenuParameterPojo.setSubsystem(parameter.getSubsystemName()); - modelMenuParameterPojo.setParameterId(parameterId); +// modelMenuParameterPojo.setMenuId(menuName); + modelMenuParameterPojo.setSubsystem(subsystem); + modelMenuParameterPojo.setPartsName(partsName); +// modelMenuParameterPojo.setParameterId(parameterId); modelMenuParameterPojo.setParameterPer(parameterPer); modelMenuParameterPojo.setId(id); modelMenuParameterPojo.setCreatedBy(request.getUserId()); @@ -130,6 +135,7 @@ public class ModelRoleServiceImpl implements ModelRoleService { businessDatabase.getBusinessDatabase() .doInsert(pojo); } + } @Override