Merge remote-tracking branch 'origin/master'

lin

2024-03-14 c4e2c196aad8af656d94bc47e9f1a80bc504b5d7

 src/main/java/org/springblade/modules/grid/mapper/GridMapper.java

@@ -45,14 +45,17 @@
    * @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
@@ -64,7 +67,7 @@
   /**
    * 空间分析 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);
}