From df6a2e0bec3ca17993faa0cdd2d216ad2ac191a7 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 20 一月 2025 18:56:05 +0800
Subject: [PATCH] 租户
---
ruoyi-system/src/main/java/com/ruoyi/system/dto/TTenantDTO.java | 10 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTenantController.java | 81 ++++++++++++++++++++++++++
ruoyi-applet/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java | 4
ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java | 8 ++
ruoyi-system/src/main/java/com/ruoyi/system/query/TTenantQuery.java | 21 +++++++
6 files changed, 122 insertions(+), 6 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..31b8618 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,21 @@
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.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+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 +25,74 @@
* @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;
+ }
+
+ /**
+ * 获取租户管理列表
+ */
+// @ApiOperation(value = "获取租户分页列表")
+// @PostMapping(value = "/pageList")
+// public AjaxResult<PageInfo<TTenant>> pageList(@RequestBody TTenantQuery query) {
+// return AjaxResult.success(tenantService.pageList(query));
+// }
+
+ /**
+ * 添加租户管理
+ */
+ @Log(title = "租户信息-新增租户", businessType = BusinessType.INSERT)
+ @ApiOperation(value = "添加租户")
+ @PostMapping(value = "/add")
+ public AjaxResult<Boolean> add(@Validated @RequestBody TTenantDTO dto) {
+ return AjaxResult.success(tenantService.save(dto));
+ }
+
+ /**
+ * 修改租户
+ */
+ @Log(title = "租户信息-修改租户", businessType = BusinessType.UPDATE)
+ @ApiOperation(value = "修改租户")
+ @PostMapping(value = "/update")
+ public AjaxResult<Boolean> update(@Validated @RequestBody TTenantDTO dto) {
+ return AjaxResult.success(tenantService.updateById(dto));
+ }
+
+ /**
+ * 查看租户详情
+ */
+ @ApiOperation(value = "查看租户详情")
+ @GetMapping(value = "/getDetailById")
+ public AjaxResult<TTenant> getDetailById(@RequestParam Long id) {
+ return AjaxResult.success(tenantService.getById(id));
+ }
+
+ /**
+ * 删除租户
+ */
+ @Log(title = "租户信息-删除租户", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "删除租户")
+ @DeleteMapping(value = "/deleteById")
+ public AjaxResult<Boolean> deleteById(@RequestParam Long id) {
+ return AjaxResult.success(tenantService.removeById(id));
+ }
+
+ /**
+ * 批量删除租户
+ */
+ @Log(title = "租户信息-删除租户", businessType = BusinessType.DELETE)
+ @ApiOperation(value = "批量删除租户")
+ @DeleteMapping(value = "/deleteByIds")
+ public AjaxResult<Boolean> deleteByIds(@RequestBody List<Long> ids) {
+ return AjaxResult.success(tenantService.removeByIds(ids));
+ }
+
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
index 04be365..b652bc3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
@@ -113,9 +113,9 @@
// 用ApiInfoBuilder进行定制
return new ApiInfoBuilder()
// 设置标题
- .title("标题：阿坝移动管理系统_接口文档")
+ .title("标题：西藏国投管理系统_接口文档")
// 描述
- .description("阿坝移动接口文档")
+ .description("西藏国投接口文档")
// 作者信息
.contact(new Contact(ruoyiConfig.getName(), null, null))
// 版本
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java b/ruoyi-applet/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
index 04be365..b652bc3 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
@@ -113,9 +113,9 @@
// 用ApiInfoBuilder进行定制
return new ApiInfoBuilder()
// 设置标题
- .title("标题：阿坝移动管理系统_接口文档")
+ .title("标题：西藏国投管理系统_接口文档")
// 描述
- .description("阿坝移动接口文档")
+ .description("西藏国投接口文档")
// 作者信息
.contact(new Contact(ruoyiConfig.getName(), null, null))
// 版本
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/TTenantDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/TTenantDTO.java
new file mode 100644
index 0000000..d52799f
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/TTenantDTO.java
@@ -0,0 +1,10 @@
+package com.ruoyi.system.dto;
+
+import com.ruoyi.system.model.TTenant;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "租户DTO")
+public class TTenantDTO extends TTenant {
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java
index eb538e9..c0b8fb4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TTenant.java
@@ -14,6 +14,9 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
/**
* <p>
* 租户
@@ -34,10 +37,12 @@
private String id;
@ApiModelProperty(value = "住户名称")
+ @NotBlank(message = "住户名称不能为空")
@TableField("resident_name")
private String residentName;
@ApiModelProperty(value = "入住时间")
+ @NotNull(message = "入住时间不能为空")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("checkIn_time")
private LocalDateTime checkinTime;
@@ -63,10 +68,12 @@
private Integer buildingArea;
@ApiModelProperty(value = "联系电话")
+ @NotBlank(message = "联系电话不能为空")
@TableField("phone")
private String phone;
@ApiModelProperty(value = "证件号码")
+ @NotBlank(message = "证件号码不能为空")
@TableField("id_card")
private String idCard;
@@ -75,6 +82,7 @@
private String email;
@ApiModelProperty(value = "银行转账专号")
+ @NotBlank(message = "银行转账专号不能为空")
@TableField("bank_number")
private String bankNumber;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TTenantQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TTenantQuery.java
new file mode 100644
index 0000000..28652a0
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TTenantQuery.java
@@ -0,0 +1,21 @@
+package com.ruoyi.system.query;
+
+import com.ruoyi.common.core.domain.BasePage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "租户查询Query")
+public class TTenantQuery extends BasePage {
+
+ @ApiModelProperty(value = "租户姓名")
+ private String tenantName;
+
+ @ApiModelProperty(value = "联系电话")
+ private String phone;
+
+
+
+}
--
Gitblit v1.7.1