jiezhoufg/yc_fdjyfluru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zjh 2025-12-23 10:23:04 +08:00
commit ff6a646058
3 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/xdap/self_development/controller/PermissionController.java
View File

@ -134,9 +134,9 @@ public class PermissionController {
// 查看角色绑定的人员或部门列表
@GetMapping("/selectUserOrDeptByRole")
public Response selectUserOrDeptByRole(
@NotBlank String roleID
@NotBlank String roleId
) {
HashMap<String, List<String>> map = modelRoleService.selectUserOrDeptByRole(roleID);
HashMap<String, List<String>> map = modelRoleService.selectUserOrDeptByRole(roleId);
if (ObjectUtils.isEmpty(map)) {
return Response.ok().data(new HashMap<>());
}

9
src/main/java/com/xdap/self_development/controller/request/RolePerJoinRequest.java
View File

@ -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;
}

28
src/main/java/com/xdap/self_development/service/impl/ModelRoleServiceImpl.java
View File

@ -72,6 +72,7 @@ public class ModelRoleServiceImpl implements ModelRoleService {
@Override
@Transactional(rollbackFor = CommonException.class)
public void updatePerForRole(List<RolePerJoinRequest> requests) {
//将老权限置为未启用
List<String> 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<ModelMenuParameterPojo> 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