From 224e0bbfc8d24785fea2e0160c36d7a8f6cd7269 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 21 Dec 2023 14:17:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.java | 69 ++++++++++++++++++++++++++++------
1 files changed, 57 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.java b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.java
index 079f930..68474a8 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.java
@@ -19,10 +19,9 @@
import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import liquibase.pro.packaged.P;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Param;
-import org.springblade.common.node.TreeNode;
+import org.springblade.common.node.TreeStringNode;
import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVOTree;
import org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO;
@@ -55,15 +54,15 @@
* 查询街道数据
* @return
*/
- List<TreeNode> getRegionListByGroupTwon(@Param("houseParam") HouseParam houseParam,
- @Param("list") List<String> list);
+ List<TreeStringNode> getRegionListByGroupTwon(@Param("houseParam") HouseParam houseParam,
+ @Param("list") List<String> list);
/**
* 查询社区数据
* @return
*/
- List<TreeNode> getRegionListByGroupNei(@Param("houseParam") HouseParam houseParam,
- @Param("list") List<String> list);
+ List<TreeStringNode> getRegionListByGroupNei(@Param("houseParam") HouseParam houseParam,
+ @Param("list") List<String> list);
/**
* 根据社区名称查询小区集合
@@ -71,8 +70,8 @@
* @param list
* @return
*/
- List<TreeNode> getDistrictList(@Param("houseParam") HouseParam houseParam,
- @Param("list") List<String> list);
+ List<TreeStringNode> getDistrictList(@Param("houseParam") HouseParam houseParam,
+ @Param("list") List<String> list);
/**
* 根据社区名称查询楼栋集合
@@ -80,8 +79,8 @@
* @param list
* @return
*/
- List<TreeNode> getBuildingList(@Param("houseParam") HouseParam houseParam,
- @Param("list") List<String> list);
+ List<TreeStringNode> getBuildingList(@Param("houseParam") HouseParam houseParam,
+ @Param("list") List<String> list);
/**
* 查询户室及住户相关信息，单元中包含住户
@@ -116,8 +115,8 @@
* @param list
* @return
*/
- List<TreeNode> getStreetRuList(@Param("houseParam") HouseParam houseParam,
- @Param("list") List<String> list);
+ List<TreeStringNode> getStreetRuList(@Param("houseParam") HouseParam houseParam,
+ @Param("list") List<String> list);
/**
* 根据街路巷编号查询街路巷门牌名称集合
@@ -164,4 +163,50 @@
* @return
*/
List<DoorplateAddressEntity> getHouseList();
+
+ /**
+ * 查询商超
+ * @param houseParam
+ * @return
+ */
+ List<TreeStringNode> getPlaceRelList(@Param("houseParam") HouseParam houseParam);
+
+ /**
+ * 查询商超详情集合
+ * @param houseParam
+ * @return
+ */
+ List<FuncNode> getPlaceRelDetailList(@Param("houseParam") HouseParam houseParam);
+
+ /**
+ * 查询小区集合
+ * @param list
+ * @return
+ */
+ List<DoorplateAddressEntity> getAoiList(@Param("list") List<Long> list);
+
+ /**
+ * 查询所有的地址表id集合
+ * @return
+ */
+ List<Long> getAoiCodeList();
+
+ /**
+ * 查询所有的地址表和场所表差集集合
+ * @return
+ */
+ List<DoorplateAddressEntity> getPlaceList();
+
+ /**
+ * 查询详情
+ * @param doorplateAddress
+ * @return
+ */
+ DoorplateAddressVO getDoorplateAddressVODetail(@Param("doorplateAddress") DoorplateAddressVO doorplateAddress);
+
+ /**
+ * 查询所有的社区集合信息
+ * @return
+ */
+ List<DoorplateAddressEntity> getAllCommunityList();
}
--
Gitblit v1.9.3