From a1ed31a624e7cf3d2f6c1c6582d853110c1867d0 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 06 九月 2021 10:19:20 +0800
Subject: [PATCH] bug修复

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |  713 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 620 insertions(+), 93 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 106a81e..b67e67e 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,40 +2,99 @@
 
 import java.util.List;
 
+import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.neighbor.*;
+import com.panzhihua.common.model.vos.community.*;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO;
 import com.panzhihua.common.model.dtos.PageDTO;
 import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
 import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
-import com.panzhihua.common.model.dtos.community.*;
-import com.panzhihua.common.model.dtos.community.bigscreen.*;
+import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticAgeGenderDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenStatisticPartyActivityDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.PageBigScreenStatisticPartyOrg;
 import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityListDTO;
 import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenActActivityPeopleListDTO;
 import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenDiscussListDTO;
 import com.panzhihua.common.model.dtos.community.bigscreen.work.ScreenMicroListDTO;
-import com.panzhihua.common.model.dtos.community.easyPhoto.*;
+import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoActivityDTO;
+import com.panzhihua.common.model.dtos.community.easyPhoto.AddEasyPhotoClassifyDTO;
+import com.panzhihua.common.model.dtos.community.easyPhoto.EditEasyPhotoActivityDTO;
+import com.panzhihua.common.model.dtos.community.easyPhoto.ExportEasyPhotoDTO;
+import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityDTO;
+import com.panzhihua.common.model.dtos.community.easyPhoto.PageEasyPhotoActivityUserDTO;
 import com.panzhihua.common.model.dtos.community.integral.ComActIntegralCommunityRankDTO;
 import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO;
 import com.panzhihua.common.model.dtos.community.integral.admin.EditComActIntegralRuleDTO;
 import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralRuleDTO;
 import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralTradeDTO;
 import com.panzhihua.common.model.dtos.community.questnaire.StatisticsSummaryDTO;
+import com.panzhihua.common.model.dtos.community.reserve.*;
 import com.panzhihua.common.model.dtos.community.switchs.SearchCommunityDTO;
-import com.panzhihua.common.model.dtos.community.wallet.*;
+import com.panzhihua.common.model.dtos.community.wallet.ComActWalletDetailDTO;
+import com.panzhihua.common.model.dtos.community.wallet.ComActWalletSettlementAdminDTO;
+import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletAdminDTO;
+import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeAdminDTO;
+import com.panzhihua.common.model.dtos.community.wallet.PageComActWalletTradeDTO;
 import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
 import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
 import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
-import com.panzhihua.common.model.dtos.grid.*;
-import com.panzhihua.common.model.dtos.grid.admin.*;
-import com.panzhihua.common.model.dtos.neighbor.*;
-import com.panzhihua.common.model.dtos.shop.*;
+import com.panzhihua.common.model.dtos.grid.AddComMngHousePopulationDTO;
+import com.panzhihua.common.model.dtos.grid.ComMngVillageListAppDTO;
+import com.panzhihua.common.model.dtos.grid.DelComMngHousePopulationDTO;
+import com.panzhihua.common.model.dtos.grid.PageComMngPopulationDTO;
+import com.panzhihua.common.model.dtos.grid.PageComMngVillageBuildHouseAppDTO;
+import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationExportDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationRelationHouseDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationSubordinateDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngVillageListExportAdminDTO;
+import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationDTO;
+import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationHouseDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopAddressDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopCartDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopEditNubCartDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopFundsExportDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopGoodsDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopOrderCreateDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopOrderDeliverDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopOrderExportDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopOrderPreviewDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopOrderQueryDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopOrderShipDTO;
+import com.panzhihua.common.model.dtos.shop.ComShopSysConfDTO;
+import com.panzhihua.common.model.dtos.shop.OrderPayDTO;
+import com.panzhihua.common.model.dtos.shop.PageComOrderListDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopAddressDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopFundsSearchDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopGoodsDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopOrderSearchDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
+import com.panzhihua.common.model.dtos.shop.PageComShopSysConfDTO;
+import com.panzhihua.common.model.dtos.shop.WxPayNotifyOrderDTO;
 import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
-import com.panzhihua.common.model.dtos.vaccines.*;
-import com.panzhihua.common.model.vos.*;
-import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.dtos.vaccines.VaccinesByAdminDTO;
+import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAdminDTO;
+import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollByAppDTO;
+import com.panzhihua.common.model.dtos.vaccines.VaccinesEnrollUserByAppDTO;
+import com.panzhihua.common.model.dtos.vaccines.VaccinesInoculationByAdminDTO;
+import com.panzhihua.common.model.vos.BcDictionaryItemVO;
+import com.panzhihua.common.model.vos.BcDictionaryVO;
+import com.panzhihua.common.model.vos.DictionaryVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
 import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender;
 import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyActivity;
 import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticPartyBuild;
@@ -43,6 +102,7 @@
 import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
 import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
 import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
+import com.panzhihua.common.model.vos.community.reserve.*;
 import com.panzhihua.common.model.vos.neighbor.AddNeighborCircleAdminVO;
 import com.panzhihua.common.model.vos.neighbor.ChangeCommentReplyStatusByAdminVO;
 import com.panzhihua.common.model.vos.neighbor.ChangeCommentStatusByAdminVO;
@@ -222,6 +282,15 @@
      */
     @GetMapping("/activity/picture/getList")
     R getPictureList(@RequestParam("userId") Long userId);
+
+    /**
+     * 获取系统预置图库  getSysPictureList
+     * @return    R   系统图库集
+     * @author txb
+     * @date 2021/8/27 13:33
+     */
+    @GetMapping("/activity/sysPicture/getList")
+    R getSysPictureList(@RequestParam("type")Integer type);
 
     /**
      * 活动报名名单
@@ -1059,7 +1128,7 @@
     R addComActEasyPhotoComment(@RequestBody ComActEasyPhotoCommentDTO comActEasyPhotoCommentDTO);
 
     /**
-     * 一起议-新增
+     * 议事投票-新增
      *
      * @param comActDiscussDTO
      *            新增参数
@@ -1069,7 +1138,17 @@
     R addDiscuss(@RequestBody ComActDiscussDTO comActDiscussDTO);
 
     /**
-     * 一起议-详情
+     * 议事投票-新增
+     *
+     * @param comActDiscussDTO
+     *            新增参数
+     * @return 新增结果
+     */
+    @PostMapping("editdiscuss")
+    R editDiscuss(@RequestBody ComActDiscussDTO comActDiscussDTO);
+
+    /**
+     * 议事投票-详情
      *
      * @param id
      *            主键
@@ -1079,7 +1158,7 @@
     R detailDiscuss(@RequestParam("id") Long id);
 
     /**
-     * 一起议-删除
+     * 议事投票-删除
      *
      * @param id
      *            主键
@@ -1089,7 +1168,7 @@
     R deleteDiscuss(@RequestParam("id") Long id);
 
     /**
-     * 一起议-回复
+     * 议事投票-回复
      *
      * @param comActDiscussCommentDTO
      *            评论内容
@@ -1099,7 +1178,7 @@
     R addDiscussComment(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO);
 
     /**
-     * 一起议-分页查询
+     * 议事投票-分页查询
      *
      * @param pageComActDiscussDTO
      *            查询参数
@@ -1109,7 +1188,7 @@
     R pageDiscuss(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);
 
     /**
-     * 一起议-评论-查看
+     * 议事投票-评论-查看
      *
      * @param id
      *            主键
@@ -1119,7 +1198,7 @@
     R detailDiscussComment(@RequestParam("id") Long id);
 
     /**
-     * 一起议-评论-置顶
+     * 议事投票-评论-置顶
      *
      * @param id
      *            主键
@@ -1129,7 +1208,7 @@
     R putDiscussCommentTop(@RequestParam("id") Long id);
 
     /**
-     * 一起议-评论-回复
+     * 议事投票-评论-回复
      *
      * @param comActDiscussCommentDTO
      *            回复内容
@@ -1139,7 +1218,7 @@
     R addDiscussCommentBack(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO);
 
     /**
-     * 一起议-评论-分页查询
+     * 议事投票-评论-分页查询
      *
      * @param pageComActDiscussCommentDTO
      *            分页查询参数
@@ -1149,7 +1228,7 @@
     R pageDiscussComment(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);
 
     /**
-     * 一起议-分页查询 小程序
+     * 议事投票-分页查询 小程序
      *
      * @param pageComActDiscussDTO
      *            查询参数
@@ -1159,7 +1238,7 @@
     R pageDiscussApplets(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);
 
     /**
-     * 一起议-点赞、取消点赞
+     * 议事投票-点赞、取消点赞
      *
      * @param comActDiscussUserDTO
      *            操作类型
@@ -1169,7 +1248,7 @@
     R putDiscussUser(@RequestBody ComActDiscussUserDTO comActDiscussUserDTO);
 
     /**
-     * 一起议-评论-分页查询 小程序
+     * 议事投票-评论-分页查询 小程序
      *
      * @param pageComActDiscussCommentDTO
      *            分页参数
@@ -1179,7 +1258,7 @@
     R pageDiscussCommentApplets(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);
 
     /**
-     * 一起议-详情 小程序
+     * 议事投票-详情 小程序
      *
      * @param id
      *            主键
@@ -1191,7 +1270,7 @@
     R detailDiscussApplets(@RequestParam("id") Long id, @RequestParam("userId") Long userId);
 
     /**
-     * 一起议-投票
+     * 议事投票-投票
      *
      * @param comActDiscussOptionUserDTO
      *            投票信息
@@ -1201,7 +1280,7 @@
     R addDiscussOptionUser(@RequestBody ComActDiscussOptionUserDTO comActDiscussOptionUserDTO);
 
     /**
-     * 一起议-评论-点赞、取消点赞
+     * 议事投票-评论-点赞、取消点赞
      *
      * @param comActDiscussUserDTO
      *            评论点赞
@@ -1376,7 +1455,7 @@
     R pageComCvtBusinessByServiceArea(@RequestBody PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO);
 
     /**
-     * 一起议-新增
+     * 议事投票-新增
      *
      * @param comOpsHouseDTO
      *            新增参数
@@ -1386,7 +1465,7 @@
     R addOpsHouse(@RequestBody ComOpsHouseDTO comOpsHouseDTO);
 
     /**
-     * 一起议-详情
+     * 议事投票-详情
      *
      * @param id
      *            主键
@@ -1426,7 +1505,7 @@
     R undercarriageHouse(@RequestBody ComOpsHouseUndercarriageVO comOpsHouseVO);
 
     /**
-     * 一起议-删除
+     * 议事投票-删除
      *
      * @param id
      *            主键
@@ -1620,7 +1699,7 @@
      */
     @PostMapping("/convenient/serve/import")
     R listSaveConvenientServeExcelVO(@RequestBody List<ComCvtServeExcelVO> list,
-        @RequestParam(value = "communityId", required = false) Long communityId);
+                                     @RequestParam(value = "communityId", required = false) Long communityId);
 
     /**
      * 导出房屋信息
@@ -1736,7 +1815,7 @@
      */
     @PostMapping("/common/data/company/import")
     R listSaveMngRealCompanyExcelVO(@RequestBody List<ComMngRealCompanyExcelVO> list,
-        @RequestParam("communityId") Long communityId);
+                                    @RequestParam("communityId") Long communityId);
 
     /**
      * 实有单位导出
@@ -1791,7 +1870,7 @@
      */
     @PostMapping("/common/data/assets/import")
     R listSaveMngRealAssetsExcelVO(@RequestBody List<ComMngRealAssetsExcelVO> list,
-        @RequestParam("communityId") Long communityId);
+                                   @RequestParam("communityId") Long communityId);
 
     /**
      * 实有单位导出
@@ -1939,7 +2018,7 @@
      */
     @PostMapping("/village/import")
     R listSaveVillageServeExcelVO(@RequestBody List<ComMngVillageServeExcelVO> list,
-        @RequestParam(value = "communityId") Long communityId);
+                                  @RequestParam(value = "communityId") Long communityId);
 
     /**
      * 批量导入实有人口
@@ -1952,7 +2031,7 @@
      */
     @PostMapping("/common/data/population/import")
     R listSavePopulationServeExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list,
-        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+                                     @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
 
     /**
      * 批量导入吸毒人员
@@ -1965,7 +2044,7 @@
      */
     @PostMapping("/common/data/population/importDrug")
     R listSavePopulationDrugExcelVO(@RequestBody List<ComMngPopulationDrugExcelVO> list,
-        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+                                    @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
 
     /**
      * 批量导入社区矫正人员
@@ -1978,7 +2057,7 @@
      */
     @PostMapping("/common/data/population/importCorrect")
     R listSavePopulationCorrectExcelVO(@RequestBody List<ComMngPopulationCorrectExcelVO> list,
-        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+                                       @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
 
     /**
      * 批量导入重精人员
@@ -1991,7 +2070,7 @@
      */
     @PostMapping("/common/data/population/importMajor")
     R listSavePopulationMajorExcelVO(@RequestBody List<ComMngPopulationMajorExcelVO> list,
-        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+                                     @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
 
     /**
      * 批量导入邪教人员
@@ -2004,7 +2083,7 @@
      */
     @PostMapping("/common/data/population/importCult")
     R listSavePopulationCultExcelVO(@RequestBody List<ComMngPopulationCultExcelVO> list,
-        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+                                    @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
 
     /**
      * 批量导入刑释人员
@@ -2017,7 +2096,7 @@
      */
     @PostMapping("/common/data/population/importRehabilitation")
     R listSavePopulationRehabilitationExcelVO(@RequestBody List<ComMngPopulationRehabilitationExcelVO> list,
-        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+                                              @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
 
     /**
      * 批量导入重点上访人员
@@ -2030,7 +2109,7 @@
      */
     @PostMapping("/common/data/population/importKey")
     R listSavePopulationKeyExcelVO(@RequestBody List<ComMngPopulationKeyExcelVO> list,
-        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+                                   @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
 
     /**
      * 批量导入服刑人员
@@ -2043,7 +2122,7 @@
      */
     @PostMapping("/common/data/population/importSentence")
     R listSavePopulationSentenceExcelVO(@RequestBody List<ComMngPopulationSentenceExcelVO> list,
-        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+                                        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
 
     /**
      * 批量导入退役军人
@@ -2056,7 +2135,7 @@
      */
     @PostMapping("/common/data/population/importVeterans")
     R listSavePopulationVeteransExcelVO(@RequestBody List<ComMngPopulationVeteransExcelVO> list,
-        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+                                        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
 
     /**
      * 批量导入残疾人
@@ -2069,7 +2148,7 @@
      */
     @PostMapping("/common/data/population/importDisability")
     R listSavePopulationDisabilityExcelVO(@RequestBody List<ComMngPopulationDisabilityExcelVO> list,
-        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+                                          @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
 
     /**
      * 批量导入低保户
@@ -2082,7 +2161,44 @@
      */
     @PostMapping("/common/data/population/importLowSecurity")
     R listSavePopulationLowSecurityExcelVO(@RequestBody List<ComMngPopulationLowSecurityExcelVO> list,
-        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+                                           @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+    /**
+     * 批量导入高龄老人  listSavePopulationElderExcelVO  批量导入高龄老人
+     * @param    list  高龄老人数据
+     * @param    communityId   社区id
+     * @return    R   导入结果
+     * @author txb
+     * @date 2021/9/01 15:03
+     */
+    @PostMapping("/common/data/population/importElder")
+    R listSavePopulationElderExcelVO(@RequestBody List<ComMngPopulationElderExcelVO> list,
+                                    @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+    /**
+     * 批量导入养老金人员  listSavePopulationPensionExcelVO  批量导入养老金人员
+     * @param    list  养老金人员数据
+     * @param    communityId   社区id
+     * @return    R   导入结果
+     * @author txb
+     * @date 2021/9/01 15:03
+     */
+    @PostMapping("/common/data/population/importPension")
+    R listSavePopulationPensionExcelVO(@RequestBody List<ComMngPopulationPensionExcelVO> list,
+                                     @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
+
+    /**
+     * 批量导入高龄老人线下认证记录  listSaveElderAuthRecordExcelVO  批量导入高龄老人线下认证记录
+     * @param    list  高龄老人线下认证记录数据
+     * @param    communityId   社区id
+     * @param    userId   登录人id
+     * @return    R   导入结果
+     * @author txb
+     * @date 2021/9/01 15:03
+     */
+    @PostMapping("/elders/authRecords/underLine/import")
+    R listSaveElderAuthRecordExcelVO(@RequestBody List<ComElderAuthRecordImportExcelVO> list,
+                                       @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
 
     /**
      * 确认导入实有人口(有则更新,无则新建)
@@ -2095,7 +2211,7 @@
      */
     @PostMapping("/common/data/population/import/confirm")
     R listSavePopulationConfirm(@RequestBody List<ComMngPopulationServeExcelVO> list,
-        @RequestParam(value = "communityId") Long communityId);
+                                @RequestParam(value = "communityId") Long communityId);
 
     /**
      * 分页查询实有人口
@@ -2255,7 +2371,7 @@
 
     /**
      * 小程序-问卷调查详情
-     * 
+     *
      * @param userId
      *            用户id
      * @param questId
@@ -2267,7 +2383,7 @@
 
     /**
      * 小程序-新增问卷调查浏览数量
-     * 
+     *
      * @param questId
      *            问卷调查id
      * @return 增加结果
@@ -2277,7 +2393,7 @@
 
     /**
      * 小程序-用户弹窗添加不在提醒接口
-     * 
+     *
      * @param questId
      *            问卷id
      * @param userId
@@ -2289,7 +2405,7 @@
 
     /**
      * 社区后台-查询问卷调查详情
-     * 
+     *
      * @param questId
      *            问卷id
      * @return 问卷调查详情
@@ -2813,7 +2929,7 @@
      */
     @PostMapping("/common/data/population/edit")
     R editPopulation(@RequestBody ComMngPopulationEditDTO populationEditDTO,
-        @RequestParam("communityId") Long communityId);
+                     @RequestParam("communityId") Long communityId);
 
     /**
      * 微心愿删除
@@ -2869,7 +2985,7 @@
      * @return 详情
      */
     @GetMapping("/detailworkguide")
-    R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId, @RequestParam("conmunityId") Long conmunityId);
+    R detailWorkGuide(@RequestParam("workGuideId") Long workGuideId, @RequestParam("communityId") Long communityId);
 
     /**
      * 办事指南_分页
@@ -2890,6 +3006,45 @@
      */
     @PostMapping("/delectworkguide")
     R delectWorkGuide(@RequestParam("workGuideId") Long workGuideId);
+
+    /**
+     * 分页查询办事指南-分类管理 pageWorkGuideClassify  分页查询办事指南-分类管理
+     * @param    comActWorkGuideClassifyVO   查询参数
+     * @return    R   返回结果
+     * @author txb
+     * @date 2021/8/31 15:03
+     */
+    @PostMapping("/workGuide/classify/apage")
+    R pageWorkGuideClassify(@RequestBody ComActWorkGuideClassifyVO comActWorkGuideClassifyVO);
+
+    /**
+     * 办事指南-分类管理新增或修改  addWorkGuideClassify  办事指南-分类管理新增或修改
+     * @param    comActWorkGuideClassifyVO   新增或修改参数
+     * @return    R   返回结果
+     * @author txb
+     * @date 2021/8/31 15:03
+     */
+    @PostMapping("/workGuide/classify/add")
+    R addWorkGuideClassify(@RequestBody ComActWorkGuideClassifyVO comActWorkGuideClassifyVO);
+
+    /**
+     * 办事指南-分类管理删除  deleteWorkGuideClassify  办事指南-分类管理删除
+     * @param    workGuideClassifyId    办事指南-分类管理id
+     * @return    R   返回结果
+     * @author txb
+     * @date 2021/8/31 15:03
+     */
+    @GetMapping("/workGuide/classify/delete")
+    R deleteWorkGuideClassify(@RequestParam("workGuideClassifyId") Long workGuideClassifyId);
+
+    /**
+     * 办事指南-分类管理列表查询  getWorkGuideClassifyList  办事指南-分类管理列表查询
+     * @return    R   返回结果
+     * @author txb
+     * @date 2021/8/31 15:03
+     */
+    @GetMapping("/workGuide/classify/getList")
+    R getWorkGuideClassifyList();
 
     /**
      * 分页查询邻里圈
@@ -3335,6 +3490,57 @@
     @PostMapping("/eldersauth/addFeedback")
     R addFeedback(@RequestBody EldersAuthFeedbackAddDTO eldersAuthFeedbackAddDTO);
 
+    //2021-8-30 身份认证改版(高龄老人认证管理)接口
+    /**
+     * 分页查询高龄老人认证记录  pageElderAuthRecords  分页查询高龄老人认证记录
+     * @param    pageElderAuthRecordsDTO   查询参数
+     * @return    R  查询结果
+     * @author txb
+     * @date 2021/9/02 11:03
+     */
+    @PostMapping("/elders/authRecords/page")
+    R pageElderAuthRecords(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO);
+
+    /**
+     * 根据高龄认证记录id查询详情 detailElderAuthRecords  根据高龄认证记录id查询详情
+     * @param    authRecordId   高龄认证记录id
+     * @return    R  查询结果
+     * @author txb
+     * @date 2021/9/02 11:03
+     */
+    @GetMapping("/elders/authRecords/detail")
+    R detailElderAuthRecords(@RequestParam(value = "authRecordId") Long authRecordId);
+
+    /**
+     * 高龄认证审核 examineElderAuthRecords  高龄认证审核
+     * @param    comElderAuthRecordVO   高龄认证审核参数
+     * @return    R  查询结果
+     * @author txb
+     * @date 2021/9/02 11:03
+     */
+    @PostMapping("/elders/authRecords/examine")
+    R examineElderAuthRecords(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO);
+
+    /**
+     * 高龄认证标记 examineElderAuthRecords  高龄认证标记
+     * @param    comElderAuthRecordVO   高龄认证标记参数
+     * @return    R  查询结果
+     * @author txb
+     * @date 2021/9/02 11:03
+     */
+    @PostMapping("/elders/authRecords/sign")
+    R signElderAuthRecords(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO);
+
+    /**
+     * 根据高龄认证记录id批量查询 getElderAuthRecordsByIds  根据高龄认证记录id批量查询
+     * @param    ids   高龄认证记录id集合
+     * @return    R  查询结果
+     * @author txb
+     * @date 2021/9/02 11:03
+     */
+    @PostMapping("/elders/authRecords/getList")
+    R getElderAuthRecordsByIds(@RequestBody List<Long> ids);
+
     /**
      * 小程序-查询疫苗分类列表
      *
@@ -3504,7 +3710,7 @@
      */
     @PostMapping("/eldersauthelderly/batchSave")
     R listSaveEldersAuthElderlyExcelVO(@RequestBody List<EldersAuthElderlyExcelVO> newVoList,
-        @RequestParam("communityId") Long communityId, @RequestParam("createBy") Long createBy);
+                                       @RequestParam("communityId") Long communityId, @RequestParam("createBy") Long createBy);
 
     /**
      * 批量保存楼栋
@@ -3515,7 +3721,7 @@
      */
     @PostMapping("/building/batchSave")
     R listSaveBuildingExcelVO(@RequestBody List<ComMngBuildingExcelVO> newVoList,
-        @RequestParam("communityId") Long communityId);
+                              @RequestParam("communityId") Long communityId);
 
     /**
      * 插入字典
@@ -3695,7 +3901,7 @@
      */
     @PostMapping("/bigscreen/party/ageGender")
     R<BigScreenStatisticAgeGender>
-        ageGender(@RequestBody BigScreenStatisticAgeGenderDTO bigScreenStatisticAgeGenderDTO);
+    ageGender(@RequestBody BigScreenStatisticAgeGenderDTO bigScreenStatisticAgeGenderDTO);
 
     /**
      * 党建数据概览
@@ -3720,7 +3926,7 @@
      */
     @PostMapping("/bigscreen/party/bigscreenPartyactivity")
     R<List<BigScreenStatisticPartyActivity>>
-        bigscreenPartyactivity(BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO);
+    bigscreenPartyactivity(BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO);
 
     /**
      * 首页大屏统计接口
@@ -3768,7 +3974,7 @@
     R activity(@RequestParam("communityId") Long communityId);
 
     /**
-     * 大屏统计一起议
+     * 大屏统计议事投票
      *
      * @param communityId
      * @return
@@ -3836,11 +4042,11 @@
     R getScreenEventDetail(@RequestBody BigScreenEventDetailDTO eventDetailDTO);
 
     /**
-     * 工作大屏-一起议列表
+     * 工作大屏-议事投票列表
      *
      * @param discussListDTO
      *            请求参数
-     * @return 一起议列表
+     * @return 议事投票列表
      */
     @PostMapping("/screen/work/getScreenDiscussList")
     R getScreenDiscussList(@RequestBody ScreenDiscussListDTO discussListDTO);
@@ -4239,7 +4445,7 @@
 
     /**
      * 查询用户交易记录总额
-     * 
+     *
      * @param pageTradeAdminDTO
      *            请求参数
      * @return 交易记录总额
@@ -4249,7 +4455,7 @@
 
     /**
      * 查询用户导出数据
-     * 
+     *
      * @param pageTradeAdminDTO
      *            请求参数
      * @return 用户导出数据
@@ -4259,7 +4465,7 @@
 
     /**
      * 导出奖励台账数据
-     * 
+     *
      * @param pageTradeAdminDTO
      *            请求参数
      * @return 奖励台账数据
@@ -4269,7 +4475,7 @@
 
     /**
      * 查询社区统计数据
-     * 
+     *
      * @param pageTradeAdminDTO
      *            查询社区统计数据
      * @return 社区统计数据
@@ -4279,7 +4485,7 @@
 
     /**
      * 社区随手拍列表统计
-     * 
+     *
      * @param communityId
      *            社区id
      * @return 统计结果
@@ -4325,7 +4531,7 @@
      * @return 邻里圈话题列表
      */
     @GetMapping("/neighbor/getNeighborTopicByApp")
-    R getNeighborTopicByApp(@RequestParam("communityId") Long communityId);
+    R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero);
 
     /**
      * 综治后台-查询社区列表
@@ -4418,6 +4624,17 @@
     R getUserReward(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
 
     /**
+     * 获取首页弹窗接口
+     * @param userId
+     *            用户id
+     * @param communityId
+     *            社区id
+     * @return 首页弹窗接口
+     */
+    @PostMapping("/easyphoto/getUserRewards")
+    R getUserRewards(@RequestParam("userId") Long userId, @RequestParam("communityId") Long communityId);
+
+    /**
      * 读取用户随手拍奖励
      *
      * @param userId
@@ -4476,7 +4693,7 @@
      */
     @GetMapping("/patrolRecord/safetyWorkRecord/detail")
     R detailSafetyWorkRecord(@RequestParam(value = "safetyWorkRecordId") Long safetyWorkRecordId,
-        @RequestParam(value = "communityId", required = false) Long communityId);
+                             @RequestParam(value = "communityId", required = false) Long communityId);
 
     /**
      * 根据巡查记录id查询安全工作记录详情
@@ -4487,7 +4704,7 @@
      */
     @GetMapping("/patrolRecord/safetyWorkRecord/detailByPrId")
     R detailSafetyWorkRecordByPrId(@RequestParam(value = "patrolRecordId") Long patrolRecordId,
-        @RequestParam(value = "communityId", required = false) Long communityId);
+                                   @RequestParam(value = "communityId", required = false) Long communityId);
 
     /**
      * 分页查询隐患报告
@@ -4558,7 +4775,7 @@
 
     /**
      * 小程序-查询积分说明
-     * 
+     *
      * @return 积分说明
      */
     @GetMapping("/integral/explain/applets")
@@ -4566,7 +4783,7 @@
 
     /**
      * 小程序-用户查询当前社区可领取积分规则列表
-     * 
+     *
      * @param userId
      *            用户id
      * @param communityId
@@ -4578,7 +4795,7 @@
 
     /**
      * 小程序-查询用户积分列表
-     * 
+     *
      * @param userId
      *            用户id
      * @return 用户积分列表
@@ -4588,7 +4805,7 @@
 
     /**
      * 小程序-查询社区积分账户排行榜
-     * 
+     *
      * @param communityRankDTO
      *            请求参数
      * @return 社区积分账户排行榜
@@ -4598,7 +4815,7 @@
 
     /**
      * 小程序-查询用户社区积分明细
-     * 
+     *
      * @param communityTradeDTO
      *            请求参数
      * @return 用户社区积分明细
@@ -4608,7 +4825,7 @@
 
     /**
      * 社区后台-根据社区id查询社区下积分规则列表
-     * 
+     *
      * @param integralRuleDTO
      *            请求参数
      * @return 社区下积分规则列表
@@ -4618,7 +4835,7 @@
 
     /**
      * 社区后台-编辑社区积分规则
-     * 
+     *
      * @param integralRuleDTO
      *            请求参数
      * @return 编辑结果
@@ -4628,7 +4845,7 @@
 
     /**
      * 社区后台-分页查询社区下积分明细记录
-     * 
+     *
      * @param integralRuleDTO
      *            请求参数
      * @return 社区下积分明细记录
@@ -4638,7 +4855,7 @@
 
     /**
      * 给用户添加积分
-     * 
+     *
      * @param integralUserDTO
      *            请求参数
      * @return 添加积分结果
@@ -4648,7 +4865,7 @@
 
     /**
      * 根据社区活动id查询社区活动报名人员列表
-     * 
+     *
      * @param activityId
      *            活动id
      * @return 社区活动报名人员列表
@@ -4668,7 +4885,7 @@
 
     /**
      * 根据id查询值班表
-     * 
+     *
      * @param rotaId
      *            值班表id
      * @return 值班表详情
@@ -4688,7 +4905,7 @@
 
     /**
      * 批量删除值班表
-     * 
+     *
      * @param rotaIds
      *            值班ids
      * @return 删除结果
@@ -4735,7 +4952,7 @@
 
     /**
      * 查询社区所有列表
-     * 
+     *
      * @return 社区列表
      */
     @GetMapping("/switch/community/all/list")
@@ -4743,7 +4960,7 @@
 
     /**
      * 根据名字查询所有社区列表
-     * 
+     *
      * @param name
      *            社区名字
      * @return 社区列表
@@ -4753,7 +4970,7 @@
 
     /**
      * 根据经纬度以及距离搜索附近社区列表
-     * 
+     *
      * @param communityDTO
      *            请求参数
      * @return 社区列表
@@ -4763,7 +4980,7 @@
 
     /**
      * 问卷调查统计汇总
-     * 
+     *
      * @param summaryDTO
      *            请求参数
      * @return 统计汇总
@@ -4773,7 +4990,7 @@
 
     /**
      * 问卷调查统计汇总导出数据查询
-     * 
+     *
      * @param questId
      *            调查问卷id
      * @return 调查统计汇总导出数据
@@ -4783,7 +5000,7 @@
 
     /**
      * 问卷调查统计汇总表头统计
-     * 
+     *
      * @param questId
      *            调查问卷id
      * @return 问卷调查统计汇总表头统计数据
@@ -4793,7 +5010,7 @@
 
     /**
      * 运营后台-新增随手拍分类
-     * 
+     *
      * @param addPhotoClassify
      *            请求参数
      * @return 新增结果
@@ -4803,7 +5020,7 @@
 
     /**
      * 运营后台-编辑随手拍分类
-     * 
+     *
      * @param addPhotoClassify
      *            请求参数
      * @return 编辑结果
@@ -4813,7 +5030,7 @@
 
     /**
      * 运营后台-分页查询随手拍分类
-     * 
+     *
      * @param addPhotoClassify
      *            请求参数
      * @return 随手拍分类列表
@@ -4823,7 +5040,7 @@
 
     /**
      * 运营后台-随手拍分类详情
-     * 
+     *
      * @param id
      *            随手拍分类id
      * @return 随手拍分类
@@ -4833,7 +5050,7 @@
 
     /**
      * 运营后台-随手拍分类删除
-     * 
+     *
      * @param id
      *            随手拍分类id
      * @return 删除结果
@@ -4843,7 +5060,7 @@
 
     /**
      * 运营后台-查询随手拍分类列表
-     * 
+     *
      * @return 随手拍分类列表
      */
     @GetMapping("/classify/admin/list")
@@ -4851,7 +5068,7 @@
 
     /**
      * 社区后台-切换随手拍公示状态
-     * 
+     *
      * @param comActEasyPhotoVO
      *            请求参数
      * @return 切换结果
@@ -4861,11 +5078,321 @@
 
     /**
      * 查询社区待处理随手拍id集合
-     * 
+     *
      * @param communityId
      *            社区id
      * @return 社区待处理随手拍id集合
      */
     @GetMapping("/easyphoto/noHandle/list")
     R easyPhotoNoHandleList(@RequestParam("communityId") Long communityId);
+
+    @GetMapping("/reserve/detail")
+    R reserveDetail(@RequestParam("id") Long id,@RequestParam("userId") Long userId,@RequestParam("recordId") Long recordId,@RequestParam("isBack") Integer isBack);
+
+    @PostMapping("/reserve/commit")
+    R reserveCommit(@RequestBody ComActReserveCommitVO comActReserveCommitVO);
+
+    /**
+     * 我的预约/登记
+     * @param pageUserReserveDTO
+     * @return
+     */
+    @PostMapping("/reserve/userReserveList")
+    R userReserveList(@RequestBody PageUserReserveDTO pageUserReserveDTO);
+
+    /**
+     * 取消预约/登记
+     */
+    @PostMapping("/reserve/cancelReserve")
+    R userCancelReserve(@RequestBody CancelRecordDTO comActReserveRecordDO);
+
+    /**
+     * 预约详情操作记录
+     */
+    @PostMapping("/reserve/detailOperation")
+    R reserveOperation(@RequestBody OperationDetailDTO comActReserveOperationRecordDO);
+
+    /**
+     * 社区后台-分页查询预约登记列表
+     * @param pageReserveDTO    请求参数
+     * @return  预约登记列表
+     */
+    @PostMapping("/reserve/admin/page")
+    R pageReserveAdmin(@RequestBody PageReserveAdminDTO pageReserveDTO);
+
+    /**
+     * 社区后台-新增预约登记信息
+     * @param addReserveDTO 请求参数
+     * @return  新增结果
+     */
+    @PostMapping("/reserve/admin/add")
+    R addReserveAdmin(@RequestBody AddReserveAdminDTO addReserveDTO);
+
+    /**
+     * 社区后台-编辑预约登记信息
+     * @param editReserveDTO 请求参数
+     * @return  新增结果
+     */
+    @PostMapping("/reserve/admin/edit")
+    R editReserveAdmin(@RequestBody EditReserveAdminDTO editReserveDTO);
+
+    /**
+     * 社区后台-修改预约登记状态
+     * @param editReserveDTO    请求参数
+     * @return  修改结果
+     */
+    @PostMapping("/reserve/admin/edit/status")
+    R editReserveStatusAdmin(@RequestBody EditComActReserveStatusDTO editReserveDTO);
+
+    /**
+     * 社区后台-继续预约登记
+     * @param editReserveDTO    请求参数
+     * @return  修改结果
+     */
+    @PostMapping("/reserve/admin/edit/info")
+    R editReserveInfoAdmin(@RequestBody EditComActReserveInfoDTO editReserveDTO);
+
+    /**
+     * 社区后台-根据预约登记id查询详情
+     * @param reserveId 预约登记id
+     * @return  预约登记详情
+     */
+    @GetMapping("/reserve/admin/detail")
+    R detailReserveAdmin(@RequestParam("reserveId") Long reserveId);
+
+    /**
+     * 社区后台-根据社区id统计预约类数据
+     * @param makeStatisticsDTO   请求参数
+     * @return  统计预约类数据
+     */
+    @PostMapping("/reserve/admin/make/statistics")
+    R makeStatisticsAdmin(@RequestBody ComActReserveMakeStatisticsDTO makeStatisticsDTO);
+
+    /**
+     * 社区后台-查询导出预约统计汇总数据
+     * @param makeStatisticsDTO   请求参数
+     * @return  统计预约类数据
+     */
+    @PostMapping("/reserve/admin/make/statistics/export")
+    R makeStatisticsExportAdmin(@RequestBody ComActReserveMakeStatisticsDTO makeStatisticsDTO);
+
+    /**
+     * 社区后台-根据预约id查询预约明细
+     * @param pageMakeDTO   请求参数
+     * @return  预约明细
+     */
+    @PostMapping("/reserve/admin/make/page")
+    R pageMakeAdmin(@RequestBody PageReserveMakeAdminDTO pageMakeDTO);
+
+    /**
+     * 根据预约记录id查询预约明细操作记录
+     * @param reserveRecordId   预约记录id
+     * @return  预约明细操作记录
+     */
+    @GetMapping("/reserve/admin/make/detail")
+    R detailMakeAdmin(@RequestParam("reserveRecordId") Long reserveRecordId);
+
+    /**
+     * 批量取消预约记录
+     * @param reserveRecordDTO   请求参数
+     * @return  取消结果
+     */
+    @PostMapping("/reserve/admin/make/cancel")
+    R makeCancelAdmin(@RequestBody CancelReserveRecordDTO reserveRecordDTO);
+
+    /**
+     * 预约明细导出数据查询
+     * @param pageMakeDTO   请求参数
+     * @return  预约明细数据
+     */
+    @PostMapping("/reserve/admin/make/list/export")
+    R exportMakeAdmin(@RequestBody PageReserveMakeAdminDTO pageMakeDTO);
+
+    /**
+     * 分页查询登记统计汇总
+     * @param registerStatisticsDTO 请求参数
+     * @return  登记统计汇总
+     */
+    @PostMapping("/reserve/admin/register/page")
+    R registerStatisticsAdmin(@RequestBody ComActReserveRegisterStatisticsDTO registerStatisticsDTO);
+
+    /**
+     * 导出登记统计汇总
+     * @param registerStatisticsDTO 请求参数
+     * @return  登记统计汇总
+     */
+    @PostMapping("/reserve/admin/register/export")
+    R registerStatisticsExportAdmin(@RequestBody ComActReserveRegisterStatisticsDTO registerStatisticsDTO);
+
+    /**
+     * 分页查询预约处理列表
+     * @param pageMakeHandleDTO 请求参数
+     * @return  预约处理列表
+     */
+    @PostMapping("/reserve/admin/make/handle/page")
+    R pageMakeHandleAdmin(@RequestBody PageReserveMakeHandleAdminDTO pageMakeHandleDTO);
+
+    /**
+     * 批量处理预约记录
+     * @param makeHandleDTO 请求参数
+     * @return  处理结果
+     */
+    @PostMapping("/reserve/admin/make/handle")
+    R makeHandleAdmin(@RequestBody MakeHandleAdminDTO makeHandleDTO);
+
+    /**
+     * 导出预约处理列表数据查询
+     * @param pageMakeHandleDTO 请求参数
+     * @return  预约处理列表
+     */
+    @PostMapping("/reserve/admin/make/handle/export")
+    R exportMakeHandleAdmin(@RequestBody PageReserveMakeHandleAdminDTO pageMakeHandleDTO);
+
+    /**
+     * 删除预约登记信息
+     * @param reserveId 预约登记id
+     * @return  删除结果
+     */
+    @GetMapping("/reserve/admin/delete")
+    R deleteReserveAdmin(@RequestParam("reserveId") Long reserveId);
+
+    /**
+     * 查询社区所有预约信息列表
+     * @param communityId   社区id
+     * @return  预约信息列表
+     */
+    @GetMapping("/reserve/admin/list")
+    R listReserveAdmin(@RequestParam("communityId") Long communityId);
+
+    /**
+     * 导出登记明细数据
+     * @param reserveId 登记id
+     * @return  登记明细数据
+     */
+    @GetMapping("/reserve/admin/register/list/export")
+    R exportRegisterAdmin(@RequestParam("reserveId") Long reserveId);
+
+    /**
+     * 查询预约登记题目列表
+     * @param reserveId 预约登记id
+     * @return  约登记题目列表
+     */
+    @GetMapping("/reserve/admin/subject/list")
+    R subjectListAdmin(@RequestParam("reserveId") Long reserveId);
+
+    /**
+     * 分页查询登记明细列表
+     * @param detailedAdminDTO  请求参数
+     * @return  登记明细列表
+     */
+    @PostMapping("/reserve/admin/register/detailed/list")
+    R registerDetailedListAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO);
+
+    /**
+     * 查询登记详情记录
+     * @param reserveRecordId   登记记录id
+     * @return  登记详情记录
+     */
+    @GetMapping("/reserve/admin/register/detailed/detail")
+    R registerDetailedDetailAdmin(@RequestParam("reserveRecordId") Long reserveRecordId);
+    /**
+     * 活动签到
+     *
+     * @param comActActRegistVO 请求参数
+     * @return 签到结果
+     */
+    @PostMapping("/activity/sign-in")
+    R activitySignIn(@RequestBody ComActActRegistVO comActActRegistVO);
+
+    /**
+     * 用户签到列表
+     *
+     * @param userId 用户id
+     * @return 用户签到记录列表
+     */
+    @GetMapping("/sign-in/user/list")
+    R listSignInActivity(@RequestParam("userId") Long userId);
+
+    /**
+     * 社区活动评价
+     *
+     * @param comActActEvaluateVO 社区评价VO
+     * @return 评价结果
+     */
+    @PostMapping("/activity/evaluate")
+    R activityEvaluate(@RequestBody ComActActEvaluateVO comActActEvaluateVO);
+
+    /**
+     * 用户评价列表
+     *
+     * @param userId 用户id
+     * @return 当前用户对所有活动的评价列表
+     */
+    @GetMapping("/evaluate/user/list")
+    R listEvaluate(@RequestParam("userId") Long userId);
+
+    /**
+     * 定时任务针对活动结束后7天还未评价的用户默认好评
+     */
+    @PostMapping("/activity/default-praise")
+    R timedTaskActivityDefaultPraise();
+
+    /**
+     * 小程序-用户新增话题
+     * @param circleTopicAppDTO 请求参数
+     * @return  新增结果
+     */
+    @PostMapping("/neighbor/addNeighborTopicByApp")
+    R addNeighborTopicByApp(@RequestBody AddNeighborCircleTopicAppDTO circleTopicAppDTO);
+
+    /**
+     * 小程序-删除邻里圈
+     * @param circleTopicAppDTO 请求参数
+     * @return  删除结果
+     */
+    @PostMapping("/neighbor/deleteNeighborByApp")
+    R deleteNeighborByApp(@RequestBody DeleteNeighborCircleAppDTO circleTopicAppDTO);
+
+    /**
+     * 获取系统配置value
+     * @param key   系统配置code
+     * @param communityId   社区id
+     * @return  系统配置value
+     */
+    @GetMapping("/sys/conf/getSysConfValue")
+    R getSysConfValue(@RequestParam("key") String key,@RequestParam("communityId") Long communityId);
+
+    /**
+     * 新增系统配置
+     * @param key   系统配置code
+     * @param communityId   社区id
+     * @param name  系统配置名称
+     * @param value 系统配置value
+     * @return  新增结果
+     */
+    @GetMapping("/sys/conf/addSysConfValue")
+    R addSysConfValue(@RequestParam("key") String key,@RequestParam("communityId") Long communityId,@RequestParam("name") String name,@RequestParam("value") String value);
+
+    /**
+     * 编辑系统配置
+     * @param communityId   社区id
+     * @param status    配置值
+     * @return  编辑结果
+     */
+    @GetMapping("/sys/conf/editSysConfValue")
+    R editSysConfValue(@RequestParam("communityId") Long communityId,@RequestParam("status") Integer status);
+
+    /**
+     * 定时任务扫描高龄认证记录信息
+     * @return  执行结果
+     */
+    @PostMapping("/elders/auth/task")
+    R timedTaskEldersAuthJobHandler();
+
+    /**
+     * 定时任务扫描上月高龄认证使用视频认证的用户添加成功记录
+     * @return  执行结果
+     */
+    @PostMapping("/elders/auth/record/task")
+    R timedTaskEldersAuthRecordJobHandler();
 }

--
Gitblit v1.7.1