From 58e1c4e2bdc8e4f8b647d7c2b9e5e5656a00b445 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 17 五月 2024 11:06:43 +0800
Subject: [PATCH] 集成申请，历史数据导入，关键属性查重多线程导致判重失误问题
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/controller/MenuController.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 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 92e402f..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;
@@ -33,6 +32,8 @@
import lombok.AllArgsConstructor;
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;
@@ -64,6 +65,7 @@
public class MenuController extends BladeController {
private final IMenuService menuService;
+
private final ITopMenuService topMenuService;
/**
@@ -95,6 +97,25 @@
}
/**
+ * 鏍规嵁鐖惰彍鍗曠殑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())));
+ }
+
+ /**
* 鎳掑姞杞藉垪琛�
*/
@GetMapping("/lazy-list")
@@ -105,6 +126,7 @@
//@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
@ApiOperationSupport(order = 3)
@ApiOperation(value = "鎳掑姞杞藉垪琛�", notes = "浼犲叆menu")
+ @ApiLog("鑿滃崟鎳掑姞杞藉垪琛�")
public R<List<MenuVO>> lazyList(Long parentId, @ApiIgnore @RequestParam Map<String, Object> menu) {
List<MenuVO> list = menuService.lazyList(parentId, menu);
return R.data(MenuWrapper.build().listNodeLazyVO(list));
@@ -159,7 +181,6 @@
}
return R.fail("鎿嶄綔澶辫触");
}
-
/**
* 鍒犻櫎
@@ -297,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