From b4d0d9b1d58bc45b9b7f249fe6b3701e8db6c35f Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 26 一月 2024 16:03:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/feign/ISysClient.java | 75 +++++++++++++++++++++++++++++++++++++
1 files changed, 74 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/feign/ISysClient.java b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/feign/ISysClient.java
index b72209a..fd963c1 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/feign/ISysClient.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/feign/ISysClient.java
@@ -17,6 +17,8 @@
package com.vci.ubcs.system.feign;
import com.vci.ubcs.system.entity.*;
+import com.vci.ubcs.system.vo.DeptVO;
+import com.vci.ubcs.system.vo.RoleVO;
import org.springblade.core.launch.constant.AppConstant;
import org.springblade.core.tool.api.R;
import org.springframework.cloud.openfeign.FeignClient;
@@ -40,8 +42,13 @@
String API_PREFIX = "/client";
String MENU = API_PREFIX + "/menu";
+ String MENU_BY_CODES = API_PREFIX + "/menu-by-codes";
+ String MDM_COUNT_CONFIG = API_PREFIX + "/mdm-count-config";
+ String MENU_BUTTON = API_PREFIX + "/menu-button";
String DEPT = API_PREFIX + "/dept";
+ String TREE = API_PREFIX + "/tree";
String DEPT_IDS = API_PREFIX + "/dept-ids";
+ String DEPT_LIST = API_PREFIX + "/dept-list";
String DEPT_IDS_FUZZY = API_PREFIX + "/dept-ids-fuzzy";
String DEPT_NAME = API_PREFIX + "/dept-name";
String DEPT_NAMES = API_PREFIX + "/dept-names";
@@ -52,6 +59,8 @@
String POST_NAME = API_PREFIX + "/post-name";
String POST_NAMES = API_PREFIX + "/post-names";
String ROLE = API_PREFIX + "/role";
+ String ROLE_TREE = API_PREFIX + "/role-tree";
+ String ROLE_LIST = API_PREFIX + "/role-list";
String ROLE_IDS = API_PREFIX + "/role-ids";
String ROLE_NAME = API_PREFIX + "/role-name";
String ROLE_NAMES = API_PREFIX + "/role-names";
@@ -69,6 +78,8 @@
String STRATEGYBYID = API_PREFIX + "/query-userid";
String REGEX = API_PREFIX + "/combination-regex";
String REGEXONE = API_PREFIX + "/combination-regex-one";
+ String GETVIEWCLASSIFY = API_PREFIX + "/get-view-classify";
+
/**
* 鑾峰彇鑿滃崟
*
@@ -79,6 +90,31 @@
R<Menu> getMenu(@RequestParam("id") Long id);
/**
+ * 鏍规嵁Code鑾峰彇鑿滃崟淇℃伅
+ * @param codes
+ * @return
+ */
+ @GetMapping(MENU_BY_CODES)
+ R<List<Menu>> getMenuByCodes(@RequestParam("codes") List<String> codes,@RequestParam("userId") Long userId);
+
+ /**
+ * 鑾峰彇鐢ㄩ厤缃殑涓绘暟鎹粺璁�
+ * @param userId
+ * @return
+ */
+ @GetMapping(MDM_COUNT_CONFIG)
+ R<MdmCountConfig> getMdmCountConfig (@RequestParam("userId") String userId);
+
+ /**
+ * 鑾峰彇鑿滃崟涓嬮潰鐨勬寜閽�
+ *
+ * @param btmType 涓氬姟绫诲瀷
+ * @return List<Menu>
+ */
+ @GetMapping(MENU_BUTTON)
+ R<List<Menu>> getMenuButtonByType(@RequestParam("classifyId") String classifyId,@RequestParam("btmType") String btmType,@RequestParam("authType") String authType);
+
+ /**
* 鑾峰彇閮ㄩ棬
*
* @param id 涓婚敭
@@ -86,6 +122,24 @@
*/
@GetMapping(DEPT)
R<Dept> getDept(@RequestParam("id") Long id);
+
+ /**
+ * 鑾峰彇閮ㄩ棬
+ *
+ * @param tenantId 涓婚敭
+ * @return List<Dept></Dept>
+ */
+ @GetMapping(TREE)
+ public R<List<DeptVO>> tree(@RequestParam("tenantId")String tenantId);
+
+ /**
+ * 鑾峰彇閮ㄩ棬
+ *
+ * @param tenantId 涓婚敭
+ * @return List<Dept></Dept>
+ */
+ @GetMapping(DEPT_LIST)
+ public R<List<DeptVO>> deptList(@RequestParam("tenantId")String tenantId);
/**
* 鑾峰彇閮ㄩ棬id
@@ -200,6 +254,22 @@
@GetMapping(ROLE_IDS)
R<String> getRoleIds(@RequestParam("tenantId") String tenantId, @RequestParam("roleNames") String roleNames);
+ /***
+ * 鑾峰彇瑙掕壊
+ * @param tenantId 绉熸埛id
+ * @return 瑙掕壊
+ */
+ @GetMapping(ROLE_TREE)
+ R<List<RoleVO>> roleTree(@RequestParam("tenantId") String tenantId);
+
+ /***
+ * 鑾峰彇瑙掕壊
+ * @param tenantId 绉熸埛id
+ * @return 瑙掕壊
+ */
+ @GetMapping(ROLE_LIST)
+ R<List<RoleVO>> roleList(@RequestParam("tenantId") String tenantId);
+
/**
* 鑾峰彇瑙掕壊鍚�
*
@@ -305,7 +375,7 @@
* @return
*/
@PostMapping(STRATEGYBYID)
- R<Strategy> getByUserId(@RequestParam("id") Long userId);
+ R<Strategy> getByUserId(@RequestParam("id") Long userId);
/**
* 鏍规嵁缁勫悎鏂瑰紡id鑾峰彇鍊�
@@ -321,4 +391,7 @@
@PostMapping(REGEXONE)
R<List<String>> getRegexByList(@RequestBody List<String> combinationIds);
+ @GetMapping(GETVIEWCLASSIFY)
+ R<List<String>> getViewClassByRoleIds(@RequestParam("roleIds") List<String> roleIds,@RequestParam("authType") String authType,@RequestParam("buttonCode") String buttonCode,@RequestParam("menuCode") String menuCode);
+
}
--
Gitblit v1.9.3