From ba345976f0a6a67bcb20627e33251ded000a3d8f Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期六, 25 五月 2024 22:40:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MenuController.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MenuController.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MenuController.java
index 1aad52f..514bd57 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MenuController.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MenuController.java
@@ -18,7 +18,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.system.entity.Menu;
import com.vci.ubcs.system.entity.TopMenu;
@@ -34,6 +33,7 @@
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.log.annotation.ApiLog;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
@@ -65,6 +65,7 @@
public class MenuController extends BladeController {
private final IMenuService menuService;
+
private final ITopMenuService topMenuService;
/**
@@ -93,6 +94,25 @@
public R<List<MenuVO>> list(@ApiIgnore @RequestParam Map<String, Object> menu) {
List<Menu> list = menuService.list(Condition.getQueryWrapper(menu, Menu.class).lambda().orderByAsc(Menu::getSort));
return R.data(MenuWrapper.build().listNodeVO(list));
+ }
+
+ /**
+ * 鏍规嵁鐖惰彍鍗曠殑code鑾峰彇锛屼笅闈㈢殑鎸夐挳
+ * @param menu
+ * @return
+ */
+ @GetMapping("/getButtonByParentCode")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "code", value = "鑿滃崟缂栧彿", paramType = "query", dataType = "string"),
+ @ApiImplicitParam(name = "category", value = "鑿滃崟绫诲瀷", paramType = "query", dataType = "string")
+ })
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "鍒楄〃", notes = "浼犲叆menu")
+ public R<List<MenuVO>> getButtonByParentCode(@ApiIgnore @RequestParam Map<String, Object> menu){
+ if(Func.isBlank(menu.getOrDefault("code","").toString())){
+ throw new ServiceException("蹇呭～鍙傛暟鑿滃崟code涓嶈兘涓虹┖锛�");
+ }
+ return R.data(MenuWrapper.build().listNodeVO(menuService.getButtonByParentCode(menu.getOrDefault("code","").toString())));
}
/**
@@ -161,7 +181,6 @@
}
return R.fail("鎿嶄綔澶辫触");
}
-
/**
* 鍒犻櫎
@@ -299,4 +318,14 @@
return menuService.cloneMenuButton(buttonCloneVO.getMenuId(), buttonCloneVO.getButtonIds());
}
+ /**
+ * 鏍规嵁瑙掕壊id鑾峰彇宸叉巿鏉冪殑鎸夐挳淇℃伅
+ * @param roleId
+ * @return
+ */
+ @GetMapping("/getButtonsByRoleId")
+ public R<List<Menu>> getButtonsByRoleId(@Valid @RequestParam("roleId") String roleId,@Valid @RequestParam("code") String menuCode){
+ return R.data(menuService.getButtonsByRoleId(roleId,menuCode));
+ }
+
}
--
Gitblit v1.9.3