From c885f99c9ff1445f6975d16faf4a23006cd5763b Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期三, 05 二月 2025 14:53:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java |   97 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 95 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java
index 4a1134b..b2eeaaf 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java
@@ -1,9 +1,25 @@
 package com.ruoyi.web.controller.api;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.dto.TTenantDTO;
+import com.ruoyi.system.model.TTenant;
+import com.ruoyi.system.query.TTenantQuery;
+import com.ruoyi.system.service.TTenantService;
+import com.ruoyi.system.vo.TenantVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
 
 /**
  * <p>
@@ -13,9 +29,86 @@
  * @author xiaochen
  * @since 2025-01-17
  */
+@Api(tags = "租户管理")
 @RestController
 @RequestMapping("/t-tenant")
 public class TTenantController {
 
+    private final TTenantService tenantService;
+    @Autowired
+    public TTenantController(TTenantService tenantService) {
+        this.tenantService = tenantService;
+    }
+
+    /**
+     * 获取租户管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('system:tenant:list')")
+    @ApiOperation(value = "获取租户分页列表")
+    @PostMapping(value = "/pageList")
+    public R<PageInfo<TenantVO>> pageList(@RequestBody TTenantQuery query) {
+        return R.ok(tenantService.pageList(query));
+    }
+
+    /**
+     * 添加租户管理
+     */
+    @PreAuthorize("@ss.hasPermi('system:tenant:add')")
+    @Log(title = "租户信息-新增租户", businessType = BusinessType.INSERT)
+    @ApiOperation(value = "添加租户")
+    @PostMapping(value = "/add")
+    public R<Boolean> add(@Validated @RequestBody TTenantDTO dto) {
+        // 密码加密
+        dto.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
+        return R.ok(tenantService.save(dto));
+    }
+
+    /**
+     * 修改租户
+     */
+    @PreAuthorize("@ss.hasPermi('system:tenant:update')")
+    @Log(title = "租户信息-修改租户", businessType = BusinessType.UPDATE)
+    @ApiOperation(value = "修改租户")
+    @PostMapping(value = "/update")
+    public R<Boolean> update(@Validated @RequestBody TTenantDTO dto) {
+        // 密码加密
+        if(StringUtils.isNotBlank(dto.getPassword())){
+            dto.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
+        }
+        return R.ok(tenantService.updateById(dto));
+    }
+
+    /**
+     * 查看租户详情
+     */
+    @PreAuthorize("@ss.hasPermi('system:tenant:detail')")
+    @ApiOperation(value = "查看租户详情")
+    @GetMapping(value = "/getDetailById")
+    public R<TTenant> getDetailById(@RequestParam String id) {
+        return R.ok(tenantService.getById(id));
+    }
+
+    /**
+     * 删除租户
+     */
+    @PreAuthorize("@ss.hasPermi('system:tenant:delete')")
+    @Log(title = "租户信息-删除租户", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "删除租户")
+    @DeleteMapping(value = "/deleteById")
+    public R<Boolean> deleteById(@RequestParam String id) {
+        return R.ok(tenantService.removeById(id));
+    }
+
+    /**
+     * 批量删除租户
+     */
+    @PreAuthorize("@ss.hasPermi('system:tenant:delete')")
+    @Log(title = "租户信息-删除租户", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "批量删除租户")
+    @DeleteMapping(value = "/deleteByIds")
+    public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
+        return R.ok(tenantService.removeByIds(ids));
+    }
+
 }
 

--
Gitblit v1.7.1