From cea2c64d33c62847635a461b7fd0cdcf06793dd4 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 10 三月 2022 11:17:21 +0800
Subject: [PATCH] 活动bug修改提交
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java | 82 ++++++++++++++++++++++++++++------------
1 files changed, 57 insertions(+), 25 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java
index 5e81276..cfdfff3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java
@@ -1,15 +1,22 @@
package com.panzhihua.applets.api;
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
import com.panzhihua.common.controller.BaseController;
-import com.panzhihua.common.model.dtos.community.PageComCvtBusinessAppletsDTO;
-import com.panzhihua.common.model.dtos.community.PageCommunityQuestnaireDTO;
+import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO;
+import com.panzhihua.common.model.dtos.community.integral.admin.AddComActIntegralUserDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComActQuestnaireVO;
-import com.panzhihua.common.model.vos.community.ComCvtBusinessVO;
+import com.panzhihua.common.model.vos.community.questnaire.QuestnaireListVo;
+import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
+import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerVO;
+import com.panzhihua.common.service.community.CommunityService;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
/**
* @description: 社区通/调查问卷接口
@@ -21,35 +28,60 @@
@RestController
@RequestMapping("/questnaire")
public class CommunityQuestnaireApi extends BaseController {
+ @Resource
+ private CommunityService communityService;
- @ApiOperation(value = "分页查询调查问卷", response = ComActQuestnaireVO.class)
- @PostMapping("/page")
- public R page(@RequestBody PageCommunityQuestnaireDTO pageCommunityQuestnaireDTO) {
- return null;
+ @ApiOperation(value = "分页查询社区调查问卷", response = QuestnaireListVo.class)
+ @PostMapping("/pageUser")
+ public R pageUser(@RequestBody PageQuestnaireDTO pageQuestnaireDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail(401, "请先登录");
+ }
+ pageQuestnaireDTO.setCommunityId(loginUserInfo.getCommunityId());
+ pageQuestnaireDTO.setUserId(loginUserInfo.getUserId());
+ return communityService.pageQuestnaire(pageQuestnaireDTO);
}
- @ApiOperation(value = "创建调查问卷")
- @PostMapping("/add")
- public R add(@RequestBody ComActQuestnaireVO comActQuestnaireVO) {
- return null;
+ @ApiOperation(value = "查询调查问卷详情", response = UsersAnswerVO.class)
+ @GetMapping("/detail")
+ public R viewQuestnaire(@RequestParam("questId") Long questId) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail(401, "请先登录");
+ }
+ return communityService.viewDetail(loginUserInfo.getUserId(), questId);
}
- @ApiOperation(value = "查看问卷", response = ComActQuestnaireVO.class)
- @GetMapping("/view")
- public R viewQuestnaire(@RequestBody ComActQuestnaireVO comActQuestnaireVO) {
- return null;
+ @ApiOperation(value = "居民填写问卷调查问卷")
+ @PostMapping("/stat/answer")
+ public R usersAnswerQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请先登录");
+ }
+ usersAnswerQuestnaireVO.setUserId(loginUserInfo.getUserId());
+ // 填写调查问卷发放积分
+ communityService.addIntegralTradeAdmin(new AddComActIntegralUserDTO(usersAnswerQuestnaireVO.getQuestId(),
+ AddComActIntegralUserDTO.integralType.cydcwj, loginUserInfo.getCommunityId(), loginUserInfo.getUserId()));
+ return communityService.usersAnsweQuestnaire(usersAnswerQuestnaireVO);
+
}
- @ApiOperation(value = "在线统计信息", response = ComActQuestnaireVO.class)
- @GetMapping("/stat")
- public R stat(@RequestBody ComActQuestnaireVO comActQuestnaireVO) {
- return null;
+ @ApiOperation(value = "添加浏览量")
+ @GetMapping("/add/view")
+ public R addView(@RequestParam("questId") Long questId) {
+ return communityService.addView(questId);
}
- @ApiOperation(value = "在线统计详细", response = ComCvtBusinessVO.class)
- @GetMapping("/stat/details")
- public R statDetails(@RequestBody PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO) {
- return null;
+ @ApiOperation(value = "用户弹窗添加不在提醒接口")
+ @GetMapping("/add/noNotice")
+ public R addNoNotice(@RequestParam("questId") Long questId) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if (loginUserInfo == null) {
+ return R.fail("请先登录");
+ }
+ return communityService.addNoNotice(questId, loginUserInfo.getUserId());
}
}
--
Gitblit v1.7.1