From 37f55403e7573d8c15b6b0f957b7cb1baf6be4ea Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期二, 29 十二月 2020 14:47:15 +0800
Subject: [PATCH] 攀枝花项目服务层异常捕获统一返回给视图层服务
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 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..d5c26db 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,16 @@
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 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;
@@ -32,6 +33,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 +48,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);
}
@@ -58,7 +63,7 @@
@ApiOperation(value = "报名/取消报名社区活动")
@PutMapping("signactivity")
- public R signActivity(@RequestBody SignactivityVO signactivityVO){
+ public R signActivity(@RequestBody @Validated(AddGroup.class) SignactivityVO signactivityVO){
Long userId = this.getUserId();
signactivityVO.setUserId(userId);
return communityService.signActivity(signactivityVO);
@@ -73,6 +78,24 @@
return communityService.listActivitySign(activitySignVO);
}
+ @ApiOperation(value = "新增社区动态浏览记录")
+ @PostMapping("dynamicuser")
+ public R addDynamicUser(@RequestBody ComActDynVO comActDynVO){
+ Long id = comActDynVO.getId();
+ if (null==id||id==0) {
+ return R.fail("社区动态不存在");
+ }
+ Long userId = this.getUserId();
+ return communityService.addDynamicUser(id,userId);
+ }
+
+ @ApiOperation(value = "志愿者申请")
+ @PostMapping("volunteer")
+ public R addVolunteer(@RequestBody @Validated(AddGroup.class) ComMngVolunteerMngVO comMngVolunteerMngVO){
+ comMngVolunteerMngVO.setState(1);
+ return communityService.addVolunteer(comMngVolunteerMngVO);
+ }
}
+
--
Gitblit v1.7.1