From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THouseController.java | 45 +++++++++++++++++++++++++++++++--------------
1 files changed, 31 insertions(+), 14 deletions(-)
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..f126710 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,22 +3,31 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.constant.DictConstants;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.system.dto.THouseDTO;
import com.ruoyi.system.dto.TTenantDTO;
+import com.ruoyi.system.model.TContract;
import com.ruoyi.system.model.THouse;
import com.ruoyi.system.model.TTenant;
import com.ruoyi.system.query.THouseQuery;
import com.ruoyi.system.query.TTenantQuery;
import com.ruoyi.system.query.TUserHistoryQuery;
+import com.ruoyi.system.service.TContractService;
import com.ruoyi.system.service.THouseService;
import com.ruoyi.system.vo.HouseVO;
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.security.access.prepost.PreInvocationAuthorizationAdviceVoter;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
/**
* <p>
@@ -37,36 +46,44 @@
@Log(title = "房屋基础信息管理-新增房屋", businessType = BusinessType.INSERT)
@ApiOperation(value = "新增房屋")
@PostMapping(value = "/addHouse")
- public AjaxResult<Boolean> addHouse(@Validated @RequestBody THouseDTO dto) {
- return AjaxResult.success(tHouseService.save(dto));
+ @PreAuthorize("@ss.hasPermi('house:list:add')")
+ 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));
+ @PreAuthorize("@ss.hasPermi('house:list:edit')")
+ 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));
+ @PreAuthorize("@ss.hasPermi('house:list:detail')")
+ public R<THouse> getHouseById(@RequestParam String id) {
+ THouse tHouse = tHouseService.getById(id);
+// tHouse.setLeaseStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_LEASE_STATUS,tHouse.getLeaseStatus()));
+// tHouse.setBusinessAttributes(DictUtils.getDictLabel(DictConstants.DICT_TYPE_BUSINESS_ATTRIBUTES,tHouse.getBusinessAttributes()));
+ return R.ok(tHouse);
}
@Log(title = "房屋基础信息管理-删除房屋", businessType = BusinessType.DELETE)
@ApiOperation(value = "删除房屋")
@DeleteMapping(value = "/deleteHouseById")
- public AjaxResult<Boolean> deleteHouseById(@RequestParam Long id) {
- return AjaxResult.success(tHouseService.removeById(id));
+ @PreAuthorize("@ss.hasPermi('house:list:delete')")
+
+ public R<Boolean> deleteHouseById(@RequestParam String 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));
+ @PreAuthorize("@ss.hasPermi('house:list')")
+ 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));
}
}
--
Gitblit v1.7.1