From 1dcfa3702505f0c431757312b5304531029f90f6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 18:57:38 +0800
Subject: [PATCH] #getter$摘出entity
---
rsf-server/src/main/java/com/vincent/rsf/server/system/controller/MenuController.java | 142 +++++++++++++----------------------------------
1 files changed, 39 insertions(+), 103 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/MenuController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/MenuController.java
index 42a4f05..589e048 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/MenuController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/MenuController.java
@@ -10,6 +10,7 @@
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.common.service.RedisService;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.utils.NodeUtils;
import com.vincent.rsf.server.system.entity.Menu;
@@ -17,145 +18,62 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
public class MenuController extends BaseController {
+ private static final String MENU_TREE_CACHE_FLAG = "MENU_TREE";
+ private static final String MENU_TREE_CACHE_KEY = "FULL_TREE";
+ private static final int MENU_TREE_CACHE_TTL_SECONDS = 300;
+
@Autowired
private MenuService menuService;
+ @Autowired
+ private RedisService redisService;
@PreAuthorize("hasAuthority('system:menu:list')")
@PostMapping("/menu/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Menu, BaseParam> pageParam = new PageParam<>(baseParam, Menu.class);
- return R.ok().add(menuService.page(pageParam, pageParam.buildWrapper(true)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(menuService.page(pageParam, pageParam.buildWrapper(true))));
}
@PreAuthorize("hasAuthority('system:menu:list')")
@PostMapping("/menu/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(menuService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(menuService.list()));
}
@PreAuthorize("hasAuthority('system:menu:list')")
@PostMapping("/menu/tree")
public R tree(@RequestBody Map<String, Object> map) {
-
- String authType = map.get("authType") == null ? "0" : map.get("authType").toString();
- if (!Cools.isEmpty(map.get("authType")) && !authType.equals("0")) {
- List<Menu> treeData = Lists.newArrayList();
- if (authType.equals("1")) { // PDA鏉冮檺
- Menu menu = new Menu();
- menu.setId(1L);
- menu.setCode("1");
- menu.setName("鍏ュ簱");
-
- Menu cmenu = new Menu();
- cmenu.setId(11L);
- cmenu.setCode("1");
- cmenu.setName("绌烘墭鍏ュ簱");
- Menu cmenu1 = new Menu();
- cmenu1.setId(12L);
- cmenu1.setCode("2");
- cmenu1.setName("鍗曟嵁缁勬墭");
-
- List<Menu> menus = Lists.newArrayList();
- menus.add(cmenu);
- menus.add(cmenu1);
- menu.setChildren(menus);
-
- treeData.add(menu);
-
- Menu menu1 = new Menu();
- menu1.setId(2L);
- menu1.setCode("2");
- menu1.setName("鍑哄簱");
- treeData.add(menu1);
-
- Menu menu2 = new Menu();
- menu2.setId(3L);
- menu2.setCode("3");
- menu2.setName("缁煎悎");
- treeData.add(menu2);
- return R.ok().add(treeData);
- } else if (authType.equals("2")) { // 浠撳簱鏉冮檺
- Menu menu = new Menu();
- menu.setId(1L);
- menu.setCode("1");
- menu.setName("浠撳簱");
-
- Menu cmenu = new Menu();
- cmenu.setId(11L);
- cmenu.setCode("1");
- cmenu.setName("绠卞３2#2F");
- Menu cmenu1 = new Menu();
- cmenu1.setId(12L);
- cmenu1.setCode("2");
- cmenu1.setName("绠卞３3#2F");
-
- List<Menu> menus = Lists.newArrayList();
- menus.add(cmenu);
- menus.add(cmenu1);
- menu.setChildren(menus);
-
-
- treeData.add(menu);
- Menu menu1 = new Menu();
- menu1.setId(2L);
- menu1.setCode("2");
- menu1.setName("鐗╂枡鍒嗙粍");
-
- Menu bmenu2 = new Menu();
- bmenu2.setId(21L);
- bmenu2.setCode("1");
- bmenu2.setName("鍘熸枡");
- Menu bmenu = new Menu();
- bmenu.setId(22L);
- bmenu.setCode("1");
- bmenu.setName("鍗婃垚鍝�");
- Menu bmenu1 = new Menu();
- bmenu1.setId(23L);
- bmenu1.setCode("2");
- bmenu1.setName("鎴愬搧");
-
- List<Menu> menus1 = Lists.newArrayList();
- menus1.add(bmenu);
- menus1.add(bmenu1);
- menu1.setChildren(menus1);
-
- treeData.add(menu1);
- return R.ok().add(treeData);
- }
- }
-
-
// PageParam<Menu, BaseParam> param = new PageParam<>(buildParam(map, BaseParam.class), Menu.class);
// QueryWrapper<Menu> wrapper = param.buildWrapper(true, queryWrapper -> queryWrapper.orderByAsc("sort"));
// List<Menu> menus = menuService.list(wrapper);
-// return R.ok().add(Utils.toTreeData(menus, 0L, Menu::getParentId, Menu::getId, Menu::setChildren));
- List<Menu> menuList = menuService.list(new LambdaQueryWrapper<Menu>().orderByAsc(Menu::getSort));
- List<Menu> treeData = Utils.toTreeData(menuList, 0L, Menu::getParentId, Menu::getId, Menu::setChildren);
+// return R.ok().add(buildPageRowsUtils.rowsMap(Utils.toTreeData(menus, 0L, Menu::getParentId, Menu::getId, Menu::setChildren)));
+ List<Menu> treeData = getMenuTreeData();
if (!Cools.isEmpty(map.get("condition"))) {
Utils.treeRemove(treeData, String.valueOf(map.get("condition")), Menu::getName, Menu::getChildren);
Utils.treeRemove(treeData, String.valueOf(map.get("condition")), Menu::getName, Menu::getChildren);
}
- return R.ok().add(treeData);
+ return R.ok().add(buildPageRowsUtils.rowsMap(treeData));
}
@PreAuthorize("hasAuthority('system:menu:list')")
@GetMapping("/menu/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(menuService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(menuService.getById(id)));
}
@PreAuthorize("hasAuthority('system:menu:list')")
@PostMapping({"/menu/many/{ids}", "/menus/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(menuService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(menuService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('system:menu:save')")
@@ -183,7 +101,8 @@
if (!menuService.save(menu)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(menu);
+ evictMenuTreeCache();
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(menu));
}
@PreAuthorize("hasAuthority('system:menu:update')")
@@ -209,7 +128,8 @@
if (!menuService.updateById(menu)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(menu);
+ evictMenuTreeCache();
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(menu));
}
@PreAuthorize("hasAuthority('system:menu:remove')")
@@ -219,7 +139,8 @@
if (!menuService.removeByIds(Arrays.asList(ids))) {
return R.error("Delete Fail");
}
- return R.ok("Delete Success").add(ids);
+ evictMenuTreeCache();
+ return R.ok("Delete Success").add(buildPageRowsUtils.rowsMap(ids));
}
@PreAuthorize("hasAuthority('system:menu:list')")
@@ -233,13 +154,28 @@
menuService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
item -> vos.add(new KeyValVo(item.getId(), item.getName()))
);
- return R.ok().add(vos);
+ return R.ok().add(buildPageRowsUtils.rowsMap(vos));
}
@PreAuthorize("hasAuthority('system:menu:list')")
@PostMapping("/menu/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(menuService.list(), Menu.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(menuService.list()), Menu.class), response);
+ }
+
+ private List<Menu> getMenuTreeData() {
+ List<Menu> treeData = redisService.get(MENU_TREE_CACHE_FLAG, MENU_TREE_CACHE_KEY);
+ if (treeData != null) {
+ return treeData;
+ }
+ List<Menu> menuList = menuService.list(new LambdaQueryWrapper<Menu>().orderByAsc(Menu::getSort));
+ treeData = Utils.toTreeData(menuList, 0L, Menu::getParentId, Menu::getId, Menu::setChildren);
+ redisService.set(MENU_TREE_CACHE_FLAG, MENU_TREE_CACHE_KEY, treeData, MENU_TREE_CACHE_TTL_SECONDS);
+ return treeData;
+ }
+
+ private void evictMenuTreeCache() {
+ redisService.delete(MENU_TREE_CACHE_FLAG, MENU_TREE_CACHE_KEY);
}
}
--
Gitblit v1.9.1