From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 17:19:12 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/house/controller/HouseController.java | 103 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 95 insertions(+), 8 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 5e10d91..242c92a 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseController.java
@@ -16,25 +16,35 @@
*/
package org.springblade.modules.house.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
-import org.springblade.core.secure.BladeUser;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.excel.util.ExcelUtil;
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.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.house.entity.HouseEntity;
+import org.springblade.modules.house.excel.HouseAndHoldExcel;
+import org.springblade.modules.house.excel.HouseAndHoldImporter;
+import org.springblade.modules.house.excel.HouseExcel;
+import org.springblade.modules.house.excel.HouseImporter;
+import org.springblade.modules.house.service.IHouseService;
+import org.springblade.modules.house.vo.HouseParam;
import org.springblade.modules.house.vo.HouseVO;
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.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
/**
* 房屋 控制器
@@ -60,6 +70,19 @@
HouseEntity detail = houseService.getOne(Condition.getQueryWrapper(house));
return R.data(HouseWrapper.build().entityVO(detail));
}
+
+ /**
+ * 房屋自定义详情查询
+ * @param house
+ * @return
+ */
+ @GetMapping("/getHouseDetail")
+ @ApiOperation(value = "房屋自定义详情查询", notes = "传入house")
+ public R<HouseVO> getHouseDetail(HouseVO house) {
+ HouseVO detail = houseService.getHouseDetail(house);
+ return R.data(detail);
+ }
+
/**
* 房屋 分页
*/
@@ -113,6 +136,17 @@
}
/**
+ * 房屋自定义新增或修改
+ * @param house
+ * @return
+ */
+ @PostMapping("/saveOrUpdateHouse")
+ @ApiOperation(value = "新增或修改", notes = "传入house")
+ public R saveOrUpdateHouse(@RequestBody HouseEntity house) {
+ return R.status(houseService.saveOrUpdateHouse(house));
+ }
+
+ /**
* 房屋 删除
*/
@PostMapping("/remove")
@@ -123,4 +157,57 @@
}
+ /**
+ * 导出房屋
+ */
+ @GetMapping("export-house")
+ @ApiOperationSupport(order = 13)
+ @ApiOperation(value = "导出房屋", notes = "传入user")
+ public void exportHouse(HouseVO household, HttpServletResponse response) {
+ List<HouseExcel> list = houseService.export(household);
+ ExcelUtil.export(response, "房屋数据" + DateUtil.time(), "房屋数据表", list, HouseExcel.class);
+ }
+
+ /**
+ * 导入房屋
+ */
+ @PostMapping("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));
+ }
+
+
+ /**
+ * 导入房屋及住户/租户人员数据
+ */
+ @PostMapping("import-houseAndHold")
+ public R importHouseAndHold(MultipartFile file, Integer isCovered) {
+ HouseAndHoldImporter houseImporter = new HouseAndHoldImporter(houseService, isCovered == 1);
+ ExcelUtil.save(file, houseImporter, HouseAndHoldExcel.class);
+ return R.success("操作成功");
+ }
+
+
+ @GetMapping("getHouseStatistics")
+ public R getHouseStatistics(@RequestParam("code") String code,
+ @RequestParam("roleType") String roleType,
+ @RequestParam(value = "aoiCode", required = false) String aoiCode,
+ @RequestParam(value = "buildingCode", required = false) String buildingCode,
+ @RequestParam(value = "unitCode", required = false) String unitCode) {
+ Map<String, Object> result = houseService.getHouseStatistics(code, roleType,aoiCode,buildingCode,unitCode);
+ return R.data(result);
+ }
+
}
--
Gitblit v1.9.3