From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service
---
src/main/java/com/lf/server/controller/sys/MenuController.java | 54 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 38 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/sys/MenuController.java b/src/main/java/com/lf/server/controller/sys/MenuController.java
index 6d92046..0f52f84 100644
--- a/src/main/java/com/lf/server/controller/sys/MenuController.java
+++ b/src/main/java/com/lf/server/controller/sys/MenuController.java
@@ -1,12 +1,13 @@
package com.lf.server.controller.sys;
-import com.lf.server.aspect.SysLog;
+import com.lf.server.annotation.SysLog;
import com.lf.server.controller.all.BaseController;
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.data.DirEntity;
import com.lf.server.entity.sys.MenuEntity;
import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.StringHelper;
+import com.lf.server.service.all.PermsService;
import com.lf.server.service.sys.MenuService;
import com.lf.server.service.sys.TokenService;
import io.swagger.annotations.Api;
@@ -34,10 +35,13 @@
@Autowired
TokenService tokenService;
+ @Autowired
+ PermsService permsService;
+
@SysLog()
@ApiOperation(value = "鎻掑叆涓�鏉�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "com.lf.server.entity.sys.MenusEntity", paramType = "body", example = "")
+ @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "MenusEntity", paramType = "body", example = "")
})
@PostMapping(value = "/insertMenu", produces = "application/json; charset=UTF-8")
public ResponseMsg<Integer> insertMenu(@RequestBody MenuEntity entity, HttpServletRequest req) {
@@ -48,17 +52,20 @@
}
int count = menuService.insertMenu(entity);
+ if (count > 0) {
+ permsService.clearPermsCache();
+ }
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@SysLog()
@ApiOperation(value = "鎻掑叆澶氭潯")
@ApiImplicitParams({
- @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "com.lf.server.entity.sys.MenusEntity", paramType = "body", example = "")
+ @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "MenusEntity", paramType = "body", example = "")
})
@PostMapping(value = "/insertMenus", produces = "application/json; charset=UTF-8")
public ResponseMsg<Integer> insertMenus(@RequestBody List<MenuEntity> list, HttpServletRequest req) {
@@ -71,10 +78,13 @@
}
int count = menuService.insertMenus(list);
+ if (count > 0) {
+ permsService.clearPermsCache();
+ }
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -87,17 +97,20 @@
public ResponseMsg<Integer> deleteMenu(int id) {
try {
int count = menuService.deleteMenu(id);
+ if (count > 0) {
+ permsService.clearPermsCache();
+ }
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@SysLog()
@ApiOperation(value = "鍒犻櫎澶氭潯")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "ID鏁扮粍", dataType = "Integer", paramType = "query", example = "1")
+ @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "List<Integer>", paramType = "query", example = "1,2")
})
@GetMapping(value = "/deleteMenus")
public ResponseMsg<Integer> deleteMenus(@RequestParam List<Integer> ids) {
@@ -107,10 +120,13 @@
}
int count = menuService.deleteMenus(ids);
+ if (count > 0) {
+ permsService.clearPermsCache();
+ }
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -129,10 +145,13 @@
}
int count = menuService.updateMenu(entity);
+ if (count > 0) {
+ permsService.clearPermsCache();
+ }
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -153,10 +172,13 @@
}
int count = menuService.updateMenus(list);
+ if (count > 0) {
+ permsService.clearPermsCache();
+ }
return success(count);
} catch (Exception ex) {
- return fail(ex.getMessage(), -1);
+ return fail(ex, -1);
}
}
@@ -172,7 +194,7 @@
return success(menuEntity);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@@ -185,26 +207,26 @@
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@SysLog()
- @ApiOperation(value = "閫掑綊鏌ヨ鏁版嵁")
+ @ApiOperation(value = "閫掑綊鏌ヨ")
@ApiImplicitParams({
@ApiImplicitParam(name = "name", value = "鑿滃崟鍚嶇О", dataType = "String", paramType = "query", required = false, example = "绠￠亾鍩虹澶ф暟鎹钩鍙�")
})
@GetMapping(value = "/selectMenuRecursive")
- public ResponseMsg<List<DirEntity>> selectMenuRecursive(String name) {
+ public ResponseMsg<Object> selectMenuRecursive(String name) {
try {
if (StringHelper.isEmpty(name)) {
name = "绠￠亾鍩虹澶ф暟鎹钩鍙�";
}
- List<DirEntity> list = menuService.selectMenuRecursive(name);
+ List<MenuEntity> list = menuService.selectMenuRecursive(name);
return success(list);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
}
--
Gitblit v1.9.3