From f76377ffd111434d90c5aaf5507cd33a982d4aa6 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期四, 10 十二月 2020 18:06:16 +0800
Subject: [PATCH] 小程序,社区活动,微心愿,随手拍完成未测试
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 109 insertions(+), 11 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 97ee988..332387f 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
@@ -5,9 +5,11 @@
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.service_community.model.dos.ComActActPrizeDO;
import com.panzhihua.service_community.model.dos.ComActDynDO;
+import com.panzhihua.service_community.model.dos.ComActMicroWishDO;
import com.panzhihua.service_community.service.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
+import org.springframework.data.domain.Page;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
@@ -131,7 +133,29 @@
*/
@PostMapping("pageActivity")
public R pageActivity(@RequestBody ComActActivityVO comActActivityVO) {
- return comActActivityService.pageActivity(comActActivityVO);
+ R r = comActActivityService.pageActivity(comActActivityVO);
+ if (r.isOk()) {
+ Page<ComActActivityVO> page = (Page<ComActActivityVO>)r.getData();
+ List<ComActActivityVO> content = page.getContent();
+ if (!ObjectUtils.isEmpty(content)) {
+ List<ComActActPrizeVO> comActActPrizeVOList=new ArrayList<>();
+ content.forEach(comActActivityVO1 -> {
+ Long id = comActActivityVO1.getId();
+ List<ComActActPrizeDO> list = comActActPrizeService.list(new QueryWrapper<ComActActPrizeDO>().lambda().eq(ComActActPrizeDO::getActivityId, id));
+ if (!ObjectUtils.isEmpty(list)) {
+ list.forEach(comActActPrizeDO -> {
+ ComActActPrizeVO comActActPrizeVO=new ComActActPrizeVO();
+ BeanUtils.copyProperties(comActActPrizeDO,comActActPrizeVO);
+ comActActPrizeVOList.add(comActActPrizeVO);
+ });
+ }
+ comActActivityVO1.setComActActPrizeVOList(comActActPrizeVOList);
+ comActActPrizeVOList.clear();
+ });
+ }
+
+ }
+ return r;
}
/**
@@ -159,9 +183,9 @@
* @param id 活动id
* @return 详情
*/
- @PostMapping("inforactivity")
- public R inforActivity(@RequestParam("id") Long id){
- ComActActivityVO comActActivityVO = comActActivityService.inforActivity(id);
+ @PostMapping("detailactivity")
+ public R detailActivity(@RequestParam("id") Long id,@RequestParam("userId")Long userId){
+ ComActActivityVO comActActivityVO = comActActivityService.inforActivity(id,userId);
if (ObjectUtils.isEmpty(comActActivityVO)) {
return R.fail("活动不存在");
}
@@ -174,6 +198,13 @@
comActActPrizeVOS.add(comActActPrizeVO);
});
comActActivityVO.setComActActPrizeVOList(comActActPrizeVOS);
+ }
+ ActivitySignVO activitySignVO=new ActivitySignVO();
+ activitySignVO.setActivityId(id);
+ R r = comActActivityService.listActivitySign(activitySignVO);
+ if (r.isOk()) {
+ List<ActivitySignVO> activitySignVOS=(List<ActivitySignVO>)r.getData();
+ comActActivityVO.setActivitySignVOList(activitySignVOS);
}
return R.ok(comActActivityVO);
}
@@ -286,7 +317,7 @@
* @return 详情
*/
@PostMapping("detaildynamic")
- public R detailDynamic(@RequestParam("id") String id){
+ public R detailDynamic(@RequestParam("id") Long id){
return comActDynService.detailDynamic(id);
}
@@ -304,11 +335,12 @@
/**
* 随手拍详情
* @param id 随手拍主键
+ * @param userId 登录用户
* @return 详情内容
*/
@PostMapping("detaileasyphoto")
- public R detailEasyPhoto(@RequestParam("id")Long id){
- return comActEasyPhotoService.detailEasyPhoto(id);
+ public R detailEasyPhoto(@RequestParam("id")Long id,@RequestParam("userId")Long userId){
+ return comActEasyPhotoService.detailEasyPhoto(id,userId);
}
/**
@@ -324,11 +356,12 @@
/**
* 心愿详情
* @param id 查询主键
+ * @param userId 登录用户id
* @return 心愿内容
*/
@PostMapping("detailmicrowish")
- public R detailMicroWish(@RequestParam("id")Long id){
- return comActMicroWishService.detailMicroWish(id);
+ public R detailMicroWish(@RequestParam("id")Long id,@RequestParam("userId")Long userId){
+ return comActMicroWishService.detailMicroWish(id,userId);
}
/**
@@ -338,8 +371,73 @@
*/
@PostMapping("putlmicrowish")
public R putlMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO){
- R r = comActMicroWishService.putlMicroWish(comActMicroWishVO);
- return r;
+ return comActMicroWishService.putlMicroWish(comActMicroWishVO);
+ }
+
+ /**
+ * 分页展示我的所有活动 时间倒序排列
+ * @param comActActivityVO 分页参数
+ * @return 分页集合
+ */
+ @PostMapping("pagemyactivity")
+ public R pageMyActivity(@RequestBody ComActActivityVO comActActivityVO){
+ return comActActivityService.pageMyActivity(comActActivityVO);
+ }
+
+ /**
+ * 报名/取消报名社区活动
+ * @param signactivityVO 报名参数
+ * @return 报名 取消报名 结果
+ */
+ @PostMapping("signactivity")
+ public R signActivity(@RequestBody SignactivityVO signactivityVO){
+ return comActActivityService.signActivity(signactivityVO);
+ }
+
+ /**
+ * 上传随手拍
+ * @param comActEasyPhotoVO 上传数据
+ * @return 上传结果
+ */
+ @PostMapping("addeasyphoto")
+ public R addEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO){
+ return comActEasyPhotoService.addEasyPhoto(comActEasyPhotoVO);
+ }
+
+ /**
+ * 发布微心愿
+ * @param comActMicroWishVO 发布内容
+ * @return 发布结果
+ */
+ @PostMapping("addmicrowish")
+ public R addMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO){
+ ComActMicroWishDO comActMicroWishDO=new ComActMicroWishDO();
+ BeanUtils.copyProperties(comActMicroWishVO,comActMicroWishDO);
+ boolean save = comActMicroWishService.save(comActMicroWishDO);
+ if (save) {
+ return R.ok();
+ }
+ return R.fail();
+ }
+
+ /**
+ * 点赞/取消点赞随手拍
+ * @param comActEasyPhotoVO 操作参数
+ * @return 操作结果
+ */
+ @PostMapping("puteasyphoto")
+ public R putEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO){
+ return comActEasyPhotoService.putEasyPhoto(comActEasyPhotoVO);
+ }
+
+ /**
+ * 点赞/取消点赞微心愿
+ * @param comActMicroWishVO 操作参数
+ * @return 操作结果
+ */
+ @PostMapping("putmicrowish")
+ R putMicroWish(@RequestBody ComActMicroWishVO comActMicroWishVO){
+ return comActMicroWishService.comActMicroWishVO(comActMicroWishVO);
}
}
--
Gitblit v1.7.1