From 7371051db9b19381f42165153d17758a90d68f33 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期日, 29 十月 2023 00:24:36 +0800
Subject: [PATCH] 修改主数据按钮查询权限接口，VciBaseUtil中增加校验当前用户是否为配置的超管用户方法
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/feign/SysClient.java | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/feign/SysClient.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/feign/SysClient.java
index 5f1dca7..20ddb06 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/feign/SysClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/feign/SysClient.java
@@ -18,13 +18,13 @@
import com.vci.ubcs.system.entity.*;
import com.vci.ubcs.system.service.*;
+import com.vci.ubcs.system.vo.DeptVO;
+import com.vci.ubcs.system.vo.RoleVO;
import lombok.AllArgsConstructor;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.util.List;
@@ -60,10 +60,29 @@
private final ICombinationService combinationService;
+ private final IMdmCountConfigService mdmCountConfigService;
+
@Override
@GetMapping(MENU)
public R<Menu> getMenu(Long id) {
return R.data(menuService.getById(id));
+ }
+
+ /**
+ * 鏍规嵁code鏌ヨ鑿滃崟淇℃伅
+ * @param codes
+ * @return
+ */
+ @Override
+ @GetMapping(MENU_BY_CODES)
+ public R<List<Menu>> getMenuByCodes(List<String> codes,Long userId) {
+ return R.data(menuService.getMenuByCodes(codes,userId));
+ }
+
+ @Override
+ @GetMapping(MENU_BUTTON)
+ public R<List<Menu>> getMenuButtonByType(String btmType) {
+ return R.data(menuService.getMenuButtonByType(btmType, AuthUtil.getUserId()));
}
@Override
@@ -75,6 +94,15 @@
@Override
public R<String> getDeptIds(String tenantId, String deptNames) {
return R.data(deptService.getDeptIds(tenantId, deptNames));
+ }
+ @Override
+ public R<List<DeptVO>> tree(String tenantId) {
+ return R.data(deptService.tree(tenantId));
+ }
+
+ @Override
+ public R<List<DeptVO>> deptList(String tenantId) {
+ return R.data(deptService.deptList(tenantId));
}
@Override
@@ -135,7 +163,14 @@
public R<String> getRoleIds(String tenantId, String roleNames) {
return R.data(roleService.getRoleIds(tenantId, roleNames));
}
-
+ @Override
+ public R<List<RoleVO>> roleTree(String tenantId) {
+ return R.data(roleService.tree(tenantId));
+ }
+ @Override
+ public R<List<RoleVO>> roleList(String tenantId) {
+ return R.data(roleService.roleList(tenantId));
+ }
@Override
@GetMapping(ROLE_NAME)
public R<String> getRoleName(Long id) {
@@ -221,5 +256,10 @@
return R.data(combinationService.getRegexList(combinationIds));
}
+ @Override
+ @GetMapping(MDM_COUNT_CONFIG)
+ public R<MdmCountConfig> getMdmCountConfig (String userId) {
+ return R.data(mdmCountConfigService.getMdmCountConfig(userId));
+ }
}
--
Gitblit v1.9.3