From d0b163b5f1114a93b5d0f04e77a00ed8adb91894 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 14 十二月 2023 20:18:37 +0800
Subject: [PATCH] 整合代码
---
Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/feign/ISysClient.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 59 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 bd46a13..fd445bf 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,9 +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";
@@ -53,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";
@@ -81,6 +89,22 @@
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 涓氬姟绫诲瀷
@@ -97,6 +121,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
@@ -211,6 +253,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);
+
/**
* 鑾峰彇瑙掕壊鍚�
*
@@ -316,7 +374,7 @@
* @return
*/
@PostMapping(STRATEGYBYID)
- R<Strategy> getByUserId(@RequestParam("id") Long userId);
+ R<Strategy> getByUserId(@RequestParam("id") Long userId);
/**
* 鏍规嵁缁勫悎鏂瑰紡id鑾峰彇鍊�
--
Gitblit v1.9.3