From e12e717a045c4b5d9893ddac9135c1721e7a0cc3 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 16 三月 2023 17:58:26 +0800
Subject: [PATCH] 上传更改过的源码jar包，上传租户管理相关功能
---
Source/BladeX/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 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..5afb563 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
@@ -29,6 +29,7 @@
import org.springblade.core.secure.BladeUser;
import org.springblade.core.secure.annotation.PreAuth;
import org.springblade.core.tenant.annotation.NonDS;
+import org.springblade.core.tenant.mp.TenantEntity;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.constant.RoleConstant;
@@ -38,6 +39,7 @@
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;
@@ -131,8 +133,9 @@
@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));
+ public R submit(@Valid @RequestBody TenantVO tenantVO) {
+ System.out.println(tenantVO);
+ return R.status(tenantService.submitTenant(tenantVO));
}
@@ -148,20 +151,9 @@
}
/**
- * 鎺堟潈閰嶇疆
- */
- @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)
@ApiOperation(value = "鏁版嵁婧愰厤缃�", notes = "浼犲叆datasource_id")
@@ -230,6 +222,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