提交 e44e6dbd authored 作者: 000516's avatar 000516

菜单管理中,添加归属系统属性

上级 b27b4a41
...@@ -156,6 +156,7 @@ public class SysMenuController extends BaseController ...@@ -156,6 +156,7 @@ public class SysMenuController extends BaseController
{ {
Long userId = SecurityUtils.getUserId(); Long userId = SecurityUtils.getUserId();
List<SysMenu> menus = sysMenuDao.selectMenuTreeByUserId(userId); List<SysMenu> menus = sysMenuDao.selectMenuTreeByUserId(userId);
// 构建前端路由所需要的菜单
return success(sysMenuDao.buildMenus(menus)); return success(sysMenuDao.buildMenus(menus));
} }
} }
\ No newline at end of file
...@@ -169,20 +169,24 @@ public class SysMenuDaoImpl implements ISysMenuDao ...@@ -169,20 +169,24 @@ public class SysMenuDaoImpl implements ISysMenuDao
for (SysMenu menu : menus) for (SysMenu menu : menus)
{ {
RouterVo router = new RouterVo(); RouterVo router = new RouterVo();
// 是否隐藏
router.setHidden("1".equals(menu.getVisible())); router.setHidden("1".equals(menu.getVisible()));
router.setName(getRouteName(menu)); router.setName(getRouteName(menu));
router.setPath(getRouterPath(menu)); router.setPath(getRouterPath(menu));
router.setComponent(getComponent(menu)); router.setComponent(getComponent(menu));
router.setBelongSys(menu.getBelongSys());
// 路由参数
router.setQuery(menu.getQuery()); router.setQuery(menu.getQuery());
router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath())); router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
List<SysMenu> cMenus = menu.getChildren(); List<SysMenu> cMenus = menu.getChildren();
// 当前菜单下有子级
if (StringUtils.isNotEmpty(cMenus) && UserConstants.TYPE_DIR.equals(menu.getMenuType())) if (StringUtils.isNotEmpty(cMenus) && UserConstants.TYPE_DIR.equals(menu.getMenuType()))
{ {
router.setAlwaysShow(true); router.setAlwaysShow(true);
router.setRedirect("noRedirect"); router.setRedirect("noRedirect");
router.setChildren(buildMenus(cMenus)); router.setChildren(buildMenus(cMenus));
} }
else if (isMenuFrame(menu)) else if (isMenuFrame(menu)) // 一级菜单且不是外链且
{ {
router.setMeta(null); router.setMeta(null);
List<RouterVo> childrenList = new ArrayList<RouterVo>(); List<RouterVo> childrenList = new ArrayList<RouterVo>();
......
...@@ -75,6 +75,9 @@ public class SysMenu extends BaseDo ...@@ -75,6 +75,9 @@ public class SysMenu extends BaseDo
/** 菜单状态(0正常 1停用) */ /** 菜单状态(0正常 1停用) */
private String status; private String status;
/** 所属系统(0后台管理 1勤策APP) */
private String belongSys;
/** 权限字符串 */ /** 权限字符串 */
@Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符") @Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符")
private String perms; private String perms;
......
...@@ -46,6 +46,8 @@ public class RouterVo ...@@ -46,6 +46,8 @@ public class RouterVo
*/ */
private Boolean alwaysShow; private Boolean alwaysShow;
/** 所属系统(0后台管理 1勤策APP) */
private String belongSys;
/** /**
* 其他元素 * 其他元素
*/ */
...@@ -145,4 +147,12 @@ public class RouterVo ...@@ -145,4 +147,12 @@ public class RouterVo
{ {
this.children = children; this.children = children;
} }
public String getBelongSys() {
return belongSys;
}
public void setBelongSys(String belongSys) {
this.belongSys = belongSys;
}
} }
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
<result property="menuType" column="menu_type" /> <result property="menuType" column="menu_type" />
<result property="visible" column="visible" /> <result property="visible" column="visible" />
<result property="status" column="status" /> <result property="status" column="status" />
<result property="belongSys" column="belong_sys" />
<result property="perms" column="perms" /> <result property="perms" column="perms" />
<result property="icon" column="icon" /> <result property="icon" column="icon" />
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by" />
...@@ -29,7 +30,7 @@ ...@@ -29,7 +30,7 @@
</resultMap> </resultMap>
<sql id="selectMenuVo"> <sql id="selectMenuVo">
select menu_id, menu_name, parent_id, order_num, path, component, `query`, route_name, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time select menu_id, menu_name, parent_id, order_num, path, component, `query`, route_name, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time ,belong_sys
from sys_menu from sys_menu
</sql> </sql>
...@@ -50,7 +51,7 @@ ...@@ -50,7 +51,7 @@
</select> </select>
<select id="selectMenuTreeAll" resultMap="SysMenuResult"> <select id="selectMenuTreeAll" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.route_name, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.route_name, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time,m.belong_sys
from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0 from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
order by m.parent_id, m.order_num order by m.parent_id, m.order_num
</select> </select>
...@@ -154,6 +155,7 @@ ...@@ -154,6 +155,7 @@
<if test="remark != null and remark != ''">remark = #{remark},</if> <if test="remark != null and remark != ''">remark = #{remark},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if> <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="updateUserId != null and updateUserId != ''">update_user_id = #{updateUserId},</if> <if test="updateUserId != null and updateUserId != ''">update_user_id = #{updateUserId},</if>
<if test="belongSys != null">belong_sys = #{belongSys},</if>
update_time = sysdate() update_time = sysdate()
</set> </set>
where menu_id = #{menuId} where menu_id = #{menuId}
...@@ -174,6 +176,7 @@ ...@@ -174,6 +176,7 @@
<if test="menuType != null and menuType != ''">menu_type,</if> <if test="menuType != null and menuType != ''">menu_type,</if>
<if test="visible != null">visible,</if> <if test="visible != null">visible,</if>
<if test="status != null">status,</if> <if test="status != null">status,</if>
<if test="belongSys != null">belong_sys,</if>
<if test="perms !=null and perms != ''">perms,</if> <if test="perms !=null and perms != ''">perms,</if>
<if test="icon != null and icon != ''">icon,</if> <if test="icon != null and icon != ''">icon,</if>
<if test="remark != null and remark != ''">remark,</if> <if test="remark != null and remark != ''">remark,</if>
...@@ -194,6 +197,7 @@ ...@@ -194,6 +197,7 @@
<if test="menuType != null and menuType != ''">#{menuType},</if> <if test="menuType != null and menuType != ''">#{menuType},</if>
<if test="visible != null">#{visible},</if> <if test="visible != null">#{visible},</if>
<if test="status != null">#{status},</if> <if test="status != null">#{status},</if>
<if test="belongSys != null">#{belongSys},</if>
<if test="perms !=null and perms != ''">#{perms},</if> <if test="perms !=null and perms != ''">#{perms},</if>
<if test="icon != null and icon != ''">#{icon},</if> <if test="icon != null and icon != ''">#{icon},</if>
<if test="remark != null and remark != ''">#{remark},</if> <if test="remark != null and remark != ''">#{remark},</if>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论