Skip to content

G
guns-vip
Commit 5570b3d9 by fsn
Options

菜单管理把查看菜单和菜单列表加入权限控制

parent 2bbdce0d
Showing with 52 additions and 42 deletions
sql/guns.sql
...@@ -10,7 +10,7 @@ Target Server Type : MYSQL ...@@ -10,7 +10,7 @@ Target Server Type : MYSQL
Target Server Version : 50621 Target Server Version : 50621
File Encoding : 65001 File Encoding : 65001
Date: 2017-06-01 22:47:00 Date: 2017-06-03 22:00:59
*/ */
SET FOREIGN_KEY_CHECKS=0; SET FOREIGN_KEY_CHECKS=0;
...@@ -102,7 +102,7 @@ CREATE TABLE `menu` ( ...@@ -102,7 +102,7 @@ CREATE TABLE `menu` (
`status` int(65) DEFAULT NULL COMMENT '菜单状态 : 1:启用 0:不启用', `status` int(65) DEFAULT NULL COMMENT '菜单状态 : 1:启用 0:不启用',
`isopen` int(11) DEFAULT NULL COMMENT '是否打开: 1:打开 0:不打开', `isopen` int(11) DEFAULT NULL COMMENT '是否打开: 1:打开 0:不打开',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=150 DEFAULT CHARSET=utf8; ) ENGINE=InnoDB AUTO_INCREMENT=152 DEFAULT CHARSET=utf8;
-- ---------------------------- -- ----------------------------
-- Records of menu -- Records of menu
...@@ -144,6 +144,8 @@ INSERT INTO `menu` VALUES ('144', 'notice_delete', 'notice', '删除通知', nul ...@@ -144,6 +144,8 @@ INSERT INTO `menu` VALUES ('144', 'notice_delete', 'notice', '删除通知', nul
INSERT INTO `menu` VALUES ('145', 'hello', '0', '通知', 'fa-rocket', '/notice/hello', '1', '1', '1', null, '1', null); INSERT INTO `menu` VALUES ('145', 'hello', '0', '通知', 'fa-rocket', '/notice/hello', '1', '1', '1', null, '1', null);
INSERT INTO `menu` VALUES ('148', 'code', 'system', '代码生成', 'fa-user', '/code', '10', '2', '1', null, '1', null); INSERT INTO `menu` VALUES ('148', 'code', 'system', '代码生成', 'fa-user', '/code', '10', '2', '1', null, '1', null);
INSERT INTO `menu` VALUES ('149', 'api_mgr', '0', '接口文档', 'fa-leaf', '/swagger-ui.html', '2', '1', '1', null, '1', null); INSERT INTO `menu` VALUES ('149', 'api_mgr', '0', '接口文档', 'fa-leaf', '/swagger-ui.html', '2', '1', '1', null, '1', null);
INSERT INTO `menu` VALUES ('150', 'to_menu_edit', 'menu', '菜单编辑跳转', '', '/menu/menu_edit', '4', '3', '0', null, '1', null);
INSERT INTO `menu` VALUES ('151', 'menu_list', 'menu', '菜单列表', '', '/menu/list', '5', '3', '0', null, '1', null);
-- ---------------------------- -- ----------------------------
-- Table structure for notice -- Table structure for notice
...@@ -180,13 +182,17 @@ CREATE TABLE `operation_log` ( ...@@ -180,13 +182,17 @@ CREATE TABLE `operation_log` (
`succeed` varchar(255) DEFAULT NULL, `succeed` varchar(255) DEFAULT NULL,
`message` text, `message` text,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=448 DEFAULT CHARSET=utf8; ) ENGINE=InnoDB AUTO_INCREMENT=452 DEFAULT CHARSET=utf8;
-- ---------------------------- -- ----------------------------
-- Records of operation_log -- Records of operation_log
-- ---------------------------- -- ----------------------------
INSERT INTO `operation_log` VALUES ('446', '业务日志', '清空业务日志', '1', 'com.stylefeng.guns.modular.system.controller.LogController', 'delLog', '2017-06-01 21:42:13', '成功', '主键id=null'); INSERT INTO `operation_log` VALUES ('446', '业务日志', '清空业务日志', '1', 'com.stylefeng.guns.modular.system.controller.LogController', 'delLog', '2017-06-01 21:42:13', '成功', '主键id=null');
INSERT INTO `operation_log` VALUES ('447', '业务日志', '清空登录日志', '1', 'com.stylefeng.guns.modular.system.controller.LoginLogController', 'delLog', '2017-06-01 21:42:15', '成功', '主键id=null'); INSERT INTO `operation_log` VALUES ('447', '业务日志', '清空登录日志', '1', 'com.stylefeng.guns.modular.system.controller.LoginLogController', 'delLog', '2017-06-01 21:42:15', '成功', '主键id=null');
INSERT INTO `operation_log` VALUES ('448', '业务日志', '菜单新增', '1', 'com.stylefeng.guns.modular.system.controller.MenuController', 'add', '2017-06-03 21:59:37', '成功', '菜单名称=菜单编辑跳转');
INSERT INTO `operation_log` VALUES ('449', '业务日志', '配置权限', '1', 'com.stylefeng.guns.modular.system.controller.RoleController', 'setAuthority', '2017-06-03 21:59:52', '成功', '角色名称=超级管理员,资源名称=系统管理,用户管理,添加用户,修改用户,删除用户,重置密码,冻结用户,解除冻结用户,分配角色,角色管理,添加角色,修改角色,删除角色,配置权限,菜单管理,添加菜单,修改菜单,删除菜单,菜单编辑跳转,业务日志,清空日志,监控管理,部门管理,添加部门,修改部门,删除部门,字典管理,添加字典,修改字典,删除字典,登录日志,通知管理,添加通知,修改通知,删除通知,代码生成,通知,接口文档');
INSERT INTO `operation_log` VALUES ('450', '业务日志', '菜单新增', '1', 'com.stylefeng.guns.modular.system.controller.MenuController', 'add', '2017-06-03 22:00:32', '成功', '菜单名称=菜单列表');
INSERT INTO `operation_log` VALUES ('451', '业务日志', '配置权限', '1', 'com.stylefeng.guns.modular.system.controller.RoleController', 'setAuthority', '2017-06-03 22:00:39', '成功', '角色名称=超级管理员,资源名称=系统管理,用户管理,添加用户,修改用户,删除用户,重置密码,冻结用户,解除冻结用户,分配角色,角色管理,添加角色,修改角色,删除角色,配置权限,菜单管理,添加菜单,修改菜单,删除菜单,菜单编辑跳转,菜单列表,业务日志,清空日志,监控管理,部门管理,添加部门,修改部门,删除部门,字典管理,添加字典,修改字典,删除字典,登录日志,通知管理,添加通知,修改通知,删除通知,代码生成,通知,接口文档');
-- ---------------------------- -- ----------------------------
-- Table structure for relation -- Table structure for relation
...@@ -197,48 +203,50 @@ CREATE TABLE `relation` ( ...@@ -197,48 +203,50 @@ CREATE TABLE `relation` (
`menuid` int(11) DEFAULT NULL, `menuid` int(11) DEFAULT NULL,
`roleid` int(11) DEFAULT NULL, `roleid` int(11) DEFAULT NULL,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=3300 DEFAULT CHARSET=utf8; ) ENGINE=InnoDB AUTO_INCREMENT=3377 DEFAULT CHARSET=utf8;
-- ---------------------------- -- ----------------------------
-- Records of relation -- Records of relation
-- ---------------------------- -- ----------------------------
INSERT INTO `relation` VALUES ('3263', '105', '1'); INSERT INTO `relation` VALUES ('3338', '105', '1');
INSERT INTO `relation` VALUES ('3264', '106', '1'); INSERT INTO `relation` VALUES ('3339', '106', '1');
INSERT INTO `relation` VALUES ('3265', '107', '1'); INSERT INTO `relation` VALUES ('3340', '107', '1');
INSERT INTO `relation` VALUES ('3266', '108', '1'); INSERT INTO `relation` VALUES ('3341', '108', '1');
INSERT INTO `relation` VALUES ('3267', '109', '1'); INSERT INTO `relation` VALUES ('3342', '109', '1');
INSERT INTO `relation` VALUES ('3268', '110', '1'); INSERT INTO `relation` VALUES ('3343', '110', '1');
INSERT INTO `relation` VALUES ('3269', '111', '1'); INSERT INTO `relation` VALUES ('3344', '111', '1');
INSERT INTO `relation` VALUES ('3270', '112', '1'); INSERT INTO `relation` VALUES ('3345', '112', '1');
INSERT INTO `relation` VALUES ('3271', '113', '1'); INSERT INTO `relation` VALUES ('3346', '113', '1');
INSERT INTO `relation` VALUES ('3272', '114', '1'); INSERT INTO `relation` VALUES ('3347', '114', '1');
INSERT INTO `relation` VALUES ('3273', '115', '1'); INSERT INTO `relation` VALUES ('3348', '115', '1');
INSERT INTO `relation` VALUES ('3274', '116', '1'); INSERT INTO `relation` VALUES ('3349', '116', '1');
INSERT INTO `relation` VALUES ('3275', '117', '1'); INSERT INTO `relation` VALUES ('3350', '117', '1');
INSERT INTO `relation` VALUES ('3276', '118', '1'); INSERT INTO `relation` VALUES ('3351', '118', '1');
INSERT INTO `relation` VALUES ('3277', '119', '1'); INSERT INTO `relation` VALUES ('3352', '119', '1');
INSERT INTO `relation` VALUES ('3278', '120', '1'); INSERT INTO `relation` VALUES ('3353', '120', '1');
INSERT INTO `relation` VALUES ('3279', '121', '1'); INSERT INTO `relation` VALUES ('3354', '121', '1');
INSERT INTO `relation` VALUES ('3280', '122', '1'); INSERT INTO `relation` VALUES ('3355', '122', '1');
INSERT INTO `relation` VALUES ('3281', '128', '1'); INSERT INTO `relation` VALUES ('3356', '150', '1');
INSERT INTO `relation` VALUES ('3282', '134', '1'); INSERT INTO `relation` VALUES ('3357', '151', '1');
INSERT INTO `relation` VALUES ('3283', '130', '1'); INSERT INTO `relation` VALUES ('3358', '128', '1');
INSERT INTO `relation` VALUES ('3284', '131', '1'); INSERT INTO `relation` VALUES ('3359', '134', '1');
INSERT INTO `relation` VALUES ('3285', '135', '1'); INSERT INTO `relation` VALUES ('3360', '130', '1');
INSERT INTO `relation` VALUES ('3286', '136', '1'); INSERT INTO `relation` VALUES ('3361', '131', '1');
INSERT INTO `relation` VALUES ('3287', '137', '1'); INSERT INTO `relation` VALUES ('3362', '135', '1');
INSERT INTO `relation` VALUES ('3288', '132', '1'); INSERT INTO `relation` VALUES ('3363', '136', '1');
INSERT INTO `relation` VALUES ('3289', '138', '1'); INSERT INTO `relation` VALUES ('3364', '137', '1');
INSERT INTO `relation` VALUES ('3290', '139', '1'); INSERT INTO `relation` VALUES ('3365', '132', '1');
INSERT INTO `relation` VALUES ('3291', '140', '1'); INSERT INTO `relation` VALUES ('3366', '138', '1');
INSERT INTO `relation` VALUES ('3292', '133', '1'); INSERT INTO `relation` VALUES ('3367', '139', '1');
INSERT INTO `relation` VALUES ('3293', '141', '1'); INSERT INTO `relation` VALUES ('3368', '140', '1');
INSERT INTO `relation` VALUES ('3294', '142', '1'); INSERT INTO `relation` VALUES ('3369', '133', '1');
INSERT INTO `relation` VALUES ('3295', '143', '1'); INSERT INTO `relation` VALUES ('3370', '141', '1');
INSERT INTO `relation` VALUES ('3296', '144', '1'); INSERT INTO `relation` VALUES ('3371', '142', '1');
INSERT INTO `relation` VALUES ('3297', '148', '1'); INSERT INTO `relation` VALUES ('3372', '143', '1');
INSERT INTO `relation` VALUES ('3298', '145', '1'); INSERT INTO `relation` VALUES ('3373', '144', '1');
INSERT INTO `relation` VALUES ('3299', '149', '1'); INSERT INTO `relation` VALUES ('3374', '148', '1');
INSERT INTO `relation` VALUES ('3375', '145', '1');
INSERT INTO `relation` VALUES ('3376', '149', '1');
-- ---------------------------- -- ----------------------------
-- Table structure for role -- Table structure for role
......
src/main/java/com/stylefeng/guns/modular/system/controller/MenuController.java
...@@ -72,6 +72,7 @@ public class MenuController extends BaseController { ...@@ -72,6 +72,7 @@ public class MenuController extends BaseController {
/** /**
* 跳转到菜单详情列表页面 * 跳转到菜单详情列表页面
*/ */
@Permission(Const.ADMIN_NAME)
@RequestMapping(value = "/menu_edit/{menuId}") @RequestMapping(value = "/menu_edit/{menuId}")
public String menuEdit(@PathVariable Integer menuId, Model model) { public String menuEdit(@PathVariable Integer menuId, Model model) {
if (ToolUtil.isEmpty(menuId)) { if (ToolUtil.isEmpty(menuId)) {
...@@ -104,8 +105,8 @@ public class MenuController extends BaseController { ...@@ -104,8 +105,8 @@ public class MenuController extends BaseController {
*/ */
@Permission(Const.ADMIN_NAME) @Permission(Const.ADMIN_NAME)
@RequestMapping(value = "/edit") @RequestMapping(value = "/edit")
@ResponseBody
@BussinessLog(value = "修改菜单", key = "name", dict = Dict.MenuDict) @BussinessLog(value = "修改菜单", key = "name", dict = Dict.MenuDict)
@ResponseBody
public Tip edit(@Valid Menu menu, BindingResult result) { public Tip edit(@Valid Menu menu, BindingResult result) {
if (result.hasErrors()) { if (result.hasErrors()) {
throw new BussinessException(BizExceptionEnum.REQUEST_NULL); throw new BussinessException(BizExceptionEnum.REQUEST_NULL);
...@@ -120,6 +121,7 @@ public class MenuController extends BaseController { ...@@ -120,6 +121,7 @@ public class MenuController extends BaseController {
/** /**
* 获取菜单列表 * 获取菜单列表
*/ */
@Permission(Const.ADMIN_NAME)
@RequestMapping(value = "/list") @RequestMapping(value = "/list")
@ResponseBody @ResponseBody
public Object list(@RequestParam(required = false) String menuName, @RequestParam(required = false) String level) { public Object list(@RequestParam(required = false) String menuName, @RequestParam(required = false) String level) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment