From 764f4b88c9e4e4ea62c46f28e362c2fb3d5a8e0f Mon Sep 17 00:00:00 2001 From: huanghongfa <18228131219@163.com> Date: 星期三, 13 一月 2021 17:36:42 +0800 Subject: [PATCH] 社区动态加封面字段 --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 134 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 132 insertions(+), 2 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java index 16c61fe..ab1f7bf 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java @@ -3,6 +3,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.exceptions.ServiceException; +import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO; +import com.panzhihua.common.model.dtos.community.PageComActDTO; +import com.panzhihua.common.model.dtos.user.PageFeedBackDTO; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.SystemmanagementConfigVO; import com.panzhihua.common.model.vos.community.*; @@ -156,8 +159,8 @@ Page<ComActActivityVO> page = (Page<ComActActivityVO>) r.getData(); List<ComActActivityVO> content = page.getRecords(); if (!ObjectUtils.isEmpty(content)) { - List<ComActActPrizeVO> comActActPrizeVOList = new ArrayList<>(); content.forEach(comActActivityVO1 -> { + List<ComActActPrizeVO> comActActPrizeVOList = new ArrayList<>(); Long id = comActActivityVO1.getId(); List<ComActActPrizeDO> list = comActActPrizeService.list(new QueryWrapper<ComActActPrizeDO>().lambda().eq(ComActActPrizeDO::getActivityId, id)); if (!ObjectUtils.isEmpty(list)) { @@ -168,8 +171,8 @@ }); } comActActivityVO1.setComActActPrizeVOList(comActActPrizeVOList); - comActActPrizeVOList.clear(); }); + page.setRecords(content); } } @@ -880,4 +883,131 @@ return R.ok(); } + /** + * 社区详情 + * @param communityId 社区id + * @return 社区详情 + */ + @PostMapping("detailcommunity") + public R detailCommunity(@RequestParam("communityId") Long communityId){ + return comActService.detailCommunity(communityId); + } + + /** + * 小区详情 + * @param areaId 小区id + * @return 小区信息 + */ + @PostMapping("detailarea") + public R detailArea(@RequestParam("areaId")Long areaId){ + return comMngStructAreaService.detailArea(areaId); + } + + /** + * 分页查询社区 + * @param pageComActDTO 查询参数 + * @return 分页集合 + */ + @PostMapping("pagecommunity") + public R pageCommunity(@RequestBody PageComActDTO pageComActDTO){ + return comActService.pageCommunity(pageComActDTO); + } + + /** + * 志愿者详情 + * @param id 主键 + * @return 志愿者 + */ + @PostMapping("detailvolunteer") + public R detailVolunteer(@RequestParam("id") Long id){ + R r = comMngVolunteerMngService.detailVolunteer(id); + if (R.isOk(r)) { + ComMngVolunteerMngAppletsVO comMngVolunteerMngAppletsVO =(ComMngVolunteerMngAppletsVO) r.getData(); + String phone = comMngVolunteerMngAppletsVO.getPhone(); + List<ComActActivityVO> comActActivityVOS= comActActivityService.listActivityByPhone(phone); + comMngVolunteerMngAppletsVO.setComActActivityVOList(comActActivityVOS); + r.setData(comMngVolunteerMngAppletsVO); + } + return r; + } + + /** + * 查询平台所有的社区 + * @return 社区集合 按照创建顺序倒序排列 + */ + @PostMapping("listcommunityall") + public R listCommunityAll(){ + return comActService.listCommunityAll(); + } + + /** + * 社区管理后台数据看板 代办事件 + * @param communityId 社区id + * @param userId 登录用户信息 + * @return 代办事件列表 + */ + @PostMapping("indexdatacommunitybackstage") + public R indexDataCommunityBackstage(@RequestParam("communityId") Long communityId, @RequestParam("userId")Long userId){ + List<TodoEventsVO> todoEventsVOS=new ArrayList<>(); + List<TodoEventsVO> todoEventsVOS1=comActEasyPhotoService.selectNeedToDo(communityId,userId); + List<TodoEventsVO> todoEventsVOS2=comActMicroWishService.selectNeedToDo(communityId,userId); + List<TodoEventsVO> todoEventsVOS3=comMngVolunteerMngService.selectNeedToDo(communityId,userId); + if (!ObjectUtils.isEmpty(todoEventsVOS1)) { + todoEventsVOS.addAll(todoEventsVOS1); + } + if (!ObjectUtils.isEmpty(todoEventsVOS2)) { + todoEventsVOS.addAll(todoEventsVOS2); + } + if (!ObjectUtils.isEmpty(todoEventsVOS3)) { + todoEventsVOS.addAll(todoEventsVOS3); + } + return R.ok(todoEventsVOS); + } + + /** + * 删除社区 + * @param communityId 社区id + * @return 删除结果 + */ + @PostMapping("delectcommunity") + public R delectCommunity(@RequestParam("communityId") Long communityId){ + return comActService.delectCommunity(communityId); + } + + /** + * 定时任务刷新社区动态置顶状态 + * @return 刷新结果 + */ + @PostMapping("timedtaskdynistopping") + public R timedTaskDynIstopping(){ + return comActDynService.timedTaskDynIstopping(); + } + /** + * 定时任务刷新社区动态发布状态 + * @return + */ + @PostMapping("timedtaskdynstatus") + public R timedTaskDynStatus(){ + return comActDynService.timedTaskDynStatus(); + } + + /** + * 定时任务查询所有要取消的社区活动 + * @return 社区活动集合 + */ + @PostMapping("timedtaskactactivity") + public R timedTaskActActivity(){ + return comActActivityService.timedTaskActActivity(); + } + + /** + * 定时任务刷新社区活动的各个状态 除取消外 + * @return 更新结果 + */ + @PostMapping("timedtaskactactivityall") + R timedTaskActActivityAll(){ + return comActActivityService.timedTaskActActivityAll(); + } + + } -- Gitblit v1.7.1