From 7f526d5cb45584c35653f136483e40cb60b5d0bf Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 22 一月 2025 15:03:16 +0800
Subject: [PATCH] 房屋
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THouseController.java | 27 +++++++------
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TencentCosUtil.java | 7 ++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 21 +++++-----
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TContractMapper.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java | 8 +++
5 files changed, 38 insertions(+), 27 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
index cddd624..463a164 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
@@ -5,6 +5,7 @@
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.StringUtils;
import com.ruoyi.system.dto.TContractDTO;
@@ -52,13 +53,13 @@
private THouseService houseService;
@ApiOperation(value = "获取合同分页列表")
@PostMapping(value = "/contractList")
- public AjaxResult<PageInfo<TContract>> contractList(@RequestBody TContractQuery query) {
- return AjaxResult.success(contractService.contractList(query));
+ public R<PageInfo<TContract>> contractList(@RequestBody TContractQuery query) {
+ return R.ok(contractService.contractList(query));
}
@Log(title = "合同管理-新增合同", businessType = BusinessType.INSERT)
@ApiOperation(value = "新增合同")
@PostMapping(value = "/addContract")
- public AjaxResult<Boolean> addContract(@Validated @RequestBody TContractDTO dto) {
+ public R<Boolean> addContract(@Validated @RequestBody TContractDTO dto) {
contractService.save(dto);
if (dto.getIsIncreasing()==1){
TContractRentType tContractRentType = new TContractRentType();
@@ -69,12 +70,12 @@
tContractRentType.setChangeTime(dto.getChangeTime());
contractRentTypeService.save(tContractRentType);
}
- return AjaxResult.success();
+ return R.ok();
}
@Log(title = "合同管理-编辑合同", businessType = BusinessType.UPDATE)
@ApiOperation(value = "编辑合同")
@PostMapping(value = "/updateContract")
- public AjaxResult<Boolean> updateContract(@Validated @RequestBody TContractDTO dto) {
+ public R<Boolean> updateContract(@Validated @RequestBody TContractDTO dto) {
contractService.updateById(dto);
contractRentTypeService.remove(new LambdaQueryWrapper<TContractRentType>()
.eq(TContractRentType::getContractId,dto.getId()));
@@ -87,22 +88,22 @@
tContractRentType.setChangeTime(dto.getChangeTime());
contractRentTypeService.save(tContractRentType);
}
- return AjaxResult.success();
+ return R.ok();
}
@Log(title = "合同管理-批量删除合同", businessType = BusinessType.DELETE)
@ApiOperation(value = "批量删除合同")
@DeleteMapping(value = "/deleteContractByIds")
- public AjaxResult<Boolean> deleteContractByIds3
+ public R<Boolean> deleteContractByIds3
(@RequestParam String ids) {
if (StringUtils.isNotEmpty(ids)){
contractService.removeBatchByIds(Arrays.asList(ids.split(",")));
}
- return AjaxResult.success();
+ return R.ok();
}
@ApiOperation(value = "查询合同信息信息")
@GetMapping(value = "/getContractById")
- public AjaxResult<TContractVO> getContractById(@RequestParam Long id) {
+ public R<TContractVO> getContractById(@RequestParam Long id) {
TContractVO res = new TContractVO();
TContract contract = contractService.getById(id);
BeanUtils.copyProperties(contract,res);
@@ -120,7 +121,7 @@
house.setTenantType(oldContract.getPayType());
}
res.setHouse(house);
- return AjaxResult.success();
+ return R.ok(res);
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THouseController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THouseController.java
index f4a20f6..641ff2e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THouseController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THouseController.java
@@ -3,7 +3,8 @@
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.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.dto.THouseDTO;
import com.ruoyi.system.dto.TTenantDTO;
@@ -37,36 +38,36 @@
@Log(title = "房屋基础信息管理-新增房屋", businessType = BusinessType.INSERT)
@ApiOperation(value = "新增房屋")
@PostMapping(value = "/addHouse")
- public AjaxResult<Boolean> addHouse(@Validated @RequestBody THouseDTO dto) {
- return AjaxResult.success(tHouseService.save(dto));
+ public R<Boolean> addHouse(@Validated @RequestBody THouseDTO dto) {
+ return R.ok(tHouseService.save(dto));
}
@Log(title = "房屋基础信息管理-编辑房屋", businessType = BusinessType.UPDATE)
@ApiOperation(value = "编辑房屋")
@PostMapping(value = "/updateHouse")
- public AjaxResult<Boolean> updateHouse(@Validated @RequestBody THouseDTO dto) {
- return AjaxResult.success(tHouseService.updateById(dto));
+ public R<Boolean> updateHouse(@Validated @RequestBody THouseDTO dto) {
+ return R.ok(tHouseService.updateById(dto));
}
@Log(title = "房屋基础信息管理-查询房屋信息", businessType = BusinessType.DELETE)
@ApiOperation(value = "查询房屋信息")
@GetMapping(value = "/getHouseById")
- public AjaxResult<THouse> getHouseById(@RequestParam Long id) {
- return AjaxResult.success(tHouseService.getById(id));
+ public R<THouse> getHouseById(@RequestParam Long id) {
+ return R.ok(tHouseService.getById(id));
}
@Log(title = "房屋基础信息管理-删除房屋", businessType = BusinessType.DELETE)
@ApiOperation(value = "删除房屋")
@DeleteMapping(value = "/deleteHouseById")
- public AjaxResult<Boolean> deleteHouseById(@RequestParam Long id) {
- return AjaxResult.success(tHouseService.removeById(id));
+ public R<Boolean> deleteHouseById(@RequestParam Long id) {
+ return R.ok(tHouseService.removeById(id));
}
@ApiOperation(value = "获取房屋分页列表")
@PostMapping(value = "/houseList")
- public AjaxResult<PageInfo<THouse>> houseList(@RequestBody THouseQuery query) {
- return AjaxResult.success(tHouseService.houseList(query));
+ public R<PageInfo<THouse>> houseList(@RequestBody THouseQuery query) {
+ return R.ok(tHouseService.houseList(query));
}
@ApiOperation(value = "历史租户列表")
@PostMapping(value = "/userHistoryList")
- public AjaxResult<PageInfo<HouseVO>> userHistoryList(@RequestBody TUserHistoryQuery query) {
- return AjaxResult.success(tHouseService.userHistoryList(query));
+ public R<PageInfo<HouseVO>> userHistoryList(@RequestBody TUserHistoryQuery query) {
+ return R.ok(tHouseService.userHistoryList(query));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TencentCosUtil.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TencentCosUtil.java
index 2ef3f76..af76a4f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TencentCosUtil.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TencentCosUtil.java
@@ -17,8 +17,10 @@
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
import java.util.UUID;
/**
@@ -127,19 +129,20 @@
// 2.2 使用https协议传输
clientConfig.setHttpProtocol(HttpProtocol.https);
COSClient cosClient = new COSClient(cred, clientConfig);
- String key = "xizang/e4ea88b8-5470-456e-bf97-75cf47f38e84.jpg";
+ String key = "/xizang/e4ea88b8-5470-456e-bf97-75cf47f38e84.jpg";
try {
// 5. 下载文件并获取输入流
InputStream inputStream = cosClient.getObject("xzgttest-1305134071", key).getObjectContent();
+
// 6. 处理输入流，例如读取内容或保存到本地文件
// 这里仅作示例，实际应用中需要根据需求处理输入流
byte[] buffer = new byte[1024];
int len;
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
while ((len = inputStream.read(buffer)) != -1) {
// 处理读取到的数据
System.out.write(buffer, 0, len);
}
- System.err.println(buffer);
} catch (Exception e) {
e.printStackTrace();
} finally {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TContractMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TContractMapper.java
index c1e5ef6..8c24731 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TContractMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TContractMapper.java
@@ -18,5 +18,5 @@
*/
public interface TContractMapper extends BaseMapper<TContract> {
- List<TContract> contractList(@Param("req") TContractQuery query, @Param("pageInfo") PageInfo<TContract> pageInfo);
+ List<TContract> contractList(@Param("query") TContractQuery query, @Param("pageInfo") PageInfo<TContract> pageInfo);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
index 6de4952..4b73a95 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TContract.java
@@ -61,7 +61,7 @@
@TableField("deposit")
private BigDecimal deposit;
- @ApiModelProperty(value = "租金支付方式 1=季付")
+ @ApiModelProperty(value = "租金支付方式 1=月付 2=季付 3=年付")
@TableField("pay_type")
private Integer payType;
@@ -125,5 +125,11 @@
@ApiModelProperty(value = "状态 1=待提交 2=待审批 3=未签订 4=已签订")
@TableField("status")
private Integer status;
+ @ApiModelProperty(value = "内存大小多个文件逗号拼接")
+ @TableField("memory")
+ private Integer memory;
+ @ApiModelProperty(value = "附件名称 逗号拼接")
+ @TableField("contract_file_name")
+ private Integer contractFileName;
}
--
Gitblit v1.7.1