From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 17:19:12 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.java | 122 +++++++++++++++++++++++++++++++++-------
1 files changed, 101 insertions(+), 21 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 862b178..b18d802 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.java
@@ -19,15 +19,17 @@
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;
import org.springblade.modules.doorplateAddress.vo.FuncNode;
+import org.springblade.modules.house.vo.HouseParam;
import java.util.List;
+import java.util.Map;
/**
* 门牌地址表（总台账数据） Mapper 接口
@@ -49,40 +51,48 @@
/**
- * 查询区域数据
+ * 查询街道数据
* @return
*/
- List<TreeNode> getRegionListByGroupTwon();
+ List<TreeStringNode> getRegionListByGroupTwon(@Param("houseParam") HouseParam houseParam,
+ @Param("list") List<String> list,
+ @Param("communityList") List<String> communityList);
/**
- * 查询区域数据
+ * 查询社区数据
* @return
*/
- List<TreeNode> getRegionListByGroupNei();
+ List<TreeStringNode> getRegionListByGroupNei(@Param("houseParam") HouseParam houseParam,
+ @Param("list") List<String> list,
+ @Param("communityList") List<String> communityList);
/**
* 根据社区名称查询小区集合
- * @param name
- * @param code
+ * @param houseParam
+ * @param list
* @return
*/
- List<TreeNode> getDistrictList(@Param("name") String name,@Param("code") String code);
+ List<TreeStringNode> getDistrictList(@Param("houseParam") HouseParam houseParam,
+ @Param("list") List<String> list,
+ @Param("communityList") List<String> communityList);
/**
* 根据社区名称查询楼栋集合
- * @param name
- * @param code
+ * @param houseParam
+ * @param list
* @return
*/
- List<TreeNode> getBuildingList(@Param("name") String name,@Param("code") String code);
+ List<TreeStringNode> getBuildingList(@Param("houseParam") HouseParam houseParam,
+ @Param("list") List<String> list);
/**
* 查询户室及住户相关信息，单元中包含住户
- * @param name
- * @param code
+ * @param houseParam
+ * @param list
* @return
*/
- List<FuncNode> getUnitHouseholdList(@Param("name") String name, @Param("code") String code);
+ List<FuncNode> getUnitHouseholdList(@Param("houseParam") HouseParam houseParam,
+ @Param("list") List<String> list);
/**
* 先查询门牌信息
@@ -104,19 +114,21 @@
/**
* 查询街路巷
- * @param name
- * @param code
+ * @param houseParam
+ * @param list
* @return
*/
- List<TreeNode> getStreetRuList(@Param("name") String name,@Param("code") String code);
+ List<TreeStringNode> getStreetRuList(@Param("houseParam") HouseParam houseParam,
+ @Param("list") List<String> list);
/**
* 根据街路巷编号查询街路巷门牌名称集合
- * @param name 该处当社区编号用
- * @param code 街路巷编号
+ * @param houseParam name/code 该处当社区编号用/ 街路巷编号
+ * @param list
* @return
*/
- List<FuncNode> getDoorplateNameList(@Param("name") String name,@Param("code") String code);
+ List<FuncNode> getDoorplateNameList(@Param("houseParam") HouseParam houseParam,
+ @Param("list") List<String> list);
/**
* 根据参数获取地址详情
@@ -132,4 +144,72 @@
* @return
*/
DoorplateAddressVO getDoorplateAddressList(@Param("vo") DoorplateAddressVO doorplateAddressVO);
+
+ /**
+ * 查询社区信息
+ * @param name
+ * @return
+ */
+ List<DoorplateAddressEntity> getAllDoorplateAddress(@Param("name") String name);
+
+ /**
+ * 获取房屋树
+ * @param houseParam
+ * @param list
+ * @return
+ */
+ @MapKey("code")
+ Map<String, DoorplateAddressVOTree> getHouseTree(@Param("houseParam") HouseParam houseParam,
+ @Param("list") List<String> list);
+ /**
+ * 查询所有户室数据
+ * @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