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 | 125 +++++++++++++++++++++++++++++------------
1 files changed, 89 insertions(+), 36 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 e37257c..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,15 @@
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;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -14,6 +17,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
@@ -28,57 +32,85 @@
@Autowired
MenuService menuService;
+ @Autowired
+ TokenService tokenService;
+
+ @Autowired
+ PermsService permsService;
+
@SysLog()
- @ApiOperation(value = "鎻掑叆涓�鏉℃暟鎹�")
+ @ApiOperation(value = "鎻掑叆涓�鏉�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "MenusEntity", 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 menuEntity) {
+ public ResponseMsg<Integer> insertMenu(@RequestBody MenuEntity entity, HttpServletRequest req) {
try {
- int count = menuService.insertMenu(menuEntity);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ entity.setCreateUser(ue.getId());
+ }
+
+ 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 = "鎻掑叆澶氭潯鏁版嵁")
+ @ApiOperation(value = "鎻掑叆澶氭潯")
@ApiImplicitParams({
- @ApiImplicitParam(name = "MenusEntity", 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> menuEntity) {
+ public ResponseMsg<Integer> insertMenus(@RequestBody List<MenuEntity> list, HttpServletRequest req) {
try {
- int count = menuService.insertMenus(menuEntity);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ for (MenuEntity entity : list) {
+ entity.setCreateUser(ue.getId());
+ }
+ }
+
+ 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);
}
}
@SysLog()
- @ApiOperation(value = "鍒犻櫎涓�鏉℃暟鎹�")
+ @ApiOperation(value = "鍒犻櫎涓�鏉�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "涓婚敭ID", dataType = "Integer", paramType = "query", example = "1")
+ @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/deleteMenu")
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 = "鍒犻櫎澶氭潯鏁版嵁")
+ @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) {
@@ -88,51 +120,72 @@
}
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);
}
}
@SysLog()
- @ApiOperation(value = "鏇存柊涓�鏉℃暟鎹�")
+ @ApiOperation(value = "鏇存柊涓�鏉�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "MenusEntity", value = "鑿滃崟ID闆嗗悎", dataType = "MenusEntity", paramType = "body", example = "")
+ @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "MenusEntity", paramType = "body", example = "")
})
@ResponseBody
@PostMapping(value = "/updateMenu", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> updateMenu(@RequestBody MenuEntity menuEntity) {
+ public ResponseMsg<Integer> updateMenu(@RequestBody MenuEntity entity, HttpServletRequest req) {
try {
- int count = menuService.updateMenu(menuEntity);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ entity.setUpdateUser(ue.getId());
+ }
+
+ 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);
}
}
@SysLog()
- @ApiOperation(value = "鏇存柊澶氭潯鏁版嵁")
+ @ApiOperation(value = "鏇存柊澶氭潯")
@ApiImplicitParams({
- @ApiImplicitParam(name = "MenusEntity", value = "涓婚敭ID闆嗗悎", dataType = "MenusEntity", paramType = "body", example = "")
+ @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "MenusEntity", paramType = "body", example = "")
})
@ResponseBody
@PostMapping(value = "/updateMenus", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> updateMenus(@RequestBody List<MenuEntity> menuEntity) {
+ public ResponseMsg<Integer> updateMenus(@RequestBody List<MenuEntity> list, HttpServletRequest req) {
try {
- int count = menuService.updateMenus(menuEntity);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue != null) {
+ for (MenuEntity entity : list) {
+ entity.setUpdateUser(ue.getId());
+ }
+ }
+
+ 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);
}
}
@SysLog()
- @ApiOperation(value = "鏍规嵁ID鏌ヨ瀛楀吀")
+ @ApiOperation(value = "鏍规嵁ID鏌ヨ")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "瀛楀吀ID", dataType = "Integer", paramType = "query", example = "1")
+ @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectMenu")
public ResponseMsg<MenuEntity> selectMenu(int id) {
@@ -141,12 +194,12 @@
return success(menuEntity);
} catch (Exception ex) {
- return fail(ex.getMessage(), null);
+ return fail(ex, null);
}
}
@SysLog()
- @ApiOperation(value = "鏌ヨ鎵�鏈夊瓧鍏�")
+ @ApiOperation(value = "鏌ヨ鎵�鏈�")
@GetMapping(value = "/selectMenuAll")
public ResponseMsg<List<MenuEntity>> selectMenuAll() {
try {
@@ -154,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