diff --git a/src/main/java/com/gxwebsoft/common/system/controller/DomainController.java b/src/main/java/com/gxwebsoft/common/system/controller/DomainController.java index bf69b26..d21e867 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/DomainController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/DomainController.java @@ -54,6 +54,15 @@ public class DomainController extends BaseController { return success(domainService.getByIdRel(id)); } + @PreAuthorize("hasAuthority('sys:domain:list')") + @OperationLog + @ApiOperation("根据domain查询授权域名") + @GetMapping("/getByDomain/{domain}") + public ApiResult getByDomain(@PathVariable("domain") String domain) { + // 使用关联查询 + return success(domainService.getByDomainRel(domain)); + } + @PreAuthorize("hasAuthority('sys:domain:save')") @OperationLog @ApiOperation("添加授权域名") diff --git a/src/main/java/com/gxwebsoft/common/system/controller/TenantController.java b/src/main/java/com/gxwebsoft/common/system/controller/TenantController.java index 0fe3ea0..7238bd9 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/TenantController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/TenantController.java @@ -96,6 +96,12 @@ public class TenantController extends BaseController { return success(tenant.getTenantId()); } + @ApiOperation("根据code搜索租户") + @GetMapping("/getByCode/{code}") + public ApiResult getByCode(@PathVariable("code") String code) { + return success(tenantService.getByCodeRel(code)); + } + @PreAuthorize("hasAuthority('sys:tenant:save')") @OperationLog @ApiOperation("添加租户") diff --git a/src/main/java/com/gxwebsoft/common/system/service/DomainService.java b/src/main/java/com/gxwebsoft/common/system/service/DomainService.java index 2996471..960aace 100644 --- a/src/main/java/com/gxwebsoft/common/system/service/DomainService.java +++ b/src/main/java/com/gxwebsoft/common/system/service/DomainService.java @@ -39,4 +39,5 @@ public interface DomainService extends IService { */ Domain getByIdRel(Integer id); + Domain getByDomainRel(String domain); } diff --git a/src/main/java/com/gxwebsoft/common/system/service/TenantService.java b/src/main/java/com/gxwebsoft/common/system/service/TenantService.java index a47ab8e..ec46196 100644 --- a/src/main/java/com/gxwebsoft/common/system/service/TenantService.java +++ b/src/main/java/com/gxwebsoft/common/system/service/TenantService.java @@ -43,4 +43,6 @@ public interface TenantService extends IService { Company initialization(Company company); boolean destructionAll(Integer tenantId); + + Tenant getByCodeRel(String code); } diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/DomainServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/DomainServiceImpl.java index d4dfc61..8f4bcca 100644 --- a/src/main/java/com/gxwebsoft/common/system/service/impl/DomainServiceImpl.java +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/DomainServiceImpl.java @@ -20,28 +20,35 @@ import java.util.List; @Service public class DomainServiceImpl extends ServiceImpl implements DomainService { - @Override - public PageResult pageRel(DomainParam param) { - PageParam page = new PageParam<>(param); - page.setDefaultOrder("create_time desc"); - List list = baseMapper.selectPageRel(page, param); - return new PageResult<>(list, page.getTotal()); - } + @Override + public PageResult pageRel(DomainParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } - @Override - public List listRel(DomainParam param) { - List list = baseMapper.selectListRel(param); - // 排序 - PageParam page = new PageParam<>(); - page.setDefaultOrder("create_time desc"); - return page.sortRecords(list); - } + @Override + public List listRel(DomainParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } - @Override - public Domain getByIdRel(Integer id) { - DomainParam param = new DomainParam(); - param.setId(id); - return param.getOne(baseMapper.selectListRel(param)); - } + @Override + public Domain getByIdRel(Integer id) { + DomainParam param = new DomainParam(); + param.setId(id); + return param.getOne(baseMapper.selectListRel(param)); + } + + @Override + public Domain getByDomainRel(String domain) { + DomainParam param = new DomainParam(); + param.setDomain(domain); + return param.getOne(baseMapper.selectListRel(param)); + } } diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java index cce0727..f0fd8fb 100644 --- a/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/TenantServiceImpl.java @@ -624,4 +624,11 @@ public class TenantServiceImpl extends ServiceImpl impleme return false; } + @Override + public Tenant getByCodeRel(String code) { + TenantParam param = new TenantParam(); + param.setTenantCode(code); + return param.getOne(baseMapper.selectListRel(param)); + } + }