From fbe37e2e00bddec409b595a4a6e50c4bb32a008a Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 21 三月 2023 18:29:55 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java | 64 ++++++++++++++++++-------------
1 files changed, 37 insertions(+), 27 deletions(-)
diff --git a/Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java b/Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java
index 6440171..a21106b 100644
--- a/Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java
+++ b/Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java
@@ -27,22 +27,20 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
-import org.springblade.core.secure.annotation.PreAuth;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
-import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.Func;
import org.springblade.system.entity.Tenant;
import org.springblade.system.entity.TenantPackage;
import org.springblade.system.service.ITenantPackageService;
import org.springblade.system.service.ITenantService;
+import org.springblade.system.vo.TenantVO;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.validation.Valid;
-import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -75,7 +73,7 @@
@GetMapping("/detail")
@ApiOperationSupport(order = 1)
@ApiOperation(value = "璇︽儏", notes = "浼犲叆tenant")
- @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<Tenant> detail(Tenant tenant) {
Tenant detail = tenantService.getOne(Condition.getQueryWrapper(tenant));
return R.data(detail);
@@ -92,7 +90,7 @@
})
@ApiOperationSupport(order = 2)
@ApiOperation(value = "鍒嗛〉", notes = "浼犲叆tenant")
- @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<IPage<Tenant>> list(@ApiIgnore @RequestParam Map<String, Object> tenant, Query query, BladeUser bladeUser) {
QueryWrapper<Tenant> queryWrapper = Condition.getQueryWrapper(tenant, Tenant.class);
IPage<Tenant> pages = tenantService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper);
@@ -105,7 +103,7 @@
@GetMapping("/select")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "涓嬫媺鏁版嵁婧�", notes = "浼犲叆tenant")
- @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<List<Tenant>> select(Tenant tenant, BladeUser bladeUser) {
QueryWrapper<Tenant> queryWrapper = Condition.getQueryWrapper(tenant);
List<Tenant> list = tenantService.list((!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper);
@@ -118,7 +116,7 @@
@GetMapping("/page")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "鍒嗛〉", notes = "浼犲叆tenant")
- @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<IPage<Tenant>> page(Tenant tenant, Query query) {
IPage<Tenant> pages = tenantService.selectTenantPage(Condition.getPage(query), tenant);
return R.data(pages);
@@ -130,9 +128,9 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 5)
@ApiOperation(value = "鏂板鎴栦慨鏀�", notes = "浼犲叆tenant")
- @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
- public R submit(@Valid @RequestBody Tenant tenant) {
- return R.status(tenantService.submitTenant(tenant));
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+ public R submit(@Valid @RequestBody TenantVO tenantVO) {
+ return R.status(tenantService.submitTenant(tenantVO));
}
@@ -142,28 +140,17 @@
@PostMapping("/remove")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "閫昏緫鍒犻櫎", notes = "浼犲叆ids")
- @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
public R remove(@ApiParam(value = "涓婚敭闆嗗悎", required = true) @RequestParam String ids) {
return R.status(tenantService.removeTenant(Func.toLongList(ids)));
}
/**
- * 鎺堟潈閰嶇疆
- */
- @PostMapping("/setting")
- @ApiOperationSupport(order = 7)
- @ApiOperation(value = "鎺堟潈閰嶇疆", notes = "浼犲叆ids,accountNumber,expireTime")
- @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
- public R setting(@ApiParam(value = "涓婚敭闆嗗悎", required = true) @RequestParam String ids, @ApiParam(value = "璐﹀彿棰濆害") Integer accountNumber, @ApiParam(value = "杩囨湡鏃堕棿") Date expireTime) {
- return R.status(tenantService.setting(accountNumber, expireTime, ids));
- }
-
- /**
* 鏁版嵁婧愰厤缃�
*/
- @PostMapping("datasource")
+ @PostMapping("/datasource")
@ApiOperationSupport(order = 8)
- @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
@ApiOperation(value = "鏁版嵁婧愰厤缃�", notes = "浼犲叆datasource_id")
public R datasource(@ApiParam(value = "绉熸埛ID", required = true) @RequestParam String tenantId, @ApiParam(value = "鏁版嵁婧怚D", required = true) @RequestParam Long datasourceId){
CacheUtil.evict(TENANT_DATASOURCE_CACHE, TENANT_DATASOURCE_EXIST_KEY, tenantId, Boolean.FALSE);
@@ -178,7 +165,7 @@
@GetMapping("/find-by-name")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "璇︽儏", notes = "浼犲叆tenant")
- @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<List<Tenant>> findByName(String name) {
List<Tenant> list = tenantService.list(Wrappers.<Tenant>query().lambda().like(Tenant::getTenantName, name));
return R.data(list);
@@ -211,7 +198,7 @@
@GetMapping("/package-detail")
@ApiOperationSupport(order = 11)
@ApiOperation(value = "浜у搧鍖呰鎯�", notes = "浼犲叆tenantId")
- @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
public R<TenantPackage> packageDetail(Long tenantId) {
Tenant tenant = tenantService.getById(tenantId);
return R.data(tenantPackageService.getById(tenant.getPackageId()));
@@ -222,7 +209,7 @@
*/
@PostMapping("/package-setting")
@ApiOperationSupport(order = 12)
- @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
@ApiOperation(value = "浜у搧鍖呴厤缃�", notes = "浼犲叆packageId")
public R packageSetting(@ApiParam(value = "绉熸埛ID", required = true) @RequestParam String tenantId, @ApiParam(value = "浜у搧鍖匢D") Long packageId) {
CacheUtil.evict(SYS_CACHE, TENANT_TENANT_ID, tenantId, Boolean.FALSE);
@@ -230,6 +217,29 @@
return R.status(tenantService.update(Wrappers.<Tenant>update().lambda().set(Tenant::getPackageId, packageId).eq(Tenant::getTenantId, tenantId)));
}
+ /**
+ * 鏌ヨ绉熸埛淇℃伅锛岀畝閿�煎褰㈠娍
+ * @return
+ */
+ @GetMapping("/tenant-map")
+ @ApiOperationSupport(order = 1)
+ @ApiOperation(value = "涓嬫媺绉熸埛淇℃伅")
+ public R<List> findAll() {
+ List<Map<String, Object>> map = tenantService.selectMaps();
+ return R.data(map);
+ }
+ /**
+ * 鏌ヨ鏄惁閰嶇疆鏈夐粯璁ゅ繀椤诲紑鍚笁鍛樼鐞�
+ * @return
+ */
+ @GetMapping("/find-ssa-enable")
+ @ApiOperationSupport(order = 14)
+ @ApiOperation(value = "涓嬫媺绉熸埛淇℃伅")
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR)
+ public R findIsOpen() {
+ boolean isOpen = this.tenantService.findIsOpen();
+ return R.data(isOpen);
+ }
}
--
Gitblit v1.9.3