From b3c6911c1e78563dc04998dd7bfb510130a9fcec Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期一, 01 二月 2021 16:37:52 +0800
Subject: [PATCH] auth
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 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 9e37ea6..bfe4ad8 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
@@ -13,12 +13,14 @@
import com.panzhihua.common.validated.PageGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.Date;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -54,7 +56,15 @@
R r = communityService.detailDynamic(id);
if (R.isOk(r)) {
//增加浏览记录
- communityService.addDynamicUser(id,userId);
+ R r1 = communityService.addDynamicUser(id, userId);
+ Object data = r.getData();
+ ComActDynVO comActDynVO=JSONObject.parseObject(JSONObject.toJSONString(data),ComActDynVO.class);
+ if (R.isOk(r1)) {
+ comActDynVO.setIsAdd(1);
+ }else{
+ comActDynVO.setIsAdd(0);
+ }
+ return R.ok(comActDynVO);
}
return r;
}
@@ -65,6 +75,10 @@
Long communityId = this.getCommunityId();
comActActivityVO.setCommunityId(communityId);
comActActivityVO.setIsApplets(1);
+ Integer status = comActActivityVO.getStatus();
+ if (null!=status&&status.intValue()==4) {
+ comActActivityVO.setIsIng(1);
+ }
return communityService.pageActivity(comActActivityVO);
}
@@ -81,6 +95,7 @@
public R signActivity(@RequestBody @Validated(AddGroup.class) SignactivityVO signactivityVO){
Long userId = this.getUserId();
Long activityId = signactivityVO.getActivityId();
+ Integer isVolunteer = signactivityVO.getIsVolunteer();
signactivityVO.setUserId(userId);
R r = communityService.signActivity(signactivityVO);
if (R.isOk(r)&&signactivityVO.getType().intValue()==1) {
@@ -92,9 +107,11 @@
sysUserNoticeVO.setTitle("报名成功");
sysUserNoticeVO.setBusinessType(1);
sysUserNoticeVO.setBusinessTitle(comActActivityVO.getActivityName());
- sysUserNoticeVO.setBusinessContent(String.format("活动将于%s开始，请按时参加",comActActivityVO.getBeginAt()));
+ Date beginAt = comActActivityVO.getBeginAt();
+ sysUserNoticeVO.setBusinessContent(String.format("活动将于%tF %tT 开始，请按时参加", beginAt,beginAt));
sysUserNoticeVO.setBusinessId(activityId);
sysUserNoticeVO.setStatus(0);
+ sysUserNoticeVO.setActivityType(isVolunteer.intValue()==1?1:2);
sysUserNoticeVO.setBusinessStatus(2);
R r1 = userService.addNotice(sysUserNoticeVO);
if (R.isOk(r1)) {
@@ -105,11 +122,16 @@
}
@ApiOperation(value = "活动人员列表",response = ActivitySignVO.class)
- @ApiImplicitParam(name ="id",value = "社区活动主键",required = true)
+ @ApiImplicitParams ({@ApiImplicitParam(name ="type",value = "人员类型 1 普通居民 2 志愿者",required = true),
+ @ApiImplicitParam(name ="id",value = "社区活动主键",required = true)})
@GetMapping("listactivitysign")
- public R listActivitySign(@RequestParam("id") Long id){
+ public R listActivitySign(@RequestParam("id") Long id,@RequestParam("type") Integer type){
ActivitySignVO activitySignVO=new ActivitySignVO();
activitySignVO.setActivityId(id);
+ if (null==type||0==type||type>2) {
+ return R.fail("人员类型错误");
+ }
+ activitySignVO.setType(type);
return communityService.listActivitySign(activitySignVO);
}
@@ -132,7 +154,7 @@
return communityService.addVolunteer(comMngVolunteerMngVO);
}
- @ApiOperation(value = "分页查询志愿者团队")
+ @ApiOperation(value = "分页查询志愿者团队",response = ComMngVolunteerMngVO.class)
@PostMapping("pagevolunteer")
public R pageVolunteer(@RequestBody @Validated(PageGroup.class) PageVolunteerDTO pageVolunteerDTO){
Long communityId = this.getCommunityId();
--
Gitblit v1.7.1