From 17bccd09afb6e6a4fffa0409d7d5285e88442103 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期四, 31 十二月 2020 16:05:57 +0800
Subject: [PATCH] 志愿者团新增接口
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 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 cd6e9be..d75f8e1 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,14 +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.dtos.community.PageVolunteerDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.validated.AddGroup;
+import com.panzhihua.common.validated.PageGroup;
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;
@@ -61,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);
@@ -69,7 +71,7 @@
@ApiOperation(value = "活动人员列表",response = ActivitySignVO.class)
@ApiImplicitParam(name ="id",value = "社区活动主键",required = true)
- @PostMapping("listactivitysign")
+ @GetMapping("listactivitysign")
public R listActivitySign(@RequestParam("id") Long id){
ActivitySignVO activitySignVO=new ActivitySignVO();
activitySignVO.setActivityId(id);
@@ -80,7 +82,7 @@
@PostMapping("dynamicuser")
public R addDynamicUser(@RequestBody ComActDynVO comActDynVO){
Long id = comActDynVO.getId();
- if (ObjectUtils.isEmpty(id)||id==0) {
+ if (null==id||id==0) {
return R.fail("社区动态不存在");
}
Long userId = this.getUserId();
@@ -89,11 +91,28 @@
@ApiOperation(value = "志愿者申请")
@PostMapping("volunteer")
- public R addVolunteer(@RequestBody ComMngVolunteerMngVO comMngVolunteerMngVO){
+ public R addVolunteer(@RequestBody @Validated(AddGroup.class) ComMngVolunteerMngVO comMngVolunteerMngVO){
comMngVolunteerMngVO.setState(1);
return communityService.addVolunteer(comMngVolunteerMngVO);
}
+ @ApiOperation(value = "分页查询志愿者团队")
+ @PostMapping("pagevolunteer")
+ public R pageVolunteer(@RequestBody @Validated(PageGroup.class) PageVolunteerDTO pageVolunteerDTO){
+ Long communityId = this.getCommunityId();
+ ComMngVolunteerMngVO comMngVolunteerMngVO=new ComMngVolunteerMngVO();
+ comMngVolunteerMngVO.setCommunityId(communityId);
+ comMngVolunteerMngVO.setPageNum(pageVolunteerDTO.getPageNum());
+ comMngVolunteerMngVO.setPageSize(pageVolunteerDTO.getPageSize());
+ return communityService.pageVolunteer(comMngVolunteerMngVO);
+ }
+
+ @ApiOperation(value = "志愿者详情",response = ComMngVolunteerMngAppletsVO.class)
+ @GetMapping("volunteer")
+ public R detailVolunteer(@RequestParam("id") Long id){
+ return communityService.detailVolunteer(id);
+ }
+
}
--
Gitblit v1.7.1