From bc670e87f764e250a54b1687dedbe0df135b411f Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 17 Nov 2023 14:12:08 +0800
Subject: [PATCH] 房屋树查询新增，房屋，住户，租赁查询修改
---
src/main/java/org/springblade/modules/house/controller/HouseController.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/controller/HouseController.java b/src/main/java/org/springblade/modules/house/controller/HouseController.java
index e75ff4b..be0e434 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseController.java
@@ -26,15 +26,16 @@
import javax.validation.Valid;
import org.springblade.core.excel.util.ExcelUtil;
-import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
-import org.springblade.modules.house.vo.HouseholdVO;
-import org.springblade.modules.system.excel.HouseExcel;
-import org.springblade.modules.system.excel.HouseHoldExcel;
+import org.springblade.modules.house.excel.HouseImporter;
+import org.springblade.modules.house.vo.HouseParam;
+import org.springblade.modules.house.excel.HouseExcel;
+import org.springblade.modules.system.excel.UserExcel;
+import org.springblade.modules.system.excel.UserImporter;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.house.entity.HouseEntity;
@@ -42,6 +43,7 @@
import org.springblade.modules.house.wrapper.HouseWrapper;
import org.springblade.modules.house.service.IHouseService;
import org.springblade.core.boot.ctrl.BladeController;
+import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -157,15 +159,35 @@
/**
- * 导出用户
+ * 导出房屋
*/
@GetMapping("export-house")
@ApiOperationSupport(order = 13)
@ApiOperation(value = "导出房屋", notes = "传入user")
- public void exportUser(HouseVO household, HttpServletResponse response) {
+ public void exportHouse(HouseVO household, HttpServletResponse response) {
List<HouseExcel> list = houseService.export(household);
ExcelUtil.export(response, "房屋数据" + DateUtil.time(), "房屋数据表", list, HouseExcel.class);
}
+ /**
+ * 导入房屋
+ */
+ @GetMapping("import-house")
+ public R importHouse(MultipartFile file, Integer isCovered) {
+ HouseImporter houseImporter = new HouseImporter(houseService, isCovered == 1);
+ ExcelUtil.save(file, houseImporter, HouseExcel.class);
+ return R.success("操作成功");
+ }
+
+ /**
+ * 查询房屋树
+ * @param houseParam
+ * @return
+ */
+ @GetMapping("/getHouseTree")
+ public R getHouseTree(HouseParam houseParam) {
+ return R.data(houseService.getHouseTree(houseParam));
+ }
+
}
--
Gitblit v1.9.3