Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang i...

zhangmei

2025-02-08 2573f2327a2046ec8545e80e4e56d1ee6c55bfae

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java

@@ -3,15 +3,19 @@

import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.AjaxResult;
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.*;

@@ -39,59 +43,71 @@
    /**
     * 获取租户管理列表
     */
//    @ApiOperation(value = "获取租户分页列表")
//    @PostMapping(value = "/pageList")
//    public AjaxResult<PageInfo<TTenant>> pageList(@RequestBody TTenantQuery query) {
//        return AjaxResult.success(tenantService.pageList(query));
//    }
    @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 AjaxResult<Boolean> add(@Validated @RequestBody TTenantDTO dto) {
        return AjaxResult.success(tenantService.save(dto));
    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 AjaxResult<Boolean> update(@Validated @RequestBody TTenantDTO dto) {
        return AjaxResult.success(tenantService.updateById(dto));
    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 AjaxResult<TTenant> getDetailById(@RequestParam Long id) {
        return AjaxResult.success(tenantService.getById(id));
    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 AjaxResult<Boolean> deleteById(@RequestParam Long id) {
        return AjaxResult.success(tenantService.removeById(id));
    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 AjaxResult<Boolean> deleteByIds(@RequestBody List<Long> ids) {
        return AjaxResult.success(tenantService.removeByIds(ids));
    public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
        return R.ok(tenantService.removeByIds(ids));
    }

}