From ad2ec97fe0c60eee4bb7c8cdacff7c876f280ea7 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 08 Jan 2024 11:30:18 +0800
Subject: [PATCH] 公安安全监管
---
src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java | 102 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 96 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 3e5768f..e523a1e 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java
@@ -25,13 +25,19 @@
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.node.ForestNodeMerger;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
import org.springblade.modules.doorplateAddress.service.IDoorplateAddressService;
+import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVOTree;
import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO;
import org.springblade.modules.doorplateAddress.wrapper.DoorplateAddressWrapper;
+import org.springblade.modules.house.vo.HouseParam;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
+
+import java.util.List;
+
/*
* 门牌地址表（总台账数据） 控制器
*
@@ -55,6 +61,14 @@
public R<DoorplateAddressVO> detail(DoorplateAddressEntity doorplateAddress) {
DoorplateAddressEntity detail = doorplateAddressService.getOne(Condition.getQueryWrapper(doorplateAddress));
return R.data(DoorplateAddressWrapper.build().entityVO(detail));
+ }
+
+ /**
+ * 门牌地址表（总台账数据） 自定义详情
+ */
+ @GetMapping("/getDetail")
+ public R getDetail(DoorplateAddressVO doorplateAddress) {
+ return R.data(doorplateAddressService.getDetail(doorplateAddress));
}
/**
@@ -121,7 +135,7 @@
/**
* 根据角色获取功能集合数据
- * @param type
+ * @param type 1：查社区 2:查房屋和场所（居民角色）
* @param roleName
* @return
*/
@@ -132,14 +146,12 @@
/**
* 获取楼盘相关集合数据
- * @param name 名称
- * @param code 编号
- * @param type 类型 1：社区 2：小区 3：楼栋 4：户室
+ * @param houseParam
* @return
*/
@GetMapping("/getHousesList")
- public R getHousesList(String name,String code,Integer type) {
- return R.data(doorplateAddressService.getHousesList(name,code,type));
+ public R getHousesList(HouseParam houseParam) {
+ return R.data(doorplateAddressService.getHousesList(houseParam));
}
/**
@@ -152,5 +164,83 @@
return R.data(doorplateAddressService.getHouseRentInfo(code));
}
+ /**
+ * 判断房屋类型
+ * @param code 门牌地址编号
+ * @return
+ */
+// @GetMapping("/getHouseType")
+// @ApiOperation(value = "通过houseCode判断房屋类型")
+// public R getHouseType(String code) {
+// return R.data(doorplateAddressService.getHouseType(code));
+// }
+
+ /**
+ * 获取门牌地址树集合信息
+ * @param code
+ * @param type
+ * @return
+ */
+ @GetMapping("/getDoorplateAddressList")
+ public R<List<DoorplateAddressVOTree>> getDoorplateAddressList(String code, String type){
+ List<DoorplateAddressVOTree> list = doorplateAddressService.getDoorplateAddressList(code,type);
+ return R.data(list);
+ }
+
+ /**
+ * 获取房屋树--数据有问题暂时不用2023/11/16
+ * @param houseParam
+ * @return
+ */
+ @GetMapping("/getHouseTree")
+ public R getHouseTree(HouseParam houseParam){
+ return R.data(doorplateAddressService.getHouseTree(houseParam));
+ }
+
+ /**
+ * 根据参数获取地址详情
+ * @return
+ */
+ @GetMapping("/getDoorplateAddressDetail")
+ public R getDoorplateAddressDetail(DoorplateAddressVO doorplateAddressVO){
+ DoorplateAddressVO detail = doorplateAddressService.getDoorplateAddressDetail(doorplateAddressVO);
+ return R.data(detail);
+ }
+
+ /**
+ * 房屋数据处理
+ * @return
+ */
+ @GetMapping("/houseDataHandle")
+ public R dataHandle(){
+ return R.data(doorplateAddressService.houseDataHandle());
+ }
+
+ /**
+ * 小区数据处理
+ * @return
+ */
+ @GetMapping("/aoiDataHandle")
+ public R aoiDataHandle(){
+ return R.data(doorplateAddressService.aoiDataHandle());
+ }
+
+ /**
+ * 场所数据处理
+ * @return
+ */
+ @GetMapping("/placeDataHandle")
+ public R placeDataHandle(){
+ return R.data(doorplateAddressService.placeDataHandle());
+ }
+
+ /**
+ * 社区数据处理
+ * @return
+ */
+ @GetMapping("/communityDataHandle")
+ public R communityDataHandle(){
+ return R.data(doorplateAddressService.communityDataHandle());
+ }
}
--
Gitblit v1.9.3