From 3052e85365fb7e77f987ef54f87a1865bee3bbc6 Mon Sep 17 00:00:00 2001 From: smallchill Date: Sat, 3 Aug 2019 00:52:45 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E5=A2=9E=E5=8A=A0=E7=A7=9F=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/system/cache/SysCache.java | 15 +++++++++++++++ .../org/springblade/system/feign/ISysClient.java | 11 +++++++++++ .../system/feign/ISysClientFallback.java | 6 ++++++ .../org/springblade/system/feign/SysClient.java | 10 ++++++++++ 4 files changed, 42 insertions(+) diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/cache/SysCache.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/cache/SysCache.java index 2f7b21c0..0c6aed5b 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/cache/SysCache.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/cache/SysCache.java @@ -22,6 +22,7 @@ import org.springblade.core.tool.utils.SpringUtil; import org.springblade.system.entity.Dept; import org.springblade.system.entity.Menu; import org.springblade.system.entity.Role; +import org.springblade.system.entity.Tenant; import org.springblade.system.feign.ISysClient; import java.util.List; @@ -43,6 +44,7 @@ public class SysCache { private static final String ROLE_NAMES_ID = "roleNames:id:"; private static final String ROLE_ALIAS_ID = "roleAlias:id:"; private static final String ROLE_ALIASES_ID = "roleAliases:id:"; + private static final String TENANT_ID = "tenant:id:"; private static ISysClient sysClient; @@ -168,4 +170,17 @@ public class SysCache { }); } + /** + * 获取租户 + * + * @param id 主键 + * @return Tenant + */ + public static Tenant getTenant(Long id) { + return CacheUtil.get(SYS_CACHE, TENANT_ID, id, () -> { + R result = sysClient.getTenant(id); + return result.getData(); + }); + } + } diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java index 3cbabc30..b9ddea2b 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java @@ -21,6 +21,7 @@ import org.springblade.core.tool.api.R; import org.springblade.system.entity.Dept; import org.springblade.system.entity.Menu; import org.springblade.system.entity.Role; +import org.springblade.system.entity.Tenant; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -48,6 +49,7 @@ public interface ISysClient { String ROLE_NAMES = API_PREFIX + "/role-names"; String ROLE_ALIAS = API_PREFIX + "/role-alias"; String ROLE_ALIASES = API_PREFIX + "/role-aliases"; + String TENANT = API_PREFIX + "/tenant"; /** * 获取菜单 @@ -130,4 +132,13 @@ public interface ISysClient { @GetMapping(ROLE_ALIASES) R> getRoleAliases(@RequestParam("roleIds") String roleIds); + /** + * 获取租户 + * + * @param id 主键 + * @return Tenant> + */ + @GetMapping(TENANT) + R getTenant(@RequestParam("id") Long id); + } diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java index 6fe53cc1..0198fc62 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClientFallback.java @@ -20,6 +20,7 @@ import org.springblade.core.tool.api.R; import org.springblade.system.entity.Dept; import org.springblade.system.entity.Menu; import org.springblade.system.entity.Role; +import org.springblade.system.entity.Tenant; import org.springframework.stereotype.Component; import java.util.List; @@ -76,4 +77,9 @@ public class ISysClientFallback implements ISysClient { public R> getRoleAliases(String roleIds) { return R.fail("获取数据失败"); } + + @Override + public R getTenant(Long id) { + return R.fail("获取数据失败"); + } } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java b/blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java index 21cb9079..b6f29a39 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/feign/SysClient.java @@ -21,9 +21,11 @@ import org.springblade.core.tool.api.R; import org.springblade.system.entity.Dept; import org.springblade.system.entity.Menu; import org.springblade.system.entity.Role; +import org.springblade.system.entity.Tenant; import org.springblade.system.service.IDeptService; import org.springblade.system.service.IMenuService; import org.springblade.system.service.IRoleService; +import org.springblade.system.service.ITenantService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; @@ -46,6 +48,8 @@ public class SysClient implements ISysClient { private IMenuService menuService; + private ITenantService tenantService; + @Override @GetMapping(MENU) public R getMenu(Long id) { @@ -100,4 +104,10 @@ public class SysClient implements ISysClient { return R.data(roleService.getRoleAliases(roleIds)); } + @Override + @GetMapping(TENANT) + public R getTenant(Long id) { + return R.data(tenantService.getById(id)); + } + }