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 | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 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 3a046f3..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
@@ -18,6 +18,7 @@
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 jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@@ -39,13 +40,13 @@
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')")
@@ -54,25 +55,25 @@
// 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));
+// 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')")
@@ -101,7 +102,7 @@
return R.error("Save Fail");
}
evictMenuTreeCache();
- return R.ok("Save Success").add(menu);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(menu));
}
@PreAuthorize("hasAuthority('system:menu:update')")
@@ -128,7 +129,7 @@
return R.error("Update Fail");
}
evictMenuTreeCache();
- return R.ok("Update Success").add(menu);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(menu));
}
@PreAuthorize("hasAuthority('system:menu:remove')")
@@ -139,7 +140,7 @@
return R.error("Delete Fail");
}
evictMenuTreeCache();
- return R.ok("Delete Success").add(ids);
+ return R.ok("Delete Success").add(buildPageRowsUtils.rowsMap(ids));
}
@PreAuthorize("hasAuthority('system:menu:list')")
@@ -153,13 +154,13 @@
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() {
--
Gitblit v1.9.1