From f27309d45c7ef46b0aea98107b67d0c5b46d4217 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 10:00:26 +0800
Subject: [PATCH] fix: remove broken duplicate page return
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MenuPdaController.java | 75 ++++++++++++++++++++++++++++++-------
1 files changed, 61 insertions(+), 14 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MenuPdaController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MenuPdaController.java
index 3772d5d..b8205ec 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MenuPdaController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MenuPdaController.java
@@ -13,13 +13,14 @@
import com.vincent.rsf.server.common.utils.NodeUtils;
import com.vincent.rsf.server.manager.entity.MenuPda;
import com.vincent.rsf.server.manager.service.MenuPdaService;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.entity.Menu;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
@@ -33,7 +34,9 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<MenuPda, BaseParam> pageParam = new PageParam<>(baseParam, MenuPda.class);
- return R.ok().add(menuPdaService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<MenuPda, BaseParam> page = menuPdaService.page(pageParam, pageParam.buildWrapper(true));
+ buildPageRowsUtils.userNameMap(page.getRecords());
+ return R.ok().add(page);
}
@PreAuthorize("hasAuthority('manager:menuPda:list')")
@@ -43,7 +46,7 @@
}
@PreAuthorize("hasAuthority('manager:menuPda:list')")
- @PostMapping({"/menuPda/many/{ids}", "/menuPdas/many/{ids}"})
+ @PostMapping({ "/menuPda/many/{ids}", "/menuPdas/many/{ids}" })
public R many(@PathVariable Long[] ids) {
return R.ok().add(menuPdaService.listByIds(Arrays.asList(ids)));
}
@@ -54,15 +57,19 @@
return R.ok().add(menuPdaService.getById(id));
}
- @PreAuthorize("hasAuthority('system:menu:list')")
+ // @PreAuthorize("hasAuthority('system:menu:list')")
@PostMapping("/menuPda/tree")
public R tree(@RequestBody Map<String, Object> map) {
-// 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));
+ // 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<MenuPda> menuList = menuPdaService.list(new LambdaQueryWrapper<MenuPda>().orderByAsc(MenuPda::getSort));
- List<MenuPda> treeData = Utils.toTreeData(menuList, 0L, MenuPda::getParentId, MenuPda::getId, MenuPda::setChildren);
+ List<MenuPda> treeData = Utils.toTreeData(menuList, 0L, MenuPda::getParentId, MenuPda::getId,
+ MenuPda::setChildren);
if (!Cools.isEmpty(map.get("condition"))) {
Utils.treeRemove(treeData, String.valueOf(map.get("condition")), MenuPda::getName, MenuPda::getChildren);
Utils.treeRemove(treeData, String.valueOf(map.get("condition")), MenuPda::getName, MenuPda::getChildren);
@@ -74,8 +81,9 @@
@OperationLog("Save Menu")
@PostMapping("/menuPda/save")
public R save(@RequestBody MenuPda menu) {
+ MenuPda parent = null;
if (menu.getParentId() != null && menu.getParentId() > 0) {
- MenuPda parent = menuPdaService.getById(menu.getParentId());
+ parent = menuPdaService.getById(menu.getParentId());
if (parent != null) {
menu.setParentName(parent.getName());
}
@@ -84,7 +92,8 @@
}
NodeUtils nodeUtils = new NodeUtils();
- nodeUtils.generatePath0(item -> menuPdaService.getById(item.getParentId()), menu, MenuPda::getId, MenuPda::getName, MenuPda::getParentId);
+ nodeUtils.generatePath0(item -> menuPdaService.getById(item.getParentId()), menu, MenuPda::getId,
+ MenuPda::getName, MenuPda::getParentId);
menu.setPath(nodeUtils.path.toString());
menu.setPathName(nodeUtils.pathName.toString());
@@ -95,7 +104,45 @@
if (!menuPdaService.save(menu)) {
return R.error("Save Fail");
}
+
+ // 濡傛灉鏄浜岀骇鑿滃崟锛坧arent鐨刾arentId涓�0锛屼笖褰撳墠鑿滃崟鏄彍鍗曠被鍨嬶級锛岃嚜鍔ㄥ垱寤簉eset鍜宻ubmit鎸夐挳
+ if (parent != null && parent.getParentId() != null && parent.getParentId() == 0L
+ && (menu.getType() == null || menu.getType() == MenuPda.TYPE_MENU)) {
+ createButtonForMenu(menu, "reset", "閲嶇疆", 1);
+ createButtonForMenu(menu, "submit", "鎻愪氦", 2);
+ }
+
return R.ok("Save Success").add(menu);
+ }
+
+ /**
+ * 涓鸿彍鍗曞垱寤烘寜閽�
+ */
+ private void createButtonForMenu(MenuPda parentMenu, String code, String name, int sort) {
+ MenuPda button = new MenuPda();
+ button.setName(name);
+ button.setParentId(parentMenu.getId());
+ button.setParentName(parentMenu.getName());
+ button.setRoute(code);
+ button.setType(MenuPda.TYPE_BTN);
+ button.setSort(sort);
+ button.setStatus(1);
+ button.setDeleted(0);
+ button.setTenantId(parentMenu.getTenantId());
+
+ // 鐢熸垚璺緞
+ NodeUtils nodeUtils = new NodeUtils();
+ nodeUtils.generatePath0(item -> menuPdaService.getById(item.getParentId()), button, MenuPda::getId,
+ MenuPda::getName, MenuPda::getParentId);
+ button.setPath(nodeUtils.path.toString());
+ button.setPathName(nodeUtils.pathName.toString());
+
+ button.setCreateBy(getLoginUserId());
+ button.setCreateTime(new Date());
+ button.setUpdateBy(getLoginUserId());
+ button.setUpdateTime(new Date());
+
+ menuPdaService.save(button);
}
@PreAuthorize("hasAuthority('system:menu:update')")
@@ -112,7 +159,8 @@
}
NodeUtils nodeUtils = new NodeUtils();
- nodeUtils.generatePath0(item -> menuPdaService.getById(item.getParentId()), menu, MenuPda::getId, MenuPda::getName, MenuPda::getParentId);
+ nodeUtils.generatePath0(item -> menuPdaService.getById(item.getParentId()), menu, MenuPda::getId,
+ MenuPda::getName, MenuPda::getParentId);
menu.setPath(nodeUtils.path.toString());
menu.setPathName(nodeUtils.pathName.toString());
@@ -143,8 +191,7 @@
wrapper.like(MenuPda::getName, condition);
}
menuPdaService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
- item -> vos.add(new KeyValVo(item.getId(), item.getName()))
- );
+ item -> vos.add(new KeyValVo(item.getId(), item.getName())));
return R.ok().add(vos);
}
--
Gitblit v1.9.1