Merge remote-tracking branch 'origin/master'

huanghongfa

2021-12-14 d7ea73196c8eb7df71c20b4fdccbc1ef9eff96fe

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

@@ -2,19 +2,8 @@

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.scheduling.annotation.Async;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -48,15 +37,21 @@
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.ComMngPopulationHouseInsertAdminDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseUserVO;
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.ComPropertyPublicityDTO;
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;
@@ -69,6 +64,7 @@
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;
@@ -88,7 +84,9 @@
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.PageComPropertyPublicityDTO;
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;
@@ -107,18 +105,55 @@
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.building.admin.AddBuildingHouseDto;
import com.panzhihua.common.model.dtos.community.building.admin.AddBuildingUnitDto;
import com.panzhihua.common.model.dtos.community.building.admin.DeleteBuildingHousePopulationDto;
import com.panzhihua.common.model.dtos.community.building.admin.EditBuildingHouseDto;
import com.panzhihua.common.model.dtos.community.building.admin.EditBuildingUnitDto;
import com.panzhihua.common.model.dtos.community.building.admin.PageBuildingListDto;
import com.panzhihua.common.model.dtos.community.building.admin.PageBuildingUnitHouseListDto;
import com.panzhihua.common.model.dtos.community.cluster.PageClusterMemberDto;
import com.panzhihua.common.model.dtos.community.cluster.admin.AddClusterAdminDto;
import com.panzhihua.common.model.dtos.community.cluster.admin.AddClusterMemberAdminDto;
import com.panzhihua.common.model.dtos.community.cluster.admin.EditClusterAdminDto;
import com.panzhihua.common.model.dtos.community.cluster.admin.EditClusterMemberAdminDto;
import com.panzhihua.common.model.dtos.community.cluster.admin.PageClusterAdminDto;
import com.panzhihua.common.model.dtos.community.cluster.admin.PageClusterMemberAdminDto;
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.rentingHouses.*;
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;
@@ -137,6 +172,10 @@
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.community.warehouse.ComActWarehouseApplyDTO;
import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseDonatesDTO;
import com.panzhihua.common.model.dtos.community.warehouse.ExportDonatesDTO;
import com.panzhihua.common.model.dtos.community.warehouse.PageDonatesDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
@@ -153,6 +192,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;
@@ -190,15 +246,23 @@
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.ComActAnnouncementVO;
import com.panzhihua.common.model.vos.community.ComActColumnVO;
import com.panzhihua.common.model.vos.community.ComActCommiteeVO;
import com.panzhihua.common.model.vos.community.ComActDynVO;
import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
import com.panzhihua.common.model.vos.community.ComActFourMemberVO;
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.ComActSocialOrgVO;
import com.panzhihua.common.model.vos.community.ComActVO;
import com.panzhihua.common.model.vos.community.ComActWorkGuideClassifyVO;
import com.panzhihua.common.model.vos.community.ComActWorkGuideVO;
import com.panzhihua.common.model.vos.community.ComCvtServeExcelVO;
import com.panzhihua.common.model.vos.community.ComElderAuthRecordImportExcelVO;
import com.panzhihua.common.model.vos.community.ComElderAuthRecordVO;
import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyDetailsVO;
import com.panzhihua.common.model.vos.community.ComMngBuildingExcelVO;
import com.panzhihua.common.model.vos.community.ComMngCarExcelVO;
@@ -206,9 +270,11 @@
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.ComMngPopulationElderExcelVO;
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.ComMngPopulationPensionExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationRehabilitationExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationSentenceExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationServeExcelVO;
@@ -226,6 +292,9 @@
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.ComPensionAuthRecordImportExcelVO;
import com.panzhihua.common.model.vos.community.ComPensionAuthRecordVO;
import com.panzhihua.common.model.vos.community.ComPropertyVO;
import com.panzhihua.common.model.vos.community.ComStreetVO;
import com.panzhihua.common.model.vos.community.ComSwRotaExcelVO;
import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO;
@@ -236,9 +305,19 @@
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.cluster.admin.ComClusterMemberExcelVO;
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.rentHouse.RentingHourseOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.RentingHoursePreOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayNotifyOrderVO;
import com.panzhihua.common.model.vos.community.rentHouse.WxPayOrderVO;
import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseApplyVO;
import com.panzhihua.common.model.vos.community.warehouse.ComActWarehouseBaseVO;
import com.panzhihua.common.model.vos.community.warehouse.QRCodeVO;
import com.panzhihua.common.model.vos.community.warehouse.WarehouseDonatesExcelVO;
import com.panzhihua.common.model.vos.neighbor.AddNeighborCircleAdminVO;
import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO;
import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO;
@@ -2419,6 +2498,12 @@
    R pagePopulation(ComMngPopulationDTO comMngPopulationVO);

    /**
     * 根据身份证查询实有人口信息
     */
    @GetMapping("/common/data/population/selectByIdCard")
    R selectByIdCard(@RequestParam("idCard") String idCard);

    /**
     * 根据id实有人口详细信息
     *
     * @param populationId
@@ -2451,12 +2536,12 @@
    /**
     * 批量删除实有人口
     *
     * @param Ids
     * @param ids
     *            实有人口id集合
     * @return 删除结果
     */
    @PostMapping("/common/data/population/delete")
    R deletePopulations(@RequestBody List<Long> Ids);
    R deletePopulations(@RequestBody List<Long> ids,@RequestParam("communityId") Long communityId);

    /**
     * 根据社区id查询所有实有人口
@@ -3152,7 +3237,7 @@
     * @return 删除结果
     */
    @PostMapping("common/data/special/delete")
    R deleteSpecialInputUser(@RequestParam(value = "id") Long id);
    R deleteSpecialInputUser(@RequestParam(value = "id") Long id,@RequestParam("communityId") Long communityId);

    /**
     * 办事指南_新增
@@ -3562,6 +3647,16 @@
    R deleteHouses(@RequestBody List<Long> Ids);

    /**
     * 新增实有房屋信息
     *
     * @param houseEditAdminDTO
     *            请求参数
     * @return 编辑结果
     */
    @PostMapping("/common/data/population/house/insert")
    R insertHouse(@RequestBody ComMngPopulationHouseInsertAdminDTO houseEditAdminDTO);

    /**
     * 实有房屋统计
     *
     * @param communityId
@@ -3745,6 +3840,15 @@
     */
    @PostMapping("/elders/authRecords/statistic/export")
    R exportElderAuthRecordsStatistic(@RequestBody PageElderAuthStatisticDTO pageElderAuthRecordsDTO);

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

    /**
     * 分页查询养老金人员认证记录  pagePensionAuthRecords  分页查询养老金人员认证记录
@@ -4828,6 +4932,14 @@
    R getCommunityLists();

    /**
     * 查询西区社区列表
     *
     * @return 社区列表
     */
    @GetMapping("/eventgrid/community/westList")
    R getWestCommunityLists();

    /**
     * 分页查询退役军人列表
     *
     * @param comExServicemanDTO
@@ -5235,7 +5347,7 @@
     * @return 查询结果
     */
    @GetMapping("/patrolRecord/rota/getRotaPersonByDate")
    R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate);
    R getRotaPersonByDate(@RequestParam(value = "rotaDate") String rotaDate,@RequestParam("communityId")Long communityId);

    /**
     * 根据日期查询值班领导
@@ -5243,7 +5355,7 @@
     * @return 查询结果
     */
    @GetMapping("/patrolRecord/rota/getRotaLeaderByDate")
    R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate);
    R getRotaLeaderByDate(@RequestParam(value = "rotaDate") String rotaDate,@RequestParam("communityId")Long communityId);

    /**
     * 批量导入值班表
@@ -5408,6 +5520,8 @@
    @PostMapping("/reserve/commit")
    R reserveCommit(@RequestBody ComActReserveCommitVO comActReserveCommitVO);

    @PostMapping("/reserve/commitNoToken")
    R reserveCommitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO);
    /**
     * 我的预约/登记
     * @param pageUserReserveDTO
@@ -5582,11 +5696,12 @@

    /**
     * 导出登记明细数据
     * @param reserveId 登记id
     * @return  登记明细数据
     *
     * @param pageReserveRegisterDetailedAdminDTO
     * @return 登记明细数据
     */
    @GetMapping("/reserve/admin/register/list/export")
    R exportRegisterAdmin(@RequestParam("reserveId") Long reserveId);
    @PostMapping("/reserve/admin/register/list/export")
    R exportRegisterAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);

    /**
     * 查询预约登记题目列表
@@ -5767,14 +5882,14 @@
    R timedTaskEldersAuthJobHandler();

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

    /**
     * 定时任务每月1号0点统计高龄老人本期应该认证总人数
     * 身份认证定时任务
     * @return  执行结果
     */
    @PostMapping("/elders/authRecords/statistics")
@@ -6033,6 +6148,79 @@
    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 cascadeHouseDTO
     *            请求参数
     * @return 菜单列表
     */
    @PostMapping("/common/data/population/second/listBack")
    public R getSecondHouse(@RequestBody CascadeHouseDTO cascadeHouseDTO);

    /**
     * 微心愿处理人列表
     * @param communityId   社区id
     * @param type  处理人类型（1.后台用户  2.党员  3.志愿者）
@@ -6040,4 +6228,1214 @@
     */
    @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
     * @param merchantId
     */
    @GetMapping("/convenient/product-category/all")
    R getAllProductCategory(@RequestParam("merchantId") Long merchantId);

    /**
     * 获取该社区商家数量大于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);

    /**
     * 群团组织成员列表-小程序分页查询
     * @param pageClusterMemberDto  请求参数
     * @return  群团组织成员列表
     */
    @PostMapping("/cluster/member/page/applets")
    R pageClusterMemberApplets(@RequestBody PageClusterMemberDto pageClusterMemberDto);

    /**
     * 群团组织列表-小程序查询社区群团组织列表
     * @param communityId   社区id
     * @return  社区群团组织列表
     */
    @GetMapping("/cluster/list/applets")
    R listClusterApplets(@RequestParam("communityId") Long communityId);

    /**
     * 分页查询群团组织列表
     * @param pageClusterAdminDto  请求参数
     * @return  群团组织列表
     */
    @PostMapping("/cluster/page/admin")
    R pageClusterAdmin(@RequestBody PageClusterAdminDto pageClusterAdminDto);

    /**
     * 新增群团组织
     * @param addClusterAdminDto    请求参数
     * @return  新增结果
     */
    @PostMapping("/cluster/add/admin")
    R addClusterAdmin(@RequestBody AddClusterAdminDto addClusterAdminDto);

    /**
     * 修改群团组织
     * @param editClusterAdminDto   请求参数
     * @return  修改结果
     */
    @PostMapping("/cluster/edit/admin")
    R editClusterAdmin(@RequestBody EditClusterAdminDto editClusterAdminDto);

    /**
     * 删除群团组织
     * @param id    组织id
     * @return  删除结果
     */
    @GetMapping("/cluster/delete/admin")
    R deleteClusterAdmin(@RequestParam("id") Long id);

    /**
     * 群团组织详情
     * @param id    组织id
     * @return  群团组织详情
     */
    @GetMapping("/cluster/detail/admin")
    R detailClusterAdmin(@RequestParam("id") Long id);

    /**
     * 分页查询群团组织成员列表
     * @param pageClusterMemberAdminDto 请求参数
     * @return  群团组织成员列表
     */
    @PostMapping("/cluster/member/page/admin")
    R pageClusterMemberAdmin(@RequestBody PageClusterMemberAdminDto pageClusterMemberAdminDto);

    /**
     * 新增群团组织成员
     * @param addClusterMemberAdminDto  请求参数
     * @return  新增结果
     */
    @PostMapping("/cluster/member/add/admin")
    R addClusterMemberAdmin(@RequestBody AddClusterMemberAdminDto addClusterMemberAdminDto);

    /**
     * 编辑群团组织成员
     * @param editClusterMemberAdminDto 请求参数
     * @return  编辑结果
     */
    @PostMapping("/cluster/member/edit/admin")
    R editClusterMemberAdmin(@RequestBody EditClusterMemberAdminDto editClusterMemberAdminDto);

    /**
     * 删除群团组织成员
     * @param id    组织成员id
     * @return  删除结果
     */
    @GetMapping("/cluster/member/delete/admin")
    R deleteClusterMemberAdmin(@RequestParam("id") Long id);

    /**
     * 群团组织成员详情
     * @param id    组织成员id
     * @return  群团组织成员详情
     */
    @GetMapping("/cluster/member/detail/admin")
    R detailClusterMemberAdmin(@RequestParam("id") Long id);

    /**
     * 查询系统民族列表
     * @return  民族列表
     */
    @GetMapping("/cluster/member/nation/list/admin")
    R memberNationListAdmin();

    /**
     * 群团组织成员导入
     * @param list  导入数据
     * @param communityId   社区id
     * @param userId    操作用户id
     * @return  导入结果
     */
    @PostMapping("/cluster/member/import/admin")
    R importClusterMember(@RequestBody List<ComClusterMemberExcelVO> list,
                                     @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);

    /**
     * 群团组织导出数据查询
     * @param pageClusterMemberAdminDto 请求参数
     * @return  导出数据结果集
     */
    @PostMapping("/cluster/member/export/admin")
    R exportClusterMember(@RequestBody PageClusterMemberAdminDto pageClusterMemberAdminDto);

    /**
     * 社区后台分页查询微心愿
     * @param comActMicroWishVO 请求参数
     * @return  微心愿列表
     */
    @PostMapping("pagemicrowishAdmin")
    R pageMicroWishAdmin(@RequestBody ComActMicroWishVO comActMicroWishVO);

    /**
     * 小程序四长四员查询居民列表
     */
    @PostMapping("/comActFourMember/member")
    R comActFourMemberQueryMember(@RequestBody CommonPage commonPage);

    /**
     *居民数据详情
     */
    @GetMapping("/comActFourMember/memberDetail")
    R comActFourMemberMemberDetail(@RequestParam("id")Long id);

    /**
     * 根据房屋id列表删除房屋信息
     *
     * @param comMngPopulationHouseUserVO
     *            请求参数
     * @return 删除结果
     */
    @PostMapping("/common/data/population/house/user/delete")
    R deleteHousesUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);

    /**
     * 新增实有房屋信息
     *
     * @param comMngPopulationHouseUserVO
     *            请求参数
     * @return 编辑结果
     */
    @PostMapping("/common/data/population/house/user/insert")
    public R insertHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);

    /**
     * 编辑实有房屋信息
     *
     * @param comMngPopulationHouseUserVO
     *            请求参数
     * @return 编辑结果
     */
    @PostMapping("/common/data/population/house/user/edit")
    public R editHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);

    /**
     * 根据id查询
     *
     * @param id
     *            请求参数
     * @return 删除结果
     */
    @GetMapping("/common/data/population/house/user/detail")
    public R detailHousesUser(@RequestParam("id") Long id);

    /**
     * 社区后台-分页查询楼栋列表
     * @param pageBuildingListDto   请求参数
     * @return  楼栋列表
     */
    @PostMapping("/building/page/admin/")
    R pageBuildingAdmin(@RequestBody PageBuildingListDto pageBuildingListDto);

    /**
     * 社区后台-查询楼栋列表表头统计数据
     * @param communityId   社区id
     * @return  楼栋列表表头统计数据
     */
    @GetMapping("/building/header/statistics/")
    R buildingListHeaderStatisticsAdmin(@RequestParam("communityId") Long communityId);

    /**
     * 社区后台-查询楼栋详情
     * @param id    楼栋id
     * @return  楼栋详情
     */
    @GetMapping("/building/detail/admin/")
    R detailBuildAdmin(@RequestParam("id") Long id);

    /**
     * 查询楼栋下单元列表
     * @param id    楼栋id
     * @return  单元列表
     */
    @GetMapping("/building/unit/list/admin")
    R buildingUnitListAdmin(@RequestParam("id") Long id);

    /**
     * 查询楼栋单元下房屋列表
     * @param unitHouseListDto    请求参数
     * @return  单元列表
     */
    @PostMapping("/building/unit/house/list/admin")
    R buildingUnitHouseListAdmin(@RequestBody PageBuildingUnitHouseListDto unitHouseListDto);

    /**
     * 查询楼栋单元下房屋详情
     * @param houseId   房屋id
     * @param communityId   社区id
     * @return  房屋详情
     */
    @GetMapping("/building/unit/house/detail/admin")
    R unitHouseDetailAdmin(@RequestParam("houseId") Long houseId,@RequestParam("communityId") Long communityId);

    /**
     * 查询社区下小区列表
     * @param communityId   社区id
     * @return  小区列表
     */
    @GetMapping("/building/village/list/admin")
    R buildingVillageListAdmin(@RequestParam("communityId") Long communityId);

    /**
     * 添加楼栋下单元
     * @param addBuildingUnitDto  请求参数
     * @return  添加结果
     */
    @PostMapping("/building/unit/add/admin")
    R addBuildingUnitAdmin(@RequestBody AddBuildingUnitDto addBuildingUnitDto);

    /**
     * 修改楼栋下单元
     * @param editBuildingUnitDto  请求参数
     * @return  修改结果
     */
    @PostMapping("/building/unit/edit/admin")
    R editBuildingUnitAdmin(@RequestBody EditBuildingUnitDto editBuildingUnitDto);

    /**
     * 添加户室
     * @param addBuildingHouseDto    请求参数
     * @return  添加结果
     */
    @PostMapping("/building/house/add/admin")
    R addBuildingHouseAdmin(@RequestBody AddBuildingHouseDto addBuildingHouseDto);

    /**
     * 修改户室
     * @param editBuildingHouseDto   请求参数
     * @return  修改结果
     */
    @PostMapping("/building/house/edit/admin")
    R editBuildingHouseAdmin(@RequestBody EditBuildingHouseDto editBuildingHouseDto);

    /**
     * 删除户室下人员关联信息
     * @param housePopulationDto    请求参数
     * @return  删除结果
     */
    @PostMapping("/building/house/population/delete/admin")
    R deleteBuildingHousePopulationAdmin(@RequestBody DeleteBuildingHousePopulationDto housePopulationDto);

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

    /**
     * 统计查询
     *
     * @param communityId
     * @return 所有数据
     */
    @GetMapping("/comActWarehouseApply/selectStatics")
    public R comActWarehouseApplySelectAll(@RequestParam("communityId") Long communityId);

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

    /**
     * 新增数据
     *
     * @param comActWarehouseApply 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActWarehouseApply")
    public R comActWarehouseApplyInsert(@RequestBody ComActWarehouseApplyVO comActWarehouseApply);

    /**
     * 修改数据
     *
     * @param comActWarehouseApply 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActWarehouseApply/update")
    public R comActWarehouseApplyUpdate(@RequestBody ComActWarehouseApplyVO comActWarehouseApply);

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

    /**
     * 生成二维码
     * @param qrCodeVO
     * @return
     */
    @PostMapping("/comActWarehouseApply/getQRCode")
    public R comActWarehouseApplyGetQRCode(@RequestBody QRCodeVO qrCodeVO);

    /**
     * 社区Id查询基础配置
     * @param communityId
     * @return
     */
    @GetMapping("/comActWarehouseBase")
    public R comActWarehouseBaseSelectOne(@RequestParam("communityId") Long communityId);

    /**
     * 新增数据
     *
     * @param comActWarehouseBase 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActWarehouseBase")
    public R comActWarehouseBaseInsert(@RequestBody ComActWarehouseBaseVO comActWarehouseBase);

    /**
     * 导出数据
     */
    @PostMapping("/comActWarehouseApply/export")
    public R comActWarehouseApplyExport(@RequestBody CommonPage commonPage);

    /**
     * 后台导入捐赠物品
     * @param list
     * @return
     */
    @PostMapping("/comActWarehouseDonates/import")
    R batchImportWarehouseDonates(@RequestBody List<WarehouseDonatesExcelVO> list);

    /**
     * 后台导出捐赠物品表格
     * @param exportDonatesDTO
     * @return
     */
    @PostMapping("/comActWarehouseDonates/donates/export")
    R exportDonates(@RequestBody ExportDonatesDTO exportDonatesDTO);

    /**
     * 分页查询捐赠物品
     * @param pageDonatesDTO
     * @return
     */
    @PostMapping("/comActWarehouseDonates/donates/page")
    R pageDonates(@RequestBody PageDonatesDTO pageDonatesDTO);

    /**
     * 新增物品捐赠
     * @param comActWarehouseDonatesDTO
     * @return
     */
    @PostMapping("/comActWarehouseDonates/donates/add")
    R addDonates(@RequestBody ComActWarehouseDonatesDTO comActWarehouseDonatesDTO);

    /**
     * 查看物品捐赠详情
     * @param donatesId
     * @param isWhich
     * @param userId
     * @return
     */
    @GetMapping("/comActWarehouseDonates/donates/get")
    R getDonates(@RequestParam("donatesId") Long donatesId, @RequestParam("isWhich") Integer isWhich, @RequestParam("userId") Long userId);

    /**
     * 捐赠物品后台签收
     * @param comActWarehouseDonatesDTO
     * @return
     */
    @PostMapping("/comActWarehouseDonates/donates/signing")
    R signingDonates(@RequestBody ComActWarehouseDonatesDTO comActWarehouseDonatesDTO);

    /**
     * 用户取消捐赠
     * @param donatesId
     * @param currentUser
     * @return
     */
    @GetMapping("/comActWarehouseDonates/donates/cancel")
    R cancelDonates(@RequestParam("donatesId") Long donatesId, @RequestParam("currentUser") Long currentUser);

    /**
     * 捐赠物品统计查询
     * @param communityId
     * @return
     */
    @GetMapping("/comActWarehouseDonates/donates/statistics")
    R getDonatesStatistics(@RequestParam("communityId") Long communityId);

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

    /**
     * 物品领用
     * @param comActWarehouseApplyDTO
     * @return
     */
    @PostMapping("/comActWarehouseDonates/donates/apply")
    R applyDonates(@RequestBody ComActWarehouseApplyDTO comActWarehouseApplyDTO);

    /**
     * 实有房屋数据修复定时任务
     * @return  实有房屋数据修复定时任务
     */
    @GetMapping("/population/house/status/task")
    R timedTaskHouseJobHandler();

    /**
     * 导出特殊群体
     *
     * @param pageInputUserDTO 请求参数
     * @return 特殊群体列表
     */
    @PostMapping("common/data/special/export")
    R specialInputUserExport(@RequestBody PageInputUserDTO pageInputUserDTO);

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

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

    /**
     * 新增数据
     *
     * @param comActAnnouncementVO 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActAnnouncement")
    R comActAnnouncementInsert(@RequestBody ComActAnnouncementVO comActAnnouncementVO);

    /**
     * 修改数据
     *
     * @param comActAnnouncementVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActAnnouncement/update")
    R comActAnnouncementUpdate(@RequestBody ComActAnnouncementVO comActAnnouncementVO);

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

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

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

    /**
     * 新增数据
     *
     * @param comActColumn 实体对象
     * @return 新增结果
     */
    @PostMapping("/comActColumn")
    R comActColumnInsert(@RequestBody ComActColumnVO comActColumn);

    /**
     * 修改数据
     *
     * @param comActColumn 实体对象
     * @return 修改结果
     */
    @PostMapping("/comActColumn/update")
    R comActColumnUpdate(@RequestBody ComActColumnVO comActColumn);

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

    /**
     * 高龄认证添加
     *
     * @param comElderAuthRecordVO
     * @return
     */
    @PostMapping("/elders/authRecord/add")
    R addAuthRecord(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO);

    /**
     * 养老认证添加
     *
     * @param comElderAuthRecordVO
     * @return
     */
    @PostMapping("/elders/pensionAuthRecord/add")
    R addPensionAuthRecordVO(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO);

    /**
     * 分页查询居家隔离统计
     * @param detailedAdminDTO
     * @return
     */
    @PostMapping("/reserve/admin/register/homeQuarantine/page")
    R pageRegisterHomeQuarantine(PageReserveRegisterDetailedAdminDTO detailedAdminDTO);

    /**
     * 居家隔离导出
     * @param pageReserveRegisterDetailedAdminDTO
     * @return
     */
    @PostMapping("/reserve/admin/homeQuarantine/export")
    R exportHomeQuarantine(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);

    /**
     * 分页查询物业宣传
     * @param pageComPropertyPublicityDTO
     * @return
     */
    @PostMapping("/property/publicity/page")
    R pageComPropertyPublicity(@RequestBody PageComPropertyPublicityDTO pageComPropertyPublicityDTO);

    /**
     * 新增物业宣传
     * @param comPropertyPublicityDTO
     * @return
     */
    @PostMapping("/property/publicity/add")
    R addComPropertyPublicity(@RequestBody ComPropertyPublicityDTO comPropertyPublicityDTO);

    /**
     * 修改物业宣传
     * @param comPropertyPublicityDTO
     * @return
     */
    @PostMapping("/property/publicity/update")
    R updateComPropertyPublicity(@RequestBody ComPropertyPublicityDTO comPropertyPublicityDTO);

    /**
     * 查看物业宣传信息
     * @param id
     * @return
     */
    @GetMapping("/property/publicity/get")
    R getComPropertyPublicity(@RequestParam("id") Long id);

    /**
     * 删除物业宣传
     * @param id
     * @return
     */
    @DeleteMapping("/property/publicity/delete")
    R deleteComPropertyPublicity(@RequestParam("id") Long id);

    /**
     * 物业公司列表
     *
     * @param villageId
     * @param communityId
     * @return
     */
    @GetMapping("/property/publicity/list/property")
    R listProperty(@RequestParam(value = "villageId", required = false) Long villageId, @RequestParam("communityId") Long communityId);

    /**
     * 分页查询物业宣传-小程序
     * @param pageComPropertyPublicityDTO
     * @return
     */
    @PostMapping("/property/publicity/page/applet")
    R pageComPropertyPublicityApplet(@RequestBody PageComPropertyPublicityDTO pageComPropertyPublicityDTO);

    /**
     * 增加物业宣传浏览量
     * @param id
     * @return
     */
    @GetMapping("/property/publicity/incr-view")
    R incrPropertyPublicityView(@RequestParam("id") Long id);

    /**
     * 获取预设图片
     * @param type
     * @param subtype
     * @return
     */
    @GetMapping("/picture/library/get")
    R getPresetPictureLibrary(@RequestParam("type") Integer type, @RequestParam("subtype") Integer subtype);

    /**
     * 分页查询房屋租赁基础配置
     * @param pageRentingHousesConfigDTO
     * @return
     */
    @PostMapping("/rentingHousesConfig/page")
    R pageRentingHousesConfig(@RequestBody PageRentingHousesConfigDTO pageRentingHousesConfigDTO);

    /**
     * 更新配置信息
     * @param rentingHousesConfigDTO
     * @return
     */
    @PutMapping("/rentingHousesConfig/update")
    R updateRentingHousesConfig(@RequestBody RentingHousesConfigDTO rentingHousesConfigDTO);

    /**
     * 新增房源信息
     * @param registerDTO
     * @return
     */
    @PostMapping("/rentingHourseRegister/register")
    R registerRentingHouse(@RequestBody RentingHouseRegisterDTO registerDTO);

    /**
     * 编辑房源信息
     * @param registerDTO
     * @return
     */
    @PostMapping("/rentingHourseRegister/update")
    R updateRentingHouse(@RequestBody RentingHouseRegisterDTO registerDTO);

    /**
     * 分页获取房源信息
     * @param pageRegisterDTO
     * @return
     */
    @PostMapping("/rentingHourseRegister/page")
    R pageRentingHouse(@RequestBody PageRentingHouseRegisterDTO pageRegisterDTO);

    /**
     * 发布/取消发布 房源信
     * @param releaseOrCancelHouseDTO
     * @return
     */
    @PutMapping("/rentingHourseRegister/releaseOrCancel")
    R releaseOrCancelHouse(@RequestBody ReleaseOrCancelHouseDTO releaseOrCancelHouseDTO);

    /**
     * 删除房源信息
     * @param registerId
     * @return
     */
    @DeleteMapping("/rentingHourseRegister/delete")
    R deleteRentingHouse(@RequestParam("registerId") Long registerId);

    /**
     * 获取详情-房源信息
     * @param registerId
     * @return
     */
    @GetMapping("/rentingHourseRegister/get")
    R getRentingHouse(@RequestParam("registerId") Long registerId);

    /**
     * 附近的房源
     */
    @PostMapping("/rentingHourseRegister/nearby")
    R nearby(@RequestBody NearbyDTO nearbyDTO);

    /**
     * 小程序分页获取房源信息
     * @param pageRegisterDTO
     * @return
     */
    @PostMapping("/rentingHourseRegister/houseList")
    R pageRentingHouseApplet(@RequestBody PageRentingHouseRegisterDTO pageRegisterDTO);

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

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

    /**
     * 新增数据
     *
     * @param rentingHourseOrder 实体对象
     * @return 新增结果
     */
    @PostMapping("/rentingHourseOrder")
    R insertRentingHourseOrder(@RequestBody RentingHourseOrderVO rentingHourseOrder);

    /**
     * 修改数据
     *
     * @param rentingHourseOrdervo 实体对象
     * @return 修改结果
     */
    @PostMapping("/rentingHourseOrder/update")
    R updateRentingHourseOrder(@RequestBody RentingHourseOrderVO rentingHourseOrdervo);

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

    /**
     * 支付回调处理订单状态以及房屋状态
     */
    @PostMapping("/rentingHourseOrder/wxNotify")
    R wxNotifyRentingHourseOrder(@RequestBody WxPayNotifyOrderVO wxPayNotifyOrderVO);

    /**
     * 支付付款
     */
    @PostMapping("/rentingHourseOrder/wxPay")
    R wxPayRentingHourseOrder(@RequestBody WxPayOrderVO wxPayOrderVO);

    /**
     * 分页查询所有数据
     *
     * @param commonPage 查询实体
     * @return 所有数据
     */
    @PostMapping("/rentingHoursePreOrder/queryAll")
    R selectAllRentingHoursePreOrder(@RequestBody CommonPage commonPage);
    /**
     * 通过主键查询单条数据
     *
     * @param id 主键
     * @return 单条数据
     */
    @GetMapping("/rentingHoursePreOrder/{id}")
    R selectOneRentingHoursePreOrder(@PathVariable("id") Long id);

    /**
     * 新增数据
     *
     * @param rentingHoursePreOrderVO 实体对象
     * @return 新增结果
     */
    @PostMapping("/rentingHoursePreOrder")
    R insertRentingHoursePreOrder(@RequestBody RentingHoursePreOrderVO rentingHoursePreOrderVO);

    /**
     * 修改数据
     *
     * @param rentingHoursePreOrderVO 实体对象
     * @return 修改结果
     */
    @PostMapping("/rentingHoursePreOrder/update")
    R updateRentingHoursePreOrder(@RequestBody RentingHoursePreOrderVO rentingHoursePreOrderVO);

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

    /**
     * 普通订单统计
     */
    @PostMapping("/rentingHourseOrder/statics")
    R staticsRentingHourseOrder(@RequestBody RentingHourseOrderVO rentingHourseOrderVO);

    /**
     * 定金订单统计
     */
    @PostMapping("/rentingHoursePreOrder/statics")
    R staticsRentingHoursePreOrder(@RequestBody RentingHoursePreOrderVO rentingHoursePreOrderVO);

    /**
     * 获取房屋租赁配置
     * @return
     * @param type
     */
    @GetMapping("/rentingHousesConfig/getConfig")
    R getRentingHouseConfig(@RequestParam("type") Integer type);

    @GetMapping("/rentingHourseRegister/updateAllHouseUnionAppCode")
    @Async
    void updateAllHouseUnionAppCode();

    /**
     * 西区大屏治理数据
     */
    @GetMapping("/screen/getWestScreenStatics")
    R westScreenStatics();

    /**
     * 西区大屏一标三实数据
     * @return  西区大屏一标三实数据
     */
    @GetMapping("/screen/getComprehensivePopulationStatics")
    R getComprehensivePopulationStatics(@RequestParam("streetId") Long streetId);

    @GetMapping("/screen/getComprehensiveStreetList")
    R getComprehensiveStreetList();
}