java/zhihuishenqu.git

			@@ -2,10 +2,7 @@

			import java.util.List;

			import com.panzhihua.common.model.dtos.community.*;
			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.DeleteMapping;
			import org.springframework.web.bind.annotation.GetMapping;
			@@ -19,6 +16,82 @@
			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.ComSwDangerReportEditDTO;
			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.ComSwPatrolRecordEditDTO;
			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.ComSwSafetyWorkEditDTO;
			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.GetIdentityEidTokenDTO;
			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.PageElderAuthRecordsDTO;
			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;
			@@ -28,19 +101,52 @@
			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.convenient.ConvenientMerchantDTO;
			import com.panzhihua.common.model.dtos.community.convenient.ConvenientProductCategoryDTO;
			import com.panzhihua.common.model.dtos.community.convenient.ConvenientProductDTO;
			import com.panzhihua.common.model.dtos.community.convenient.ConvenientServiceCategoryDTO;
			import com.panzhihua.common.model.dtos.community.convenient.DeleteConvenientProductDTO;
			import com.panzhihua.common.model.dtos.community.convenient.DisableOrEnableConvenientMerchantDTO;
			import com.panzhihua.common.model.dtos.community.convenient.ExportMerchantDTO;
			import com.panzhihua.common.model.dtos.community.convenient.OnShelfOrOffShelfProductDTO;
			import com.panzhihua.common.model.dtos.community.convenient.PageClassifyMerchantDTO;
			import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO;
			import com.panzhihua.common.model.dtos.community.convenient.PageConvenientProductCategoryDTO;
			import com.panzhihua.common.model.dtos.community.convenient.PageConvenientProductDTO;
			import com.panzhihua.common.model.dtos.community.convenient.PageConvenientServiceCategoryDTO;
			import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
			import com.panzhihua.common.model.dtos.community.convenient.PageSearchDTO;
			import com.panzhihua.common.model.dtos.community.convenient.ResetPasswordConvenientMerchantDTO;
			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.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.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.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.*;
			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;
			@@ -63,6 +169,23 @@
			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.neighbor.AddComActNeighborCircleAppDTO;
			import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAdminDTO;
			import com.panzhihua.common.model.dtos.neighbor.AddNeighborCircleTopicAppDTO;
			import com.panzhihua.common.model.dtos.neighbor.ComActNeighborAddBrowseAppDTO;
			import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAdminDTO;
			import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleAppDTO;
			import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleDetailAppDTO;
			import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCircleTopicAdminDTO;
			import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCommentAppDTO;
			import com.panzhihua.common.model.dtos.neighbor.ComActNeighborCommentReplyAppDTO;
			import com.panzhihua.common.model.dtos.neighbor.ComActNeighborFabulousAppDTO;
			import com.panzhihua.common.model.dtos.neighbor.ComActNeighborForwardAppDTO;
			import com.panzhihua.common.model.dtos.neighbor.ComActNeighborReplyAppDTO;
			import com.panzhihua.common.model.dtos.neighbor.DeleteNeighborCircleAppDTO;
			import com.panzhihua.common.model.dtos.neighbor.DetailNeighborAllCommentByAdminDTO;
			import com.panzhihua.common.model.dtos.neighbor.DetailNeighborCommentReplyByAdminDTO;
			import com.panzhihua.common.model.dtos.property.CommonPage;
			import com.panzhihua.common.model.dtos.shop.ComShopAddressDTO;
			import com.panzhihua.common.model.dtos.shop.ComShopCartDTO;
			import com.panzhihua.common.model.dtos.shop.ComShopEditNubCartDTO;
			@@ -99,10 +222,10 @@
			import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyActivity;
			import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyBuild;
			import com.panzhihua.common.model.vos.community.bigscreen.PartyBuildingMemberVO;
			import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
			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;
			@@ -1160,12 +1283,20 @@
			/**
			* 议事投票-详情
			*
			* @param id
			* 主键
			* @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);

			/**
			* 议事投票-删除
			@@ -1198,6 +1329,16 @@
			R pageDiscuss(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);

			/**
			* 议事投票-后台分页查询
			*
			* @param pageComActDiscussDTO
			* 查询参数
			* @return ComActDiscussVO
			*/
			@PostMapping("pagediscussAdmin")
			R pageDiscussAdmin(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);

			/**
			* 议事投票-评论-查看
			*
			* @param id
			@@ -1206,6 +1347,14 @@
			*/
			@PostMapping("detaildiscusscomment")
			R detailDiscussComment(@RequestParam("id") Long id);

			/**
			* 议事投票评论详情
			* @param pageComActDiscussCommentDTO 请求参数
			* @return 议事投票详情
			*/
			@PostMapping("detaildiscusscommentAdmin")
			R detailDiscussCommentAdmin(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);

			/**
			* 议事投票-评论-置顶
			@@ -1236,6 +1385,16 @@
			*/
			@PostMapping("pagediscusscomment")
			R pageDiscussComment(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);

			/**
			* 议事投票-评论-后台分页查询
			*
			* @param pageComActDiscussCommentDTO
			* 分页查询参数
			* @return ComActDiscussCommentVO
			*/
			@PostMapping("pagediscusscommentAdmin")
			R pageDiscussCommentAdmin(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);

			/**
			* 议事投票-分页查询小程序
			@@ -3565,14 +3724,14 @@
			R getElderAuthRecordsByIds(@RequestBody List<Long> ids);

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

			/**
			* 分页查询养老金人员认证记录 pagePensionAuthRecords 分页查询养老金人员认证记录
			@@ -3633,6 +3792,27 @@
			*/
			@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);

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

			/**
			@@ -5506,6 +5686,67 @@
			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 执行结果
			*/
			@@ -5556,4 +5797,624 @@
			*/
			@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);

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

			/**
			* 通过主键查询单条数据
			*
			* @param id 主键
			* @return 单条数据
			*/
			@GetMapping("/comActFourMember/{id}")
			R comActFourMemberSelectOne(@PathVariable("id") Integer id);

			/**
			* 新增数据
			*
			* @param comActFourMember 实体对象
			* @return 新增结果
			*/
			@PostMapping("/comActFourMember")
			R comActFourMemberInsert(@RequestBody ComActFourMemberVO comActFourMember);

			/**
			* 修改数据
			*
			* @param comActFourMember 实体对象
			* @return 修改结果
			*/
			@PostMapping("/comActFourMember/update")
			R comActFourMemberUpdate(@RequestBody ComActFourMemberVO comActFourMember);

			/**
			* 删除数据
			*
			* @param comActFourMember 主键结合
			* @return 删除结果
			*/
			@PostMapping("/comActFourMember/del")
			R comActFourMemberDelete(@RequestBody ComActFourMemberVO comActFourMember);

			/**
			* 楼栋查询
			* @param communityId
			* @return
			*/
			@GetMapping("/building/query")
			R comActFourMemberQueryBuilding(@RequestParam("communityId")Long communityId);

			/**
			* 查询房屋二级级联菜单
			*
			* @param cascadeHouseDTO
			* 请求参数
			* @return 菜单列表
			*/
			@PostMapping("/common/data/population/second/list")
			R getSecondHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO);

			/**
			* 微心愿处理人列表
			* @param communityId 社区id
			* @param type 处理人类型（1.后台用户 2.党员 3.志愿者）
			* @return 处理人列表
			*/
			@GetMapping("/wish/handle/list/admin")
			R wishHandleListAdmin(@RequestParam(value = "communityId") Long communityId,@RequestParam("type") Integer type);

			/**
			* 便民服务新增分类
			* @param convenientServiceCategoryDTO
			* @return
			*/
			@PostMapping("/convenient/service-category/add")
			R addServiceCategory(@RequestBody ConvenientServiceCategoryDTO convenientServiceCategoryDTO);

			/**
			* 便民服务分类编辑
			* @param convenientServiceCategoryDTO
			* @return
			*/
			@PutMapping("/convenient/service-category/put")
			R putServiceCategory(@RequestBody ConvenientServiceCategoryDTO convenientServiceCategoryDTO);

			/**
			* 便民服务分类删除
			* @param categoryId
			* @return
			*/
			@DeleteMapping("/convenient/service-category/delete")
			R deleteServiceCategory(@RequestParam("categoryId") Long categoryId, @RequestParam("operator") Long operator);

			/**
			* 获取便民服务分类详情
			* @param categoryId
			* @return
			*/
			@GetMapping("/convenient/service-category/get")
			R getServiceCategory(@RequestParam("categoryId") Long categoryId);

			/**
			* 分页查询便民服务分类
			* @param pageConvenientServiceCategoryDTO
			* @return
			*/
			@PostMapping("/convenient/service-category/page")
			R pageServiceCategory(@RequestBody PageConvenientServiceCategoryDTO pageConvenientServiceCategoryDTO);

			/**
			* 便民服务新增商家
			* @param convenientMerchantDTO
			* @return
			*/
			@PostMapping("/convenient/merchant/add")
			R addMerchant(@RequestBody ConvenientMerchantDTO convenientMerchantDTO);

			/**
			* 编辑便民服务商家
			* @param convenientMerchantDTO
			* @return
			*/
			@PutMapping("/convenient/merchant/put")
			R putMerchant(@RequestBody ConvenientMerchantDTO convenientMerchantDTO);

			/**
			* 删除便民服务商家
			* @param merchantId
			* @param operator
			* @return
			*/
			@DeleteMapping("/convenient/merchant/delete")
			R deleteMerchant(@RequestParam("merchantId") Long merchantId, @RequestParam("operator") Long operator);

			/**
			* 分页查询便民服务商家
			* @param pageConvenientMerchantDTO
			* @return
			*/
			@PostMapping("/convenient/merchant/page")
			R pageMerchant(@RequestBody PageConvenientMerchantDTO pageConvenientMerchantDTO);

			/**
			* 获取便民服务商家详情
			* @param merchantId
			* @return
			*/
			@GetMapping("/convenient/merchant/get")
			R getMerchant(@RequestParam("merchantId") Long merchantId);

			/**
			* 禁用/启用便民服务商家
			* @param disableOrEnableConvenientMerchantDTO
			* @return
			*/
			@PutMapping("/convenient/merchant/disable-or-enable")
			R disableOrEnableMerchant(@RequestBody DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO);

			/**
			* 重置便民服务商家账号密码
			* @param resetPasswordConvenientMerchantDTO
			* @return
			*/
			@PutMapping("/convenient/merchant/reset-password")
			R resetPasswordMerchant(@RequestBody ResetPasswordConvenientMerchantDTO resetPasswordConvenientMerchantDTO);

			/**
			* 获取所有便民服务分类
			* @return
			*/
			@GetMapping("/convenient/service-category/all")
			R getAllServiceCategories();

			/**
			* 获取用户便民服务商家详情
			* @param account 商家绑定账号
			* @return
			*/
			@GetMapping("/convenient/getUserMerchantInfoByAccount")
			R<ConvenientMerchantVO> getUserMerchantInfoByAccount(@RequestParam("account") String account);

			/**
			* 获取商便民服务商家信息
			* @param userId
			* @return
			*/
			@GetMapping("/convenient/merchantInfo")
			R<ConvenientMerchantVO> getUserConvenientMerchantInfo(@RequestParam("userId") Long userId);

			/**
			* 新增便民服务产品分类信息
			* @param convenientProductCategoryDTO
			* @return
			*/
			@PostMapping("/convenient/product-category/add")
			R addProductCategory(@RequestBody ConvenientProductCategoryDTO convenientProductCategoryDTO);

			/**
			* 编辑便民服务产品分类信息
			* @param convenientProductCategoryDTO
			* @return
			*/
			@PutMapping("/convenient/product-category/put")
			R putProductCategory(@RequestBody ConvenientProductCategoryDTO convenientProductCategoryDTO);

			/**
			* 删除便民服务产品分类信息
			* @param categoryId
			* @param operator
			* @return
			*/
			@DeleteMapping("/convenient/product-category/delete")
			R deleteProductCategory(@RequestParam("categoryId") Long categoryId, @RequestParam("operator") Long operator);

			/**
			* 获取便民服务产品分类详情
			* @param categoryId
			* @return
			*/
			@GetMapping("/convenient/product-category/get")
			R getProductCategory(@RequestParam("categoryId") Long categoryId);

			/**
			* 分页查询便民服务产品分类信息
			* @param pageConvenientProductCategoryDTO
			* @return
			*/
			@PostMapping("/convenient/product-category/page")
			R pageProductCategory(@RequestBody PageConvenientProductCategoryDTO pageConvenientProductCategoryDTO);

			/**
			* 便民服务商家后台新增产品
			* @param convenientProductDTO
			* @return
			*/
			@PostMapping("/convenient/product/add")
			R addProduct(@RequestBody ConvenientProductDTO convenientProductDTO);

			/**
			* 便民服务商家后台编辑产品
			* @param convenientProductDTO
			* @return
			*/
			@PutMapping("/convenient/product/put")
			R putProduct(@RequestBody ConvenientProductDTO convenientProductDTO);

			/**
			* 便民服务商家后台获取产品详情
			* @param productId
			* @return
			*/
			@GetMapping("/convenient/product/get")
			R getProduct(@RequestParam("productId") Long productId);

			/**
			* 便民服务商家后台分页获取产品信息
			* @param pageConvenientProductDTO
			* @return
			*/
			@PostMapping("/convenient/product/page")
			R pageProduct(@RequestBody PageConvenientProductDTO pageConvenientProductDTO);

			/**
			* 便民服务商家后台删除产品信息
			* @param deleteConvenientProductDTO
			* @return
			*/
			@DeleteMapping("/convenient/product/delete")
			R deleteProduct(@RequestBody DeleteConvenientProductDTO deleteConvenientProductDTO);

			/**
			* 便民服务商家后台上架/下架产品
			* @param onShelfOrOffShelfProductDTO
			* @return
			*/
			@PutMapping("/convenient/product/onShelf-or-offShelf")
			R onShelfOrOffShelfProduct(@RequestBody OnShelfOrOffShelfProductDTO onShelfOrOffShelfProductDTO);

			/**
			* 获取所有产品分类
			* @return
			*/
			@GetMapping("/convenient/product-category/all")
			R getAllProductCategory();

			/**
			* 获取该社区商家数量大于0的分类
			* @param communityId
			* @return
			*/
			@GetMapping("/convenient/service-category/suitable")
			R getSuitableServiceCategories(@RequestParam("communityId") Long communityId);

			/**
			* 获取该社区下的热门商家
			* @param pagePopularMerchantDTO
			* @return
			*/
			@PostMapping("/convenient/merchant/popular")
			R getPopularMerchants(@RequestBody PagePopularMerchantDTO pagePopularMerchantDTO);

			/**
			* 分页获取服务类型下商家信息
			* @param pageClassifyMerchantDTO
			* @return
			*/
			@PostMapping("/convenient/merchant/classify")
			R getClassifyMerchants(@RequestBody PageClassifyMerchantDTO pageClassifyMerchantDTO);

			/**
			* 获取商家详情
			* @param merchantId
			* @return
			*/
			@GetMapping("/convenient/merchant/detail")
			R getMerchantDetail(@RequestParam("merchantId") Long merchantId);

			/**
			* 获取商家产品
			* @param merchantId
			* @return
			*/
			@GetMapping("/convenient/product/list")
			R getMerchantProduct(@RequestParam("merchantId") Long merchantId);

			/**
			* 获取产品详情
			* @param productId
			* @return
			*/
			@GetMapping("/convenient/product/detail")
			R getProductDetail(@RequestParam("productId") Long productId);

			/**
			* 搜索商家信息
			* @param pageSearchDTO
			* @return
			*/
			@PostMapping("/convenient/merchant/search")
			R pageSearchMerchant(@RequestBody PageSearchDTO pageSearchDTO);

			/**
			* 搜索商品信息
			* @param pageSearchDTO
			* @return
			*/
			@PostMapping("/convenient/product/search")
			R pageSearchProduct(@RequestBody PageSearchDTO pageSearchDTO);

			/**
			* 增加商家店铺咨询量
			* @param merchantId
			* @return
			*/
			@GetMapping("/convenient/merchant/consult")
			R consultMerchant(@RequestParam("merchantId") Long merchantId);

			/**
			* 增加产品浏览量
			* @param productId
			* @return
			*/
			@GetMapping("/convenient/product/incr-view")
			R incrProductView(@RequestParam("productId") Long productId);

			/**
			* 获取商家导出数据
			* @param exportMerchantDTO
			* @return
			*/
			@PostMapping("/convenient/merchant/export")
			R exportMerchant(@RequestBody ExportMerchantDTO exportMerchantDTO);

			/**
			* 增加商家店铺浏览量
			* @param merchantId
			* @return
			*/
			@GetMapping("/convenient/merchant/incr-view")
			R incrMerchantView(@RequestParam("merchantId") Long merchantId);

			/**
			* 定时任务每隔半小时将商家浏览量和咨询量总值计入指定商家数据中
			* @return
			*/
			@PostMapping("/convenient/timedTaskWriteDataToMerchantJobHandler")
			R timedTaskWriteDataToMerchantJobHandler();

			/**
			* 获取商家上下架产品数量
			* @param merchantId
			* @return
			*/
			@GetMapping("/convenient/product/shelf-num")
			R getProductShelfNum(@RequestParam("merchantId") Long merchantId);
			}