权限架构变更
This commit is contained in:
parent
8d9d9421fd
commit
1ffa2ae9da
@ -131,16 +131,6 @@ public class PermissionController {
|
||||
throw new RuntimeException(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
// 根据子系统获取参数
|
||||
@GetMapping("/getAllParameters")
|
||||
public Response getAllParameters(
|
||||
@NotBlank String subsystem
|
||||
) {
|
||||
List<ParametersView> list = parameterService.getAllParameters(subsystem);
|
||||
return Response.ok().data(list);
|
||||
}
|
||||
|
||||
// 查看角色绑定的人员或部门列表
|
||||
@GetMapping("/selectUserOrDeptByRole")
|
||||
public Response selectUserOrDeptByRole(
|
||||
|
||||
@ -12,23 +12,43 @@ import java.util.Date;
|
||||
@EqualsAndHashCode(callSuper = false)
|
||||
@Table("yfsjglpt_model_menu_parameter")
|
||||
public class ModelMenuParameterPojo {
|
||||
/** ID,; */
|
||||
/**
|
||||
* ID,;
|
||||
*/
|
||||
@RowID(sequence = "yfsjglpt_model_menu_parameter_s", type = RowIDType.UUID)
|
||||
private String id;
|
||||
/** 菜单ID,; */
|
||||
/**
|
||||
* 菜单ID,;
|
||||
*/
|
||||
private String menuId;
|
||||
/** 子系统,; */
|
||||
/**
|
||||
* 子系统,;
|
||||
*/
|
||||
private String subsystem;
|
||||
/** 参数ID,; */
|
||||
//零部件名称
|
||||
private String partsName;
|
||||
/**
|
||||
* 参数ID,;
|
||||
*/
|
||||
private String parameterId;
|
||||
/** 参数权限,1:查看;2:编辑,; */
|
||||
/**
|
||||
* 参数权限,1:查看;2:编辑,;
|
||||
*/
|
||||
private int parameterPer;
|
||||
/** 创建人,; */
|
||||
/**
|
||||
* 创建人,;
|
||||
*/
|
||||
private String createdBy;
|
||||
/** 创建时间,; */
|
||||
/**
|
||||
* 创建时间,;
|
||||
*/
|
||||
private Date creationDate;
|
||||
/** 最后更新人,; */
|
||||
/**
|
||||
* 最后更新人,;
|
||||
*/
|
||||
private String lastUpdatedBy;
|
||||
/** 最后更新时间,; */
|
||||
/**
|
||||
* 最后更新时间,;
|
||||
*/
|
||||
private Date lastUpdateDate;
|
||||
}
|
||||
|
||||
@ -8,9 +8,10 @@ import java.util.ArrayList;
|
||||
@Data
|
||||
public class MenuParamView {
|
||||
private String id;
|
||||
private String menuPath;
|
||||
// private String menuPath;
|
||||
private String subsystem;
|
||||
private String parameterName;
|
||||
private String parameterId;
|
||||
private String partsName;
|
||||
// private String parameterName;
|
||||
// private String parameterId;
|
||||
private String parameterPer;
|
||||
}
|
||||
|
||||
@ -40,6 +40,13 @@ public class ModelRoleServiceImpl implements ModelRoleService {
|
||||
|
||||
@Override
|
||||
public void addRoles(ModelRolesRequest request) {
|
||||
List<ModelRolesPojo> modelRolesPojos = businessDatabase.getBusinessDatabase()
|
||||
.eq("is_enabled", 1)
|
||||
.eq("role_code", request.getRoleCode())
|
||||
.doQuery(ModelRolesPojo.class);
|
||||
if (ObjectUtils.isNotEmpty(modelRolesPojos)) {
|
||||
throw new RuntimeException("角色代号已存在");
|
||||
}
|
||||
ModelRolesPojo modelRolesPojo = new ModelRolesPojo();
|
||||
BeanUtils.copyProperties(request, modelRolesPojo);
|
||||
modelRolesPojo.setCreatedBy(request.getUserId());
|
||||
@ -166,16 +173,17 @@ public class ModelRoleServiceImpl implements ModelRoleService {
|
||||
.eq("role_id", roleID)
|
||||
.eq("is_enable", 1)
|
||||
.doQuery(ModelRolePermissionPojo.class);
|
||||
List<String> perids = role.stream().map(x -> x.getPerId()).distinct().collect(Collectors.toList());
|
||||
if (ObjectUtils.isEmpty(role)) {
|
||||
log.warn("该角色没有权限");
|
||||
return null;
|
||||
}
|
||||
List<String> perids = role.stream().map(x -> x.getPerId()).distinct().collect(Collectors.toList());
|
||||
List<ModelMenuParameterPojo> menuParameters = businessDatabase.getBusinessDatabase()
|
||||
.in("id", perids)
|
||||
.doQuery(ModelMenuParameterPojo.class);
|
||||
//获取权限
|
||||
for (ModelMenuParameterPojo menuParameter : menuParameters) {
|
||||
/* 权限变更不再管理菜单且不再存参数 改为子系统+零部件
|
||||
ModelMenuDictionaryPojo modelMenuDictionaryPojo = modelMenuPermissionService.selectMenuById(menuParameter.getMenuId());
|
||||
String parameterId = menuParameter.getParameterId();
|
||||
|
||||
@ -189,7 +197,7 @@ public class ModelRoleServiceImpl implements ModelRoleService {
|
||||
continue; // 或者抛出更具体的异常
|
||||
}
|
||||
|
||||
Parameter parameter = parameters.get(0);
|
||||
Parameter parameter = parameters.get(0);*/
|
||||
|
||||
ParamPermissionEnum byCode = ParamPermissionEnum.getByCode(menuParameter.getParameterPer());
|
||||
if (byCode == null) {
|
||||
@ -197,10 +205,9 @@ public class ModelRoleServiceImpl implements ModelRoleService {
|
||||
}
|
||||
MenuParamView menuParamView = new MenuParamView();
|
||||
menuParamView.setId(menuParameter.getId());
|
||||
menuParamView.setMenuPath(modelMenuDictionaryPojo.getMenuDesc());
|
||||
// menuParamView.setMenuPath(modelMenuDictionaryPojo.getMenuDesc());
|
||||
menuParamView.setSubsystem(menuParameter.getSubsystem());
|
||||
menuParamView.setParameterName(parameter.getParameterName());
|
||||
menuParamView.setParameterId(parameterId);
|
||||
menuParamView.setSubsystem(menuParameter.getPartsName());
|
||||
menuParamView.setParameterPer(byCode.getDesc());
|
||||
menuParamViews.add(menuParamView);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user