Merge remote-tracking branch 'origin/master'

lin

2024-03-25 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4

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

@@ -16,14 +16,14 @@
 */
package org.springblade.modules.house.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springblade.modules.house.entity.HouseEntity;
import org.springblade.modules.house.excel.HouseAndHoldExcel;
import org.springblade.modules.house.excel.HouseExcel;
import org.springblade.modules.house.vo.HouseParam;
import org.springblade.modules.house.vo.HouseTree;
import org.springblade.modules.house.vo.HouseVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.modules.house.excel.HouseExcel;

import java.util.List;
import java.util.Map;
@@ -47,35 +47,66 @@

   /**
    * 房屋自定义详情查询
    *
    * @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
    */
    List<HouseTree> getHouseTree(HouseParam houseParam);
   List<HouseTree> getHouseTree(HouseParam houseParam);

   /**
    * 人房数据导入
    *
    * @param data
    * @param isCovered
    */
   void importHouseAndHold(List<HouseAndHoldExcel> data, Boolean isCovered);

    Map<String, Object> getHouseStatistics(String code, String roleType);
   Map<String, Object> getHouseStatistics(String code, String roleType, String aoiCode, String buildingCode, String unitCode);

   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);
}