From 6f0ff6db680da1f45636d7ffd7c6543f49b4c616 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期一, 21 十二月 2020 18:16:58 +0800
Subject: [PATCH] 测试环境

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java |   29 +++++++++++++++++++++++++----
 1 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
index 7cc0a6d..cd6e9be 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -1,15 +1,14 @@
 package com.panzhihua.applets.api;
 
 import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
 import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ActivitySignVO;
-import com.panzhihua.common.model.vos.community.ComActActivityVO;
-import com.panzhihua.common.model.vos.community.ComActDynVO;
-import com.panzhihua.common.model.vos.community.SignactivityVO;
+import com.panzhihua.common.model.vos.community.*;
 import com.panzhihua.common.service.community.CommunityService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -32,6 +31,8 @@
     public R pageDynamic(@RequestBody ComActDynVO comActDynVO){
         Long communityId = this.getCommunityId();
         comActDynVO.setCommunityId(communityId);
+        comActDynVO.setIsTopping(null);
+        comActDynVO.setStatus(null);
         return communityService.pageDynamic(comActDynVO);
     }
 
@@ -45,6 +46,8 @@
     @ApiOperation(value = "分页查询社区活动",response = ComActActivityVO.class)
     @PostMapping("pageactivity")
     public R pageActivity(@RequestBody ComActActivityVO comActActivityVO){
+        Long communityId = this.getCommunityId();
+        comActActivityVO.setCommunityId(communityId);
         return communityService.pageActivity(comActActivityVO);
     }
 
@@ -73,6 +76,24 @@
         return communityService.listActivitySign(activitySignVO);
     }
 
+    @ApiOperation(value = "新增社区动态浏览记录")
+    @PostMapping("dynamicuser")
+    public R addDynamicUser(@RequestBody ComActDynVO comActDynVO){
+        Long id = comActDynVO.getId();
+        if (ObjectUtils.isEmpty(id)||id==0) {
+            return R.fail("社区动态不存在");
+        }
+        Long userId = this.getUserId();
+        return communityService.addDynamicUser(id,userId);
+    }
+
+    @ApiOperation(value = "志愿者申请")
+    @PostMapping("volunteer")
+    public R addVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO){
+        comMngVolunteerMngVO.setState(1);
+        return communityService.addVolunteer(comMngVolunteerMngVO);
+    }
 
 
 }
+

--
Gitblit v1.7.1