|  | @@ -24,8 +24,7 @@ import java.util.List;
 | 
											
												
													
														|  |   */
 |  |   */
 | 
											
												
													
														|  |  @RestController
 |  |  @RestController
 | 
											
												
													
														|  |  @RequestMapping("/menu")
 |  |  @RequestMapping("/menu")
 | 
											
												
													
														|  | -public class SysMenuController extends BaseController
 |  | 
 | 
											
												
													
														|  | -{
 |  | 
 | 
											
												
													
														|  | 
 |  | +public class SysMenuController extends BaseController {
 | 
											
												
													
														|  |      @Autowired
 |  |      @Autowired
 | 
											
												
													
														|  |      private ISysMenuService menuService;
 |  |      private ISysMenuService menuService;
 | 
											
												
													
														|  |  
 |  |  
 | 
											
										
											
												
													
														|  | @@ -34,8 +33,7 @@ public class SysMenuController extends BaseController
 | 
											
												
													
														|  |       */
 |  |       */
 | 
											
												
													
														|  |      @RequiresPermissions("system:menu:list")
 |  |      @RequiresPermissions("system:menu:list")
 | 
											
												
													
														|  |      @GetMapping("/list")
 |  |      @GetMapping("/list")
 | 
											
												
													
														|  | -    public AjaxResult list(SysMenu menu)
 |  | 
 | 
											
												
													
														|  | -    {
 |  | 
 | 
											
												
													
														|  | 
 |  | +    public AjaxResult list(SysMenu menu) {
 | 
											
												
													
														|  |          Long userId = SecurityUtils.getUserId();
 |  |          Long userId = SecurityUtils.getUserId();
 | 
											
												
													
														|  |          List<SysMenu> menus = menuService.selectMenuList(menu, userId);
 |  |          List<SysMenu> menus = menuService.selectMenuList(menu, userId);
 | 
											
												
													
														|  |          return success(menus);
 |  |          return success(menus);
 | 
											
										
											
												
													
														|  | @@ -46,8 +44,7 @@ public class SysMenuController extends BaseController
 | 
											
												
													
														|  |       */
 |  |       */
 | 
											
												
													
														|  |      @RequiresPermissions("system:menu:query")
 |  |      @RequiresPermissions("system:menu:query")
 | 
											
												
													
														|  |      @GetMapping(value = "/{menuId}")
 |  |      @GetMapping(value = "/{menuId}")
 | 
											
												
													
														|  | -    public AjaxResult getInfo(@PathVariable Long menuId)
 |  | 
 | 
											
												
													
														|  | -    {
 |  | 
 | 
											
												
													
														|  | 
 |  | +    public AjaxResult getInfo(@PathVariable Long menuId) {
 | 
											
												
													
														|  |          return success(menuService.selectMenuById(menuId));
 |  |          return success(menuService.selectMenuById(menuId));
 | 
											
												
													
														|  |      }
 |  |      }
 | 
											
												
													
														|  |  
 |  |  
 | 
											
										
											
												
													
														|  | @@ -55,8 +52,7 @@ public class SysMenuController extends BaseController
 | 
											
												
													
														|  |       * 获取菜单下拉树列表
 |  |       * 获取菜单下拉树列表
 | 
											
												
													
														|  |       */
 |  |       */
 | 
											
												
													
														|  |      @GetMapping("/treeselect")
 |  |      @GetMapping("/treeselect")
 | 
											
												
													
														|  | -    public AjaxResult treeselect(SysMenu menu)
 |  | 
 | 
											
												
													
														|  | -    {
 |  | 
 | 
											
												
													
														|  | 
 |  | +    public AjaxResult treeselect(SysMenu menu) {
 | 
											
												
													
														|  |          Long userId = SecurityUtils.getUserId();
 |  |          Long userId = SecurityUtils.getUserId();
 | 
											
												
													
														|  |          List<SysMenu> menus = menuService.selectMenuList(menu, userId);
 |  |          List<SysMenu> menus = menuService.selectMenuList(menu, userId);
 | 
											
												
													
														|  |          return success(menuService.buildMenuTreeSelect(menus));
 |  |          return success(menuService.buildMenuTreeSelect(menus));
 | 
											
										
											
												
													
														|  | @@ -66,8 +62,7 @@ public class SysMenuController extends BaseController
 | 
											
												
													
														|  |       * 加载对应角色菜单列表树
 |  |       * 加载对应角色菜单列表树
 | 
											
												
													
														|  |       */
 |  |       */
 | 
											
												
													
														|  |      @GetMapping(value = "/roleMenuTreeselect/{roleId}")
 |  |      @GetMapping(value = "/roleMenuTreeselect/{roleId}")
 | 
											
												
													
														|  | -    public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
 |  | 
 | 
											
												
													
														|  | -    {
 |  | 
 | 
											
												
													
														|  | 
 |  | +    public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId) {
 | 
											
												
													
														|  |          Long userId = SecurityUtils.getUserId();
 |  |          Long userId = SecurityUtils.getUserId();
 | 
											
												
													
														|  |          List<SysMenu> menus = menuService.selectMenuList(userId);
 |  |          List<SysMenu> menus = menuService.selectMenuList(userId);
 | 
											
												
													
														|  |          AjaxResult ajax = AjaxResult.success();
 |  |          AjaxResult ajax = AjaxResult.success();
 | 
											
										
											
												
													
														|  | @@ -82,14 +77,10 @@ public class SysMenuController extends BaseController
 | 
											
												
													
														|  |      @RequiresPermissions("system:menu:add")
 |  |      @RequiresPermissions("system:menu:add")
 | 
											
												
													
														|  |      @Log(title = "菜单管理", businessType = BusinessType.INSERT)
 |  |      @Log(title = "菜单管理", businessType = BusinessType.INSERT)
 | 
											
												
													
														|  |      @PostMapping
 |  |      @PostMapping
 | 
											
												
													
														|  | -    public AjaxResult add(@Validated @RequestBody SysMenu menu)
 |  | 
 | 
											
												
													
														|  | -    {
 |  | 
 | 
											
												
													
														|  | -        if (!menuService.checkMenuNameUnique(menu))
 |  | 
 | 
											
												
													
														|  | -        {
 |  | 
 | 
											
												
													
														|  | 
 |  | +    public AjaxResult add(@Validated @RequestBody SysMenu menu) {
 | 
											
												
													
														|  | 
 |  | +        if (!menuService.checkMenuNameUnique(menu)) {
 | 
											
												
													
														|  |              return error("新增菜单'" + menu.getMenuName() + "'失败,菜单名称已存在");
 |  |              return error("新增菜单'" + menu.getMenuName() + "'失败,菜单名称已存在");
 | 
											
												
													
														|  | -        }
 |  | 
 | 
											
												
													
														|  | -        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
 |  | 
 | 
											
												
													
														|  | -        {
 |  | 
 | 
											
												
													
														|  | 
 |  | +        } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
 | 
											
												
													
														|  |              return error("新增菜单'" + menu.getMenuName() + "'失败,地址必须以http(s)://开头");
 |  |              return error("新增菜单'" + menu.getMenuName() + "'失败,地址必须以http(s)://开头");
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
												
													
														|  |          menu.setCreateBy(SecurityUtils.getUsername());
 |  |          menu.setCreateBy(SecurityUtils.getUsername());
 | 
											
										
											
												
													
														|  | @@ -102,18 +93,12 @@ public class SysMenuController extends BaseController
 | 
											
												
													
														|  |      @RequiresPermissions("system:menu:edit")
 |  |      @RequiresPermissions("system:menu:edit")
 | 
											
												
													
														|  |      @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
 |  |      @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
 | 
											
												
													
														|  |      @PutMapping
 |  |      @PutMapping
 | 
											
												
													
														|  | -    public AjaxResult edit(@Validated @RequestBody SysMenu menu)
 |  | 
 | 
											
												
													
														|  | -    {
 |  | 
 | 
											
												
													
														|  | -        if (!menuService.checkMenuNameUnique(menu))
 |  | 
 | 
											
												
													
														|  | -        {
 |  | 
 | 
											
												
													
														|  | 
 |  | +    public AjaxResult edit(@Validated @RequestBody SysMenu menu) {
 | 
											
												
													
														|  | 
 |  | +        if (!menuService.checkMenuNameUnique(menu)) {
 | 
											
												
													
														|  |              return error("修改菜单'" + menu.getMenuName() + "'失败,菜单名称已存在");
 |  |              return error("修改菜单'" + menu.getMenuName() + "'失败,菜单名称已存在");
 | 
											
												
													
														|  | -        }
 |  | 
 | 
											
												
													
														|  | -        else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
 |  | 
 | 
											
												
													
														|  | -        {
 |  | 
 | 
											
												
													
														|  | 
 |  | +        } else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
 | 
											
												
													
														|  |              return error("修改菜单'" + menu.getMenuName() + "'失败,地址必须以http(s)://开头");
 |  |              return error("修改菜单'" + menu.getMenuName() + "'失败,地址必须以http(s)://开头");
 | 
											
												
													
														|  | -        }
 |  | 
 | 
											
												
													
														|  | -        else if (menu.getId().equals(menu.getParentId()))
 |  | 
 | 
											
												
													
														|  | -        {
 |  | 
 | 
											
												
													
														|  | 
 |  | +        } else if (menu.getId().equals(menu.getParentId())) {
 | 
											
												
													
														|  |              return error("修改菜单'" + menu.getMenuName() + "'失败,上级菜单不能选择自己");
 |  |              return error("修改菜单'" + menu.getMenuName() + "'失败,上级菜单不能选择自己");
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
												
													
														|  |          menu.setUpdateBy(SecurityUtils.getUsername());
 |  |          menu.setUpdateBy(SecurityUtils.getUsername());
 | 
											
										
											
												
													
														|  | @@ -126,14 +111,11 @@ public class SysMenuController extends BaseController
 | 
											
												
													
														|  |      @RequiresPermissions("system:menu:remove")
 |  |      @RequiresPermissions("system:menu:remove")
 | 
											
												
													
														|  |      @Log(title = "菜单管理", businessType = BusinessType.DELETE)
 |  |      @Log(title = "菜单管理", businessType = BusinessType.DELETE)
 | 
											
												
													
														|  |      @DeleteMapping("/{menuId}")
 |  |      @DeleteMapping("/{menuId}")
 | 
											
												
													
														|  | -    public AjaxResult remove(@PathVariable("menuId") Long menuId)
 |  | 
 | 
											
												
													
														|  | -    {
 |  | 
 | 
											
												
													
														|  | -        if (menuService.hasChildByMenuId(menuId))
 |  | 
 | 
											
												
													
														|  | -        {
 |  | 
 | 
											
												
													
														|  | 
 |  | +    public AjaxResult remove(@PathVariable("menuId") Long menuId) {
 | 
											
												
													
														|  | 
 |  | +        if (menuService.hasChildByMenuId(menuId)) {
 | 
											
												
													
														|  |              return warn("存在子菜单,不允许删除");
 |  |              return warn("存在子菜单,不允许删除");
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
												
													
														|  | -        if (menuService.checkMenuExistRole(menuId))
 |  | 
 | 
											
												
													
														|  | -        {
 |  | 
 | 
											
												
													
														|  | 
 |  | +        if (menuService.checkMenuExistRole(menuId)) {
 | 
											
												
													
														|  |              return warn("菜单已分配,不允许删除");
 |  |              return warn("菜单已分配,不允许删除");
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
												
													
														|  |          return toAjax(menuService.deleteMenuById(menuId));
 |  |          return toAjax(menuService.deleteMenuById(menuId));
 | 
											
										
											
												
													
														|  | @@ -145,10 +127,9 @@ public class SysMenuController extends BaseController
 | 
											
												
													
														|  |       * @return 路由信息
 |  |       * @return 路由信息
 | 
											
												
													
														|  |       */
 |  |       */
 | 
											
												
													
														|  |      @GetMapping("getRouters")
 |  |      @GetMapping("getRouters")
 | 
											
												
													
														|  | -    public AjaxResult getRouters()
 |  | 
 | 
											
												
													
														|  | -    {
 |  | 
 | 
											
												
													
														|  | 
 |  | +    public AjaxResult getRouters() {
 | 
											
												
													
														|  |          LoginUser loginUser = SecurityUtils.getLoginUser();
 |  |          LoginUser loginUser = SecurityUtils.getLoginUser();
 | 
											
												
													
														|  | -        List<SysMenu> menus = menuService.selectMenuTreeByUserId(loginUser.getUserid(),loginUser.getPlatformType());
 |  | 
 | 
											
												
													
														|  | 
 |  | +        List<SysMenu> menus = menuService.selectMenuTreeByUserId(loginUser.getUserid(), loginUser.getPlatformType());
 | 
											
												
													
														|  |          return success(menuService.buildMenus(menus));
 |  |          return success(menuService.buildMenus(menus));
 | 
											
												
													
														|  |      }
 |  |      }
 | 
											
												
													
														|  |  }
 |  |  }
 |