From 620bb4712a31791231c4381581f0f60088f079fe Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 27 五月 2026 14:03:45 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/project/system/controller/SysMenuController.java | 58 ++++++++++++++++++++++++++--------------------------------
1 files changed, 26 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java b/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java
index 285dc69..a59bdb3 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java
@@ -1,12 +1,11 @@
package com.ruoyi.project.system.controller;
-import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysMenu;
import com.ruoyi.project.system.service.ISysMenuService;
import lombok.AllArgsConstructor;
@@ -14,13 +13,11 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
/**
* 鑿滃崟淇℃伅
- *
+ *
* @author ruoyi
*/
@RestController
@@ -35,10 +32,10 @@
*/
@PreAuthorize("@ss.hasPermi('system:menu:list')")
@GetMapping("/list")
- public R<?> list(SysMenu menu)
+ public AjaxResult list(SysMenu menu)
{
List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
- return R.ok(menus);
+ return success(menus);
}
/**
@@ -46,32 +43,32 @@
*/
@PreAuthorize("@ss.hasPermi('system:menu:query')")
@GetMapping(value = "/{menuId}")
- public R<?> getInfo(@PathVariable Long menuId)
+ public AjaxResult getInfo(@PathVariable Long menuId)
{
- return R.ok(menuService.selectMenuById(menuId));
+ return success(menuService.selectMenuById(menuId));
}
/**
* 鑾峰彇鑿滃崟涓嬫媺鏍戝垪琛�
*/
@GetMapping("/treeselect")
- public R<?> treeselect(SysMenu menu)
+ public AjaxResult treeselect(SysMenu menu)
{
List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
- return R.ok(menuService.buildMenuTreeSelect(menus));
+ return success(menuService.buildMenuTreeSelect(menus));
}
/**
* 鍔犺浇瀵瑰簲瑙掕壊鑿滃崟鍒楄〃鏍�
*/
@GetMapping(value = "/roleMenuTreeselect/{roleId}")
- public R<?> roleMenuTreeselect(@PathVariable("roleId") Long roleId)
+ public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
{
List<SysMenu> menus = menuService.selectMenuList(getUserId());
- Map<String, Object> map = new HashMap<>();
- map.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
- map.put("menus", menuService.buildMenuTreeSelect(menus));
- return R.ok(map);
+ AjaxResult ajax = AjaxResult.success();
+ ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
+ ajax.put("menus", menuService.buildMenuTreeSelect(menus));
+ return ajax;
}
/**
@@ -80,19 +77,18 @@
@PreAuthorize("@ss.hasPermi('system:menu:add')")
@Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
- public R<?> add(@Validated @RequestBody SysMenu menu)
+ public AjaxResult add(@Validated @RequestBody SysMenu menu)
{
if (!menuService.checkMenuNameUnique(menu))
{
- return R.fail("鏂板鑿滃崟'" + menu.getMenuName() + "'澶辫触锛岃彍鍗曞悕绉板凡瀛樺湪");
+ return error("鏂板鑿滃崟'" + menu.getMenuName() + "'澶辫触锛岃彍鍗曞悕绉板凡瀛樺湪");
}
else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
{
- return R.fail("鏂板鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屽湴鍧�蹇呴』浠ttp(s)://寮�澶�");
+ return error("鏂板鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屽湴鍧�蹇呴』浠ttp(s)://寮�澶�");
}
menu.setCreateBy(getUsername());
- menuService.insertMenu(menu);
- return R.ok();
+ return toAjax(menuService.insertMenu(menu));
}
/**
@@ -101,23 +97,22 @@
@PreAuthorize("@ss.hasPermi('system:menu:edit')")
@Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
- public R<?> edit(@Validated @RequestBody SysMenu menu)
+ public AjaxResult edit(@Validated @RequestBody SysMenu menu)
{
if (!menuService.checkMenuNameUnique(menu))
{
- return R.fail("淇敼鑿滃崟'" + menu.getMenuName() + "'澶辫触锛岃彍鍗曞悕绉板凡瀛樺湪");
+ return error("淇敼鑿滃崟'" + menu.getMenuName() + "'澶辫触锛岃彍鍗曞悕绉板凡瀛樺湪");
}
else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
{
- return R.fail("淇敼鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屽湴鍧�蹇呴』浠ttp(s)://寮�澶�");
+ return error("淇敼鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屽湴鍧�蹇呴』浠ttp(s)://寮�澶�");
}
else if (menu.getMenuId().equals(menu.getParentId()))
{
- return R.fail("淇敼鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屼笂绾ц彍鍗曚笉鑳介�夋嫨鑷繁");
+ return error("淇敼鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屼笂绾ц彍鍗曚笉鑳介�夋嫨鑷繁");
}
menu.setUpdateBy(getUsername());
- menuService.updateMenu(menu);
- return R.ok();
+ return toAjax(menuService.updateMenu(menu));
}
/**
@@ -126,17 +121,16 @@
@PreAuthorize("@ss.hasPermi('system:menu:remove')")
@Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{menuId}")
- public R<?> remove(@PathVariable("menuId") Long menuId)
+ public AjaxResult remove(@PathVariable("menuId") Long menuId)
{
if (menuService.hasChildByMenuId(menuId))
{
- return R.fail(HttpStatus.WARN, "瀛樺湪瀛愯彍鍗�,涓嶅厑璁稿垹闄�");
+ return warn("瀛樺湪瀛愯彍鍗�,涓嶅厑璁稿垹闄�");
}
if (menuService.checkMenuExistRole(menuId))
{
- return R.fail(HttpStatus.WARN, "鑿滃崟宸插垎閰�,涓嶅厑璁稿垹闄�");
+ return warn("鑿滃崟宸插垎閰�,涓嶅厑璁稿垹闄�");
}
- menuService.deleteMenuById(menuId);
- return R.ok();
+ return toAjax(menuService.deleteMenuById(menuId));
}
}
\ No newline at end of file
--
Gitblit v1.9.3