Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-07-05 2dcf4b9d75cc1b6613aea59cec4a0f9cc97f1c0e

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java

@@ -5,7 +5,13 @@
import com.panzhihua.common.model.dtos.community.ComMngPopulationTagCardNoDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
import com.panzhihua.common.model.dtos.grid.AddComMngHousePopulationDTO;
import com.panzhihua.common.model.dtos.grid.PageComMngPopulationDTO;
import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationExportDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationSubordinateDTO;
import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngPopulationServeExcelVO;
@@ -205,13 +211,87 @@
     */
    R screenStatistic(Long communityId);

    /**
     * 获取社区网格
     *
     * @param communityId 社区id
     * @return 网格数据
     */
    R getScreenGirds(Long communityId);

    /**
     * 事件大屏查询事件详情
     *
     * @param eventDetailDTO 请求参数
     * @return 事件详情
     */
    R getScreenEventDetail(BigScreenEventDetailDTO eventDetailDTO);

    /**
     * 获取人口数据信息
     *
     * @param populationListDTO 请求参数
     * @return 人口数据
     */
    R pagePopulationListApp(PagePopulationListDTO populationListDTO);

    /**
     * 根据人口id获取人口详情
     *
     * @param populationId  人口id
     * @return  人口详情
     */
    R getPopulationDetailApp(Long populationId);

    /**
     * 修复人口加密问题
     *
     * @return 修复结果
     */
    R getPopulationRepairByApp();

    /**
     * 综治后台-居民列表
     * @param populationListDTO 请求参数
     * @return  居民列表
     */
    R getGridPopulationAdminList(ComMngPopulationListDTO populationListDTO);

    /**
     * 综治后台-删除居民
     * @param ids   居民id集合
     * @return  删除结果
     */
    R delGridPopulationAdmin(List<Long> ids);

    /**
     * 查询平台人口列表
     * @param populationDTO 请求参数
     * @return  人口列表
     */
    R getBuildingHousePopulationList(PageComMngPopulationDTO populationDTO);

    R binding();

    /**
     * 综治后台-居民标签栏统计
     * @return  居民统计
     */
    R getGridPopulationStatistics(Long communityId);

    /**
     * 综治后台-居民导出查询居民数据
     * @param populationExportDTO   请求参数
     * @return  导出结果
     */
    R getGridPopulationExport(ComMngPopulationExportDTO populationExportDTO);

    /**
     * 综治后台-居民管理小区列表
     * @param name  小区名字
     * @return  小区列表
     */
    R relationVillage(String name);

    R getVillagePopulationAdmin(PageComMngVillagePopulationDTO villagePopulationDTO);
}