Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into ...

101captain

2021-09-22 1775bb71f952106c58657cf02891cbe2a286c8f8

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

@@ -2,9 +2,15 @@

import java.util.List;

import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussDetailDTO;
import com.panzhihua.common.model.dtos.community.discuss.ComActDiscussPublishResultDTO;
import com.panzhihua.common.model.dtos.community.elder.ElderAuthStatisticHeaderDTO;
import com.panzhihua.common.model.dtos.community.elder.PageElderAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.elder.PagePensionAuthStatisticDTO;
import com.panzhihua.common.model.dtos.community.elder.SignElderAuthStatisticDTO;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.vos.community.*;
import io.swagger.annotations.ApiOperation;
@@ -21,6 +27,77 @@
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
import com.panzhihua.common.model.dtos.community.AddComActDynTypeDTO;
import com.panzhihua.common.model.dtos.community.AddIdentityAuthDTO;
import com.panzhihua.common.model.dtos.community.CancelRecordDTO;
import com.panzhihua.common.model.dtos.community.CascadeHouseDTO;
import com.panzhihua.common.model.dtos.community.ComActDiscussCommentDTO;
import com.panzhihua.common.model.dtos.community.ComActDiscussCommentUserDTO;
import com.panzhihua.common.model.dtos.community.ComActDiscussDTO;
import com.panzhihua.common.model.dtos.community.ComActDiscussOptionUserDTO;
import com.panzhihua.common.model.dtos.community.ComActDiscussUserDTO;
import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentDTO;
import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO;
import com.panzhihua.common.model.dtos.community.ComCvtBusinessDTO;
import com.panzhihua.common.model.dtos.community.ComCvtCategoryDTO;
import com.panzhihua.common.model.dtos.community.ComCvtServeDTO;
import com.panzhihua.common.model.dtos.community.ComExServicemanDTO;
import com.panzhihua.common.model.dtos.community.ComMngCarAppletDTO;
import com.panzhihua.common.model.dtos.community.ComMngCarSaveDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationEditDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseAdminDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseEditAdminDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO;
import com.panzhihua.common.model.dtos.community.ComMngRealCompanyBelongsDTO;
import com.panzhihua.common.model.dtos.community.ComOpsHouseDTO;
import com.panzhihua.common.model.dtos.community.ComSwDangerReportHandleDTO;
import com.panzhihua.common.model.dtos.community.ComSwDangerReportRectifyDTO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordAddDTO;
import com.panzhihua.common.model.dtos.community.ComSwPatrolRecordPageDTO;
import com.panzhihua.common.model.dtos.community.ComSwRotaPageDTO;
import com.panzhihua.common.model.dtos.community.ComSwRotaSaveDTO;
import com.panzhihua.common.model.dtos.community.DisabledPersonsDTO;
import com.panzhihua.common.model.dtos.community.EditComActDynTypeDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthAddByFamilyDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthAddDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthDeleteDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthEditDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthElderlyDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthFeedbackAddDTO;
import com.panzhihua.common.model.dtos.community.EldersAuthTypeQueryDTO;
import com.panzhihua.common.model.dtos.community.ExportComMngCarExcelDTO;
import com.panzhihua.common.model.dtos.community.ExportRealAssetsExcelDTO;
import com.panzhihua.common.model.dtos.community.ExportRealCompanyExcelDTO;
import com.panzhihua.common.model.dtos.community.GrantRewardDTO;
import com.panzhihua.common.model.dtos.community.KeyPersonInfoDTO;
import com.panzhihua.common.model.dtos.community.OperationDetailDTO;
import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
import com.panzhihua.common.model.dtos.community.PageComActDTO;
import com.panzhihua.common.model.dtos.community.PageComActDiscussCommentDTO;
import com.panzhihua.common.model.dtos.community.PageComActDiscussDTO;
import com.panzhihua.common.model.dtos.community.PageComActDynTypeDTO;
import com.panzhihua.common.model.dtos.community.PageComActEasyPhotoCommentDTO;
import com.panzhihua.common.model.dtos.community.PageComCvtBusinessAppletsDTO;
import com.panzhihua.common.model.dtos.community.PageComCvtBusinessDTO;
import com.panzhihua.common.model.dtos.community.PageComCvtCategoryDTO;
import com.panzhihua.common.model.dtos.community.PageComCvtServeDTO;
import com.panzhihua.common.model.dtos.community.PageComEldersRecordsDTO;
import com.panzhihua.common.model.dtos.community.PageComMngCarDTO;
import com.panzhihua.common.model.dtos.community.PageComMngRealAssetsDTO;
import com.panzhihua.common.model.dtos.community.PageComMngRealCompanyDTO;
import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
import com.panzhihua.common.model.dtos.community.PageComOpsHouseDTO;
import com.panzhihua.common.model.dtos.community.PageComStreetDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthElderlyDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthHistoryDTO;
import com.panzhihua.common.model.dtos.community.PageEldersAuthRecordDTO;
import com.panzhihua.common.model.dtos.community.PageIdentityAuthRecordDTO;
import com.panzhihua.common.model.dtos.community.PageQuestnaireAnswerDTO;
import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO;
import com.panzhihua.common.model.dtos.community.PageQuestnaireSubDetailsDTO;
import com.panzhihua.common.model.dtos.community.PageUserReserveDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO;
@@ -42,7 +119,18 @@
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.questnaire.StatisticsSummaryDTO;
import com.panzhihua.common.model.dtos.community.reserve.*;
import com.panzhihua.common.model.dtos.community.reserve.AddReserveAdminDTO;
import com.panzhihua.common.model.dtos.community.reserve.CancelReserveRecordDTO;
import com.panzhihua.common.model.dtos.community.reserve.ComActReserveMakeStatisticsDTO;
import com.panzhihua.common.model.dtos.community.reserve.ComActReserveRegisterStatisticsDTO;
import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveInfoDTO;
import com.panzhihua.common.model.dtos.community.reserve.EditComActReserveStatusDTO;
import com.panzhihua.common.model.dtos.community.reserve.EditReserveAdminDTO;
import com.panzhihua.common.model.dtos.community.reserve.MakeHandleAdminDTO;
import com.panzhihua.common.model.dtos.community.reserve.PageReserveAdminDTO;
import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeAdminDTO;
import com.panzhihua.common.model.dtos.community.reserve.PageReserveMakeHandleAdminDTO;
import com.panzhihua.common.model.dtos.community.reserve.PageReserveRegisterDetailedAdminDTO;
import com.panzhihua.common.model.dtos.community.switchs.SearchCommunityDTO;
import com.panzhihua.common.model.dtos.community.wallet.ComActWalletDetailDTO;
import com.panzhihua.common.model.dtos.community.wallet.ComActWalletSettlementAdminDTO;
@@ -97,6 +185,53 @@
import com.panzhihua.common.model.vos.DictionaryVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.community.ActivitySignVO;
import com.panzhihua.common.model.vos.community.BatchhouseVO;
import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
import com.panzhihua.common.model.vos.community.ComActActRegistVO;
import com.panzhihua.common.model.vos.community.ComActActivityVO;
import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.ComActMessageBackVO;
import com.panzhihua.common.model.vos.community.ComActMessageVO;
import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
import com.panzhihua.common.model.vos.community.ComActReserveCommitVO;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComActWorkGuideVO;
import com.panzhihua.common.model.vos.community.ComCvtServeExcelVO;
import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyDetailsVO;
import com.panzhihua.common.model.vos.community.ComMngBuildingExcelVO;
import com.panzhihua.common.model.vos.community.ComMngCarExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationCorrectExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationCultExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationDisabilityExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationDrugExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationKeyExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationLowSecurityExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationMajorExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationRehabilitationExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationSentenceExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationServeExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationVeteransExcelVO;
import com.panzhihua.common.model.vos.community.ComMngRealAssetsExcelVO;
import com.panzhihua.common.model.vos.community.ComMngRealAssetsVO;
import com.panzhihua.common.model.vos.community.ComMngRealCompanyExcelVO;
import com.panzhihua.common.model.vos.community.ComMngRealCompanyVO;
import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
import com.panzhihua.common.model.vos.community.ComMngStructOtherBuildVO;
import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO;
import com.panzhihua.common.model.vos.community.ComMngVillageVO;
import com.panzhihua.common.model.vos.community.ComMngVolunteerMngVO;
import com.panzhihua.common.model.vos.community.ComOpsHouseUndercarriageVO;
import com.panzhihua.common.model.vos.community.ComOpsHouseVO;
import com.panzhihua.common.model.vos.community.ComStreetVO;
import com.panzhihua.common.model.vos.community.ComSwRotaExcelVO;
import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO;
import com.panzhihua.common.model.vos.community.ResetComActMessageVO;
import com.panzhihua.common.model.vos.community.SignactivityVO;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyActivity;
import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyBuild;
@@ -104,7 +239,6 @@
import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
import com.panzhihua.common.model.vos.community.reserve.*;
import com.panzhihua.common.model.vos.neighbor.AddNeighborCircleAdminVO;
import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO;
import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO;
@@ -193,7 +327,7 @@
     * @return 详情
     */
    @PostMapping("detailactivity")
    R detailActivity(@RequestParam("id") Long id, @RequestParam(value = "userId", required = false) Long userId);
    R detailActivity(@RequestParam("id") Long id, @RequestParam(value = "userId", required = false) Long userId,@RequestParam(value = "pageNum", required = false) Long pageNum,@RequestParam(value = "pageSize", required = false) Long pageSize);

    /**
     * 分页活动报名名单
@@ -284,6 +418,15 @@
     */
    @GetMapping("/activity/picture/getList")
    R getPictureList(@RequestParam("userId") Long userId);

    /**
     * 获取系统预置图库  getSysPictureList
     * @return    R   系统图库集
     * @author txb
     * @date 2021/8/27 13:33
     */
    @GetMapping("/activity/sysPicture/getList")
    R getSysPictureList(@RequestParam("type")Integer type);

    /**
     * 活动报名名单
@@ -398,6 +541,16 @@
     */
    @PostMapping("pagemicrowish")
    R pageMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO);

    /**
     * 小程序分页查询微心愿
     *
     * @param comActMicroWishVO
     *            查询参数
     * @return 分页集合
     */
    @PostMapping("pagemicrowish/applets")
    R pageMicroWishApplets(@RequestBody ComActMicroWishVO comActMicroWishVO);

    /**
     * 心愿详情
@@ -2193,6 +2346,56 @@
                                           @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

    /**
     * 批量导入高龄老人  listSavePopulationElderExcelVO  批量导入高龄老人
     * @param    list  高龄老人数据
     * @param    communityId   社区id
     * @return    R   导入结果
     * @author txb
     * @date 2021/9/01 15:03
     */
    @PostMapping("/common/data/population/importElder")
    R listSavePopulationElderExcelVO(@RequestBody List<ComMngPopulationElderExcelVO> list,
                                    @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

    /**
     * 批量导入养老金人员  listSavePopulationPensionExcelVO  批量导入养老金人员
     * @param    list  养老金人员数据
     * @param    communityId   社区id
     * @return    R   导入结果
     * @author txb
     * @date 2021/9/01 15:03
     */
    @PostMapping("/common/data/population/importPension")
    R listSavePopulationPensionExcelVO(@RequestBody List<ComMngPopulationPensionExcelVO> list,
                                     @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

    /**
     * 批量导入高龄老人线下认证记录  listSaveElderAuthRecordExcelVO  批量导入高龄老人线下认证记录
     * @param    list  高龄老人线下认证记录数据
     * @param    communityId   社区id
     * @param    userId   登录人id
     * @return    R   导入结果
     * @author txb
     * @date 2021/9/01 15:03
     */
    @PostMapping("/elders/authRecords/underLine/import")
    R listSaveElderAuthRecordExcelVO(@RequestBody List<ComElderAuthRecordImportExcelVO> list,
                                       @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

    /**
     * 批量导入养老线下认证记录  listSavePensionAuthRecordExcelVO  批量导入养老线下认证记录
     * @param    list  养老线下认证记录数据
     * @param    communityId   社区id
     * @param    userId   登录人id
     * @return    R   导入结果
     * @author txb
     * @date 2021/9/01 15:03
     */
    @PostMapping("/elders/pensionAuthRecords/underLine/import")
    R listSavePensionAuthRecordExcelVO(@RequestBody List<ComPensionAuthRecordImportExcelVO> list,
                                     @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

    /**
     * 确认导入实有人口（有则更新，无则新建）
     *
     * @param list
@@ -2223,7 +2426,7 @@
     * @return 实有人口详细信息
     */
    @PostMapping("/common/data/population/detail")
    R<ComMngPopulationVO> detailPopulation(@RequestParam(value = "populationId") Long populationId);
    R<ComMngPopulationVO> detailPopulation(@RequestParam(value = "populationId") Long populationId, @RequestParam(value = "communityId") Long communityId);

    /**
     * 根据id查询实有人口电子档案信息
@@ -3000,6 +3203,45 @@
    R delectWorkGuide(@RequestParam("workGuideId") Long workGuideId);

    /**
     * 分页查询办事指南-分类管理 pageWorkGuideClassify  分页查询办事指南-分类管理
     * @param    comActWorkGuideClassifyVO   查询参数
     * @return    R   返回结果
     * @author txb
     * @date 2021/8/31 15:03
     */
    @PostMapping("/workGuide/classify/apage")
    R pageWorkGuideClassify(@RequestBody ComActWorkGuideClassifyVO comActWorkGuideClassifyVO);

    /**
     * 办事指南-分类管理新增或修改  addWorkGuideClassify  办事指南-分类管理新增或修改
     * @param    comActWorkGuideClassifyVO   新增或修改参数
     * @return    R   返回结果
     * @author txb
     * @date 2021/8/31 15:03
     */
    @PostMapping("/workGuide/classify/add")
    R addWorkGuideClassify(@RequestBody ComActWorkGuideClassifyVO comActWorkGuideClassifyVO);

    /**
     * 办事指南-分类管理删除  deleteWorkGuideClassify  办事指南-分类管理删除
     * @param    workGuideClassifyId    办事指南-分类管理id
     * @return    R   返回结果
     * @author txb
     * @date 2021/8/31 15:03
     */
    @GetMapping("/workGuide/classify/delete")
    R deleteWorkGuideClassify(@RequestParam("workGuideClassifyId") Long workGuideClassifyId);

    /**
     * 办事指南-分类管理列表查询  getWorkGuideClassifyList  办事指南-分类管理列表查询
     * @return    R   返回结果
     * @author txb
     * @date 2021/8/31 15:03
     */
    @GetMapping("/workGuide/classify/getList")
    R getWorkGuideClassifyList();

    /**
     * 分页查询邻里圈
     *
     * @param neighborCircleAppDTO
@@ -3443,6 +3685,148 @@
    @PostMapping("/eldersauth/addFeedback")
    R addFeedback(@RequestBody EldersAuthFeedbackAddDTO eldersAuthFeedbackAddDTO);

    //2021-8-30 身份认证改版（高龄老人认证管理）接口
    /**
     * 分页查询高龄老人认证记录  pageElderAuthRecords  分页查询高龄老人认证记录
     * @param    pageElderAuthRecordsDTO   查询参数
     * @return    R  查询结果
     * @author txb
     * @date 2021/9/02 11:03
     */
    @PostMapping("/elders/authRecords/page")
    R pageElderAuthRecords(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO);

    /**
     * 根据高龄认证记录id查询详情 detailElderAuthRecords  根据高龄认证记录id查询详情
     * @param    authRecordId   高龄认证记录id
     * @return    R  查询结果
     * @author txb
     * @date 2021/9/02 11:03
     */
    @GetMapping("/elders/authRecords/detail")
    R detailElderAuthRecords(@RequestParam(value = "authRecordId") Long authRecordId);

    /**
     * 高龄认证审核 examineElderAuthRecords  高龄认证审核
     * @param    comElderAuthRecordVO   高龄认证审核参数
     * @return    R  查询结果
     * @author txb
     * @date 2021/9/02 11:03
     */
    @PostMapping("/elders/authRecords/examine")
    R examineElderAuthRecords(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO);

    /**
     * 高龄认证标记 examineElderAuthRecords  高龄认证标记
     * @param    comElderAuthRecordVO   高龄认证标记参数
     * @return    R  查询结果
     * @author txb
     * @date 2021/9/02 11:03
     */
    @PostMapping("/elders/authRecords/sign")
    R signElderAuthRecords(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO);

    /**
     * 根据高龄认证记录id批量查询 getElderAuthRecordsByIds  根据高龄认证记录id批量查询
     * @param    ids   高龄认证记录id集合
     * @return    R  查询结果
     * @author txb
     * @date 2021/9/02 11:03
     */
    @PostMapping("/elders/authRecords/getList")
    R getElderAuthRecordsByIds(@RequestBody List<Long> ids);

    /**
     * 导出高龄认证统计记录 exportElderAuthRecordsStatistic
     * @param    pageElderAuthRecordsDTO   查询参数
     * @return    R  查询结果
     * @author txb
     * @date 2021/9/02 11:03
     */
    @PostMapping("/elders/authRecords/statistic/export")
    R exportElderAuthRecordsStatistic(@RequestBody PageElderAuthStatisticDTO pageElderAuthRecordsDTO);

    /**
     * 分页查询养老金人员认证记录  pagePensionAuthRecords  分页查询养老金人员认证记录
     * @param    pageElderAuthRecordsDTO   查询参数
     * @return    R  查询结果
     * @author txb
     * @date 2021/9/07 14:03
     */
    @PostMapping("/elders/pensionAuthRecords/page")
    R pagePensionAuthRecords(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO);

    /**
     * 根据养老认证记录id查询详情 detailPensionAuthRecords  根据养老认证记录id查询详情
     * @param    authRecordId   养老认证记录id
     * @return    R  查询结果
     * @author txb
     * @date 2021/9/07 11:03
     */
    @GetMapping("/elders/pensionAuthRecords/detail")
    R detailPensionAuthRecords(@RequestParam(value = "authRecordId") Long authRecordId);

    /**
     * 养老认证审核 examinePensionAuthRecords  养老认证审核
     * @param    comPensionAuthRecordVO   养老认证审核参数
     * @return    R  查询结果
     * @author txb
     * @date 2021/9/07 11:03
     */
    @PostMapping("/elders/pensionAuthRecords/examine")
    R examinePensionAuthRecords(@RequestBody ComPensionAuthRecordVO comPensionAuthRecordVO);

    /**
     * 养老认证标记 signPensionAuthRecords  养老认证标记
     * @param    comPensionAuthRecordVO   养老认证标记参数
     * @return    R  查询结果
     * @author txb
     * @date 2021/9/02 11:03
     */
    @PostMapping("/elders/pensionAuthRecords/sign")
    R signPensionAuthRecords(@RequestBody ComPensionAuthRecordVO comPensionAuthRecordVO);

    /**
     * 根据养老认证记录id批量查询 getPensionAuthRecordsByIds  根据养老认证记录id批量查询
     * @param    ids   养老认证记录id集合
     * @return    R  查询结果
     * @author txb
     * @date 2021/9/02 11:03
     */
    @PostMapping("/elders/pensionAuthRecords/getList")
    R getPensionAuthRecordsByIds(@RequestBody List<Long> ids);

    /**
     * 导出养老认证记录 exportPensionAuthRecordsStatistic  导出养老认证记录
     * @param    pageElderAuthRecordsDTO   查询参数
     * @return    R  查询结果
     * @author txb
     * @date 2021/9/02 11:03
     */
    @PostMapping("/elders/pensionAuthRecords/statistic/export")
    R exportPensionAuthRecordsStatistic(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO);

    /**
     * 查询养老认证社区认证方式 setPensionAuthType  查询养老认证社区认证方式
     * @param    eldersAuthTypeQueryDTO   查询参数
     * @return    R  查询结果
     * @author txb
     * @date 2021/9/10 16:03
     */
    @PostMapping("/elders/pensionAuthRecords/authtype")
    R communityPensionAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO);

    /**
     * 设置当前社区养老认证方式:核验类型（1.视频认证 2.人脸核验） setPensionAuthType  设置当前社区养老认证方式:核验类型（1.视频认证 2.人脸核验）
     * @param    communityId   社区id
     * @param    type         检验类型
     * @return    R  设置结果
     * @author txb
     * @date 2021/9/10 16:03
     */
    @PutMapping("/elders/pensionAuthRecords/authType/{type}")
    R setPensionAuthType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type);

    /**
     * 小程序-查询疫苗分类列表
     *
@@ -3591,7 +3975,7 @@
     * @param eldersAuthTypeQueryDTO
     * @return
     */
    @PostMapping("/elders/authtype")
    @PostMapping("/elders/authType")
    R communityElderAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO);

    /**
@@ -4433,7 +4817,7 @@
     * @return 邻里圈话题列表
     */
    @GetMapping("/neighbor/getNeighborTopicByApp")
    R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero);
    R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero,@RequestParam("name") String name);

    /**
     * 综治后台-查询社区列表
@@ -4526,6 +4910,17 @@
    R getUserReward(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);

    /**
     * 获取首页弹窗接口
     * @param userId
     *            用户id
     * @param communityId
     *            社区id
     * @return 首页弹窗接口
     */
    @PostMapping("/easyphoto/getUserRewards")
    R getUserRewards(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);

    /**
     * 读取用户随手拍奖励
     *
     * @param userId
@@ -4556,6 +4951,16 @@
    R addPatrolRecord(@RequestBody ComSwPatrolRecordAddDTO comSwPatrolRecordAddDTO);

    /**
     * 编辑巡查记录 editPatrolRecord  编辑巡查记录
     * @param    comSwPatrolRecordEditDTO   编辑巡查记录参数
     * @return    R  编辑结果
     * @author txb
     * @date 2021/9/08 17:03
     */
    @PostMapping("/patrolRecord/edit")
    R editPatrolRecord(@RequestBody ComSwPatrolRecordEditDTO comSwPatrolRecordEditDTO);

    /**
     * 根据巡查记录id查询详情
     *
     * @param patrolRecordId
@@ -4574,6 +4979,16 @@
     */
    @PostMapping("/patrolRecord/safetyWorkRecord/page")
    R pageSafetyWorkRecord(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);

    /**
     * 编辑安全工作记录 editSafetyWork  编辑安全工作记录
     * @param    comSwSafetyWorkEditDTO   编辑安全工作记录参数
     * @return    R  编辑结果
     * @author txb
     * @date 2021/9/08 17:03
     */
    @PostMapping("/patrolRecord/safetyWorkRecord/edit")
    R editSafetyWork(@RequestBody ComSwSafetyWorkEditDTO comSwSafetyWorkEditDTO);

    /**
     * 根据安全工作记录id查询详情
@@ -4606,6 +5021,16 @@
     */
    @PostMapping("/patrolRecord/dangerReport/page")
    R pageDangerReport(@RequestBody ComSwPatrolRecordPageDTO comSwPatrolRecordPageDTO);

    /**
     * 编辑隐患报告 editDangerReport  编辑隐患报告
     * @param    comSwDangerReportEditDTO   编辑隐患报告参数
     * @return    R  编辑结果
     * @author txb
     * @date 2021/9/08 17:03
     */
    @PostMapping("/patrolRecord/dangerReport/edit")
    R editDangerReport(@RequestBody ComSwDangerReportEditDTO comSwDangerReportEditDTO);

    /**
     * 根据隐患报告id查询详情
@@ -5241,7 +5666,7 @@
     * @param circleTopicAppDTO 请求参数
     * @return  删除结果
     */
    @PostMapping("/neighbor/circleTopicAppDTO")
    @PostMapping("/neighbor/deleteNeighborByApp")
    R deleteNeighborByApp(@RequestBody DeleteNeighborCircleAppDTO circleTopicAppDTO);

    /**
@@ -5333,4 +5758,277 @@
     */
    @PostMapping("discuss/edit-result")
    R editDiscussResult(@RequestBody ComActDiscussDTO comActDiscussDTO);

    /**
     * 定时任务扫描高龄认证记录信息
     * @return  执行结果
     */
    @PostMapping("/elders/auth/task")
    R timedTaskEldersAuthJobHandler();

    /**
     * 定时任务扫描上月高龄认证使用视频认证的用户添加成功记录
     * @return  执行结果
     */
    @PostMapping("/elders/auth/record/task")
    R timedTaskEldersAuthRecordJobHandler();

    /**
     * 定时任务每月1号0点统计高龄老人本期应该认证总人数
     * @return  执行结果
     */
    @PostMapping("/elders/authRecords/statistics")
    R timedTaskElderAuthStatisticsJobHandler();

    /**
     * 定时任务每年3月1号0点统计养老认证本期应该认证总人数
     * @return  执行结果
     */
    @PostMapping("/elders/pensionAuthRecords/statistics")
    R timedTaskPensionAuthStatisticsJobHandler();

    /**
     * 办事指南列表-按分类查询
     * @param pageActWorkGuideDTO   请求参数
     * @return  办事指南分类列表
     */
    @PostMapping("/listworkguide")
    R listWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO);

    /**
     * 根据办事指南分类id查询办事指南列表
     * @param classifyId   办事指南分类id
     * @return  办事指南列表数据
     */
    @GetMapping("/listworkguide/classify")
    R listWorkGuideByClassifyId(@RequestParam("classifyId") Long classifyId);

    /**
     * 小程序查询所有进行中的预约登记
     * @param communityId   社区id
     * @return  社区所有进行中的预约登记列表
     */
    @GetMapping("/reserve/list")
    R reserveListApplets(@RequestParam("communityId") Long communityId);

    /**
     * 查询社区高龄认证方式（1.视频认证 2.人脸核验）
     * @param eldersAuthTypeQueryDTO    请求参数
     * @return  社区高龄认证方式（1.视频认证 2.人脸核验）
     */
    @PostMapping("/elders/new/authtype")
    R communityEldersAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO);

    /**
     * 设置当前社区高龄认证方式:核验类型（1.视频认证 2.人脸核验）
     * @param    communityId   社区id
     * @param    type         检验类型
     * @return    R  设置结果
     */
    @PutMapping("/elders/new/authType/{type}")
    R setEldersAuthType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type);

    /**
     * 新增身份认证
     * @param addIdentityAuthDTO 新增身份认证请求参数
     * @return 新增结果结果
     */
    @PostMapping("/identity-auth/add")
    R addIdentityAuth(@RequestBody AddIdentityAuthDTO addIdentityAuthDTO);

    /**
     * 分页查询身份认证记录
     * @param pageIdentityAuthRecordDTO 分页查询身份认证记录参数
     * @return 身份认证记录列表
     */
    @PostMapping("/identity-auth/record/page")
    R queryRecordWithPage(@RequestBody PageIdentityAuthRecordDTO pageIdentityAuthRecordDTO);

    /**
     * 获取身份认证详情
     * @param authType 认证类型
     * @param identityAuthId 认证id
     * @return 认证记录详情
     */
    @GetMapping("/identity-auth/detail")
    R retrieveIdentityAuthDetail(@RequestParam("authType") Integer authType,
                                 @RequestParam("identityAuthId") Long identityAuthId);

    /**
     * 获取身份认证方式
     * @param communityId
     * @param identityAuthType
     * @return 认证方式
     */
    @GetMapping("/identity-auth/mode")
    R getIdentityAuthMode(@RequestParam(value = "communityId") Long communityId,
                          @RequestParam(value = "identityAuthType") Integer identityAuthType);

    /**
     * 获取身份认证人脸核验token
     * @param getIdentityEidTokenDTO
     * @return token
     */
    @PostMapping("/identity-auth/getEidToken")
    R getEidToken(@RequestBody GetIdentityEidTokenDTO getIdentityEidTokenDTO);

    /**
     * 一起议获取是否有发布权
     * @param comActDiscussDTO
     * @return
     */
    @PostMapping("discuss/permissions")
    R getDiscussPermissions(@RequestBody ComActDiscussDTO comActDiscussDTO);

    /**
     * 高龄认证统计-分页查询
     * @param pageElderAuthStatisticDTO 请求参数
     * @return  高龄认证统计列表
     */
    @PostMapping("/elders/auth/statistic/page")
    R pageAuthStatisticAdmin(@RequestBody PageElderAuthStatisticDTO pageElderAuthStatisticDTO);

    /**
     * 高龄认证统计-标记
     * @param signElderAuthStatisticDTO 请求参数
     * @return  标记结果
     */
    @PostMapping("/elders/auth/statistic/sign")
    R signAuthStatisticAdmin(@RequestBody SignElderAuthStatisticDTO signElderAuthStatisticDTO);

    /**
     * 高龄认证统计-统计表头数据
     * @param statisticHeaderDTO 请求参数
     * @return  统计表头数据
     */
    @PostMapping("/elders/auth/header/statistic")
    R getAuthHeaderStatisticAdmin(@RequestBody ElderAuthStatisticHeaderDTO statisticHeaderDTO);

    /**
     * 养老认证统计-分页查询
     * @param pensionAuthStatisticDTO   请求参数
     * @return  养老认证统列表
     */
    @PostMapping("/elders/pension/auth/statistic/page")
    R pagePensionAuthStatisticAdmin(@RequestBody PagePensionAuthStatisticDTO pensionAuthStatisticDTO);

    /**
     * 养老认证记标记
     * @param signElderAuthStatisticDTO 请求参数
     * @return  标记结果
     */
    @PostMapping("/elders/pension/auth/statistic/sign")
    R signPensionAuthStatisticAdmin(@RequestBody SignElderAuthStatisticDTO signElderAuthStatisticDTO);

    /**
     * 养老认证表头统计
     * @param statisticHeaderDTO    请求参数
     * @return  统计结果
     */
    @PostMapping("/elders/pension/auth/header/statistic")
    R getPensionAuthHeaderStatisticAdmin(@RequestBody ElderAuthStatisticHeaderDTO statisticHeaderDTO);

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/comActSocialOrg/queryAll")
    R comActSocialOrgSelectAll(CommonPage commonPage);

    /**
     * 新增数据
     *
     * @param comActSocialOrg 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActSocialOrg")
    R comActSocialOrgInsert(@RequestBody ComActSocialOrgVO comActSocialOrg);

    /**
     * 修改数据
     *
     * @param comActSocialOrg 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActSocialOrg/update")
    R comActSocialOrgUpdate(@RequestBody ComActSocialOrgVO comActSocialOrg);

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/comActSocialOrg/del")
    R comActSocialOrgDelete(@RequestParam("id") Long id);

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/comActCommittee/queryAll")
    R comActCommitteeSelectAll(@RequestBody CommonPage commonPage);
    /**
     * 新增数据
     *
     * @param comActCommittee 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActCommittee")
    R comActCommitteeInsert(@RequestBody ComActCommiteeVO comActCommittee);
    /**
     * 修改数据
     *
     * @param comActCommittee 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActCommittee/update")
    R comActCommitteeUpdate(@RequestBody ComActCommiteeVO comActCommittee);

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/comActCommittee/del")
    R comActCommitteeDelete(@RequestParam("id") Long id);

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/comProperty/queryAll")
    R comPropertySelectAll(@RequestBody CommonPage commonPage);
    /**
     * 新增数据
     *
     * @param comPropertyVO 实体对象
     * @return 新增结果
     */
    @PostMapping("/comProperty")
    R comPropertyInsert(@RequestBody ComPropertyVO comPropertyVO);
    /**
     * 修改数据
     *
     * @param comPropertyVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/comProperty/update")
    R comPropertyUpdate(@RequestBody ComPropertyVO comPropertyVO);

    /**
     * 删除数据
     *
     * @param id 主键结合
     * @return 删除结果
     */
    @GetMapping("/comProperty/del")
    R comPropertyDelete(@RequestParam("id") Long id);
}