From f1208474f771a1c233d7425c8ed13fbaa0d521ac Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 12 三月 2025 09:35:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/5.X' into 5.X
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java
index 053ff17..66c1b7d 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java
@@ -24,6 +24,7 @@
import org.dromara.system.domain.bo.SysTenantBo;
import org.dromara.system.domain.vo.SysTenantVo;
import org.dromara.system.service.ISysTenantService;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -38,6 +39,7 @@
@RequiredArgsConstructor
@RestController
@RequestMapping("/system/tenant")
+@ConditionalOnProperty(value = "tenant.enable", havingValue = "true")
public class SysTenantController extends BaseController {
private final ISysTenantService tenantService;
@@ -57,7 +59,7 @@
*/
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
@SaCheckPermission("system:tenant:export")
- @Log(title = "绉熸埛", businessType = BusinessType.EXPORT)
+ @Log(title = "绉熸埛绠＄悊", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(SysTenantBo bo, HttpServletResponse response) {
List<SysTenantVo> list = tenantService.queryList(bo);
@@ -83,7 +85,7 @@
@ApiEncrypt
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
@SaCheckPermission("system:tenant:add")
- @Log(title = "绉熸埛", businessType = BusinessType.INSERT)
+ @Log(title = "绉熸埛绠＄悊", businessType = BusinessType.INSERT)
@Lock4j
@RepeatSubmit()
@PostMapping()
@@ -99,7 +101,7 @@
*/
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
@SaCheckPermission("system:tenant:edit")
- @Log(title = "绉熸埛", businessType = BusinessType.UPDATE)
+ @Log(title = "绉熸埛绠＄悊", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysTenantBo bo) {
@@ -115,7 +117,7 @@
*/
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
@SaCheckPermission("system:tenant:edit")
- @Log(title = "绉熸埛", businessType = BusinessType.UPDATE)
+ @Log(title = "绉熸埛绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
public R<Void> changeStatus(@RequestBody SysTenantBo bo) {
tenantService.checkTenantAllowed(bo.getTenantId());
@@ -129,7 +131,7 @@
*/
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
@SaCheckPermission("system:tenant:remove")
- @Log(title = "绉熸埛", businessType = BusinessType.DELETE)
+ @Log(title = "绉熸埛绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
@PathVariable Long[] ids) {
@@ -144,7 +146,7 @@
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
@GetMapping("/dynamic/{tenantId}")
public R<Void> dynamicTenant(@NotBlank(message = "绉熸埛ID涓嶈兘涓虹┖") @PathVariable String tenantId) {
- TenantHelper.setDynamic(tenantId);
+ TenantHelper.setDynamic(tenantId, true);
return R.ok();
}
@@ -167,11 +169,25 @@
*/
@SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
@SaCheckPermission("system:tenant:edit")
- @Log(title = "绉熸埛", businessType = BusinessType.UPDATE)
+ @Log(title = "绉熸埛绠＄悊", businessType = BusinessType.UPDATE)
@GetMapping("/syncTenantPackage")
public R<Void> syncTenantPackage(@NotBlank(message = "绉熸埛ID涓嶈兘涓虹┖") String tenantId,
@NotNull(message = "濂楅ID涓嶈兘涓虹┖") Long packageId) {
return toAjax(TenantHelper.ignore(() -> tenantService.syncTenantPackage(tenantId, packageId)));
}
+ /**
+ * 鍚屾绉熸埛瀛楀吀
+ */
+ @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
+ @Log(title = "绉熸埛绠＄悊", businessType = BusinessType.INSERT)
+ @GetMapping("/syncTenantDict")
+ public R<Void> syncTenantDict() {
+ if (!TenantHelper.isEnable()) {
+ return R.fail("褰撳墠鏈紑鍚鎴锋ā寮�");
+ }
+ tenantService.syncTenantDict();
+ return R.ok("鍚屾绉熸埛瀛楀吀鎴愬姛");
+ }
+
}
--
Gitblit v1.9.3