Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

 src/main/java/org/springblade/modules/house/service/IHouseService.java

@@ -47,24 +47,27 @@

   /**
    * 房屋自定义详情查询
    *
    * @param house
    * @return
    */
    HouseVO getHouseDetail(HouseVO house);
   HouseVO getHouseDetail(HouseVO house);

   /**
    * 房屋自定义新增或修改
    *
    * @param house
    * @return
    */
   boolean saveOrUpdateHouse(HouseEntity house);

    void importUserHouse(List<HouseExcel> data, Boolean isCovered);
   void importUserHouse(List<HouseExcel> data, Boolean isCovered);

   List<HouseExcel> export(HouseVO household);

   /**
    * 查询房屋树
    *
    * @param houseParam
    * @return
    */
@@ -83,4 +86,27 @@
   List<String> getHouseBuilding(String districtCode);

   List<String> getHouseUnit(String districtCode, String building);

   List<Map<String, Object>> labelStatistics(HouseVO house);

   List<Map<String, Object>> labelCommunityStatistics(HouseVO house);

   /**
    * 房屋网格处理
    * @return
    */
    Object houseGridHandle();

   /**
    * 房屋警格处理
    * @return
    */
   Object houseJwGridHandle();

   /**
    * 房屋画像统计-按房屋标签统计
    * @param house
    * @return
    */
   List<Map<String,Object>> getHouseLabelStatistic(HouseVO house);
}