From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/controller/HouseController.java | 83 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 81 insertions(+), 2 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 20c41f1..1623399 100644
--- a/src/main/java/org/springblade/modules/house/controller/HouseController.java
+++ b/src/main/java/org/springblade/modules/house/controller/HouseController.java
@@ -106,6 +106,28 @@
}
/**
+ * 房屋标签统计
+ */
+ @GetMapping("/labelStatistics")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "房屋标签统计")
+ public R labelStatistics(HouseVO house) {
+ List<Map<String, Object>> pages = houseService.labelStatistics( house);
+ return R.data(pages);
+ }
+
+ /**
+ * 房屋标签区域统计
+ */
+ @GetMapping("/labelCommunityStatistics")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "房屋标签区域统计")
+ public R labelCommunityStatistics(HouseVO house) {
+ List<Map<String, Object>> pages = houseService.labelCommunityStatistics( house);
+ return R.data(pages);
+ }
+
+ /**
* 房屋 新增
*/
@PostMapping("/save")
@@ -205,9 +227,66 @@
@RequestParam("roleType") String roleType,
@RequestParam(value = "aoiCode", required = false) String aoiCode,
@RequestParam(value = "buildingCode", required = false) String buildingCode,
- @RequestParam(value = "uniCode", required = false) String uniCode) {
- Map<String, Object> result = houseService.getHouseStatistics(code, roleType,aoiCode,buildingCode,uniCode);
+ @RequestParam(value = "unitCode", required = false) String unitCode) {
+ Map<String, Object> result = houseService.getHouseStatistics(code, roleType, aoiCode, buildingCode, unitCode);
return R.data(result);
}
+ /**
+ * 通过小区id查询小区的栋
+ *
+ * @param districtCode
+ * @return
+ */
+ @GetMapping("/getHouseBuilding")
+ @ApiOperation(value = "通过小区id查询小区的栋", notes = "传入小区id")
+ public R<List<String>> getHouseBuilding(@RequestParam("districtCode") String districtCode) {
+ List<String> detail = houseService.getHouseBuilding(districtCode);
+ return R.data(detail);
+ }
+
+ /**
+ * 通过小区id查询小区的单元
+ *
+ * @param districtCode
+ * @return
+ */
+ @GetMapping("/getHouseUnit")
+ @ApiOperation(value = "通过小区id查询小区的单元", notes = "传入小区id")
+ public R<List<String>> getHouseUnit(@RequestParam("districtCode") String districtCode, @RequestParam("building") String building) {
+ List<String> detail = houseService.getHouseUnit(districtCode, building);
+ return R.data(detail);
+ }
+
+ /**
+ * 房屋网格处理
+ * @return
+ */
+ @GetMapping("/houseGridHandle")
+ @ApiOperation(value = "房屋网格处理")
+ public R houseGridHandle() {
+ return R.data(houseService.houseGridHandle());
+ }
+
+ /**
+ * 房屋警格处理
+ * @return
+ */
+ @GetMapping("/houseJwGridHandle")
+ @ApiOperation(value = "房屋警格处理")
+ public R houseJwGridHandle() {
+ return R.data(houseService.houseJwGridHandle());
+ }
+
+
+ /**
+ * 房屋画像统计-按房屋标签统计
+ * @return
+ */
+ @GetMapping("/getHouseLabelStatistic")
+ @ApiOperation(value = "房屋画像统计")
+ public R getHouseLabelStatistic(HouseVO house) {
+ return R.data(houseService.getHouseLabelStatistic(house));
+ }
+
}
--
Gitblit v1.9.3