From e74987c5c7e6256e84a0852f36a367bf8f2e032d Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期二, 13 四月 2021 16:21:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 218 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 204 insertions(+), 14 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
index 026792c..2093f1d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -4,28 +4,24 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.exceptions.ServiceException;
-import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentDTO;
-import com.panzhihua.common.model.dtos.community.PageComActEasyPhotoCommentDTO;
-import com.panzhihua.common.model.dtos.community.ComActEasyPhotoCommentUserDTO;
-import com.panzhihua.common.model.dtos.community.PageComActDTO;
-import com.panzhihua.common.model.vos.LoginUserInfoVO;
+import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.community.*;
+import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
+import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
+import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
-import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.service_community.model.dos.ComActActPrizeDO;
import com.panzhihua.service_community.model.dos.ComActDynDO;
import com.panzhihua.service_community.model.dos.ComActMicroWishDO;
import com.panzhihua.service_community.model.dos.ComMngStructAreaDO;
import com.panzhihua.service_community.service.*;
-import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
-import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -68,6 +64,8 @@
private ComMngStructAreaDistrictService comMngStructAreaDistrictService;
@Resource
private ComActMessageService comActMessageService;
+ @Resource
+ private ComActQuestnaireService comActQuestnaireService;
/**
* 新增社区活动
@@ -397,6 +395,17 @@
@PostMapping("pagedynamic")
public R pageDynamic(@RequestBody ComActDynVO comActDynVO) {
return comActDynService.pageDynamic(comActDynVO);
+ }
+
+ /**
+ * 管理后台分页查询社区动态
+ *
+ * @param comActDynVO 查询参数
+ * @return 动态集合
+ */
+ @PostMapping("pagedynamicByAdmin")
+ public R pagedynamicByAdmin(@RequestBody ComActDynVO comActDynVO) {
+ return comActDynService.pageDynamicByAdmin(comActDynVO);
}
/**
@@ -1218,7 +1227,7 @@
* 我发的留言
* @return 结果集合
*/
- @GetMapping("pagemymessage")
+ @PostMapping("pagemymessage")
public R pageMyMessage (@RequestBody ComActMessageVO comActMessageVO){
return comActMessageService.pageMyMessageApplets(comActMessageVO);
}
@@ -1226,17 +1235,198 @@
* 发给我的留言
* @return 结果集合
*/
- @GetMapping("pagesendtomemessage")
+ @PostMapping("pagesendtomemessage")
public R pageSendToMessage (@RequestBody ComActMessageVO comActMessageVO){
return comActMessageService.pageSendToMessageApplets(comActMessageVO);
}
/**
- * 社区留言
- * @return 发布结果
+ * 根据id查询留言集合
+ * @return 结果集合
*/
- @GetMapping("pagemycommunitymessage")
+ @PostMapping("pagemessagebyuser")
+ public R pageMessageByUser (@RequestBody ComActMessageVO comActMessageVO){
+ return comActMessageService.pageMessageByUserApplets(comActMessageVO);
+ }
+ /**
+ * 社区留言
+ * @return 结果集合
+ */
+ @PostMapping("pagemycommunitymessage")
public R pageMyCommunityMessage (@RequestBody ComActMessageVO comActMessageVO){
return comActMessageService.pageMyCommunityMessageApplets(comActMessageVO);
}
-
+ /**
+ * 新增留言回复
+ * @param comActMessageBackVO 新增留言回复信息
+ * @return 发布结果
+ */
+ @PostMapping("addmessageback")
+ public R addMessageBack(@RequestBody ComActMessageBackVO comActMessageBackVO){
+ // 微信内容审核
+ return comActMessageService.addMessageBack(comActMessageBackVO);
+ }
+ @PostMapping("deletemessage")
+ public R deleteMessage(@RequestBody ComActMessageVO comActMessageVO) {
+ return comActMessageService.deleteMessage(comActMessageVO);
+ }
+
+ @PostMapping("resetmessagepublic")
+ public R resetMessagePublic(@RequestBody ResetComActMessageVO resetComActMessageVO) {
+ return comActMessageService.resetMessagePublic(resetComActMessageVO);
+ }
+
+ /**
+ * 留言详情
+ *
+ * @param id 主键
+ * @return 详情内容
+ */
+ @PostMapping("detailmessage")
+ public R detailMessage(@RequestParam("id") Long id) {
+ return comActMessageService.detailMessage(id);
+ }
+
+ /**
+ * 导出房屋信息
+ * @param areaId
+ * @return
+ */
+ @PostMapping("house/export")
+ public R houseExport(@RequestParam("areaId") Long areaId) {
+ return comMngStructHouseService.houseExport(areaId);
+ }
+
+ /**
+ * 查看用户问卷调查详细
+ * @param userId 用户ID
+ * @param questId 问卷ID
+ * @return 用户问卷调查详细
+ */
+ @GetMapping("questnaire/usersanswer")
+ public R answerInfoQuestnaire(@RequestParam("userId") Long userId, @RequestParam("questId") Long questId) {
+ return comActQuestnaireService.answerInfoQuestnaire(userId, questId);
+ }
+
+ /**
+ * 查看问卷调查详细
+ * @param questId 问卷ID
+ * @return 用户问卷调查详细
+ */
+ @GetMapping("questnaire/view")
+ public R view(@RequestParam("userId") Long userId, @RequestParam("questId") Long questId) {
+ /**
+ * 根据用户身份分别返回 数据
+ */
+ /* 问卷参与者， 已提交问卷则返回问卷详细， 否则返回空的问卷 */
+ boolean isMember = true;//默认情况下，可不做逻辑判断，直接查询返回用户答卷
+ if(isMember) {
+ return comActQuestnaireService.answerInfoQuestnaire(userId, questId);
+ }else {
+ /*非问卷参与者 返回问卷“预览” */
+ return comActQuestnaireService.infoQuestnaire(questId);
+ }
+ }
+
+
+ /**
+ * 新增社区问卷
+ * @param questnaireVO
+ * @return
+ */
+ @Transactional(rollbackFor = Exception.class)
+ @PostMapping("questnaire/addquestnaire")
+ public R addQuestnaire(@RequestBody QuestnaireVO questnaireVO, @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId) {
+ return comActQuestnaireService.addQuestnaire(questnaireVO, communityId, userId);
+ }
+
+ /**
+ * 社区问卷列表
+ * @param pageQuestnaireDTO
+ * @return
+ */
+ @PostMapping("questnaire/pagequestnaire")
+ public R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO,@RequestParam("communityId") Long communityId) {
+ return comActQuestnaireService.pageQuestnaire(pageQuestnaireDTO,communityId);
+ }
+
+ /**
+ * 编辑问卷——问卷、题目、选项
+ * @param questnaireVO
+ * @return
+ */
+ @Transactional(rollbackFor = Exception.class)
+ @PostMapping("questnaire/editquestnaire")
+ public R editQuestnaire(@RequestBody QuestnaireVO questnaireVO) {
+ return comActQuestnaireService.editQuestnaire(questnaireVO);
+ }
+
+ /**
+ * 修改问卷状态
+ * @param editComActQuestnaireVo
+ * @return
+ */
+ @PostMapping("questnaire/editquestnairedo")
+ public R editQuestnaireDO(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo, @RequestParam("userId") Long userId) {
+ return comActQuestnaireService.editQuestnaireDO(editComActQuestnaireVo, userId);
+ }
+
+ /**
+ * 删除问卷 ——隐藏
+ * @param questId 调查问卷Id
+ * @return
+ */
+ @Transactional(rollbackFor = Exception.class)
+ @PostMapping("questnaire/deletequestnaire")
+ public R editQuestnaireDO(@RequestParam("questId") Long questId,@RequestParam("userId") Long userId) {
+ return comActQuestnaireService.deleteQuestnaire(questId,userId);
+ }
+
+ /**
+ * 查看用户问卷调查统计信息
+ * @param questId 问卷ID
+ * @return 用户问卷调查统计信息
+ */
+ @GetMapping("questnaire/stat")
+ public R statistics(@RequestParam("questId") Long questId) {
+ return comActQuestnaireService.statQuestnaire(questId);
+ }
+
+ /**
+ * 问卷答题结果
+ *
+ * @param questId 问卷ID
+ */
+ @PostMapping("questnaire/answerslist")
+ public R answerResultList(@RequestParam("questId")Long questId){
+ return comActQuestnaireService.answerResultList(questId);
+ }
+ /**
+ * 问卷题目 答卷信息
+ *
+ * @param pageQuestnaireSubDetailsDTO 问卷ID
+ */
+ @PostMapping("questnaire/qaqeustanswerdetails")
+ public R qaQeustAnswerDetails(@RequestBody PageQuestnaireSubDetailsDTO pageQuestnaireSubDetailsDTO){
+ return comActQuestnaireService.qaQeustDetails(pageQuestnaireSubDetailsDTO);
+ }
+
+ /**
+ * 社区问卷回答用户分页
+ * @param pageQuestnaireAnswerDTO
+ * @return 分页数据
+ */
+ @PostMapping("questnaire/pagequestnaireanswer")
+ public R pageQuestnaireAnswer(@RequestBody PageQuestnaireAnswerDTO pageQuestnaireAnswerDTO){
+ return comActQuestnaireService.pageQuestnaireAnswer(pageQuestnaireAnswerDTO);
+ }
+
+ /**
+ * 居民填写问卷调查问卷
+ * @param usersAnswerQuestnaireVO
+ */
+ @PostMapping("questnaire/usersanswequestnaire")
+ public R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO,@RequestParam("userId") Long userId){
+ return comActQuestnaireService.usersAnsweQuestnaire(usersAnswerQuestnaireVO,userId);
+ }
+
}
--
Gitblit v1.7.1