Merge branch 'txb'

tangxiaobao

2021-08-13 8a6375edade9f1edc194a0381369fe94e56c13c7

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -19,6 +19,7 @@
import com.panzhihua.common.model.dtos.community.integral.admin.EditComActIntegralRuleDTO;
import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralRuleDTO;
import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralTradeDTO;
import com.panzhihua.common.model.dtos.community.switchs.SearchCommunityDTO;
import com.panzhihua.common.model.dtos.community.wallet.*;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
@@ -1731,6 +1732,76 @@
     */
    @PostMapping("/common/data/population/importMajor")
    R listSavePopulationMajorExcelVO(@RequestBody List<ComMngPopulationMajorExcelVO> list, @RequestParam(value = "communityId") Long communityId);

    /**
     * 批量导入邪教人员
     *
     * @param list        邪教人员数据
     * @param communityId 社区id
     * @return 导入结果
     */
    @PostMapping("/common/data/population/importCult")
    R listSavePopulationCultExcelVO(@RequestBody List<ComMngPopulationCultExcelVO> list, @RequestParam(value = "communityId") Long communityId);

    /**
     * 批量导入刑释人员
     *
     * @param list        刑释人员数据
     * @param communityId 社区id
     * @return 导入结果
     */
    @PostMapping("/common/data/population/importRehabilitation")
    R listSavePopulationRehabilitationExcelVO(@RequestBody List<ComMngPopulationRehabilitationExcelVO> list, @RequestParam(value = "communityId") Long communityId);

    /**
     * 批量导入重点上访人员
     *
     * @param list        重点上访人员数据
     * @param communityId 社区id
     * @return 导入结果
     */
    @PostMapping("/common/data/population/importKey")
    R listSavePopulationKeyExcelVO(@RequestBody List<ComMngPopulationKeyExcelVO> list, @RequestParam(value = "communityId") Long communityId);

    /**
     * 批量导入服刑人员
     *
     * @param list        服刑人员数据
     * @param communityId 社区id
     * @return 导入结果
     */
    @PostMapping("/common/data/population/importSentence")
    R listSavePopulationSentenceExcelVO(@RequestBody List<ComMngPopulationSentenceExcelVO> list, @RequestParam(value = "communityId") Long communityId);

    /**
     * 批量导入退役军人
     *
     * @param list        退役军人数据
     * @param communityId 社区id
     * @return 导入结果
     */
    @PostMapping("/common/data/population/importVeterans")
    R listSavePopulationVeteransExcelVO(@RequestBody List<ComMngPopulationVeteransExcelVO> list, @RequestParam(value = "communityId") Long communityId);

    /**
     * 批量导入残疾人
     *
     * @param list        残疾人数据
     * @param communityId 社区id
     * @return 导入结果
     */
    @PostMapping("/common/data/population/importDisability")
    R listSavePopulationDisabilityExcelVO(@RequestBody List<ComMngPopulationDisabilityExcelVO> list, @RequestParam(value = "communityId") Long communityId);

    /**
     * 批量导入低保户
     *
     * @param list        低保户数据
     * @param communityId 社区id
     * @return 导入结果
     */
    @PostMapping("/common/data/population/importLowSecurity")
    R listSavePopulationLowSecurityExcelVO(@RequestBody List<ComMngPopulationLowSecurityExcelVO> list, @RequestParam(value = "communityId") Long communityId);

    /**
     * 确认导入实有人口（有则更新，无则新建）
@@ -4064,4 +4135,33 @@
    @PostMapping("/patrolRecord/rota/import")
    R listSaveSwRotaExcelVO(@RequestBody List<ComSwRotaExcelVO> list, @RequestParam("communityId") Long communityId);

    /**
     * 定时任务检测即将开始的社区活动，并使用订阅消息通知用户
     */
    @PostMapping("timedTaskActivityNotice")
    R timedTaskActivityNotice();

    /**
     * 查询社区所有列表
     * @return  社区列表
     */
    @GetMapping("/switch/community/all/list")
    R communitySwitchList();

    /**
     * 根据名字查询所有社区列表
     * @param name  社区名字
     * @return  社区列表
     */
    @GetMapping("/switch/community/search/list")
    R communitySwitchSearchList(@RequestParam(value = "name") String name);

    /**
     * 根据经纬度以及距离搜索附近社区列表
     * @param communityDTO  请求参数
     * @return  社区列表
     */
    @PostMapping("/switch/community/search/distance/list")
    R communitySwitchSearchDistanceList(@RequestBody SearchCommunityDTO communityDTO);

}