From 6a959e84e81ce34065a1d0ee4f190f59b0c0d321 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 09 十二月 2024 20:43:17 +0800
Subject: [PATCH] 1
---
se-modules/se-system/src/main/java/com/se/system/controller/IndexController.java | 38 +++++++++++++++++++
se-modules/se-system/src/main/resources/mapper/system/SysMenuMapper.xml | 4 -
se-modules/se-system/src/main/java/com/se/system/controller/SysMenuController.java | 19 +--------
se-modules/se-system/src/main/java/com/se/system/service/impl/SysMenuServiceImpl.java | 9 ----
se-modules/se-system/src/main/java/com/se/system/service/inte/ISysMenuService.java | 9 ----
5 files changed, 43 insertions(+), 36 deletions(-)
diff --git a/se-modules/se-system/src/main/java/com/se/system/controller/IndexController.java b/se-modules/se-system/src/main/java/com/se/system/controller/IndexController.java
index 9281f8b..a57250b 100644
--- a/se-modules/se-system/src/main/java/com/se/system/controller/IndexController.java
+++ b/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");
+ }
// 鈶燩V缁熻锛歅V锛圥age 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();
diff --git a/se-modules/se-system/src/main/java/com/se/system/controller/SysMenuController.java b/se-modules/se-system/src/main/java/com/se/system/controller/SysMenuController.java
index 47f6da2..8ff0f74 100644
--- a/se-modules/se-system/src/main/java/com/se/system/controller/SysMenuController.java
+++ b/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);
}
}
\ No newline at end of file
diff --git a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysMenuServiceImpl.java b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysMenuServiceImpl.java
index b919d2c..d354600 100644
--- a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysMenuServiceImpl.java
+++ b/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);
}
diff --git a/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysMenuService.java b/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysMenuService.java
index afdcc73..da1426a 100644
--- a/se-modules/se-system/src/main/java/com/se/system/service/inte/ISysMenuService.java
+++ b/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);
}
diff --git a/se-modules/se-system/src/main/resources/mapper/system/SysMenuMapper.xml b/se-modules/se-system/src/main/resources/mapper/system/SysMenuMapper.xml
index 3f461a7..d1b861c 100644
--- a/se-modules/se-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/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>
--
Gitblit v1.9.3