Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang i...

zhangmei

2025-02-08 2573f2327a2046ec8545e80e4e56d1ee6c55bfae

 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;
@@ -14,6 +15,7 @@
import com.ruoyi.system.query.TUserHistoryQuery;
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.validation.annotation.Validated;
@@ -27,6 +29,7 @@
 * @author xiaochen
 * @since 2025-01-17
 */
@Api(tags = "房屋基础信息管理")
@RestController
@RequestMapping("/t-house")
public class THouseController {
@@ -35,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 String 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 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));
    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));
    }

}