From f37e7e5c00cb8196ff978f8eac2aab3fe9465b0d Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 03 Nov 2023 10:04:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 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..4743f59 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,45 @@
/**
* 根据角色获取功能集合数据
+ * @param type 1：查社区 2：查场所 3：查房屋
* @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
+ * @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);
+ }
}
--
Gitblit v1.9.3