From 307ea3042f5b03e735772e5d3eaad8d5fc16b6ba Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 18 二月 2022 17:23:22 +0800
Subject: [PATCH] Merge branch 'master' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |  380 +++++++++---------------------------------------------
 1 files changed, 63 insertions(+), 317 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 de2dfdb..9236a90 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,149 +2,28 @@
 
 import java.util.List;
 
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.DeleteProductDTO;
 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;
-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 org.springframework.web.bind.annotation.*;
 
 import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO;
 import com.panzhihua.common.model.dtos.PageBaseDTO;
 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.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;
-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.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;
-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.*;
+import com.panzhihua.common.model.dtos.community.bigscreen.*;
 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.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.building.admin.*;
 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.cluster.admin.*;
+import com.panzhihua.common.model.dtos.community.convenient.*;
 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.easyPhoto.*;
 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;
@@ -154,50 +33,12 @@
 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.microCommercialStreet.DisableOrEnableMcsMerchantDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.LoginWithPhoneDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsEvaluateDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsGameDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsInfoDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsProductDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageJoinGameListDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsEvaluateDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsGameDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsInformationDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsMerchantDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageMcsProductDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.PageVerifyRecordDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.PutUserInfoDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetPopularForGameDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForGameDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForInfoDTO;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.SetShelfForProductDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.*;
 import com.panzhihua.common.model.dtos.community.questnaire.StatisticsSummaryDTO;
-import com.panzhihua.common.model.dtos.community.rentingHouses.NearbyDTO;
-import com.panzhihua.common.model.dtos.community.rentingHouses.PageRentingHouseRegisterDTO;
-import com.panzhihua.common.model.dtos.community.rentingHouses.PageRentingHousesConfigDTO;
-import com.panzhihua.common.model.dtos.community.rentingHouses.ReleaseOrCancelHouseDTO;
-import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHouseRegisterDTO;
-import com.panzhihua.common.model.dtos.community.rentingHouses.RentingHousesConfigDTO;
-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.rentingHouses.*;
+import com.panzhihua.common.model.dtos.community.reserve.*;
 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;
-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.wallet.*;
 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;
@@ -205,130 +46,15 @@
 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.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.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.grid.*;
+import com.panzhihua.common.model.dtos.grid.admin.*;
+import com.panzhihua.common.model.dtos.neighbor.*;
 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;
-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.shop.*;
 import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
-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.ComActActivityTypeVO;
-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;
-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.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;
-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.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;
-import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO;
-import com.panzhihua.common.model.vos.community.QRActivityCodeVO;
-import com.panzhihua.common.model.vos.community.ResetComActMessageVO;
-import com.panzhihua.common.model.vos.community.SignactivityVO;
+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.vos.community.bigscreen.BigScreenStatisticAgeGender;
 import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyActivity;
 import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyBuild;
@@ -344,6 +70,7 @@
 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.reserve.ComActReserveDetailAdminVO;
 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;
@@ -357,8 +84,6 @@
 import com.panzhihua.common.model.vos.shop.ShopStoreVO;
 import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
 import com.panzhihua.common.model.vos.user.UserPhoneVO;
-
-import javax.validation.Valid;
 
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -2467,7 +2192,7 @@
      */
     @PostMapping("/common/data/population/importElder")
     R listSavePopulationElderExcelVO(@RequestBody List<ComMngPopulationElderExcelVO> list,
-                                    @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
 
     /**
      * 批量导入养老金人员  listSavePopulationPensionExcelVO  批量导入养老金人员
@@ -2479,7 +2204,7 @@
      */
     @PostMapping("/common/data/population/importPension")
     R listSavePopulationPensionExcelVO(@RequestBody List<ComMngPopulationPensionExcelVO> list,
-                                     @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
 
     /**
      * 批量导入高龄老人线下认证记录  listSaveElderAuthRecordExcelVO  批量导入高龄老人线下认证记录
@@ -2492,7 +2217,7 @@
      */
     @PostMapping("/elders/authRecords/underLine/import")
     R listSaveElderAuthRecordExcelVO(@RequestBody List<ComElderAuthRecordImportExcelVO> list,
-                                       @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
 
     /**
      * 批量导入养老线下认证记录  listSavePensionAuthRecordExcelVO  批量导入养老线下认证记录
@@ -2505,7 +2230,7 @@
      */
     @PostMapping("/elders/pensionAuthRecords/underLine/import")
     R listSavePensionAuthRecordExcelVO(@RequestBody List<ComPensionAuthRecordImportExcelVO> list,
-                                     @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
 
     /**
      * 确认导入实有人口（有则更新，无则新建）
@@ -5640,7 +5365,7 @@
      * @return  预约登记详情
      */
     @GetMapping("/reserve/admin/detail")
-    R detailReserveAdmin(@RequestParam("reserveId") Long reserveId);
+    R<ComActReserveDetailAdminVO> detailReserveAdmin(@RequestParam("reserveId") Long reserveId);
 
     /**
      * 社区后台-根据社区id统计预约类数据
@@ -5755,6 +5480,15 @@
     @PostMapping("/reserve/admin/register/list/export")
     R exportRegisterAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO pageReserveRegisterDetailedAdminDTO);
 
+    /**
+     * 查询预约登记题目下属选择项列表
+     *
+     * @param reserveSubId
+     *            预约登记id
+     * @return 查询预约登记题目下属选择项列表
+     */
+    @GetMapping("/reserve/admin/subject/selection/list")
+    List<String> subjectSelectionListAdmin(@RequestParam("reserveSubId") Long reserveSubId);
     /**
      * 查询预约登记题目列表
      * @param reserveId 预约登记id
@@ -6278,7 +6012,7 @@
      * @return 菜单列表
      */
     @PostMapping("/common/data/population/second/listBack")
-    public R getSecondHouse(@RequestBody CascadeHouseDTO cascadeHouseDTO);
+    R getSecondHouse(@RequestBody CascadeHouseDTO cascadeHouseDTO);
 
     /**
      * 微心愿处理人列表
@@ -6729,7 +6463,7 @@
      */
     @PostMapping("/cluster/member/import/admin")
     R importClusterMember(@RequestBody List<ComClusterMemberExcelVO> list,
-                                     @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
 
     /**
      * 群团组织导出数据查询
@@ -6777,7 +6511,7 @@
      * @return 编辑结果
      */
     @PostMapping("/common/data/population/house/user/insert")
-    public R insertHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);
+    R insertHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);
 
     /**
      * 编辑实有房屋信息
@@ -6787,7 +6521,7 @@
      * @return 编辑结果
      */
     @PostMapping("/common/data/population/house/user/edit")
-    public R editHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);
+    R editHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO);
 
     /**
      * 根据id查询
@@ -6797,7 +6531,7 @@
      * @return 删除结果
      */
     @GetMapping("/common/data/population/house/user/detail")
-    public R detailHousesUser(@RequestParam("id") Long id);
+    R detailHousesUser(@RequestParam("id") Long id);
 
     /**
      * 社区后台-分页查询楼栋列表
@@ -6903,7 +6637,7 @@
      * @return 所有数据
      */
     @PostMapping("/comActWarehouseApply/queryAll")
-    public R comActWarehouseApplySelectAll(@RequestBody CommonPage commonPage);
+    R comActWarehouseApplySelectAll(@RequestBody CommonPage commonPage);
 
     /**
      * 统计查询
@@ -6912,7 +6646,7 @@
      * @return 所有数据
      */
     @GetMapping("/comActWarehouseApply/selectStatics")
-    public R comActWarehouseApplySelectAll(@RequestParam("communityId") Long communityId);
+    R comActWarehouseApplySelectAll(@RequestParam("communityId") Long communityId);
 
     /**
      * 通过主键查询单条数据
@@ -6921,7 +6655,7 @@
      * @return 单条数据
      */
     @GetMapping("/comActWarehouseApply/{id}")
-    public R comActWarehouseApplySelectOne(@PathVariable("id") Integer id);
+    R comActWarehouseApplySelectOne(@PathVariable("id") Integer id);
 
     /**
      * 新增数据
@@ -6930,7 +6664,7 @@
      * @return 新增结果
      */
     @PostMapping("/comActWarehouseApply")
-    public R comActWarehouseApplyInsert(@RequestBody ComActWarehouseApplyVO comActWarehouseApply);
+    R comActWarehouseApplyInsert(@RequestBody ComActWarehouseApplyVO comActWarehouseApply);
 
     /**
      * 修改数据
@@ -6939,7 +6673,7 @@
      * @return 修改结果
      */
     @PostMapping("/comActWarehouseApply/update")
-    public R comActWarehouseApplyUpdate(@RequestBody ComActWarehouseApplyVO comActWarehouseApply);
+    R comActWarehouseApplyUpdate(@RequestBody ComActWarehouseApplyVO comActWarehouseApply);
 
     /**
      * 删除数据
@@ -6948,7 +6682,7 @@
      * @return 删除结果
      */
     @GetMapping("/comActWarehouseApply/del")
-    public R comActWarehouseApplyDelete(@RequestParam("id") Long id);
+    R comActWarehouseApplyDelete(@RequestParam("id") Long id);
 
     /**
      * 生成二维码
@@ -6956,7 +6690,7 @@
      * @return
      */
     @PostMapping("/comActWarehouseApply/getQRCode")
-    public R comActWarehouseApplyGetQRCode(@RequestBody QRCodeVO qrCodeVO);
+    R comActWarehouseApplyGetQRCode(@RequestBody QRCodeVO qrCodeVO);
 
     /**
      * 社区Id查询基础配置
@@ -6964,7 +6698,7 @@
      * @return
      */
     @GetMapping("/comActWarehouseBase")
-    public R comActWarehouseBaseSelectOne(@RequestParam("communityId") Long communityId);
+    R comActWarehouseBaseSelectOne(@RequestParam("communityId") Long communityId);
 
     /**
      * 新增数据
@@ -6973,13 +6707,13 @@
      * @return 新增结果
      */
     @PostMapping("/comActWarehouseBase")
-    public R comActWarehouseBaseInsert(@RequestBody ComActWarehouseBaseVO comActWarehouseBase);
+    R comActWarehouseBaseInsert(@RequestBody ComActWarehouseBaseVO comActWarehouseBase);
 
     /**
      * 导出数据
      */
     @PostMapping("/comActWarehouseApply/export")
-    public R comActWarehouseApplyExport(@RequestBody CommonPage commonPage);
+    R comActWarehouseApplyExport(@RequestBody CommonPage commonPage);
 
     /**
      * 后台导入捐赠物品
@@ -7055,7 +6789,7 @@
      * @return 所有数据
      */
     @PostMapping("/comActWarehouseOperation/queryAll")
-    public R comActWarehouseOperationSelectAll(@RequestBody CommonPage commonPage);
+    R comActWarehouseOperationSelectAll(@RequestBody CommonPage commonPage);
 
     /**
      * 物品领用
@@ -7071,7 +6805,7 @@
      * @return
      */
     @PostMapping("/comActActivityCode/getQRCode")
-    public R getQRCode(@RequestBody QRActivityCodeVO qrCodeVO);
+    R getQRCode(@RequestBody QRActivityCodeVO qrCodeVO);
 
     /**
      * 重置二维码
@@ -7079,7 +6813,7 @@
      * @return
      */
     @PostMapping("/comActActivityCode/resetQRCode")
-    public R resetQRCode(@RequestBody QRActivityCodeVO qrCodeVO);
+    R resetQRCode(@RequestBody QRActivityCodeVO qrCodeVO);
 
     /**
      * 实有房屋数据修复定时任务
@@ -8292,4 +8026,16 @@
     @PostMapping("/common/data/history/filled")
     R filledPopulationPersonType(@RequestBody List<ComMngPopulationServeExcelVO> newVoList,
                                  @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId);
+
+    /**
+     * [方法描述] 根据社区ID查询所属城市所在区区域代码，
+     *
+     * @param communityId
+     *            社区ID
+     * @return String 区域code
+     * @author manailin
+     * @date 2022/2/17 10:09
+     */
+    @GetMapping("act/getActBelongRegionCode")
+    String getActBelongRegionCode(@RequestParam("communityId") Long communityId);
 }

--
Gitblit v1.7.1