From 8d8c7da4e91028fc877f101dcd244bef3e18c197 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sun, 12 Nov 2023 07:34:21 +0800
Subject: [PATCH] 标签报事+通知公告

---
 src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java |   63 ++++++++++++++++++++++++++++++-
 1 files changed, 61 insertions(+), 2 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 9bf3a2c..a40ff3f 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;
+
 /*
  * 门牌地址表(总台账数据) 控制器
  *
@@ -121,13 +127,66 @@
 
 	/**
 	 * 根据角色获取功能集合数据
+	 * @param type 1:查社区  2:查房屋和场所(居民角色)
 	 * @param roleName
 	 * @return
 	 */
 	@GetMapping("/getFuncList")
-	public R getFuncList(String roleName) {
-		return R.data(doorplateAddressService.getFuncList(roleName));
+	public R getFuncList(Integer type,String roleName) {
+		return R.data(doorplateAddressService.getFuncList(type,roleName));
 	}
 
+	/**
+	 * 获取楼盘相关集合数据
+	 * @param houseParam
+	 * @return
+	 */
+	@GetMapping("/getHousesList")
+	public R getHousesList(HouseParam houseParam) {
+		return R.data(doorplateAddressService.getHousesList(houseParam));
+	}
+
+	/**
+	 * 查询房屋及出租详情信息
+	 * @param code 门牌地址编号
+	 * @return
+	 */
+	@GetMapping("/getHouseRentInfo")
+	public R getHouseRentInfo(String code) {
+		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);
+	}
+
+	/**
+	 * 根据参数获取地址详情
+	 * @return
+	 */
+	@GetMapping("/getDoorplateAddressDetail")
+	public R getDoorplateAddressDetail(DoorplateAddressVO doorplateAddressVO){
+		DoorplateAddressVO detail = doorplateAddressService.getDoorplateAddressDetail(doorplateAddressVO);
+		return R.data(detail);
+	}
 
 }

--
Gitblit v1.9.3