From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/grid/mapper/GridMapper.java | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.java b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.java
index c7a51c7..fba8db9 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.java
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.java
@@ -45,26 +45,29 @@
* @param grid
* @return
*/
- List<GridVO> selectGridPage(IPage page,@Param("grid") GridVO grid);
+ List<GridVO> selectGridPage(IPage page,
+ @Param("grid") GridVO grid,
+ @Param("regionChildCodesList") List<String> regionChildCodesList,
+ @Param("isAdministrator") Integer isAdministrator);
/**
* 根据地址编号查询网格数据
* @param houseCode
* @return
*/
- GridVO getGridDetailByHouseCode(@Param("houseCode") String houseCode);
+ GridVO getPlaceGridDetailByHouseCode(@Param("houseCode") String houseCode);
/**
* 根据用户id(网格员)查询对应的房屋地址code
* @param userId
* @return
*/
- List<String> getAddressCodeListByUserId(@Param("userId") Long userId);
+ List<String> getAddressCodeListByUserId(@Param("userId") Long userId,@Param("addressCode") String addressCode);
/**
* 空间分析 mysql 5.7 点落面
*/
- GridEntity spatialAnalysis(@Param("point")String point);
+ List<GridEntity> spatialAnalysis(@Param("point")String point);
/**
* 根据参数查询网格数据
@@ -103,4 +106,34 @@
* @return
*/
List<GridEntity> getGridList(@Param("grid") GridVO grid);
+
+ /**
+ * 查询小区网格绑定
+ * @param aoiCode 小区aoiCode
+ * @return
+ */
+ List<GridVO> getGridListByAoiCode(@Param("aoiCode") String aoiCode);
+
+ /**
+ * 查询对应网格人对应的网格
+ * @param userId
+ * @return
+ */
+ GridEntity getGridByUserId(@Param("userId") Long userId);
+
+ /**
+ * 根据网格名称，社区名称查询对应的网格
+ * @param gridName
+ * @param communityName
+ * @return
+ */
+ GridEntity getGridByNames(@Param("gridName") String gridName,
+ @Param("communityName") String communityName);
+
+ /**
+ * 查询用户对应的网格
+ * @param userId
+ * @return
+ */
+ List<String> getGridListByUserId(@Param("userId") String userId);
}
--
Gitblit v1.9.3