From 1775bb71f952106c58657cf02891cbe2a286c8f8 Mon Sep 17 00:00:00 2001 From: 101captain <237651143@qq.com> Date: 星期三, 22 九月 2021 11:30:47 +0800 Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 1442 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 1,343 insertions(+), 99 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java index 22c3848..9d7adc8 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java @@ -2,39 +2,236 @@ 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; import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO; 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.*; -import com.panzhihua.common.model.dtos.community.bigscreen.*; +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; +import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticPartyActivityDTO; +import com.panzhihua.common.model.dtos.community.bigscreen.PageBigScreenStatisticPartyOrg; import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO; import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO; import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO; import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO; -import com.panzhihua.common.model.dtos.community.easyPhoto.*; +import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoActivityDTO; +import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoClassifyDTO; +import com.panzhihua.common.model.dtos.community.easyPhoto.EditEasyPhotoActivityDTO; +import com.panzhihua.common.model.dtos.community.easyPhoto.ExportEasyPhotoDTO; +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.questnaire.StatisticsSummaryDTO; +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.*; +import com.panzhihua.common.model.dtos.community.wallet.ComActWalletDetailDTO; +import com.panzhihua.common.model.dtos.community.wallet.ComActWalletSettlementAdminDTO; +import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletAdminDTO; +import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeAdminDTO; +import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO; import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO; import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO; import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO; -import com.panzhihua.common.model.dtos.grid.*; -import com.panzhihua.common.model.dtos.grid.admin.*; -import com.panzhihua.common.model.dtos.neighbor.*; -import com.panzhihua.common.model.dtos.shop.*; +import com.panzhihua.common.model.dtos.grid.AddComMngHousePopulationDTO; +import com.panzhihua.common.model.dtos.grid.ComMngVillageListAppDTO; +import com.panzhihua.common.model.dtos.grid.DelComMngHousePopulationDTO; +import com.panzhihua.common.model.dtos.grid.PageComMngPopulationDTO; +import com.panzhihua.common.model.dtos.grid.PageComMngVillageBuildHouseAppDTO; +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.ComMngPopulationRelationHouseDTO; +import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationSubordinateDTO; +import com.panzhihua.common.model.dtos.grid.admin.ComMngVillageListExportAdminDTO; +import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationDTO; +import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationHouseDTO; +import com.panzhihua.common.model.dtos.shop.ComShopAddressDTO; +import com.panzhihua.common.model.dtos.shop.ComShopCartDTO; +import com.panzhihua.common.model.dtos.shop.ComShopEditNubCartDTO; +import com.panzhihua.common.model.dtos.shop.ComShopFundsExportDTO; +import com.panzhihua.common.model.dtos.shop.ComShopGoodsDTO; +import com.panzhihua.common.model.dtos.shop.ComShopOrderCreateDTO; +import com.panzhihua.common.model.dtos.shop.ComShopOrderDeliverDTO; +import com.panzhihua.common.model.dtos.shop.ComShopOrderExportDTO; +import com.panzhihua.common.model.dtos.shop.ComShopOrderPreviewDTO; +import com.panzhihua.common.model.dtos.shop.ComShopOrderQueryDTO; +import com.panzhihua.common.model.dtos.shop.ComShopOrderShipDTO; +import com.panzhihua.common.model.dtos.shop.ComShopSysConfDTO; +import com.panzhihua.common.model.dtos.shop.OrderPayDTO; +import com.panzhihua.common.model.dtos.shop.PageComOrderListDTO; +import com.panzhihua.common.model.dtos.shop.PageComShopAddressDTO; +import com.panzhihua.common.model.dtos.shop.PageComShopFundsSearchDTO; +import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO; +import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO; +import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO; +import com.panzhihua.common.model.dtos.shop.PageComShopSysConfDTO; +import com.panzhihua.common.model.dtos.shop.WxPayNotifyOrderDTO; import com.panzhihua.common.model.dtos.user.PageInputUserDTO; -import com.panzhihua.common.model.dtos.vaccines.*; -import com.panzhihua.common.model.vos.*; -import com.panzhihua.common.model.vos.community.*; +import com.panzhihua.common.model.dtos.vaccines.VaccinesByAdminDTO; +import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAdminDTO; +import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAppDTO; +import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollUserByAppDTO; +import com.panzhihua.common.model.dtos.vaccines.VaccinesInoculationByAdminDTO; +import com.panzhihua.common.model.vos.BcDictionaryItemVO; +import com.panzhihua.common.model.vos.BcDictionaryVO; +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; @@ -130,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); /** * 分页活动报名名单 @@ -141,6 +338,95 @@ */ @PostMapping("listactivitysign") R listActivitySign(@RequestBody ActivitySignVO activitySignVO); + + /** + * description getSignLists 查询活动报名名单 + * @param activitySignVO 查询参数 + * @return R 查询结果 + * @author txb + * @date 2021/8/24 14:03 + */ + @PostMapping("/activity/sign/getList") + R getSignLists(@RequestBody ActivitySignVO activitySignVO); + + /** + * description listActivityRegists 分页查询活动评价 + * @param comActActEvaluateVO 活动评价vo + * @return R 分页查询结果 + * @author txb + * @date 2021/8/24 14:03 + */ + @PostMapping("/activity/evaluate/page") + R pageActivityEvaluates(@RequestBody ComActActEvaluateVO comActActEvaluateVO); + + /** + * description getEvaluateLists 查询活动评价 + * @param comActActEvaluateVO 查询参数 + * @return R 查询结果 + * @author txb + * @date 2021/8/24 14:03 + */ + @PostMapping("/activity/evaluate/getList") + R getEvaluateLists(@RequestBody ComActActEvaluateVO comActActEvaluateVO); + + /** + * description pageActivityRegists 分页查询活动签到 + * @param comActActRegistVO 活动签到vo + * @return R 分页查询结果 + * @author txb + * @date 2021/8/24 14:03 + */ + @PostMapping("/activity/regist/page") + R pageActivityRegists(@RequestBody ComActActRegistVO comActActRegistVO); + + /** + * description getRegistLists 查询活动签到 + * @param comActActRegistVO 查询参数 + * @return R 查询结果 + * @author txb + * @date 2021/8/25 9:33 + */ + @PostMapping("/activity/regist/getList") + R getRegistLists(@RequestBody ComActActRegistVO comActActRegistVO); + + /** + * description getRegistLists 查询活动未签到 + * @param comActActRegistVO 查询参数 + * @return R 查询结果 + * @author txb + * @date 2021/8/25 9:33 + */ + @PostMapping("/activity/noRegist/getList") + R getNoRegistLists(@RequestBody ComActActRegistVO comActActRegistVO); + + /** + * description activityStagistics 活动数据统计 + * @param activityId 活动id + * @return R 统计结果 + * @author txb + * @date 2021/8/25 13:33 + */ + @GetMapping("/activity/statistics") + R activityStatistics(@RequestParam("activityId") Long activityId); + + /** + * 获取活动历史封面 getPictureList + * @param userId 用户id + * @return R 统计结果 + * @author txb + * @date 2021/8/27 13:33 + */ + @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); /** * 活动报名名单 @@ -255,6 +541,16 @@ */ @PostMapping("pagemicrowish") R pageMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO); + + /** + * 小程序分页查询微心愿 + * + * @param comActMicroWishVO + * 查询参数 + * @return 分页集合 + */ + @PostMapping("pagemicrowish/applets") + R pageMicroWishApplets(@RequestBody ComActMicroWishVO comActMicroWishVO); /** * 心愿详情 @@ -978,7 +1274,7 @@ R addComActEasyPhotoComment(@RequestBody ComActEasyPhotoCommentDTO comActEasyPhotoCommentDTO); /** - * 一起议-新增 + * 议事投票-新增 * * @param comActDiscussDTO * 新增参数 @@ -988,17 +1284,35 @@ R addDiscuss(@RequestBody ComActDiscussDTO comActDiscussDTO); /** - * 一起议-详情 + * 议事投票-新增 * - * @param id - * 主键 + * @param comActDiscussDTO + * 新增参数 + * @return 新增结果 + */ + @PostMapping("editdiscuss") + R editDiscuss(@RequestBody ComActDiscussDTO comActDiscussDTO); + + /** + * 议事投票-详情 + * + * @param discussDetailDTO + * 请求参数 * @return ComActDiscussVO */ @PostMapping("detaildiscuss") - R detailDiscuss(@RequestParam("id") Long id); + R detailDiscuss(@RequestBody ComActDiscussDetailDTO discussDetailDTO); /** - * 一起议-删除 + * 分页查询评论下回复列表 + * @param discussDetailDTO 请求参数 + * @return 回复列表 + */ + @PostMapping("discussCommentReplyAdmin") + R discussCommentReplyAdmin(@RequestBody ComActDiscussDetailDTO discussDetailDTO); + + /** + * 议事投票-删除 * * @param id * 主键 @@ -1008,7 +1322,7 @@ R deleteDiscuss(@RequestParam("id") Long id); /** - * 一起议-回复 + * 议事投票-回复 * * @param comActDiscussCommentDTO * 评论内容 @@ -1018,7 +1332,7 @@ R addDiscussComment(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO); /** - * 一起议-分页查询 + * 议事投票-分页查询 * * @param pageComActDiscussDTO * 查询参数 @@ -1028,7 +1342,17 @@ R pageDiscuss(@RequestBody PageComActDiscussDTO pageComActDiscussDTO); /** - * 一起议-评论-查看 + * 议事投票-后台分页查询 + * + * @param pageComActDiscussDTO + * 查询参数 + * @return ComActDiscussVO + */ + @PostMapping("pagediscussAdmin") + R pageDiscussAdmin(@RequestBody PageComActDiscussDTO pageComActDiscussDTO); + + /** + * 议事投票-评论-查看 * * @param id * 主键 @@ -1038,7 +1362,15 @@ R detailDiscussComment(@RequestParam("id") Long id); /** - * 一起议-评论-置顶 + * 议事投票评论详情 + * @param pageComActDiscussCommentDTO 请求参数 + * @return 议事投票详情 + */ + @PostMapping("detaildiscusscommentAdmin") + R detailDiscussCommentAdmin(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO); + + /** + * 议事投票-评论-置顶 * * @param id * 主键 @@ -1048,7 +1380,7 @@ R putDiscussCommentTop(@RequestParam("id") Long id); /** - * 一起议-评论-回复 + * 议事投票-评论-回复 * * @param comActDiscussCommentDTO * 回复内容 @@ -1058,7 +1390,7 @@ R addDiscussCommentBack(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO); /** - * 一起议-评论-分页查询 + * 议事投票-评论-分页查询 * * @param pageComActDiscussCommentDTO * 分页查询参数 @@ -1068,7 +1400,17 @@ R pageDiscussComment(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO); /** - * 一起议-分页查询 小程序 + * 议事投票-评论-后台分页查询 + * + * @param pageComActDiscussCommentDTO + * 分页查询参数 + * @return ComActDiscussCommentVO + */ + @PostMapping("pagediscusscommentAdmin") + R pageDiscussCommentAdmin(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO); + + /** + * 议事投票-分页查询 小程序 * * @param pageComActDiscussDTO * 查询参数 @@ -1078,7 +1420,7 @@ R pageDiscussApplets(@RequestBody PageComActDiscussDTO pageComActDiscussDTO); /** - * 一起议-点赞、取消点赞 + * 议事投票-点赞、取消点赞 * * @param comActDiscussUserDTO * 操作类型 @@ -1088,7 +1430,7 @@ R putDiscussUser(@RequestBody ComActDiscussUserDTO comActDiscussUserDTO); /** - * 一起议-评论-分页查询 小程序 + * 议事投票-评论-分页查询 小程序 * * @param pageComActDiscussCommentDTO * 分页参数 @@ -1098,7 +1440,7 @@ R pageDiscussCommentApplets(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO); /** - * 一起议-详情 小程序 + * 议事投票-详情 小程序 * * @param id * 主键 @@ -1110,7 +1452,7 @@ R detailDiscussApplets(@RequestParam("id") Long id, @RequestParam("userId") Long userId); /** - * 一起议-投票 + * 议事投票-投票 * * @param comActDiscussOptionUserDTO * 投票信息 @@ -1120,7 +1462,7 @@ R addDiscussOptionUser(@RequestBody ComActDiscussOptionUserDTO comActDiscussOptionUserDTO); /** - * 一起议-评论-点赞、取消点赞 + * 议事投票-评论-点赞、取消点赞 * * @param comActDiscussUserDTO * 评论点赞 @@ -1295,7 +1637,7 @@ R pageComCvtBusinessByServiceArea(@RequestBody PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO); /** - * 一起议-新增 + * 议事投票-新增 * * @param comOpsHouseDTO * 新增参数 @@ -1305,7 +1647,7 @@ R addOpsHouse(@RequestBody ComOpsHouseDTO comOpsHouseDTO); /** - * 一起议-详情 + * 议事投票-详情 * * @param id * 主键 @@ -1345,7 +1687,7 @@ R undercarriageHouse(@RequestBody ComOpsHouseUndercarriageVO comOpsHouseVO); /** - * 一起议-删除 + * 议事投票-删除 * * @param id * 主键 @@ -1539,7 +1881,7 @@ */ @PostMapping("/convenient/serve/import") R listSaveConvenientServeExcelVO(@RequestBody List<ComCvtServeExcelVO> list, - @RequestParam(value = "communityId", required = false) Long communityId); + @RequestParam(value = "communityId", required = false) Long communityId); /** * 导出房屋信息 @@ -1655,7 +1997,7 @@ */ @PostMapping("/common/data/company/import") R listSaveMngRealCompanyExcelVO(@RequestBody List<ComMngRealCompanyExcelVO> list, - @RequestParam("communityId") Long communityId); + @RequestParam("communityId") Long communityId); /** * 实有单位导出 @@ -1710,7 +2052,7 @@ */ @PostMapping("/common/data/assets/import") R listSaveMngRealAssetsExcelVO(@RequestBody List<ComMngRealAssetsExcelVO> list, - @RequestParam("communityId") Long communityId); + @RequestParam("communityId") Long communityId); /** * 实有单位导出 @@ -1858,7 +2200,7 @@ */ @PostMapping("/village/import") R listSaveVillageServeExcelVO(@RequestBody List<ComMngVillageServeExcelVO> list, - @RequestParam(value = "communityId") Long communityId); + @RequestParam(value = "communityId") Long communityId); /** * 批量导入实有人口 @@ -1871,7 +2213,7 @@ */ @PostMapping("/common/data/population/import") R listSavePopulationServeExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, - @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId); + @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId); /** * 批量导入吸毒人员 @@ -1884,7 +2226,7 @@ */ @PostMapping("/common/data/population/importDrug") R listSavePopulationDrugExcelVO(@RequestBody List<ComMngPopulationDrugExcelVO> list, - @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId); + @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId); /** * 批量导入社区矫正人员 @@ -1897,7 +2239,7 @@ */ @PostMapping("/common/data/population/importCorrect") R listSavePopulationCorrectExcelVO(@RequestBody List<ComMngPopulationCorrectExcelVO> list, - @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId); + @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId); /** * 批量导入重精人员 @@ -1910,7 +2252,7 @@ */ @PostMapping("/common/data/population/importMajor") R listSavePopulationMajorExcelVO(@RequestBody List<ComMngPopulationMajorExcelVO> list, - @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId); + @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId); /** * 批量导入邪教人员 @@ -1923,7 +2265,7 @@ */ @PostMapping("/common/data/population/importCult") R listSavePopulationCultExcelVO(@RequestBody List<ComMngPopulationCultExcelVO> list, - @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId); + @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId); /** * 批量导入刑释人员 @@ -1936,7 +2278,7 @@ */ @PostMapping("/common/data/population/importRehabilitation") R listSavePopulationRehabilitationExcelVO(@RequestBody List<ComMngPopulationRehabilitationExcelVO> list, - @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId); + @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId); /** * 批量导入重点上访人员 @@ -1949,7 +2291,7 @@ */ @PostMapping("/common/data/population/importKey") R listSavePopulationKeyExcelVO(@RequestBody List<ComMngPopulationKeyExcelVO> list, - @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId); + @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId); /** * 批量导入服刑人员 @@ -1962,7 +2304,7 @@ */ @PostMapping("/common/data/population/importSentence") R listSavePopulationSentenceExcelVO(@RequestBody List<ComMngPopulationSentenceExcelVO> list, - @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId); + @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId); /** * 批量导入退役军人 @@ -1975,7 +2317,7 @@ */ @PostMapping("/common/data/population/importVeterans") R listSavePopulationVeteransExcelVO(@RequestBody List<ComMngPopulationVeteransExcelVO> list, - @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId); + @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId); /** * 批量导入残疾人 @@ -1988,7 +2330,7 @@ */ @PostMapping("/common/data/population/importDisability") R listSavePopulationDisabilityExcelVO(@RequestBody List<ComMngPopulationDisabilityExcelVO> list, - @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId); + @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId); /** * 批量导入低保户 @@ -2001,7 +2343,57 @@ */ @PostMapping("/common/data/population/importLowSecurity") R listSavePopulationLowSecurityExcelVO(@RequestBody List<ComMngPopulationLowSecurityExcelVO> list, - @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId); + @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); /** * 确认导入实有人口(有则更新,无则新建) @@ -2014,7 +2406,7 @@ */ @PostMapping("/common/data/population/import/confirm") R listSavePopulationConfirm(@RequestBody List<ComMngPopulationServeExcelVO> list, - @RequestParam(value = "communityId") Long communityId); + @RequestParam(value = "communityId") Long communityId); /** * 分页查询实有人口 @@ -2034,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查询实有人口电子档案信息 @@ -2174,7 +2566,7 @@ /** * 小程序-问卷调查详情 - * + * * @param userId * 用户id * @param questId @@ -2186,7 +2578,7 @@ /** * 小程序-新增问卷调查浏览数量 - * + * * @param questId * 问卷调查id * @return 增加结果 @@ -2196,7 +2588,7 @@ /** * 小程序-用户弹窗添加不在提醒接口 - * + * * @param questId * 问卷id * @param userId @@ -2208,7 +2600,7 @@ /** * 社区后台-查询问卷调查详情 - * + * * @param questId * 问卷id * @return 问卷调查详情 @@ -2732,7 +3124,7 @@ */ @PostMapping("/common/data/population/edit") R editPopulation(@RequestBody ComMngPopulationEditDTO populationEditDTO, - @RequestParam("communityId") Long communityId); + @RequestParam("communityId") Long communityId); /** * 微心愿删除 @@ -2788,7 +3180,7 @@ * @return 详情 */ @GetMapping("/detailworkguide") - R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId, @RequestParam("conmunityId") Long conmunityId); + R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId, @RequestParam("communityId") Long communityId); /** * 办事指南_分页 @@ -2809,6 +3201,45 @@ */ @PostMapping("/delectworkguide") 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(); /** * 分页查询邻里圈 @@ -3254,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); + /** * 小程序-查询疫苗分类列表 * @@ -3402,7 +3975,7 @@ * @param eldersAuthTypeQueryDTO * @return */ - @PostMapping("/elders/authtype") + @PostMapping("/elders/authType") R communityElderAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO); /** @@ -3423,7 +3996,7 @@ */ @PostMapping("/eldersauthelderly/batchSave") R listSaveEldersAuthElderlyExcelVO(@RequestBody List<EldersAuthElderlyExcelVO> newVoList, - @RequestParam("communityId") Long communityId, @RequestParam("createBy") Long createBy); + @RequestParam("communityId") Long communityId, @RequestParam("createBy") Long createBy); /** * 批量保存楼栋 @@ -3434,7 +4007,7 @@ */ @PostMapping("/building/batchSave") R listSaveBuildingExcelVO(@RequestBody List<ComMngBuildingExcelVO> newVoList, - @RequestParam("communityId") Long communityId); + @RequestParam("communityId") Long communityId); /** * 插入字典 @@ -3614,7 +4187,7 @@ */ @PostMapping("/bigscreen/party/ageGender") R<BigScreenStatisticAgeGender> - ageGender(@RequestBody BigScreenStatisticAgeGenderDTO bigScreenStatisticAgeGenderDTO); + ageGender(@RequestBody BigScreenStatisticAgeGenderDTO bigScreenStatisticAgeGenderDTO); /** * 党建数据概览 @@ -3639,7 +4212,7 @@ */ @PostMapping("/bigscreen/party/bigscreenPartyactivity") R<List<BigScreenStatisticPartyActivity>> - bigscreenPartyactivity(BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO); + bigscreenPartyactivity(BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO); /** * 首页大屏统计接口 @@ -3687,7 +4260,7 @@ R activity(@RequestParam("communityId") Long communityId); /** - * 大屏统计一起议 + * 大屏统计议事投票 * * @param communityId * @return @@ -3755,11 +4328,11 @@ R getScreenEventDetail(@RequestBody BigScreenEventDetailDTO eventDetailDTO); /** - * 工作大屏-一起议列表 + * 工作大屏-议事投票列表 * * @param discussListDTO * 请求参数 - * @return 一起议列表 + * @return 议事投票列表 */ @PostMapping("/screen/work/getScreenDiscussList") R getScreenDiscussList(@RequestBody ScreenDiscussListDTO discussListDTO); @@ -4158,7 +4731,7 @@ /** * 查询用户交易记录总额 - * + * * @param pageTradeAdminDTO * 请求参数 * @return 交易记录总额 @@ -4168,7 +4741,7 @@ /** * 查询用户导出数据 - * + * * @param pageTradeAdminDTO * 请求参数 * @return 用户导出数据 @@ -4178,7 +4751,7 @@ /** * 导出奖励台账数据 - * + * * @param pageTradeAdminDTO * 请求参数 * @return 奖励台账数据 @@ -4188,7 +4761,7 @@ /** * 查询社区统计数据 - * + * * @param pageTradeAdminDTO * 查询社区统计数据 * @return 社区统计数据 @@ -4198,7 +4771,7 @@ /** * 社区随手拍列表统计 - * + * * @param communityId * 社区id * @return 统计结果 @@ -4244,7 +4817,7 @@ * @return 邻里圈话题列表 */ @GetMapping("/neighbor/getNeighborTopicByApp") - R getNeighborTopicByApp(@RequestParam("communityId") Long communityId); + R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero,@RequestParam("name") String name); /** * 综治后台-查询社区列表 @@ -4337,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 @@ -4367,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 @@ -4387,6 +4981,16 @@ 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查询详情 * * @param safetyWorkRecordId @@ -4395,7 +4999,7 @@ */ @GetMapping("/patrolRecord/safetyWorkRecord/detail") R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId, - @RequestParam(value = "communityId", required = false) Long communityId); + @RequestParam(value = "communityId", required = false) Long communityId); /** * 根据巡查记录id查询安全工作记录详情 @@ -4406,7 +5010,7 @@ */ @GetMapping("/patrolRecord/safetyWorkRecord/detailByPrId") R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId, - @RequestParam(value = "communityId", required = false) Long communityId); + @RequestParam(value = "communityId", required = false) Long communityId); /** * 分页查询隐患报告 @@ -4417,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查询详情 @@ -4477,7 +5091,7 @@ /** * 小程序-查询积分说明 - * + * * @return 积分说明 */ @GetMapping("/integral/explain/applets") @@ -4485,7 +5099,7 @@ /** * 小程序-用户查询当前社区可领取积分规则列表 - * + * * @param userId * 用户id * @param communityId @@ -4497,7 +5111,7 @@ /** * 小程序-查询用户积分列表 - * + * * @param userId * 用户id * @return 用户积分列表 @@ -4507,7 +5121,7 @@ /** * 小程序-查询社区积分账户排行榜 - * + * * @param communityRankDTO * 请求参数 * @return 社区积分账户排行榜 @@ -4517,7 +5131,7 @@ /** * 小程序-查询用户社区积分明细 - * + * * @param communityTradeDTO * 请求参数 * @return 用户社区积分明细 @@ -4527,7 +5141,7 @@ /** * 社区后台-根据社区id查询社区下积分规则列表 - * + * * @param integralRuleDTO * 请求参数 * @return 社区下积分规则列表 @@ -4537,7 +5151,7 @@ /** * 社区后台-编辑社区积分规则 - * + * * @param integralRuleDTO * 请求参数 * @return 编辑结果 @@ -4547,7 +5161,7 @@ /** * 社区后台-分页查询社区下积分明细记录 - * + * * @param integralRuleDTO * 请求参数 * @return 社区下积分明细记录 @@ -4557,7 +5171,7 @@ /** * 给用户添加积分 - * + * * @param integralUserDTO * 请求参数 * @return 添加积分结果 @@ -4567,7 +5181,7 @@ /** * 根据社区活动id查询社区活动报名人员列表 - * + * * @param activityId * 活动id * @return 社区活动报名人员列表 @@ -4587,7 +5201,7 @@ /** * 根据id查询值班表 - * + * * @param rotaId * 值班表id * @return 值班表详情 @@ -4607,7 +5221,7 @@ /** * 批量删除值班表 - * + * * @param rotaIds * 值班ids * @return 删除结果 @@ -4654,7 +5268,7 @@ /** * 查询社区所有列表 - * + * * @return 社区列表 */ @GetMapping("/switch/community/all/list") @@ -4662,7 +5276,7 @@ /** * 根据名字查询所有社区列表 - * + * * @param name * 社区名字 * @return 社区列表 @@ -4672,7 +5286,7 @@ /** * 根据经纬度以及距离搜索附近社区列表 - * + * * @param communityDTO * 请求参数 * @return 社区列表 @@ -4682,7 +5296,7 @@ /** * 问卷调查统计汇总 - * + * * @param summaryDTO * 请求参数 * @return 统计汇总 @@ -4692,7 +5306,7 @@ /** * 问卷调查统计汇总导出数据查询 - * + * * @param questId * 调查问卷id * @return 调查统计汇总导出数据 @@ -4702,7 +5316,7 @@ /** * 问卷调查统计汇总表头统计 - * + * * @param questId * 调查问卷id * @return 问卷调查统计汇总表头统计数据 @@ -4712,7 +5326,7 @@ /** * 运营后台-新增随手拍分类 - * + * * @param addPhotoClassify * 请求参数 * @return 新增结果 @@ -4722,7 +5336,7 @@ /** * 运营后台-编辑随手拍分类 - * + * * @param addPhotoClassify * 请求参数 * @return 编辑结果 @@ -4732,7 +5346,7 @@ /** * 运营后台-分页查询随手拍分类 - * + * * @param addPhotoClassify * 请求参数 * @return 随手拍分类列表 @@ -4742,7 +5356,7 @@ /** * 运营后台-随手拍分类详情 - * + * * @param id * 随手拍分类id * @return 随手拍分类 @@ -4752,7 +5366,7 @@ /** * 运营后台-随手拍分类删除 - * + * * @param id * 随手拍分类id * @return 删除结果 @@ -4762,7 +5376,7 @@ /** * 运营后台-查询随手拍分类列表 - * + * * @return 随手拍分类列表 */ @GetMapping("/classify/admin/list") @@ -4770,7 +5384,7 @@ /** * 社区后台-切换随手拍公示状态 - * + * * @param comActEasyPhotoVO * 请求参数 * @return 切换结果 @@ -4780,11 +5394,641 @@ /** * 查询社区待处理随手拍id集合 - * + * * @param communityId * 社区id * @return 社区待处理随手拍id集合 */ @GetMapping("/easyphoto/noHandle/list") R easyPhotoNoHandleList(@RequestParam("communityId") Long communityId); + + @GetMapping("/reserve/detail") + R reserveDetail(@RequestParam("id") Long id,@RequestParam("userId") Long userId,@RequestParam("recordId") Long recordId,@RequestParam("isBack") Integer isBack); + + @PostMapping("/reserve/commit") + R reserveCommit(@RequestBody ComActReserveCommitVO comActReserveCommitVO); + + /** + * 我的预约/登记 + * @param pageUserReserveDTO + * @return + */ + @PostMapping("/reserve/userReserveList") + R userReserveList(@RequestBody PageUserReserveDTO pageUserReserveDTO); + + /** + * 取消预约/登记 + */ + @PostMapping("/reserve/cancelReserve") + R userCancelReserve(@RequestBody CancelRecordDTO comActReserveRecordDO); + + /** + * 预约详情操作记录 + */ + @PostMapping("/reserve/detailOperation") + R reserveOperation(@RequestBody OperationDetailDTO comActReserveOperationRecordDO); + + /** + * 社区后台-分页查询预约登记列表 + * @param pageReserveDTO 请求参数 + * @return 预约登记列表 + */ + @PostMapping("/reserve/admin/page") + R pageReserveAdmin(@RequestBody PageReserveAdminDTO pageReserveDTO); + + /** + * 社区后台-新增预约登记信息 + * @param addReserveDTO 请求参数 + * @return 新增结果 + */ + @PostMapping("/reserve/admin/add") + R addReserveAdmin(@RequestBody AddReserveAdminDTO addReserveDTO); + + /** + * 社区后台-编辑预约登记信息 + * @param editReserveDTO 请求参数 + * @return 新增结果 + */ + @PostMapping("/reserve/admin/edit") + R editReserveAdmin(@RequestBody EditReserveAdminDTO editReserveDTO); + + /** + * 社区后台-修改预约登记状态 + * @param editReserveDTO 请求参数 + * @return 修改结果 + */ + @PostMapping("/reserve/admin/edit/status") + R editReserveStatusAdmin(@RequestBody EditComActReserveStatusDTO editReserveDTO); + + /** + * 社区后台-继续预约登记 + * @param editReserveDTO 请求参数 + * @return 修改结果 + */ + @PostMapping("/reserve/admin/edit/info") + R editReserveInfoAdmin(@RequestBody EditComActReserveInfoDTO editReserveDTO); + + /** + * 社区后台-根据预约登记id查询详情 + * @param reserveId 预约登记id + * @return 预约登记详情 + */ + @GetMapping("/reserve/admin/detail") + R detailReserveAdmin(@RequestParam("reserveId") Long reserveId); + + /** + * 社区后台-根据社区id统计预约类数据 + * @param makeStatisticsDTO 请求参数 + * @return 统计预约类数据 + */ + @PostMapping("/reserve/admin/make/statistics") + R makeStatisticsAdmin(@RequestBody ComActReserveMakeStatisticsDTO makeStatisticsDTO); + + /** + * 社区后台-查询导出预约统计汇总数据 + * @param makeStatisticsDTO 请求参数 + * @return 统计预约类数据 + */ + @PostMapping("/reserve/admin/make/statistics/export") + R makeStatisticsExportAdmin(@RequestBody ComActReserveMakeStatisticsDTO makeStatisticsDTO); + + /** + * 社区后台-根据预约id查询预约明细 + * @param pageMakeDTO 请求参数 + * @return 预约明细 + */ + @PostMapping("/reserve/admin/make/page") + R pageMakeAdmin(@RequestBody PageReserveMakeAdminDTO pageMakeDTO); + + /** + * 根据预约记录id查询预约明细操作记录 + * @param reserveRecordId 预约记录id + * @return 预约明细操作记录 + */ + @GetMapping("/reserve/admin/make/detail") + R detailMakeAdmin(@RequestParam("reserveRecordId") Long reserveRecordId); + + /** + * 批量取消预约记录 + * @param reserveRecordDTO 请求参数 + * @return 取消结果 + */ + @PostMapping("/reserve/admin/make/cancel") + R makeCancelAdmin(@RequestBody CancelReserveRecordDTO reserveRecordDTO); + + /** + * 预约明细导出数据查询 + * @param pageMakeDTO 请求参数 + * @return 预约明细数据 + */ + @PostMapping("/reserve/admin/make/list/export") + R exportMakeAdmin(@RequestBody PageReserveMakeAdminDTO pageMakeDTO); + + /** + * 分页查询登记统计汇总 + * @param registerStatisticsDTO 请求参数 + * @return 登记统计汇总 + */ + @PostMapping("/reserve/admin/register/page") + R registerStatisticsAdmin(@RequestBody ComActReserveRegisterStatisticsDTO registerStatisticsDTO); + + /** + * 导出登记统计汇总 + * @param registerStatisticsDTO 请求参数 + * @return 登记统计汇总 + */ + @PostMapping("/reserve/admin/register/export") + R registerStatisticsExportAdmin(@RequestBody ComActReserveRegisterStatisticsDTO registerStatisticsDTO); + + /** + * 分页查询预约处理列表 + * @param pageMakeHandleDTO 请求参数 + * @return 预约处理列表 + */ + @PostMapping("/reserve/admin/make/handle/page") + R pageMakeHandleAdmin(@RequestBody PageReserveMakeHandleAdminDTO pageMakeHandleDTO); + + /** + * 批量处理预约记录 + * @param makeHandleDTO 请求参数 + * @return 处理结果 + */ + @PostMapping("/reserve/admin/make/handle") + R makeHandleAdmin(@RequestBody MakeHandleAdminDTO makeHandleDTO); + + /** + * 导出预约处理列表数据查询 + * @param pageMakeHandleDTO 请求参数 + * @return 预约处理列表 + */ + @PostMapping("/reserve/admin/make/handle/export") + R exportMakeHandleAdmin(@RequestBody PageReserveMakeHandleAdminDTO pageMakeHandleDTO); + + /** + * 删除预约登记信息 + * @param reserveId 预约登记id + * @return 删除结果 + */ + @GetMapping("/reserve/admin/delete") + R deleteReserveAdmin(@RequestParam("reserveId") Long reserveId); + + /** + * 查询社区所有预约信息列表 + * @param communityId 社区id + * @return 预约信息列表 + */ + @GetMapping("/reserve/admin/list") + R listReserveAdmin(@RequestParam("communityId") Long communityId); + + /** + * 导出登记明细数据 + * @param reserveId 登记id + * @return 登记明细数据 + */ + @GetMapping("/reserve/admin/register/list/export") + R exportRegisterAdmin(@RequestParam("reserveId") Long reserveId); + + /** + * 查询预约登记题目列表 + * @param reserveId 预约登记id + * @return 约登记题目列表 + */ + @GetMapping("/reserve/admin/subject/list") + R subjectListAdmin(@RequestParam("reserveId") Long reserveId); + + /** + * 分页查询登记明细列表 + * @param detailedAdminDTO 请求参数 + * @return 登记明细列表 + */ + @PostMapping("/reserve/admin/register/detailed/list") + R registerDetailedListAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO); + + /** + * 查询登记详情记录 + * @param reserveRecordId 登记记录id + * @return 登记详情记录 + */ + @GetMapping("/reserve/admin/register/detailed/detail") + R registerDetailedDetailAdmin(@RequestParam("reserveRecordId") Long reserveRecordId); + /** + * 活动签到 + * + * @param comActActRegistVO 请求参数 + * @return 签到结果 + */ + @PostMapping("/activity/sign-in") + R activitySignIn(@RequestBody ComActActRegistVO comActActRegistVO); + + /** + * 用户签到列表 + * + * @param userId 用户id + * @return 用户签到记录列表 + */ + @GetMapping("/sign-in/user/list") + R listSignInActivity(@RequestParam("userId") Long userId); + + /** + * 社区活动评价 + * + * @param comActActEvaluateVO 社区评价VO + * @return 评价结果 + */ + @PostMapping("/activity/evaluate") + R activityEvaluate(@RequestBody ComActActEvaluateVO comActActEvaluateVO); + + /** + * 用户评价列表 + * + * @param userId 用户id + * @return 当前用户对所有活动的评价列表 + */ + @GetMapping("/evaluate/user/list") + R listEvaluate(@RequestParam("userId") Long userId); + + /** + * 定时任务针对活动结束后7天还未评价的用户默认好评 + */ + @PostMapping("/activity/default-praise") + R timedTaskActivityDefaultPraise(); + + /** + * 小程序-用户新增话题 + * @param circleTopicAppDTO 请求参数 + * @return 新增结果 + */ + @PostMapping("/neighbor/addNeighborTopicByApp") + R addNeighborTopicByApp(@RequestBody AddNeighborCircleTopicAppDTO circleTopicAppDTO); + + /** + * 小程序-删除邻里圈 + * @param circleTopicAppDTO 请求参数 + * @return 删除结果 + */ + @PostMapping("/neighbor/deleteNeighborByApp") + R deleteNeighborByApp(@RequestBody DeleteNeighborCircleAppDTO circleTopicAppDTO); + + /** + * 获取系统配置value + * @param key 系统配置code + * @param communityId 社区id + * @return 系统配置value + */ + @GetMapping("/sys/conf/getSysConfValue") + R getSysConfValue(@RequestParam("key") String key,@RequestParam("communityId") Long communityId); + + /** + * 新增系统配置 + * @param key 系统配置code + * @param communityId 社区id + * @param name 系统配置名称 + * @param value 系统配置value + * @return 新增结果 + */ + @GetMapping("/sys/conf/addSysConfValue") + R addSysConfValue(@RequestParam("key") String key,@RequestParam("communityId") Long communityId,@RequestParam("name") String name,@RequestParam("value") String value); + + /** + * 编辑系统配置 + * @param communityId 社区id + * @param status 配置值 + * @return 编辑结果 + */ + @GetMapping("/sys/conf/editSysConfValue") + R editSysConfValue(@RequestParam("communityId") Long communityId,@RequestParam("status") Integer status); + + /** + * 议事投票后台公布结果 + * @param publishResultDTO 请求参数 + * @return 公布结果 + */ + @PostMapping("publishResultAdmin") + R publishResultAdmin(@RequestBody ComActDiscussPublishResultDTO publishResultDTO); + + /** + * 议事投票-评论/回复删除 + * @param id 评论/回复id + * @return 删除结果 + */ + @GetMapping("deleteDiscussCommentAdmin") + R deleteDiscussCommentAdmin(@RequestParam("id") Long id); + + /** + * 查询社区可发布议事投票权限配置 + * @param communityId 社区id + * @return 社区可发布议事投票权限配置 + */ + @GetMapping("discussJurisdictionGet") + R discussJurisdictionGet(@RequestParam("communityId") Long communityId,@RequestParam("userId") Long userId); + + /** + * 设置当前社区议事投票小程序身份验证参数(1.全部 2.党员 3.志愿者 4.社区工作人员) + * @param communityId 社区id + * @param value 需要设置的参数值 + * @return 设置结果 + */ + @GetMapping("discussJurisdictionSet") + R discussJurisdictionSet(@RequestParam("communityId") Long communityId, @RequestParam("value") String value); + + /** + * 议事投票检测状态定时任务 + * @return 执行结果 + */ + @GetMapping("timedTaskDiscussInspectStatus") + R timedTaskDiscussInspectStatus(); + + /** + * 一起议增加浏览量 + * @param discussId 一起议主键id + */ + @PostMapping("discuss/increase-view-num") + void increaseViewNum(@RequestParam("discussId") Long discussId); + + /** + * 定时任务每半小时执行一次将一起议浏览量写入到表中 + */ + @PostMapping("discuss/write-view-num") + R timedTaskWriteDiscussViewNumToTable(); + + /** + * 公布/编辑一起议投票结果 + * @param comActDiscussDTO + * @return 请求结果 + */ + @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); } -- Gitblit v1.7.1