From 63013400c2790a650878445c8352992df71103b2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 19 七月 2023 11:42:59 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/feign/SysClient.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 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..2aafe53 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,12 @@
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.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;
@@ -65,6 +64,11 @@
public R<Menu> getMenu(Long id) {
return R.data(menuService.getById(id));
}
+ @Override
+ @GetMapping(MENU_BUTTON)
+ public R<List<Menu>> getMenuButtonByType(String btmType) {
+ return R.data(menuService.getMenuButtonByType(btmType));
+ }
@Override
@GetMapping(DEPT)
@@ -75,6 +79,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 +148,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) {
--
Gitblit v1.9.3