From ca4034c3a285f2c22fa19e5eaa88d505b5588c0b Mon Sep 17 00:00:00 2001 From: puhanshu <a9236326> Date: 星期三, 29 十二月 2021 10:48:40 +0800 Subject: [PATCH] Merge branch 'master' into test --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 157 +++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 135 insertions(+), 22 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 9ad35a6..b748423 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,6 +2,7 @@ import java.util.List; +import com.panzhihua.common.model.dtos.PageBaseDTO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.scheduling.annotation.Async; import org.springframework.web.bind.annotation.DeleteMapping; @@ -245,6 +246,7 @@ import com.panzhihua.common.model.vos.community.BatchhouseVO; import com.panzhihua.common.model.vos.community.ComActActEvaluateVO; import com.panzhihua.common.model.vos.community.ComActActRegistVO; +import com.panzhihua.common.model.vos.community.ComActActivityTypeVO; import com.panzhihua.common.model.vos.community.ComActActivityVO; import com.panzhihua.common.model.vos.community.ComActAnnouncementVO; import com.panzhihua.common.model.vos.community.ComActColumnVO; @@ -299,6 +301,7 @@ import com.panzhihua.common.model.vos.community.ComSwRotaExcelVO; import com.panzhihua.common.model.vos.community.EldersAuthDetailsVO; import com.panzhihua.common.model.vos.community.EldersAuthElderlyExcelVO; +import com.panzhihua.common.model.vos.community.QRActivityCodeVO; import com.panzhihua.common.model.vos.community.ResetComActMessageVO; import com.panzhihua.common.model.vos.community.SignactivityVO; import com.panzhihua.common.model.vos.community.bigscreen.BigScreenStatisticAgeGender; @@ -1067,10 +1070,11 @@ * * @param userId * 用户id + * @param status * @return 活动列表 */ @PostMapping("listactivity") - R listActivity(@RequestParam("userId") Long userId); + R listActivity(@RequestParam("userId") Long userId, @RequestParam(value = "status", required = false) Integer status); /** * 用户确认心愿 @@ -4940,6 +4944,14 @@ R getWestCommunityLists(); /** + * 综治app-小区列表 + * @param villageListAppDTO 请求参数 + * @return 小区列表 + */ + @PostMapping("/village/grid/list/app") + R getGridVillageListApp(@RequestBody ComMngVillageListAppDTO villageListAppDTO); + + /** * 分页查询退役军人列表 * * @param comExServicemanDTO @@ -5292,11 +5304,11 @@ R addIntegralTradeAdmin(@RequestBody AddComActIntegralUserDTO integralUserDTO); /** - * 根据社区活动id查询社区活动报名人员列表 + * 根据社区活动id查询社区活动报名且未参与人员列表 * * @param activityId * 活动id - * @return 社区活动报名人员列表 + * @return 社区活动报名且未参与人员列表 */ @PostMapping("/integral/act/activity/admin") R getTaskActivityPeopleList(@RequestParam("activityId") Long activityId); @@ -7006,6 +7018,22 @@ R applyDonates(@RequestBody ComActWarehouseApplyDTO comActWarehouseApplyDTO); /** + * 生成二维码 + * @param qrCodeVO + * @return + */ + @PostMapping("/comActActivityCode/getQRCode") + public R getQRCode(@RequestBody QRActivityCodeVO qrCodeVO); + + /** + * 重置二维码 + * @param qrCodeVO + * @return + */ + @PostMapping("/comActActivityCode/resetQRCode") + public R resetQRCode(@RequestBody QRActivityCodeVO qrCodeVO); + + /** * 实有房屋数据修复定时任务 * @return 实有房屋数据修复定时任务 */ @@ -7128,6 +7156,48 @@ */ @PostMapping("/elders/pensionAuthRecord/add") R addPensionAuthRecordVO(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO); + /** + * 活动报名签到情况 + * @param id 活动主键id + * @return + */ + @GetMapping("/activity/sign-in/list") + R listSignInRecord(@RequestParam("id") Long id); + + /** + * 活动签到记录 + * @param id 活动主键 + * @param userId 用户id + * @return + */ + @GetMapping("/activity/regist/list") + R listRegistRecord(@RequestParam("id") Long id, @RequestParam("userId") Long userId); + + /** + * 获取活动类型(目前只有志愿者活动需要获取) + * @param communityId + * @param type + * @return + */ + @GetMapping("/activity/type/list") + R listActivityType(@RequestParam("communityId") Long communityId, @RequestParam("type") Integer type); + + /** + * 添加活动类型 + * @param comActActivityTypeVO + * @return + */ + @PostMapping("/activity/type/add") + R addActivityType(@RequestBody ComActActivityTypeVO comActActivityTypeVO); + + /** + * 我的评价 + * @param userId + * @param activityId + * @return + */ + @GetMapping("/activity/my-evaluate") + R listMyActivityEvaluate(@RequestParam("userId") Long userId, @RequestParam("activityId") Long activityId); /** * 分页查询居家隔离统计 @@ -7460,11 +7530,11 @@ /** * 党员积分前3 - * @param communityId + * @param pageBigScreenStatisticPartyOrg * @return */ - @GetMapping("/bigscreen/party/partyActivityTop") - R partyActivityTop(@RequestParam("communityId")Long communityId); + @PostMapping("/bigscreen/party/partyActivityTop") + R partyActivityTop(@RequestBody PageBigScreenStatisticPartyOrg pageBigScreenStatisticPartyOrg); /** * 社区服务大屏数据分析接口 @@ -7534,12 +7604,10 @@ /** * 首页二级页面-随手拍展示列表 - * @param communityId - * @param classifyId * @return */ - @GetMapping("/screen/index/easyPhotoList") - R indexEasyPhotoList(@RequestParam("communityId") Long communityId, @RequestParam(value = "classifyId", required = false) Long classifyId); + @PostMapping("/screen/index/easyPhotoList") + R indexEasyPhotoList(@RequestBody PageBaseDTO pageBaseDTO); /** * 首页二级页面-社区问卷 @@ -7559,12 +7627,11 @@ /** * 首页二级页面-社区动态展示列表 - * @param communityId - * @param type + * @param pageBaseDTO * @return */ - @GetMapping("/screen/index/dynList") - R indexDynList(@RequestParam("communityId") Long communityId, @RequestParam(value = "type", required = false) Long type); + @PostMapping("/screen/index/dynList") + R indexDynList(@RequestBody PageBaseDTO pageBaseDTO); /** * 首页二级页面-邻里圈 @@ -7576,12 +7643,11 @@ /** * 首页二级页面-邻里圈展示列表 - * @param communityId - * @param topicId + * @param pageBaseDTO * @return */ - @GetMapping("/screen/index/neighborList") - R indexNeighborList(@RequestParam("communityId") Long communityId, @RequestParam(value = "topicId", required = false) Long topicId); + @PostMapping("/screen/index/neighborList") + R indexNeighborList(@RequestBody PageBaseDTO pageBaseDTO); /** * 首页二级页面-便民商家 @@ -7593,10 +7659,57 @@ /** * 首页二级页面-商家展示列表 - * @param communityId - * @param categoryId + * @param pageBaseDTO * @return */ - @GetMapping("/screen/index/merchantList") - R indexMerchantList(@RequestParam("communityId") Long communityId, @RequestParam(value = "categoryId", required = false) Long categoryId); + @PostMapping("/screen/index/merchantList") + R indexMerchantList(@RequestBody PageBaseDTO pageBaseDTO); + + /** + * 首页二级页面-微心愿展示列表 + * @param pageBaseDTO + * @return + */ + @PostMapping("/screen/index/microWishList") + R indexMicroWishList(@RequestBody PageBaseDTO pageBaseDTO); + + /** + * 首页二级页面-社区问卷展示列表 + * @param pageBaseDTO + * @return + */ + @PostMapping("/screen/index/questionnaireList") + R indexQuestionnaireList(@RequestBody PageBaseDTO pageBaseDTO); + + /** + * 首页二级页面-居民活动 + * @param communityId + * @return + */ + @GetMapping("/screen/index/residentAct") + R indexResidentAct(@RequestParam("communityId") Long communityId); + + /** + * 首页二级页面-居民活动展示列表 + * @param pageBaseDTO + * @return + */ + @PostMapping("/screen/index/residentActList") + R indexResidentActList(@RequestBody PageBaseDTO pageBaseDTO); + + /** + * 首页二级页面-志愿者活动 + * @param communityId + * @return + */ + @GetMapping("/screen/index/volunteerAct") + R indexVolunteerAct(@RequestParam("communityId") Long communityId); + + /** + * 首页二级页面-志愿者活动展示列表 + * @param pageBaseDTO + * @return + */ + @PostMapping("/screen/index/volunteerActList") + R indexVolunteerActList(@RequestBody PageBaseDTO pageBaseDTO); } -- Gitblit v1.7.1