From 5d5cd3ad979a0b85ab8c7034dcad1663fdcf71be Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 01 Dec 2023 14:18:53 +0800
Subject: [PATCH] 文章通过范围查询
---
src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java | 100 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 98 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..78092f9 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,103 @@
/**
* 根据角色获取功能集合数据
+ * @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);
+ }
+
+ /**
+ * 获取房屋树--数据有问题暂时不用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("/dataHandle")
+ public R dataHandle(){
+ return R.data(doorplateAddressService.dataHandle());
+ }
+
+ /**
+ * 小区数据处理
+ * @return
+ */
+ @GetMapping("/aoiDataHandle")
+ public R aoiDataHandle(){
+ return R.data(doorplateAddressService.aoiDataHandle());
+ }
+
+ /**
+ * 场所数据处理
+ * @return
+ */
+ @GetMapping("/placeDataHandle")
+ public R placeDataHandle(){
+ return R.data(doorplateAddressService.placeDataHandle());
+ }
}
--
Gitblit v1.9.3