bug修复

huanghongfa

2021-09-08 c45a0047d6b1be8e140bc580ee9320eff3d42ac6

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

@@ -3,6 +3,7 @@
import java.util.List;

import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.neighbor.*;
import com.panzhihua.common.model.vos.community.*;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
@@ -62,20 +63,6 @@
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.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.DetailNeighborAllCommentByAdminDTO;
import com.panzhihua.common.model.dtos.neighbor.DetailNeighborCommentReplyByAdminDTO;
import com.panzhihua.common.model.dtos.shop.ComShopAddressDTO;
import com.panzhihua.common.model.dtos.shop.ComShopCartDTO;
import com.panzhihua.common.model.dtos.shop.ComShopEditNubCartDTO;
@@ -295,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);

    /**
     * 活动报名名单
@@ -1132,7 +1128,7 @@
    R addComActEasyPhotoComment(@RequestBody ComActEasyPhotoCommentDTO comActEasyPhotoCommentDTO);

    /**
     * 一起议-新增
     * 议事投票-新增
     *
     * @param comActDiscussDTO
     *            新增参数
@@ -1142,7 +1138,17 @@
    R addDiscuss(@RequestBody ComActDiscussDTO comActDiscussDTO);

    /**
     * 一起议-详情
     * 议事投票-新增
     *
     * @param comActDiscussDTO
     *            新增参数
     * @return 新增结果
     */
    @PostMapping("editdiscuss")
    R editDiscuss(@RequestBody ComActDiscussDTO comActDiscussDTO);

    /**
     * 议事投票-详情
     *
     * @param id
     *            主键
@@ -1152,7 +1158,7 @@
    R detailDiscuss(@RequestParam("id") Long id);

    /**
     * 一起议-删除
     * 议事投票-删除
     *
     * @param id
     *            主键
@@ -1162,7 +1168,7 @@
    R deleteDiscuss(@RequestParam("id") Long id);

    /**
     * 一起议-回复
     * 议事投票-回复
     *
     * @param comActDiscussCommentDTO
     *            评论内容
@@ -1172,7 +1178,7 @@
    R addDiscussComment(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO);

    /**
     * 一起议-分页查询
     * 议事投票-分页查询
     *
     * @param pageComActDiscussDTO
     *            查询参数
@@ -1182,7 +1188,7 @@
    R pageDiscuss(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);

    /**
     * 一起议-评论-查看
     * 议事投票-评论-查看
     *
     * @param id
     *            主键
@@ -1192,7 +1198,7 @@
    R detailDiscussComment(@RequestParam("id") Long id);

    /**
     * 一起议-评论-置顶
     * 议事投票-评论-置顶
     *
     * @param id
     *            主键
@@ -1202,7 +1208,7 @@
    R putDiscussCommentTop(@RequestParam("id") Long id);

    /**
     * 一起议-评论-回复
     * 议事投票-评论-回复
     *
     * @param comActDiscussCommentDTO
     *            回复内容
@@ -1212,7 +1218,7 @@
    R addDiscussCommentBack(@RequestBody ComActDiscussCommentDTO comActDiscussCommentDTO);

    /**
     * 一起议-评论-分页查询
     * 议事投票-评论-分页查询
     *
     * @param pageComActDiscussCommentDTO
     *            分页查询参数
@@ -1222,7 +1228,7 @@
    R pageDiscussComment(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);

    /**
     * 一起议-分页查询 小程序
     * 议事投票-分页查询 小程序
     *
     * @param pageComActDiscussDTO
     *            查询参数
@@ -1232,7 +1238,7 @@
    R pageDiscussApplets(@RequestBody PageComActDiscussDTO pageComActDiscussDTO);

    /**
     * 一起议-点赞、取消点赞
     * 议事投票-点赞、取消点赞
     *
     * @param comActDiscussUserDTO
     *            操作类型
@@ -1242,7 +1248,7 @@
    R putDiscussUser(@RequestBody ComActDiscussUserDTO comActDiscussUserDTO);

    /**
     * 一起议-评论-分页查询 小程序
     * 议事投票-评论-分页查询 小程序
     *
     * @param pageComActDiscussCommentDTO
     *            分页参数
@@ -1252,7 +1258,7 @@
    R pageDiscussCommentApplets(@RequestBody PageComActDiscussCommentDTO pageComActDiscussCommentDTO);

    /**
     * 一起议-详情 小程序
     * 议事投票-详情 小程序
     *
     * @param id
     *            主键
@@ -1264,7 +1270,7 @@
    R detailDiscussApplets(@RequestParam("id") Long id, @RequestParam("userId") Long userId);

    /**
     * 一起议-投票
     * 议事投票-投票
     *
     * @param comActDiscussOptionUserDTO
     *            投票信息
@@ -1274,7 +1280,7 @@
    R addDiscussOptionUser(@RequestBody ComActDiscussOptionUserDTO comActDiscussOptionUserDTO);

    /**
     * 一起议-评论-点赞、取消点赞
     * 议事投票-评论-点赞、取消点赞
     *
     * @param comActDiscussUserDTO
     *            评论点赞
@@ -1449,7 +1455,7 @@
    R pageComCvtBusinessByServiceArea(@RequestBody PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO);

    /**
     * 一起议-新增
     * 议事投票-新增
     *
     * @param comOpsHouseDTO
     *            新增参数
@@ -1459,7 +1465,7 @@
    R addOpsHouse(@RequestBody ComOpsHouseDTO comOpsHouseDTO);

    /**
     * 一起议-详情
     * 议事投票-详情
     *
     * @param id
     *            主键
@@ -1499,7 +1505,7 @@
    R undercarriageHouse(@RequestBody ComOpsHouseUndercarriageVO comOpsHouseVO);

    /**
     * 一起议-删除
     * 议事投票-删除
     *
     * @param id
     *            主键
@@ -1693,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);

    /**
     * 导出房屋信息
@@ -1809,7 +1815,7 @@
     */
    @PostMapping("/common/data/company/import")
    R listSaveMngRealCompanyExcelVO(@RequestBody List<ComMngRealCompanyExcelVO> list,
        @RequestParam("communityId") Long communityId);
                                    @RequestParam("communityId") Long communityId);

    /**
     * 实有单位导出
@@ -1864,7 +1870,7 @@
     */
    @PostMapping("/common/data/assets/import")
    R listSaveMngRealAssetsExcelVO(@RequestBody List<ComMngRealAssetsExcelVO> list,
        @RequestParam("communityId") Long communityId);
                                   @RequestParam("communityId") Long communityId);

    /**
     * 实有单位导出
@@ -2012,7 +2018,7 @@
     */
    @PostMapping("/village/import")
    R listSaveVillageServeExcelVO(@RequestBody List<ComMngVillageServeExcelVO> list,
        @RequestParam(value = "communityId") Long communityId);
                                  @RequestParam(value = "communityId") Long communityId);

    /**
     * 批量导入实有人口
@@ -2025,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);

    /**
     * 批量导入吸毒人员
@@ -2038,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);

    /**
     * 批量导入社区矫正人员
@@ -2051,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);

    /**
     * 批量导入重精人员
@@ -2064,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);

    /**
     * 批量导入邪教人员
@@ -2077,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);

    /**
     * 批量导入刑释人员
@@ -2090,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);

    /**
     * 批量导入重点上访人员
@@ -2103,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);

    /**
     * 批量导入服刑人员
@@ -2116,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);

    /**
     * 批量导入退役军人
@@ -2129,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);

    /**
     * 批量导入残疾人
@@ -2142,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);

    /**
     * 批量导入低保户
@@ -2155,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);

    /**
     * 确认导入实有人口（有则更新，无则新建）
@@ -2168,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);

    /**
     * 分页查询实有人口
@@ -2328,7 +2371,7 @@

    /**
     * 小程序-问卷调查详情
     * 
     *
     * @param userId
     *            用户id
     * @param questId
@@ -2340,7 +2383,7 @@

    /**
     * 小程序-新增问卷调查浏览数量
     * 
     *
     * @param questId
     *            问卷调查id
     * @return 增加结果
@@ -2350,7 +2393,7 @@

    /**
     * 小程序-用户弹窗添加不在提醒接口
     * 
     *
     * @param questId
     *            问卷id
     * @param userId
@@ -2362,7 +2405,7 @@

    /**
     * 社区后台-查询问卷调查详情
     * 
     *
     * @param questId
     *            问卷id
     * @return 问卷调查详情
@@ -2886,7 +2929,7 @@
     */
    @PostMapping("/common/data/population/edit")
    R editPopulation(@RequestBody ComMngPopulationEditDTO populationEditDTO,
        @RequestParam("communityId") Long communityId);
                     @RequestParam("communityId") Long communityId);

    /**
     * 微心愿删除
@@ -2942,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);

    /**
     * 办事指南_分页
@@ -2963,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();

    /**
     * 分页查询邻里圈
@@ -3408,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);

    /**
     * 小程序-查询疫苗分类列表
     *
@@ -3577,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);

    /**
     * 批量保存楼栋
@@ -3588,7 +3721,7 @@
     */
    @PostMapping("/building/batchSave")
    R listSaveBuildingExcelVO(@RequestBody List<ComMngBuildingExcelVO> newVoList,
        @RequestParam("communityId") Long communityId);
                              @RequestParam("communityId") Long communityId);

    /**
     * 插入字典
@@ -3768,7 +3901,7 @@
     */
    @PostMapping("/bigscreen/party/ageGender")
    R<BigScreenStatisticAgeGender>
        ageGender(@RequestBody BigScreenStatisticAgeGenderDTO bigScreenStatisticAgeGenderDTO);
    ageGender(@RequestBody BigScreenStatisticAgeGenderDTO bigScreenStatisticAgeGenderDTO);

    /**
     * 党建数据概览
@@ -3793,7 +3926,7 @@
     */
    @PostMapping("/bigscreen/party/bigscreenPartyactivity")
    R<List<BigScreenStatisticPartyActivity>>
        bigscreenPartyactivity(BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO);
    bigscreenPartyactivity(BigScreenStatisticPartyActivityDTO bigScreenStatisticPartyActivityDTO);

    /**
     * 首页大屏统计接口
@@ -3841,7 +3974,7 @@
    R activity(@RequestParam("communityId") Long communityId);

    /**
     * 大屏统计一起议
     * 大屏统计议事投票
     *
     * @param communityId
     * @return
@@ -3909,11 +4042,11 @@
    R getScreenEventDetail(@RequestBody BigScreenEventDetailDTO eventDetailDTO);

    /**
     * 工作大屏-一起议列表
     * 工作大屏-议事投票列表
     *
     * @param discussListDTO
     *            请求参数
     * @return 一起议列表
     * @return 议事投票列表
     */
    @PostMapping("/screen/work/getScreenDiscussList")
    R getScreenDiscussList(@RequestBody ScreenDiscussListDTO discussListDTO);
@@ -4312,7 +4445,7 @@

    /**
     * 查询用户交易记录总额
     * 
     *
     * @param pageTradeAdminDTO
     *            请求参数
     * @return 交易记录总额
@@ -4322,7 +4455,7 @@

    /**
     * 查询用户导出数据
     * 
     *
     * @param pageTradeAdminDTO
     *            请求参数
     * @return 用户导出数据
@@ -4332,7 +4465,7 @@

    /**
     * 导出奖励台账数据
     * 
     *
     * @param pageTradeAdminDTO
     *            请求参数
     * @return 奖励台账数据
@@ -4342,7 +4475,7 @@

    /**
     * 查询社区统计数据
     * 
     *
     * @param pageTradeAdminDTO
     *            查询社区统计数据
     * @return 社区统计数据
@@ -4352,7 +4485,7 @@

    /**
     * 社区随手拍列表统计
     * 
     *
     * @param communityId
     *            社区id
     * @return 统计结果
@@ -4398,7 +4531,7 @@
     * @return 邻里圈话题列表
     */
    @GetMapping("/neighbor/getNeighborTopicByApp")
    R getNeighborTopicByApp(@RequestParam("communityId") Long communityId);
    R getNeighborTopicByApp(@RequestParam("communityId") Long communityId,@RequestParam("isZero") Integer isZero,@RequestParam("name") String name);

    /**
     * 综治后台-查询社区列表
@@ -4491,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
@@ -4549,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查询安全工作记录详情
@@ -4560,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);

    /**
     * 分页查询隐患报告
@@ -4631,7 +4775,7 @@

    /**
     * 小程序-查询积分说明
     * 
     *
     * @return 积分说明
     */
    @GetMapping("/integral/explain/applets")
@@ -4639,7 +4783,7 @@

    /**
     * 小程序-用户查询当前社区可领取积分规则列表
     * 
     *
     * @param userId
     *            用户id
     * @param communityId
@@ -4651,7 +4795,7 @@

    /**
     * 小程序-查询用户积分列表
     * 
     *
     * @param userId
     *            用户id
     * @return 用户积分列表
@@ -4661,7 +4805,7 @@

    /**
     * 小程序-查询社区积分账户排行榜
     * 
     *
     * @param communityRankDTO
     *            请求参数
     * @return 社区积分账户排行榜
@@ -4671,7 +4815,7 @@

    /**
     * 小程序-查询用户社区积分明细
     * 
     *
     * @param communityTradeDTO
     *            请求参数
     * @return 用户社区积分明细
@@ -4681,7 +4825,7 @@

    /**
     * 社区后台-根据社区id查询社区下积分规则列表
     * 
     *
     * @param integralRuleDTO
     *            请求参数
     * @return 社区下积分规则列表
@@ -4691,7 +4835,7 @@

    /**
     * 社区后台-编辑社区积分规则
     * 
     *
     * @param integralRuleDTO
     *            请求参数
     * @return 编辑结果
@@ -4701,7 +4845,7 @@

    /**
     * 社区后台-分页查询社区下积分明细记录
     * 
     *
     * @param integralRuleDTO
     *            请求参数
     * @return 社区下积分明细记录
@@ -4711,7 +4855,7 @@

    /**
     * 给用户添加积分
     * 
     *
     * @param integralUserDTO
     *            请求参数
     * @return 添加积分结果
@@ -4721,7 +4865,7 @@

    /**
     * 根据社区活动id查询社区活动报名人员列表
     * 
     *
     * @param activityId
     *            活动id
     * @return 社区活动报名人员列表
@@ -4741,7 +4885,7 @@

    /**
     * 根据id查询值班表
     * 
     *
     * @param rotaId
     *            值班表id
     * @return 值班表详情
@@ -4761,7 +4905,7 @@

    /**
     * 批量删除值班表
     * 
     *
     * @param rotaIds
     *            值班ids
     * @return 删除结果
@@ -4808,7 +4952,7 @@

    /**
     * 查询社区所有列表
     * 
     *
     * @return 社区列表
     */
    @GetMapping("/switch/community/all/list")
@@ -4816,7 +4960,7 @@

    /**
     * 根据名字查询所有社区列表
     * 
     *
     * @param name
     *            社区名字
     * @return 社区列表
@@ -4826,7 +4970,7 @@

    /**
     * 根据经纬度以及距离搜索附近社区列表
     * 
     *
     * @param communityDTO
     *            请求参数
     * @return 社区列表
@@ -4836,7 +4980,7 @@

    /**
     * 问卷调查统计汇总
     * 
     *
     * @param summaryDTO
     *            请求参数
     * @return 统计汇总
@@ -4846,7 +4990,7 @@

    /**
     * 问卷调查统计汇总导出数据查询
     * 
     *
     * @param questId
     *            调查问卷id
     * @return 调查统计汇总导出数据
@@ -4856,7 +5000,7 @@

    /**
     * 问卷调查统计汇总表头统计
     * 
     *
     * @param questId
     *            调查问卷id
     * @return 问卷调查统计汇总表头统计数据
@@ -4866,7 +5010,7 @@

    /**
     * 运营后台-新增随手拍分类
     * 
     *
     * @param addPhotoClassify
     *            请求参数
     * @return 新增结果
@@ -4876,7 +5020,7 @@

    /**
     * 运营后台-编辑随手拍分类
     * 
     *
     * @param addPhotoClassify
     *            请求参数
     * @return 编辑结果
@@ -4886,7 +5030,7 @@

    /**
     * 运营后台-分页查询随手拍分类
     * 
     *
     * @param addPhotoClassify
     *            请求参数
     * @return 随手拍分类列表
@@ -4896,7 +5040,7 @@

    /**
     * 运营后台-随手拍分类详情
     * 
     *
     * @param id
     *            随手拍分类id
     * @return 随手拍分类
@@ -4906,7 +5050,7 @@

    /**
     * 运营后台-随手拍分类删除
     * 
     *
     * @param id
     *            随手拍分类id
     * @return 删除结果
@@ -4916,7 +5060,7 @@

    /**
     * 运营后台-查询随手拍分类列表
     * 
     *
     * @return 随手拍分类列表
     */
    @GetMapping("/classify/admin/list")
@@ -4924,7 +5068,7 @@

    /**
     * 社区后台-切换随手拍公示状态
     * 
     *
     * @param comActEasyPhotoVO
     *            请求参数
     * @return 切换结果
@@ -4934,7 +5078,7 @@

    /**
     * 查询社区待处理随手拍id集合
     * 
     *
     * @param communityId
     *            社区id
     * @return 社区待处理随手拍id集合
@@ -4943,7 +5087,7 @@
    R easyPhotoNoHandleList(@RequestParam("communityId") Long communityId);

    @GetMapping("/reserve/detail")
    R reserveDetail(@RequestParam("id") Long id,@RequestParam("userId") Long userId,@RequestParam("recordId") Long recordId);
    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);
@@ -5192,4 +5336,87 @@
     */
    @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();

    /**
     * 办事指南列表-按分类查询
     * @param pageActWorkGuideDTO   请求参数
     * @return  办事指南分类列表
     */
    @PostMapping("/listworkguide")
    R listWorkGuide(@RequestBody PageActWorkGuideDTO pageActWorkGuideDTO);

    /**
     * 根据办事指南分类id查询办事指南列表
     * @param classifyId   办事指南分类id
     * @return  办事指南列表数据
     */
    @GetMapping("/listworkguide/classify")
    R listWorkGuideByClassifyId(@RequestParam("classifyId") Long classifyId);

    /**
     * 小程序查询所有进行中的预约登记
     * @param communityId   社区id
     * @return  社区所有进行中的预约登记列表
     */
    @GetMapping("/reserve/list")
    R reserveListApplets(@RequestParam("communityId") Long communityId);
}