se-modules/se-system/src/main/java/com/se/system/controller/IndexController.java
@@ -1,5 +1,6 @@ package com.se.system.controller; import com.se.common.core.utils.StringUtils; import com.se.common.core.utils.ip.IpUtils; import com.se.common.core.web.controller.BaseController; import com.se.common.core.web.domain.AjaxResult; @@ -10,9 +11,12 @@ import com.se.system.api.domain.SysLogininfor; import com.se.system.api.domain.SysOperLog; import com.se.system.api.model.LoginUser; import com.se.system.domain.SysMenu; import com.se.system.service.IndexService; import com.se.system.service.impl.SysMenuServiceImpl; import com.se.system.service.inte.ISysLogininforService; import com.se.system.service.inte.ISysOperLogService; import org.omg.PortableInterceptor.SYSTEM_EXCEPTION; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -31,10 +35,19 @@ IndexService indexService; @Resource SysMenuServiceImpl menuService; @Resource ISysOperLogService operLogService; @Resource ISysLogininforService logininforService; private SysMenu sysMenu = new SysMenu(); public IndexController() { sysMenu.setMark("index"); } // ①PV统计:PV(Page View):页面浏览量或点击量,即网站所有页面被访问的总次数。 // 每打开或刷新一个页面,PV就会增加一次,多次打开或刷新同一页面则浏览量累计。 @@ -139,6 +152,31 @@ return map; } @GetMapping("/getAllPerms") public AjaxResult getAllPerms() { try { List<SysMenu> menus = menuService.selectMenuList(sysMenu, 1L); return success(menuService.buildMenus(menus)); } catch (Exception ex) { logger.error(ex.getMessage(), ex); return error(ex.getMessage()); } } @GetMapping("/getMyPerms") public AjaxResult getMyPerms() { try { Long userId = SecurityUtils.getUserId(); List<SysMenu> menus = menuService.selectMenuList(sysMenu, userId); return success(menuService.buildMenus(menus)); } catch (Exception ex) { logger.error(ex.getMessage(), ex); return error(ex.getMessage()); } } @GetMapping("/addAccessLog") public AjaxResult addAccessLog(String title, int status) { long start = System.currentTimeMillis(); se-modules/se-system/src/main/java/com/se/system/controller/SysMenuController.java
@@ -30,6 +30,7 @@ */ @RestController @RequestMapping("/menu") @SuppressWarnings("ALL") public class SysMenuController extends BaseController { @Autowired @@ -41,12 +42,12 @@ @RequiresPermissions("system:menu:list") @GetMapping("/list") public AjaxResult list(SysMenu menu) { if (StringUtils.isEmpty(menu.getMark())) { /*if (StringUtils.isEmpty(menu.getMark())) { menu.setMark("sys"); } if ("all".equals(menu.getMark())) { menu.setMark(null); } }*/ Long userId = SecurityUtils.getUserId(); List<SysMenu> menus = menuService.selectMenuList(menu, userId); @@ -168,19 +169,5 @@ List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId, mark); return success(menuService.buildMenus(menus)); } /** * 根据标识获取菜单 * * @return 菜单 */ @GetMapping("getMenusByMark") public AjaxResult getMenusByMark(String mark) { Long userId = SecurityUtils.getUserId(); List<SysMenu> menus = menuService.selectMenusByUserIdAndMark(userId, mark); return success(menus); } } se-modules/se-system/src/main/java/com/se/system/service/impl/SysMenuServiceImpl.java
@@ -71,7 +71,7 @@ } //menu.setMenuId(SecurityUtils.isAdmin(userId) ? null : userId); return menuMapper.selectMenuListByUserId(menu); return menuList; } /** @@ -127,13 +127,6 @@ menus = menuMapper.selectMenuTreeByUserId(userId, mark); } //List<SysMenu> menus = menuMapper.selectMenuTreeByUserId(SecurityUtils.isAdmin(userId) ? null : userId, mark); return getChildPerms(menus, 0); } @Override public List<SysMenu> selectMenusByUserIdAndMark(Long userId, String mark) { List<SysMenu> menus = menuMapper.selectMenusByUserIdAndMark(SecurityUtils.isAdmin(userId) ? null : userId, mark); return getChildPerms(menus, 0); } se-modules/se-system/src/main/java/com/se/system/service/inte/ISysMenuService.java
@@ -141,13 +141,4 @@ * @return 结果 */ public boolean checkMenuNameUnique(SysMenu menu); /** * 根据用户ID和标识查询菜单 * * @param userId 用户ID * @param mark 菜单标识 * @return 菜单集合 */ List<SysMenu> selectMenusByUserIdAndMark(Long userId, String mark); } se-modules/se-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -70,9 +70,7 @@ left join sys_user_role ur on rm.role_id = ur.role_id left join sys_role ro on ur.role_id = ro.role_id <where> <if test="menuId != null"> ur.user_id = #{menuId} </if> ur.user_id = #{params.userId} <if test="menuName != null and menuName != ''"> AND m.menu_name like concat('%', #{menuName}, '%') </if>