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/service/IGridService.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/grid/service/IGridService.java b/src/main/java/org/springblade/modules/grid/service/IGridService.java
index 8309dfa..c116ad2 100644
--- a/src/main/java/org/springblade/modules/grid/service/IGridService.java
+++ b/src/main/java/org/springblade/modules/grid/service/IGridService.java
@@ -17,6 +17,7 @@
package org.springblade.modules.grid.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity;
import org.springblade.modules.grid.entity.GridEntity;
import org.springblade.modules.grid.excel.GridExcel;
import org.springblade.modules.grid.excel.GridmanExcel;
@@ -56,19 +57,25 @@
* @param houseCode
* @return
*/
- GridVO getGridDetailByHouseCode(String houseCode);
+ GridVO getPlaceGridDetailByHouseCode(String houseCode);
/**
* 根据用户id(网格员)查询对应的房屋地址code
* @param userId
+ * @param addressCode 地址编码
* @return
*/
- List<String> getAddressCodeListByUserId(Long userId);
+ List<String> getAddressCodeListByUserId(Long userId,String addressCode);
/**
* 空间分析
*/
- Object spatialAnalysis();
+ Object spatialAnalysis(DoorplateAddressEntity addressEntity);
+
+ /**
+ * 空间分析
+ */
+ List<GridEntity> spatialAnalysis(String point);
/**
* 根据参数查询网格数据
@@ -102,4 +109,40 @@
Object getGridTree(GridVO grid);
Object gridInfoByHouseCode(String houseCode);
+
+ /**
+ * 网格集合查询
+ * @param grid
+ * @return
+ */
+ Object getGridList(GridVO grid);
+
+ /**
+ * 查询小区网格绑定
+ * @param aoiCode 小区aoiCode
+ * @return
+ */
+ List<GridVO> getGridListByAoiCode(String aoiCode);
+
+ /**
+ * 查询对应网格人对应的网格
+ * @param userId
+ * @return
+ */
+ GridEntity getGridByUserId(Long userId);
+
+ /**
+ * 根据网格名称，社区名称查询对应的网格
+ * @param gridName
+ * @param communityName
+ * @return
+ */
+ GridEntity getGridByNames(String gridName, String communityName);
+
+ /**
+ * 查询用户对应的网格编号集合
+ * @param userId
+ * @return
+ */
+ List<String> getGridListByUserId(Long userId);
}
--
Gitblit v1.9.3