From 43a8d7b9b93555f6c1c8526bae6074d2ab06d045 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期三, 30 十二月 2020 19:14:46 +0800
Subject: [PATCH] 增加接口测试使用

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java |   33 +++++++++++++++++++++------------
 1 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
index eb8fcee..ed959bc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/IndexApi.java
@@ -6,10 +6,12 @@
 import com.panzhihua.common.model.vos.community.ComActEasyPhotoVO;
 import com.panzhihua.common.model.vos.community.ComActMicroWishVO;
 import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.validated.AddGroup;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.util.ObjectUtils;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -27,22 +29,21 @@
     @Resource
     private CommunityService communityService;
 
-    @ApiOperation("分页展示社区随手拍")
+    @ApiOperation(value = "分页展示社区随手拍",response = ComActEasyPhotoVO.class)
     @PostMapping("pageeasyphoto")
-    public R pageEasyPhoto (){
+    public R pageEasyPhoto (@RequestBody ComActEasyPhotoVO comActEasyPhotoVO){
         LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
         Long communityId = loginUserInfo.getCommunityId();
         Long userId = loginUserInfo.getUserId();
-        ComActEasyPhotoVO comActEasyPhotoVO=new ComActEasyPhotoVO();
         comActEasyPhotoVO.setCommunityId(communityId);
-        comActEasyPhotoVO.setSponsorId(userId);
         comActEasyPhotoVO.setStatus(4);
+        comActEasyPhotoVO.setLogInUserId(userId);
         return communityService.pageEasyPhoto(comActEasyPhotoVO);
     }
 
     @ApiOperation("上传随手拍")
     @PostMapping("easyphoto")
-    public R addEasyPhoto (@RequestBody ComActEasyPhotoVO comActEasyPhotoVO){
+    public R addEasyPhoto (@RequestBody @Validated(AddGroup.class) ComActEasyPhotoVO comActEasyPhotoVO){
         LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
         Long communityId = loginUserInfo.getCommunityId();
         Long userId = loginUserInfo.getUserId();
@@ -52,7 +53,7 @@
         return communityService.addEasyPhoto(comActEasyPhotoVO);
     }
 
-    @ApiOperation("随手拍详情")
+    @ApiOperation(value = "随手拍详情",response =ComActEasyPhotoVO.class )
     @GetMapping("detaileasyphoto")
     @ApiImplicitParam(name = "id",value = "随手拍主键")
     public R detailEasyPhoto (@RequestParam("id") Long id){
@@ -64,8 +65,12 @@
     @PutMapping("easyphoto")
     public R putEasyPhoto (@RequestBody ComActEasyPhotoVO comActEasyPhotoVO){
         Long id = comActEasyPhotoVO.getId();
-        if (ObjectUtils.isEmpty(id)) {
+        if (null==id||id==0) {
             return R.fail("随手拍主键不能为空");
+        }
+        Integer haveGiveThumbsUp = comActEasyPhotoVO.getHaveGiveThumbsUp();
+        if (null==haveGiveThumbsUp) {
+            return R.fail("操作类型不能为空");
         }
         Long userId = this.getUserId();
         comActEasyPhotoVO.setSponsorId(userId);
@@ -73,13 +78,12 @@
     }
 
 
-    @ApiOperation("分页展示社区微心愿")
+    @ApiOperation(value = "分页展示社区微心愿",response = ComActMicroWishVO.class)
     @PostMapping("pagemicrowish")
-    public R pageMicroWish (){
+    public R pageMicroWish (@RequestBody ComActMicroWishVO comActMicroWishVO){
         LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
         Long communityId = loginUserInfo.getCommunityId();
         Long userId = loginUserInfo.getUserId();
-        ComActMicroWishVO comActMicroWishVO=new ComActMicroWishVO();
         comActMicroWishVO.setCommunityId(communityId);
         comActMicroWishVO.setIsApplets(1);
         comActMicroWishVO.setResponsibleId(userId);//责任人暂时放登录用户id
@@ -88,10 +92,15 @@
 
     @ApiOperation("发布微心愿")
     @PostMapping("microwish")
-    public R addMicroWish (@RequestBody ComActMicroWishVO comActMicroWishVO){
+    public R addMicroWish (@RequestBody @Validated(AddGroup.class) ComActMicroWishVO comActMicroWishVO){
         LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
         Long communityId = loginUserInfo.getCommunityId();
         Long userId = loginUserInfo.getUserId();
+        String phone = loginUserInfo.getPhone();
+        if (ObjectUtils.isEmpty(phone)) {
+            return R.fail("只有认证后的用户才能发布微心愿");
+        }
+        comActMicroWishVO.setSponsorPhone(phone);
         comActMicroWishVO.setCommunityId(communityId);
         comActMicroWishVO.setSponsorId(userId);
         return communityService.addMicroWish(comActMicroWishVO);
@@ -109,7 +118,7 @@
     @PutMapping("microwish")
     public R putMicroWish (@RequestBody ComActMicroWishVO comActMicroWishVO){
         Long id = comActMicroWishVO.getId();
-        if (ObjectUtils.isEmpty(id)) {
+        if (null==id||id==0) {
             return R.fail("微心愿主键不能为空");
         }
         Long userId = this.getUserId();

--
Gitblit v1.7.1