Merge branch 'txb'

tangxiaobao

2021-08-13 8a6375edade9f1edc194a0381369fe94e56c13c7

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

@@ -14,6 +14,12 @@
import com.panzhihua.common.model.dtos.community.easyPhoto.EditEasyPhotoActivityDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityDTO;
import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityUserDTO;
import com.panzhihua.common.model.dtos.community.integral.ComActIntegralCommunityRankDTO;
import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO;
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;
@@ -1696,6 +1702,106 @@
     */
    @PostMapping("/common/data/population/import")
    R listSavePopulationServeExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId);

    /**
     * 批量导入吸毒人员
     *
     * @param list        吸毒人员数据
     * @param communityId 社区id
     * @return 导入结果
     */
    @PostMapping("/common/data/population/importDrug")
    R listSavePopulationDrugExcelVO(@RequestBody List<ComMngPopulationDrugExcelVO> list, @RequestParam(value = "communityId") Long communityId);

    /**
     * 批量导入社区矫正人员
     *
     * @param list        社区矫正人员数据
     * @param communityId 社区id
     * @return 导入结果
     */
    @PostMapping("/common/data/population/importCorrect")
    R listSavePopulationCorrectExcelVO(@RequestBody List<ComMngPopulationCorrectExcelVO> list, @RequestParam(value = "communityId") Long communityId);

    /**
     * 批量导入重精人员
     *
     * @param list        重精人员数据
     * @param communityId 社区id
     * @return 导入结果
     */
    @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);

    /**
     * 确认导入实有人口（有则更新，无则新建）
@@ -3643,9 +3749,8 @@

    /**
     * 社区随手拍列表统计
     *
     * @param communityId 社区id
     * @return 统计结果
     * @param communityId   社区id
     * @return  统计结果
     */
    @GetMapping("/easyphoto/statistics")
    R easyPhotoStatistics(@RequestParam("communityId") Long communityId);
@@ -3819,7 +3924,7 @@
     * @return 安全工作记录详情查询结果
     */
    @GetMapping("/patrolRecord/safetyWorkRecord/detail")
    R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId);
    R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId, @RequestParam(value = "communityId", required = false) Long communityId);

    /**
     * 根据巡查记录id查询安全工作记录详情
@@ -3828,7 +3933,7 @@
     * @return 安全工作记录详情查询结果
     */
    @GetMapping("/patrolRecord/safetyWorkRecord/detailByPrId")
    R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId);
    R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId, @RequestParam(value = "communityId", required = false) Long communityId);

    /**
     * 分页查询隐患报告
@@ -3893,6 +3998,86 @@
    R patrolRecordStatistics(@RequestParam(value = "communityId") Long communityId);

    /**
     * 小程序-查询积分说明
     * @return  积分说明
     */
    @GetMapping("/integral/explain/applets")
    R getIntegralExplainApplets();

    /**
     * 小程序-用户查询当前社区可领取积分规则列表
     * @param userId    用户id
     * @param communityId   社区id
     * @return  可领取积分规则列表
     */
    @PostMapping("/integral/receive/applets")
    R getIntegralReceiveApplets(@RequestParam("userId") Long userId,@RequestParam("communityId") Long communityId);

    /**
     * 小程序-查询用户积分列表
     * @param userId    用户id
     * @return  用户积分列表
     */
    @PostMapping("/integral/user/list/applets")
    R getIntegralUserListApplets(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);

    /**
     * 小程序-查询社区积分账户排行榜
     * @param communityRankDTO  请求参数
     * @return  社区积分账户排行榜
     */
    @PostMapping("/integral/community/rank/applets")
    R getIntegralCommunityRankApplets(@RequestBody ComActIntegralCommunityRankDTO communityRankDTO);

    /**
     * 小程序-查询用户社区积分明细
     * @param communityTradeDTO 请求参数
     * @return  用户社区积分明细
     */
    @PostMapping("/integral/community/trade/applets")
    R getIntegralCommunityTradeApplets(@RequestBody ComActIntegralCommunityRankDTO communityTradeDTO);

    /**
     * 社区后台-根据社区id查询社区下积分规则列表
     * @param integralRuleDTO   请求参数
     * @return  社区下积分规则列表
     */
    @PostMapping("/integral/rule/list/admin")
    R getIntegralRuleAdminList(@RequestBody PageComActIntegralRuleDTO integralRuleDTO);

    /**
     * 社区后台-编辑社区积分规则
     * @param integralRuleDTO   请求参数
     * @return  编辑结果
     */
    @PostMapping("/integral/rule/edit/admin")
    R editIntegralRuleAdmin(@RequestBody EditComActIntegralRuleDTO integralRuleDTO);

    /**
     * 社区后台-分页查询社区下积分明细记录
     * @param integralRuleDTO   请求参数
     * @return  社区下积分明细记录
     */
    @PostMapping("/integral/user/trade/page/admin")
    R getIntegralTradeListAdmin(@RequestBody PageComActIntegralTradeDTO integralRuleDTO);

    /**
     * 给用户添加积分
     * @param integralUserDTO   请求参数
     * @return  添加积分结果
     */
    @PostMapping("/integral/user/add/admin")
    R addIntegralTradeAdmin(@RequestBody AddComActIntegralUserDTO integralUserDTO);

    /**
     * 根据社区活动id查询社区活动报名人员列表
     * @param activityId    活动id
     * @return  社区活动报名人员列表
     */
    @PostMapping("/integral/act/activity/admin")
    R getTaskActivityPeopleList(@RequestParam("activityId") Long activityId);

    /**
     * 分页查询值班表
     *
     * @param comSwRotaPageDTO 查询参数
@@ -3900,6 +4085,14 @@
     */
    @PostMapping("/patrolRecord/rota/page")
    R pageRota(@RequestBody ComSwRotaPageDTO comSwRotaPageDTO);

    /**
     * 根据id查询值班表
     * @param rotaId 值班表id
     * @return 值班表详情
     */
    @GetMapping("/patrolRecord/rota/detail")
    R detailRota(@RequestParam("rotaId") Long rotaId);

    /**
     * 新增值班表
@@ -3934,4 +4127,41 @@
    @GetMapping("/patrolRecord/rota/getRotaLeaderByDate")
    R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate);

    /**
     * 批量导入值班表
     *
     * @param list 值班表集合
     */
    @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);

}