From 87691e2c99d235ac73648aad0c2937e3df993c8c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 22 一月 2025 15:02:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 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 31b8618..32854e3 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,8 +3,10 @@
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;
@@ -39,11 +41,11 @@
/**
* 获取租户管理列表
*/
-// @ApiOperation(value = "获取租户分页列表")
-// @PostMapping(value = "/pageList")
-// public AjaxResult<PageInfo<TTenant>> pageList(@RequestBody TTenantQuery query) {
-// return AjaxResult.success(tenantService.pageList(query));
-// }
+ @ApiOperation(value = "获取租户分页列表")
+ @PostMapping(value = "/pageList")
+ public R<PageInfo<TTenant>> pageList(@RequestBody TTenantQuery query) {
+ return R.ok(tenantService.pageList(query));
+ }
/**
* 添加租户管理
@@ -51,8 +53,10 @@
@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));
}
/**
@@ -61,8 +65,12 @@
@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));
}
/**
@@ -70,8 +78,8 @@
*/
@ApiOperation(value = "查看租户详情")
@GetMapping(value = "/getDetailById")
- public AjaxResult<TTenant> getDetailById(@RequestParam Long id) {
- return AjaxResult.success(tenantService.getById(id));
+ public R<TTenant> getDetailById(@RequestParam Long id) {
+ return R.ok(tenantService.getById(id));
}
/**
@@ -80,8 +88,8 @@
@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 Long id) {
+ return R.ok(tenantService.removeById(id));
}
/**
@@ -90,8 +98,8 @@
@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<Long> ids) {
+ return R.ok(tenantService.removeByIds(ids));
}
}
--
Gitblit v1.7.1