Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 258d0897 由 LN
选项

菜单增加titlekey

1 个父辈 e9de6c4c
内嵌 并排
正在显示 3 个修改的文件 包含 25 行增加 和 3 行删除
src/main/java/com/neotel/smfcore/security/rest/RoleController.java
...@@ -6,10 +6,13 @@ import com.neotel.smfcore.common.exception.ValidateException; ...@@ -6,10 +6,13 @@ import com.neotel.smfcore.common.exception.ValidateException;
import com.neotel.smfcore.common.utils.QueryHelp; import com.neotel.smfcore.common.utils.QueryHelp;
import com.neotel.smfcore.common.utils.SecurityUtils; import com.neotel.smfcore.common.utils.SecurityUtils;
import com.neotel.smfcore.security.rest.bean.dto.RoleDto; import com.neotel.smfcore.security.rest.bean.dto.RoleDto;
import com.neotel.smfcore.security.rest.bean.mapstruct.MenuMapper;
import com.neotel.smfcore.security.rest.bean.mapstruct.RoleMapper; import com.neotel.smfcore.security.rest.bean.mapstruct.RoleMapper;
import com.neotel.smfcore.security.rest.bean.query.RoleQueryCriteria; import com.neotel.smfcore.security.rest.bean.query.RoleQueryCriteria;
import com.neotel.smfcore.security.service.manager.IMenuManager;
import com.neotel.smfcore.security.service.manager.IRoleManager; import com.neotel.smfcore.security.service.manager.IRoleManager;
import com.neotel.smfcore.security.service.manager.IUserManager; import com.neotel.smfcore.security.service.manager.IUserManager;
import com.neotel.smfcore.security.service.po.Menu;
import com.neotel.smfcore.security.service.po.Role; import com.neotel.smfcore.security.service.po.Role;
import com.neotel.smfcore.security.service.po.User; import com.neotel.smfcore.security.service.po.User;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -47,6 +50,9 @@ public class RoleController { ...@@ -47,6 +50,9 @@ public class RoleController {
@Autowired @Autowired
private RoleMapper roleMapper; private RoleMapper roleMapper;
@Autowired
private IMenuManager menuManager;
@ApiOperation(value="获取单个role ",notes = "权限:roles:list") @ApiOperation(value="获取单个role ",notes = "权限:roles:list")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "角色的ID",required=true) @ApiImplicitParam(name = "id", value = "角色的ID",required=true)
...@@ -118,6 +124,15 @@ public class RoleController { ...@@ -118,6 +124,15 @@ public class RoleController {
throw new ValidateException("smfcode.valueCanotNull","{0}不能为空",new String[]{"ID"} ); throw new ValidateException("smfcode.valueCanotNull","{0}不能为空",new String[]{"ID"} );
} }
Role role = roleManager.get(resources.getId()); Role role = roleManager.get(resources.getId());
//判断ID是否存在
Set<String> menuIds=resources.getMenus();
Query query=new Query(Criteria.where("id").in(menuIds));
List<Menu> menus=menuManager.findByQuery(query);
if(menus==null&&(menus.size()!=menuIds.size())){
throw new ValidateException("smfcode.menuNotExist","菜单{0}不存在",new String[]{"ID"} );
}
roleManager.updateMenu(resources); roleManager.updateMenu(resources);
return new ResponseEntity<>(HttpStatus.OK); return new ResponseEntity<>(HttpStatus.OK);
} }
......
src/main/java/com/neotel/smfcore/security/rest/bean/vo/MenuMetaVo.java
package com.neotel.smfcore.security.rest.bean.vo; package com.neotel.smfcore.security.rest.bean.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
...@@ -10,4 +11,7 @@ public class MenuMetaVo implements Serializable { ...@@ -10,4 +11,7 @@ public class MenuMetaVo implements Serializable {
private String title; private String title;
private String icon; private String icon;
private Boolean noCache; private Boolean noCache;
@ApiModelProperty("国际化key")
private String titleKey;
} }
src/main/java/com/neotel/smfcore/security/service/manager/impl/MenuManagerImpl.java
...@@ -126,8 +126,8 @@ public class MenuManagerImpl implements IMenuManager { ...@@ -126,8 +126,8 @@ public class MenuManagerImpl implements IMenuManager {
List<Menu> menuDtoList=menu.getChildren(); List<Menu> menuDtoList=menu.getChildren();
MenuVo menuVo=new MenuVo(); MenuVo menuVo=new MenuVo();
String oldName=ObjectUtil.isNotEmpty(menu.getComponentName())?menu.getComponentName():menu.getTitle(); String oldName=ObjectUtil.isNotEmpty(menu.getComponentName())?menu.getComponentName():menu.getTitle();
String titleKey=menu.GetMsgKey(); String titleKey=menu.getTitleKey();
String title= MessageUtils.getText(titleKey, locale,oldName); String title= MessageUtils.getText(menu.GetMsgKey(), locale,oldName);
// log.info(titleKey+"="+title); // log.info(titleKey+"="+title);
menuVo.setName(title); menuVo.setName(title);
boolean pidIsNull=(menu.getPid()==null)||(StringUtils.isBlank(menu.getPid())||menu.getPid().equals("0")); boolean pidIsNull=(menu.getPid()==null)||(StringUtils.isBlank(menu.getPid())||menu.getPid().equals("0"));
...@@ -144,7 +144,10 @@ public class MenuManagerImpl implements IMenuManager { ...@@ -144,7 +144,10 @@ public class MenuManagerImpl implements IMenuManager {
menuVo.setComponent(menu.getComponent()); menuVo.setComponent(menu.getComponent());
} }
} }
menuVo.setMeta(new MenuMetaVo(title, menu.getIcon(),!menu.getCache())); if(titleKey==null||titleKey==""){
log.error("菜单【"+title+"】titleKey为空");
}
menuVo.setMeta(new MenuMetaVo(title, menu.getIcon(),!menu.getCache(),titleKey));
if(CollectionUtil.isNotEmpty(menuDtoList)){ if(CollectionUtil.isNotEmpty(menuDtoList)){
menuVo.setAlwaysShow(true); menuVo.setAlwaysShow(true);
menuVo.setRedirect("noredirect"); menuVo.setRedirect("noredirect");
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!