From 95dc030ad8e77303207a1a42a3afd9a7a6612d75 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Tue, 03 Jun 2025 18:43:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xin
---
oying-system/src/main/java/com/oying/modules/system/rest/MenuController.java | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/system/rest/MenuController.java b/oying-system/src/main/java/com/oying/modules/system/rest/MenuController.java
index 3ee9b2a..09ee649 100644
--- a/oying-system/src/main/java/com/oying/modules/system/rest/MenuController.java
+++ b/oying-system/src/main/java/com/oying/modules/system/rest/MenuController.java
@@ -4,6 +4,7 @@
import com.oying.modules.system.domain.Menu;
import com.oying.modules.system.domain.dto.MenuQueryCriteria;
import com.oying.modules.system.domain.dto.MenuVo;
+import com.oying.utils.R;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@@ -18,6 +19,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+
import javax.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;
@@ -44,50 +46,50 @@
@GetMapping(value = "/build")
@ApiOperation("获取前端所需菜单")
- public ResponseEntity<List<MenuVo>> buildMenus(){
+ public ResponseEntity<Object> buildMenus() {
List<Menu> menuList = menuService.findByUser(SecurityUtils.getCurrentUserId());
List<Menu> menus = menuService.buildTree(menuList);
- return new ResponseEntity<>(menuService.buildMenus(menus),HttpStatus.OK);
+ return new ResponseEntity<>(R.success(menuService.buildMenus(menus)), HttpStatus.OK);
}
@ApiOperation("返回全部的菜单")
@GetMapping(value = "/lazy")
@PreAuthorize("@el.check('menu:list','roles:list')")
- public ResponseEntity<List<Menu>> queryAllMenu(@RequestParam Long pid){
- return new ResponseEntity<>(menuService.getMenus(pid),HttpStatus.OK);
+ public ResponseEntity<Object> queryAllMenu(@RequestParam Long pid) {
+ return new ResponseEntity<>(R.success(menuService.getMenus(pid)), HttpStatus.OK);
}
@ApiOperation("根据菜单ID返回所有子节点ID，包含自身ID")
@GetMapping(value = "/child")
@PreAuthorize("@el.check('menu:list','roles:list')")
- public ResponseEntity<Object> childMenu(@RequestParam Long id){
+ public ResponseEntity<Object> childMenu(@RequestParam Long id) {
Set<Menu> menuSet = new HashSet<>();
List<Menu> menuList = menuService.getMenus(id);
menuSet.add(menuService.getById(id));
menuSet = menuService.getChildMenus(menuList, menuSet);
Set<Long> ids = menuSet.stream().map(Menu::getId).collect(Collectors.toSet());
- return new ResponseEntity<>(ids,HttpStatus.OK);
+ return new ResponseEntity<>(R.success(ids), HttpStatus.OK);
}
@GetMapping
@ApiOperation("查询菜单")
@PreAuthorize("@el.check('menu:list')")
- public ResponseEntity<PageResult<Menu>> queryMenu(MenuQueryCriteria criteria) throws Exception {
+ public ResponseEntity<Object> queryMenu(MenuQueryCriteria criteria) throws Exception {
List<Menu> menuList = menuService.queryAll(criteria, true);
- return new ResponseEntity<>(PageUtil.toPage(menuList),HttpStatus.OK);
+ return new ResponseEntity<>(R.success(PageUtil.toPage(menuList)), HttpStatus.OK);
}
@ApiOperation("查询菜单:根据ID获取同级与上级数据")
@PostMapping("/superior")
@PreAuthorize("@el.check('menu:list')")
- public ResponseEntity<List<Menu>> getMenuSuperior(@RequestBody List<Long> ids) {
+ public ResponseEntity<Object> getMenuSuperior(@RequestBody List<Long> ids) {
Set<Menu> menus = new LinkedHashSet<>();
- if(CollectionUtil.isNotEmpty(ids)){
+ if (CollectionUtil.isNotEmpty(ids)) {
for (Long id : ids) {
Menu menu = menuService.findById(id);
List<Menu> menuList = menuService.getSuperior(menu, new ArrayList<>());
for (Menu data : menuList) {
- if(data.getId().equals(menu.getPid())) {
+ if (data.getId().equals(menu.getPid())) {
data.setSubCount(data.getSubCount() - 1);
}
}
@@ -95,37 +97,37 @@
}
// 编辑菜单时不显示自己以及自己下级的数据，避免出现PID数据环形问题
menus = menus.stream().filter(i -> !ids.contains(i.getId())).collect(Collectors.toSet());
- return new ResponseEntity<>(menuService.buildTree(new ArrayList<>(menus)),HttpStatus.OK);
+ return new ResponseEntity<>(R.success(menuService.buildTree(new ArrayList<>(menus))), HttpStatus.OK);
}
- return new ResponseEntity<>(menuService.getMenus(null),HttpStatus.OK);
+ return new ResponseEntity<>(R.success(menuService.getMenus(null)), HttpStatus.OK);
}
@Log("新增菜单")
@ApiOperation("新增菜单")
@PostMapping
@PreAuthorize("@el.check('menu:add')")
- public ResponseEntity<Object> createMenu(@Validated @RequestBody Menu resources){
+ public ResponseEntity<Object> createMenu(@Validated @RequestBody Menu resources) {
if (resources.getId() != null) {
- throw new BadRequestException("A new "+ ENTITY_NAME +" cannot already have an ID");
+ throw new BadRequestException("A new " + ENTITY_NAME + " cannot already have an ID");
}
menuService.create(resources);
- return new ResponseEntity<>(HttpStatus.CREATED);
+ return new ResponseEntity<>(R.success(), HttpStatus.CREATED);
}
@Log("修改菜单")
@ApiOperation("修改菜单")
@PutMapping
@PreAuthorize("@el.check('menu:edit')")
- public ResponseEntity<Object> updateMenu(@Validated(Menu.Update.class) @RequestBody Menu resources){
+ public ResponseEntity<Object> updateMenu(@Validated(Menu.Update.class) @RequestBody Menu resources) {
menuService.update(resources);
- return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+ return new ResponseEntity<>(R.success(), HttpStatus.NO_CONTENT);
}
@Log("删除菜单")
@ApiOperation("删除菜单")
@DeleteMapping
@PreAuthorize("@el.check('menu:del')")
- public ResponseEntity<Object> deleteMenu(@RequestBody Set<Long> ids){
+ public ResponseEntity<Object> deleteMenu(@RequestBody Set<Long> ids) {
Set<Menu> menuSet = new HashSet<>();
for (Long id : ids) {
List<Menu> menuList = menuService.getMenus(id);
@@ -133,6 +135,6 @@
menuSet = menuService.getChildMenus(menuList, menuSet);
}
menuService.delete(menuSet);
- return new ResponseEntity<>(HttpStatus.OK);
+ return new ResponseEntity<>(R.success(), HttpStatus.OK);
}
}
--
Gitblit v1.9.3