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/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
index e8b9f93..c95c697 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -1,5 +1,7 @@
package com.panzhihua.applets.api;
+import com.panzhihua.common.model.vos.community.ComActActivityVO;
+import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.exceptions.UnAuthenticationException;
@@ -9,6 +11,7 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -22,10 +25,12 @@
**/
@RestController
@RequestMapping("/user/")
-@Api(tags = {"用户模块"})
+@Api(tags = {"我的模块"})
public class UserApi extends BaseController {
@Resource
private UserService userService;
+ @Resource
+ private CommunityService communityService;
@ApiOperation(value = "当前登录用户信息",response = LoginUserInfoVO.class)
@GetMapping("info")
@@ -38,4 +43,14 @@
R<LoginUserInfoVO> r = userService.getUserInfoByUserId(userId + "");
return r;
}
+
+ @ApiOperation(value = "分页展示我的活动",response = ComActActivityVO.class)
+ @GetMapping("pagemyactivity")
+ public R pageMyActivity(@RequestBody ComActActivityVO comActActivityVO){
+ Long userId = this.getUserId();
+// todo 我的活动包括普通社区活动、志愿者活动、党建活动
+ comActActivityVO.setSponsorId(userId);//登录人id 暂时存入负责人字段
+ R r = communityService.pageMyActivity(comActActivityVO);
+ return r;
+ }
}
--
Gitblit v1.7.1