From d9eee1919dbff7ffddc48b1f4fee2ec41a54a2a2 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期二, 05 一月 2021 18:19:52 +0800
Subject: [PATCH] 运营后台完成
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 46 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 7cc0a6d..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,15 +1,16 @@
package com.panzhihua.applets.api;
import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.dtos.community.PageVolunteerDTO;
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 com.panzhihua.common.validated.PageGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
+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);
@@ -66,13 +71,48 @@
@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);
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);
+ }
+
+ @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