From caefe9a9cc486247f831e46356b0b03ca450fdf9 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 25 二月 2022 10:14:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into dev

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |  692 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 641 insertions(+), 51 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 2c3fc46..c2dbbbf 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
@@ -1,75 +1,237 @@
 package com.panzhihua.common.service.community;
 
-import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
-import com.panzhihua.common.model.dtos.common.*;
-import com.panzhihua.common.model.dtos.community.microCommercialStreet.DeleteProductDTO;
-import com.panzhihua.common.model.vos.community.volunteer.ComMngVolunteerExcelVO;
-import com.panzhihua.common.model.dtos.PageBaseDTO;
-import com.panzhihua.common.model.dtos.civil.*;
-import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
-import com.panzhihua.common.model.dtos.community.GetIdentityEidTokenDTO;
-import com.panzhihua.common.model.dtos.community.*;
-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.*;
-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.*;
-import com.panzhihua.common.model.vos.civil.ComActSocialWorkerDetailsVO;
-import com.panzhihua.common.model.vos.community.*;
-import com.panzhihua.common.model.vos.community.cluster.admin.ComClusterMemberExcelVO;
-import com.panzhihua.common.model.vos.community.raffle.ComActRaffleRecordVO;
-import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
-import com.panzhihua.common.model.vos.community.social.*;
-import io.swagger.annotations.ApiOperation;
-import com.panzhihua.common.model.vos.community.*;
-import org.springframework.beans.BeanUtils;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.scheduling.annotation.Async;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO;
 import com.panzhihua.common.model.dtos.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.*;
-import com.panzhihua.common.model.dtos.community.bigscreen.*;
+import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerAddDTO;
+import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerDeleteDTO;
+import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerEditDTO;
+import com.panzhihua.common.model.dtos.civil.ComActSocialWorkerExcelVO;
+import com.panzhihua.common.model.dtos.civil.PageComActSocialWorkerDTO;
+import com.panzhihua.common.model.dtos.common.AddComMngVolunteerOrgTeamDto;
+import com.panzhihua.common.model.dtos.common.AddComMngVolunteerServiceTypeDto;
+import com.panzhihua.common.model.dtos.common.AddComMngVolunteerSkillDto;
+import com.panzhihua.common.model.dtos.common.EditComMngVolunteerOrgTeamDto;
+import com.panzhihua.common.model.dtos.common.EditComMngVolunteerServiceTypeDto;
+import com.panzhihua.common.model.dtos.common.EditComMngVolunteerSkillDto;
+import com.panzhihua.common.model.dtos.common.PageComMngVolunteerOrgTeamDto;
+import com.panzhihua.common.model.dtos.common.PageComMngVolunteerServiceTypeDto;
+import com.panzhihua.common.model.dtos.common.PageComMngVolunteerSkillDto;
+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.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.*;
+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.*;
-import com.panzhihua.common.model.dtos.community.convenient.*;
+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.*;
+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.fms.AddFmsClassroomAdminDTO;
+import com.panzhihua.common.model.dtos.community.fms.AddFmsServiceAdminDTO;
+import com.panzhihua.common.model.dtos.community.fms.AddTeamDTO;
+import com.panzhihua.common.model.dtos.community.fms.AddTeamMemberDTO;
+import com.panzhihua.common.model.dtos.community.fms.AddTeamTypeDTO;
+import com.panzhihua.common.model.dtos.community.fms.ApplyFmsServiceDTO;
+import com.panzhihua.common.model.dtos.community.fms.ApprovalFmsServiceAdminDTO;
+import com.panzhihua.common.model.dtos.community.fms.DeleteTeamMemberDTO;
+import com.panzhihua.common.model.dtos.community.fms.EditFmsClassroomAdminDTO;
+import com.panzhihua.common.model.dtos.community.fms.EditTeamDTO;
+import com.panzhihua.common.model.dtos.community.fms.EditTeamMemberDTO;
+import com.panzhihua.common.model.dtos.community.fms.EditTeamTypeDTO;
+import com.panzhihua.common.model.dtos.community.fms.EvaluationFmsServiceDTO;
+import com.panzhihua.common.model.dtos.community.fms.FeedbackFmsServiceDTO;
+import com.panzhihua.common.model.dtos.community.fms.PageFmsClassroomAdminDTO;
+import com.panzhihua.common.model.dtos.community.fms.PageFmsEventAdminDTO;
+import com.panzhihua.common.model.dtos.community.fms.PageFmsServiceAdminDTO;
+import com.panzhihua.common.model.dtos.community.fms.PageFmsServiceAppletsDTO;
+import com.panzhihua.common.model.dtos.community.fms.PageFmsTeamDTO;
+import com.panzhihua.common.model.dtos.community.fms.PageTeamMemberDTO;
 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.microCommercialStreet.*;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.DeleteProductDTO;
+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.questnaire.StatisticsSummaryDTO;
-import com.panzhihua.common.model.dtos.community.rentingHouses.*;
-import com.panzhihua.common.model.dtos.community.reserve.*;
+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.switchs.SearchCommunityDTO;
-import com.panzhihua.common.model.dtos.community.wallet.*;
+import com.panzhihua.common.model.dtos.community.wallet.ComActWalletDetailDTO;
+import com.panzhihua.common.model.dtos.community.wallet.ComActWalletSettlementAdminDTO;
+import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletAdminDTO;
+import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeAdminDTO;
+import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
 import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseApplyDTO;
 import com.panzhihua.common.model.dtos.community.warehouse.ComActWarehouseDonatesDTO;
 import com.panzhihua.common.model.dtos.community.warehouse.ExportDonatesDTO;
@@ -77,17 +239,70 @@
 import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
 import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
 import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
-import com.panzhihua.common.model.dtos.grid.*;
-import com.panzhihua.common.model.dtos.grid.admin.*;
-import com.panzhihua.common.model.dtos.neighbor.*;
+import com.panzhihua.common.model.dtos.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.property.CommonPage;
-import com.panzhihua.common.model.dtos.shop.*;
+import com.panzhihua.common.model.dtos.shop.ComShopAddressDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopCartDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopEditNubCartDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopFundsExportDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopGoodsDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopOrderCreateDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopOrderDeliverDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopOrderExportDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopOrderPreviewDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopOrderQueryDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopOrderShipDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopSysConfDTO;
+import com.panzhihua.common.model.dtos.shop.OrderPayDTO;
+import com.panzhihua.common.model.dtos.shop.PageComOrderListDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopAddressDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopFundsSearchDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopSysConfDTO;
+import com.panzhihua.common.model.dtos.shop.WxPayNotifyOrderDTO;
 import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
 import com.panzhihua.common.model.dtos.vaccines.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.ComActSocialMemberVO;
+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.civil.ComActSocialWorkerDetailsVO;
 import com.panzhihua.common.model.vos.community.ActivitySignVO;
 import com.panzhihua.common.model.vos.community.BatchhouseVO;
 import com.panzhihua.common.model.vos.community.ComActActEvaluateVO;
@@ -150,25 +365,32 @@
 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;
 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.fms.ComFmsServiceImportExcelVO;
+import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberImportExcelVO;
 import com.panzhihua.common.model.vos.community.microCommercialStreet.McsConfigVO;
 import com.panzhihua.common.model.vos.community.microCommercialStreet.McsOrderVO;
 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.raffle.ComActRaffleRecordVO;
+import com.panzhihua.common.model.vos.community.raffle.ComActRaffleVO;
 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.reserve.ComActReserveDetailAdminVO;
+import com.panzhihua.common.model.vos.community.social.ComActSocialProjectMemberVO;
+import com.panzhihua.common.model.vos.community.social.ComActSocialProjectPublicityVO;
+import com.panzhihua.common.model.vos.community.social.ComActSocialProjectScheduleVO;
+import com.panzhihua.common.model.vos.community.social.ComActSocialWorkerServiceVO;
+import com.panzhihua.common.model.vos.community.social.SocialProjectVO;
+import com.panzhihua.common.model.vos.community.volunteer.ComMngVolunteerExcelVO;
 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;
@@ -182,8 +404,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
@@ -8739,4 +8959,374 @@
      */
     @GetMapping("act/getActBelongRegionCode")
     String getActBelongRegionCode(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 新增团队类型
+     * @param addTeamTypeDTO
+     * @return
+     */
+    @PostMapping("/fms/teamType/add")
+    R addFmsTeamType(@RequestBody AddTeamTypeDTO addTeamTypeDTO);
+
+    /**
+     * 修改团队类型
+     * @param editTeamTypeDTO
+     * @return
+     */
+    @PostMapping("/fms/teamType/edit")
+    R editFmsTeamType(@RequestBody EditTeamTypeDTO editTeamTypeDTO);
+
+    /**
+     * 删除团队类型
+     * @param teamTypeId
+     * @param communityId
+     * @return
+     */
+    @DeleteMapping("/fms/teamType/delete")
+    R deleteFmsTeamType(@RequestParam("teamTypeId") Long teamTypeId,
+                        @RequestParam("communityId") Long communityId);
+
+    /**
+     * 获取团队类型列表
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/fms/teamType/list")
+    R listFmsTeamType(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 新增团队
+     * @param addTeamDTO
+     * @return
+     */
+    @PostMapping("/fms/team/add")
+    R addFmsTeam(@RequestBody AddTeamDTO addTeamDTO);
+
+    /**
+     * 修改团队信息
+     * @param editTeamDTO
+     * @return
+     */
+    @PostMapping("/fms/team/edit")
+    R editFmsTeam(@RequestBody EditTeamDTO editTeamDTO);
+
+    /**
+     * 删除团队
+     * @param teamId
+     * @return
+     */
+    @DeleteMapping("/fms/team/delete")
+    R deleteFmsTeam(@RequestParam("teamId") Long teamId);
+
+    /**
+     * 获取团队列表
+     * @param teamTypeId
+     * @return
+     */
+    @GetMapping("/fms/team/list")
+    R listFmsTeam(@RequestParam("teamTypeId") Long teamTypeId);
+
+    /**
+     * 获取团队详情
+     * @param teamId
+     * @return
+     */
+    @GetMapping("/fms/team/detail")
+    R detailFmsTeam(@RequestParam("teamId") Long teamId);
+
+    /**
+     * 级联查询团队数据
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/fms/team/cascade")
+    R retrieveFmsTeamCascade(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 新增团队成员
+     * @param addTeamMemberDTO
+     * @return
+     */
+    @PostMapping("/fms/teamMember/add")
+    R addFmsTeamMember(@RequestBody AddTeamMemberDTO addTeamMemberDTO);
+
+    /**
+     * 编辑团队成员
+     * @param editTeamMemberDTO
+     * @return
+     */
+    @PostMapping("/fms/teamMember/edit")
+    R editFmsTeamMember(@RequestBody EditTeamMemberDTO editTeamMemberDTO);
+
+    /**
+     * 删除团队成员
+     * @param deleteTeamMemberDTO
+     * @return
+     */
+    @PostMapping("/fms/teamMember/delete")
+    R deleteFmsTeamMember(@RequestBody DeleteTeamMemberDTO deleteTeamMemberDTO);
+
+    /**
+     * 分页查询团队成员
+     * @param pageTeamMemberDTO
+     * @return
+     */
+    @PostMapping("/fms/teamMember/page")
+    R pageFmsTeamMember(@RequestBody PageTeamMemberDTO pageTeamMemberDTO);
+
+    /**
+     * 微团队顶部统计
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/fms/teamMember/statistics")
+    R statisticsFmsTeamMember(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 批量导入团队成员
+     * @param voList
+     * @param communityId
+     * @param userId
+     * @return
+     */
+    @PostMapping("/fms/teamMember/import")
+    R listSaveFmsTeamMemberExcelVO(@RequestBody List<ComFmsTeamMemberImportExcelVO> voList,
+                                   @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId);
+
+    /**
+     * 团队人员导出
+     * @param pageTeamMemberDTO
+     * @return
+     */
+    @PostMapping("/fms/teamMember/export")
+    R exportTeamMember(@RequestBody PageTeamMemberDTO pageTeamMemberDTO);
+
+    /**
+     * 后台新增微服务
+     * @param adminDTO
+     * @return
+     */
+    @PostMapping("/fms/service/adminAdd")
+    R addFmsServiceAdmin(@RequestBody AddFmsServiceAdminDTO adminDTO);
+
+    /**
+     * 后台分页查询微服务
+     * @param adminDTO
+     * @return
+     */
+    @PostMapping("/fms/service/adminPage")
+    R pageFmsServiceAdmin(@RequestBody PageFmsServiceAdminDTO adminDTO);
+
+    /**
+     * 后台核实微服务
+     * @param adminDTO
+     * @return
+     */
+    @PostMapping("/fms/service/approval")
+    R approvalFmsService(@RequestBody ApprovalFmsServiceAdminDTO adminDTO);
+
+    /**
+     * 级联查询团队服务人员
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/fms/teamMember/cascade")
+    R retrieveFmsTeamMemberCascade(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 后台查看微服务详情
+     * @param serviceId
+     * @return
+     */
+    @GetMapping("/fms/service/detailAdmin")
+    R detailFmsServiceAdmin(@RequestParam("serviceId") Long serviceId);
+
+    /**
+     * 后台删除微服务
+     * @param serviceId
+     * @return
+     */
+    @DeleteMapping("/fms/service/delete")
+    R deleteFmsServiceAdmin(@RequestParam("serviceId") Long serviceId);
+
+    /**
+     * 微服务顶部统计
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/fms/service/statistics")
+    R statisticsFmsService(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 后台导入微服务数据
+     * @param voList
+     * @param communityId
+     * @param userId
+     * @return
+     */
+    @PostMapping("/fms/service/import")
+    R listSaveFmsServiceExcelVO(@RequestBody List<ComFmsServiceImportExcelVO> voList,
+                                @RequestParam("communityId") Long communityId,
+                                @RequestParam("userId") Long userId);
+
+    /**
+     * 后台新增微讲堂
+     * @param adminDTO
+     * @return
+     */
+    @PostMapping("/fms/classroom/add")
+    R addFmsClassroom(@RequestBody AddFmsClassroomAdminDTO adminDTO);
+
+    /**
+     * 后台编辑微讲堂
+     * @param adminDTO
+     * @return
+     */
+    @PostMapping("/fms/classroom/edit")
+    R editFmsClassroom(@RequestBody EditFmsClassroomAdminDTO adminDTO);
+
+    /**
+     * 后台删除微讲堂
+     * @param id
+     * @return
+     */
+    @DeleteMapping("/fms/classroom/delete")
+    R deleteFmsClassroom(@RequestParam("id") Long id);
+
+    /**
+     * 后台获取微讲堂详情
+     * @param id
+     * @return
+     */
+    @GetMapping("/fms/classroom/detail")
+    R detailFmsClassroom(@RequestParam("id") Long id);
+
+    /**
+     * 后台分页查询微讲堂
+     * @param adminDTO
+     * @return
+     */
+    @PostMapping("/fms/classroom/pageAdmin")
+    R pageFmsClassroomAdmin(@RequestBody PageFmsClassroomAdminDTO adminDTO);
+
+    /**
+     * 微讲堂顶部统计
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/fms/classroom/statistics")
+    R statisticsFmsClassroom(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 后台分页查询微调节/微防控
+     * @param adminDTO
+     * @return
+     */
+    @PostMapping("/fms/event/page")
+    R pageFmsEvent(@RequestBody PageFmsEventAdminDTO adminDTO);
+
+    /**
+     * 微调节/微防控顶部统计
+     * @param type
+     * @param communityId
+     * @return
+     */
+    @GetMapping("/fms/event/statistics")
+    R statisticsFmsEvent(@RequestParam("type") Integer type, @RequestParam("communityId") Long communityId);
+
+    /**
+     * 微调节/微防控事件详情
+     * @param eventId
+     * @return
+     */
+    @GetMapping("/fms/event/detail")
+    R detailFmsEvent(@RequestParam("eventId") Long eventId);
+
+    /**
+     * 小程序分页查询团队信息
+     * @param pageFmsTeamDTO
+     * @return
+     */
+    @PostMapping("/fms/team/pageApplets")
+    R pageFmsTeamApplets(@RequestBody PageFmsTeamDTO pageFmsTeamDTO);
+
+    /**
+     * 获取微讲堂详情
+     * @param id
+     * @return
+     */
+    @GetMapping("/fms/classroom/detailApplets")
+    R detailFmsClassroomApplets(@RequestParam("id") Long id);
+
+    /**
+     * 小程序分页查询微调节/微防控
+     * @param adminDTO
+     * @return
+     */
+    @PostMapping("/fms/event/pageApplets")
+    R pageFmsEventApplets(@RequestBody PageFmsEventAdminDTO adminDTO);
+
+    /**
+     * 小程序分页查询微服务
+     * @param adminDTO
+     * @return
+     */
+    @PostMapping("/fms/service/pageApplets")
+    R pageFmsServiceApplets(@RequestBody PageFmsServiceAppletsDTO adminDTO);
+
+    /**
+     * 小程序查看微服务详情
+     * @param serviceId
+     * @param userId
+     * @return
+     */
+    @GetMapping("/fms/service/detailApplets")
+    R detailFmsServiceApplets(@RequestParam("serviceId") Long serviceId, @RequestParam(value = "userId", required = false) Long userId);
+
+    /**
+     * 微服务申请
+     * @param adminDTO
+     * @return
+     */
+    @PostMapping("/fms/service/apply")
+    R applyFmsService(@RequestBody ApplyFmsServiceDTO adminDTO);
+
+    /**
+     * 分页查询我的微服务
+     * @param adminDTO
+     * @return
+     */
+    @PostMapping("/fms/service/pageMy")
+    R pageMyFmsService(@RequestBody PageFmsServiceAppletsDTO adminDTO);
+
+    /**
+     * 微服务评价
+     * @param evaluationFmsServiceDTO
+     * @return
+     */
+    @PostMapping("/fms/service/evaluate")
+    R evaluateFmsService(@RequestBody EvaluationFmsServiceDTO evaluationFmsServiceDTO);
+
+    /**
+     * 微团队成员分页查询服务处理
+     * @param adminDTO
+     * @return
+     */
+    @PostMapping("/fms/service/pageDeal")
+    R pageDealFmsService(@RequestBody PageFmsServiceAppletsDTO adminDTO);
+
+    /**
+     * 微团队成员服务反馈
+     * @param adminDTO
+     * @return
+     */
+    @PostMapping("/fms/service/feedback")
+    R feedbackFmsService(@RequestBody FeedbackFmsServiceDTO adminDTO);
+
+    /**
+     * 定时任务针对服务结束后3天还未评价的用户默认好评
+     * @return
+     */
+    @PostMapping("/fms/service/defaultPraise")
+    R timedTaskFmsServiceDefaultPraise();
 }

--
Gitblit v1.7.1