From 31b8c6fc8c13f6a6e04362801eec0fce85af7366 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期四, 11 十一月 2021 08:54:04 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 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 abca450..147d52d 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
@@ -4,25 +4,35 @@
import javax.annotation.Resource;
-import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
-import com.panzhihua.common.service.partybuilding.PartyBuildingService;
+import com.panzhihua.common.model.vos.community.*;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.ComMngCarAppletDTO;
+import com.panzhihua.common.model.dtos.community.PageComMngVillageDTO;
import com.panzhihua.common.model.dtos.community.PageVolunteerDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.partybuilding.PartyBuildingService;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.common.validated.PageGroup;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
/**
@@ -144,18 +154,24 @@
return communityService.activityEvaluate(comActActEvaluateVO);
}
+ @ApiOperation(value = "我的评价", response = MyActivityEvaluateVO.class)
+ @GetMapping("activity/my-evaluate")
+ public R listMyActivityEvaluate(@RequestParam("activityId") Long activityId) {
+ return communityService.listMyActivityEvaluate(getUserId(), activityId);
+ }
+
@ApiOperation(value = "报名/取消报名社区活动")
@PutMapping("signactivity")
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) {
R r2 = communityService.detailActivity(activityId, userId,null,null);
ComActActivityVO comActActivityVO =
JSONObject.parseObject(JSONObject.toJSONString(r2.getData()), ComActActivityVO.class);
+ Integer isVolunteer = JSONObject.parseObject(JSONObject.toJSONString(r.getData()), Integer.class);
SysUserNoticeVO sysUserNoticeVO = new SysUserNoticeVO();
sysUserNoticeVO.setUserId(userId);
sysUserNoticeVO.setType(1);
@@ -203,14 +219,13 @@
}
if (type.intValue() == 1) {
return communityService.listSignInRecord(id);
- } else {
- return partyBuildingService.listSignInRecord(id);
}
+ return R.fail("type不存在");
}
@ApiOperation(value = "活动签到记录", response = ComActActRegistVO.class)
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "社区活动主键", required = true),
+ @ApiImplicitParam(name = "id", value = "活动主键", required = true),
@ApiImplicitParam(name = "type", value = "活动类型，1.居民/志愿者活动 2.党员活动", required = true),
@ApiImplicitParam(name = "userId", value = "用户id", required = true)
})
@@ -220,9 +235,8 @@
@RequestParam("userId") Long userId) {
if (type.intValue() == 1) {
return communityService.listRegistRecord(id, userId);
- } else {
- return partyBuildingService.listRegistRecord(id, userId);
}
+ return R.fail("type不存在");
}
// @ApiOperation(value = "新增社区动态浏览记录")
@@ -295,4 +309,9 @@
required = true) @RequestParam(value = "provinceAdcode") Integer provinceAdcode) {
return communityService.getCityTreeByProvinceCode(provinceAdcode);
}
+ @ApiOperation(value = "社区详情", response = ComActVO.class)
+ @GetMapping("community")
+ public R detailCommunity() {
+ return communityService.detailCommunity(this.getCommunityId());
+ }
}
--
Gitblit v1.7.1