From d9fe4c2d64339fc799e47e1b5a297f349acd59c6 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 18 一月 2024 09:56:16 +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 | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 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 8d0a2d6..0ad731f 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
@@ -42,6 +42,8 @@
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";
@@ -76,6 +78,7 @@
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";
/**
* 鑾峰彇鑿滃崟
@@ -87,13 +90,29 @@
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("btmType") String btmType);
+ R<List<Menu>> getMenuButtonByType(@RequestParam("classifyId") String classifyId,@RequestParam("btmType") String btmType,@RequestParam("authType") String authType);
/**
* 鑾峰彇閮ㄩ棬
@@ -356,7 +375,7 @@
* @return
*/
@PostMapping(STRATEGYBYID)
- R<Strategy> getByUserId(@RequestParam("id") Long userId);
+ R<Strategy> getByUserId(@RequestParam("id") Long userId);
/**
* 鏍规嵁缁勫悎鏂瑰紡id鑾峰彇鍊�
@@ -372,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("menuCode") String menuCode);
+
}
--
Gitblit v1.9.3