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-applet/src/main/java/com/ruoyi/web/controller/api/THouseController.java | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/THouseController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/THouseController.java
new file mode 100644
index 0000000..2942d5e
--- /dev/null
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/THouseController.java
@@ -0,0 +1,43 @@
+package com.ruoyi.web.controller.api;
+
+
+import com.ruoyi.common.constant.DictConstants;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.utils.DictUtils;
+import com.ruoyi.system.model.THouse;
+import com.ruoyi.system.service.THouseService;
+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.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 房屋管理 前端控制器
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-01-17
+ */
+@Api(tags = "房屋管理")
+@RestController
+@RequestMapping("/t-house")
+public class THouseController {
+ @Autowired
+ private THouseService tHouseService;
+ @ApiOperation(value = "查询房屋信息")
+ @GetMapping(value = "/getHouseById")
+ 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);
+ }
+
+}
+
--
Gitblit v1.7.1