From 70a29ae28b85643e00a4b7fbf111a95646a24dc2 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 20 Mar 2024 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 46 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java b/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java
index 78092f9..c45a1d9 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java
@@ -64,6 +64,14 @@
}
/**
+ * 门牌地址表（总台账数据） 自定义详情
+ */
+ @GetMapping("/getDetail")
+ public R getDetail(DoorplateAddressVO doorplateAddress) {
+ return R.data(doorplateAddressService.getDetail(doorplateAddress));
+ }
+
+ /**
* 门牌地址表（总台账数据） 分页
*/
@GetMapping("/list")
@@ -200,12 +208,12 @@
}
/**
- * 数据处理
+ * 房屋数据处理
* @return
*/
- @GetMapping("/dataHandle")
- public R dataHandle(){
- return R.data(doorplateAddressService.dataHandle());
+ @GetMapping("/houseDataHandle")
+ public R dataHandle(String townName){
+ return R.data(doorplateAddressService.houseDataHandle(townName));
}
/**
@@ -222,8 +230,40 @@
* @return
*/
@GetMapping("/placeDataHandle")
- public R placeDataHandle(){
- return R.data(doorplateAddressService.placeDataHandle());
+ public R placeDataHandle(String townName){
+ return R.data(doorplateAddressService.placeDataHandle(townName));
+ }
+
+ /**
+ * 社区数据处理
+ * @return
+ */
+ @GetMapping("/communityDataHandle")
+ public R communityDataHandle(){
+ return R.data(doorplateAddressService.communityDataHandle());
+ }
+
+
+ /**
+ * 查询场所标准地址数据
+ * @param doorplateAddressVO
+ * 查询场所标准地址数据
+ * @return
+ */
+ @GetMapping("/getPlaceList")
+ public R getPlaceList(DoorplateAddressVO doorplateAddressVO,Integer size){
+ return R.data(doorplateAddressService.getPlaceList(doorplateAddressVO,size));
+ }
+
+ /**
+ * 通过小区id 查询楼栋编码
+ * @param districtId 门牌地址编号
+ * @return
+ */
+ @GetMapping("/getHouseBuildingCode")
+ public R<List<DoorplateAddressVO>> getHouseBuildingCode(String districtId) {
+ List<DoorplateAddressVO> houseBuildingCode = doorplateAddressService.getHouseBuildingCode(districtId);
+ return R.data(houseBuildingCode);
}
}
--
Gitblit v1.9.3