Merge remote-tracking branch 'origin/master'

lin

2024-03-20 70a29ae28b85643e00a4b7fbf111a95646a24dc2

 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;
@@ -68,7 +69,12 @@
   /**
    * 空间分析
    */
   Object spatialAnalysis();
   Object spatialAnalysis(DoorplateAddressEntity addressEntity);

   /**
    * 空间分析
    */
   List<GridEntity> spatialAnalysis(String point);

   /**
    * 根据参数查询网格数据
@@ -131,4 +137,11 @@
    * @return
    */
    GridEntity getGridByNames(String gridName, String communityName);

   /**
    * 查询用户对应的网格编号集合
    * @param userId
    * @return
    */
   List<String> getGridListByUserId(Long userId);
}