From becc3df6d06e9b0a6fd773229e99b4b2075b8043 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 17 二月 2025 14:41:05 +0800
Subject: [PATCH] 资讯修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 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 e1d0e48..c9f0d94 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
@@ -3,17 +3,23 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.constant.DictConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.dto.TTenantDTO;
+import com.ruoyi.system.model.TContract;
import com.ruoyi.system.model.TTenant;
+import com.ruoyi.system.query.TContractQuery;
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.*;
@@ -41,15 +47,17 @@
/**
* 获取租户管理列表
*/
+ @PreAuthorize("@ss.hasPermi('system:tenant:list')")
@ApiOperation(value = "获取租户分页列表")
@PostMapping(value = "/pageList")
- public R<PageInfo<TTenant>> pageList(@RequestBody TTenantQuery query) {
+ 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")
@@ -62,6 +70,7 @@
/**
* 修改租户
*/
+ @PreAuthorize("@ss.hasPermi('system:tenant:update')")
@Log(title = "租户信息-修改租户", businessType = BusinessType.UPDATE)
@ApiOperation(value = "修改租户")
@PostMapping(value = "/update")
@@ -76,15 +85,27 @@
/**
* 查看租户详情
*/
+ @PreAuthorize("@ss.hasPermi('system:tenant:detail')")
@ApiOperation(value = "查看租户详情")
@GetMapping(value = "/getDetailById")
public R<TTenant> getDetailById(@RequestParam String id) {
- return R.ok(tenantService.getById(id));
+ TTenant tenant = tenantService.getById(id);
+ tenant.setTenantAttributes(StringUtils.isNotEmpty(tenant.getTenantAttributes())?DictUtils.getDictLabel(DictConstants.DICT_TYPE_TENANT_ATTRIBUTE,tenant.getTenantAttributes()):"");
+ tenant.setTenantType(StringUtils.isNotEmpty(tenant.getTenantType())?DictUtils.getDictLabel(DictConstants.DICT_TYPE_TENANT_TYPE,tenant.getTenantType()):"");
+ return R.ok(tenant);
}
+
+// @PreAuthorize("@ss.hasPermi('system:contract:list')")
+// @ApiOperation(value = "获取合同分页列表")
+// @PostMapping(value = "/contractList")
+// public R<PageInfo<TContract>> contractList(@RequestBody TContractQuery query) {
+// return R.ok(contractService.contractList(query));
+// }
/**
* 删除租户
*/
+ @PreAuthorize("@ss.hasPermi('system:tenant:delete')")
@Log(title = "租户信息-删除租户", businessType = BusinessType.DELETE)
@ApiOperation(value = "删除租户")
@DeleteMapping(value = "/deleteById")
@@ -95,6 +116,7 @@
/**
* 批量删除租户
*/
+ @PreAuthorize("@ss.hasPermi('system:tenant:delete')")
@Log(title = "租户信息-删除租户", businessType = BusinessType.DELETE)
@ApiOperation(value = "批量删除租户")
@DeleteMapping(value = "/deleteByIds")
--
Gitblit v1.7.1