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-08 17:53:20 +08:00
commit abf878bad1
6 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ import lombok.Data;
public class RolePerJoinRequest { public class RolePerJoinRequest {
//角色ID 菜单ID 参数ID //角色ID 菜单ID 参数ID
private String roleId; private String roleId;
private String menuId; private String menuName;
private String parameterId; private String parameterId;
private Integer parameterPer; private Integer parameterPer;
private String userId; private String userId;

8
src/main/java/com/xdap/self_development/pojo/ModelMenuDictionaryPojo.java
View File

@ -15,8 +15,8 @@ public class ModelMenuDictionaryPojo {
@RowID(sequence = "yfsjglpt_model_menu_dictionary_s", type = RowIDType.UUID) @RowID(sequence = "yfsjglpt_model_menu_dictionary_s", type = RowIDType.UUID)
private String id ; private String id ;
/** 上级ID,; */ /** 上级名称,; */
private String parentId ; private String parentName ;
/** 菜单名称,; */ /** 菜单名称,; */
private String menuName ; private String menuName ;
/** 菜单代码,; */ /** 菜单代码,; */
@ -34,9 +34,9 @@ public class ModelMenuDictionaryPojo {
/** 最后更新时间,; */ /** 最后更新时间,; */
private Date lastUpdateDate ; private Date lastUpdateDate ;
public ModelMenuDictionaryPojo(String id, String parentId, String menuName) { public ModelMenuDictionaryPojo(String id, String parentName, String menuName) {
this.id = id; this.id = id;
this.parentId = parentId; this.parentName = parentName;
this.menuName = menuName; this.menuName = menuName;
} }
} }

1
src/main/java/com/xdap/self_development/pojo/view/MenuParamView.java
View File

@ -11,5 +11,6 @@ public class MenuParamView {
private String menuPath; private String menuPath;
private String subsystem; private String subsystem;
private String parameterName; private String parameterName;
private String parameterId;
private String parameterPer; private String parameterPer;
} }

2
src/main/java/com/xdap/self_development/service/ModelMenuPermissionService.java
View File

@ -12,5 +12,5 @@ public interface ModelMenuPermissionService {
//菜单查询 //菜单查询
List<MenuListView> selectMenus(); List<MenuListView> selectMenus();
//根据ID查询路径 //根据ID查询路径
ModelMenuDictionaryPojo selectMenuById(String menuId); ModelMenuDictionaryPojo selectMenuById(String menuName);
} }

12
src/main/java/com/xdap/self_development/service/impl/ModelMenuPermissionServiceImpl.java
View File

@ -44,15 +44,15 @@ public class ModelMenuPermissionServiceImpl implements ModelMenuPermissionServic
} }
for (ModelMenuDictionaryPojo pojo : permissionPojos) { for (ModelMenuDictionaryPojo pojo : permissionPojos) {
String parentId = pojo.getParentId(); String parentName = pojo.getParentName();
MenuListView currentNode = nodeMap.get(pojo.getId()); MenuListView currentNode = nodeMap.get(pojo.getId());
if (ObjectUtils.isEmpty(parentId) || !nodeMap.containsKey(parentId)) { if (ObjectUtils.isEmpty(parentName) || !nodeMap.containsKey(parentName)) {
// 根节点 // 根节点
views.add(currentNode); views.add(currentNode);
} else { } else {
// 子节点，添加到父节点 // 子节点，添加到父节点
MenuListView parentNode = nodeMap.get(parentId); MenuListView parentNode = nodeMap.get(parentName);
if (parentNode.getListViews() == null) { if (parentNode.getListViews() == null) {
parentNode.setListViews(new ArrayList<>()); parentNode.setListViews(new ArrayList<>());
} }
@ -64,12 +64,12 @@ public class ModelMenuPermissionServiceImpl implements ModelMenuPermissionServic
} }
@Override @Override
public ModelMenuDictionaryPojo selectMenuById(String menuId) { public ModelMenuDictionaryPojo selectMenuById(String menuName) {
if (ObjectUtils.isEmpty(menuId)) { if (ObjectUtils.isEmpty(menuName)) {
throw new RuntimeException("根据ID查询菜单时ID未传入"); throw new RuntimeException("根据ID查询菜单时ID未传入");
} }
ModelMenuDictionaryPojo modelMenuDictionaryPojo = businessDatabase.getBusinessDatabase() ModelMenuDictionaryPojo modelMenuDictionaryPojo = businessDatabase.getBusinessDatabase()
.eq("id", menuId) .eq("menu_name", menuName)
.doQuery(ModelMenuDictionaryPojo.class).get(0); .doQuery(ModelMenuDictionaryPojo.class).get(0);
return modelMenuDictionaryPojo; return modelMenuDictionaryPojo;
} }

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

@ -73,15 +73,15 @@ public class ModelRoleServiceImpl implements ModelRoleService {
//增加新权限 //增加新权限
for (RolePerJoinRequest request : requests) { for (RolePerJoinRequest request : requests) {
String roleId = request.getRoleId(); String roleId = request.getRoleId();
String menuId = request.getMenuId(); String menuName = request.getMenuName();
String parameterId = request.getParameterId(); String parameterId = request.getParameterId();
Integer parameterPer = request.getParameterPer(); Integer parameterPer = request.getParameterPer();
if (ObjectUtils.isEmpty(parameterId) || ObjectUtils.isEmpty(parameterPer) || ObjectUtils.isEmpty(roleId) || ObjectUtils.isEmpty(menuId)) { if (ObjectUtils.isEmpty(parameterId) || ObjectUtils.isEmpty(parameterPer) || ObjectUtils.isEmpty(roleId) || ObjectUtils.isEmpty(menuName)) {
log.warn("参数不完整无法写入"); log.warn("参数不完整无法写入");
continue; continue;
} }
List<ModelMenuParameterPojo> modelMenuParameterPojos = businessDatabase.getBusinessDatabase() List<ModelMenuParameterPojo> modelMenuParameterPojos = businessDatabase.getBusinessDatabase()
.eq("menu_id", menuId) .eq("menu_id", menuName)
.eq("parameter_id", parameterId) .eq("parameter_id", parameterId)
.eq("parameter_per", parameterPer) .eq("parameter_per", parameterPer)
.doQuery(ModelMenuParameterPojo.class); .doQuery(ModelMenuParameterPojo.class);
@ -94,7 +94,7 @@ public class ModelRoleServiceImpl implements ModelRoleService {
.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(menuId); modelMenuParameterPojo.setMenuId(menuName);
modelMenuParameterPojo.setSubsystem(parameter.getSubsystemName()); modelMenuParameterPojo.setSubsystem(parameter.getSubsystemName());
modelMenuParameterPojo.setParameterId(parameterId); modelMenuParameterPojo.setParameterId(parameterId);
modelMenuParameterPojo.setParameterPer(parameterPer); modelMenuParameterPojo.setParameterPer(parameterPer);
@ -179,6 +179,7 @@ public class ModelRoleServiceImpl implements ModelRoleService {
menuParamView.setMenuPath(modelMenuDictionaryPojo.getMenuDesc()); menuParamView.setMenuPath(modelMenuDictionaryPojo.getMenuDesc());
menuParamView.setSubsystem(menuParameter.getSubsystem()); menuParamView.setSubsystem(menuParameter.getSubsystem());
menuParamView.setParameterName(parameter.getParameterName()); menuParamView.setParameterName(parameter.getParameterName());
menuParamView.setParameterId(parameterId);
menuParamView.setParameterPer(byCode.getDesc()); menuParamView.setParameterPer(byCode.getDesc());
menuParamViews.add(menuParamView); menuParamViews.add(menuParamView);
} }