From 53730f292f424132acc1fb4c1c04ed028e34f43a Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期六, 17 四月 2021 16:15:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 132 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 129 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 1f0efca..133777a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -1,14 +1,19 @@
package com.panzhihua.common.service.community;
import com.panzhihua.common.model.dtos.AppletesBackstageConfigDTO;
+import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.advertisement.ComOpsAdvDTO;
import com.panzhihua.common.model.dtos.advertisement.PageComOpsAdvDTO;
import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.shop.PageComShopStoreDTO;
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.shop.ShopOperLogVO;
+import com.panzhihua.common.model.vos.shop.ShopStoreVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@@ -131,6 +136,15 @@
*/
@PostMapping("pagedynamic")
R pageDynamic(@RequestBody ComActDynVO comActDynVO);
+
+ /**
+ * 管理后台分页查询社区动态
+ *
+ * @param comActDynVO 查询参数
+ * @return 动态集合
+ */
+ @PostMapping("pagedynamicByAdmin")
+ R pageDynamicByAdmin(@RequestBody ComActDynVO comActDynVO);
/**
* 社区动态详情
@@ -1638,7 +1652,7 @@
R getPopulationLists(@RequestBody List<Long> Ids);
/**
- * 新增社区问卷
+ * 创建调查问卷
*
* @param questnaireVO
* @return
@@ -1653,7 +1667,7 @@
* @return
*/
@PostMapping("/questnaire/pagequestnaire")
- R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO);
+ R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO, @RequestParam("communityId") Long communityId);
/**
@@ -1673,7 +1687,7 @@
* @return
*/
@PostMapping("/questnaire/editquestnairedo")
- R editQuestnaireDO(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo);
+ R editQuestnaireDO(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo, @RequestParam("userId") Long userId);
/**
* 删除问卷 ——隐藏
@@ -1683,4 +1697,116 @@
*/
@PostMapping("/questnaire/deletequestnaire")
R editQuestnaireDO(@RequestParam("questId") Long questId,@RequestParam("userId") Long userId);
+
+ /**
+ * 问卷答题结果
+ *
+ * @param questId 问卷ID
+ */
+ @PostMapping("/questnaire/answerslist")
+ R answerResultList(@RequestParam("questId") Long questId);
+
+
+ /**
+ * 问卷调查详细
+ * @param questId 问卷ID
+ * @return 用户问卷调查详细
+ */
+ @GetMapping("/questnaire/view")
+ R view(@RequestParam("userId") Long userId, @RequestParam("questId") Long questId);
+
+ /**
+ * 用户问卷调查详细
+ * @param userId 用户ID
+ * @param questId 问卷ID
+ * @return 用户问卷调查详细
+ */
+ @GetMapping("/questnaire/usersanswer")
+ R answerInfoQuestnaire(@RequestParam("userId") Long userId, @RequestParam("questId") Long questId);
+
+ /**
+ * 查看用户问卷调查统计信息
+ * @param questId 问卷ID
+ * @return 用户问卷调查统计信息
+ */
+ @GetMapping("/questnaire/stat")
+ R statistics(@RequestParam("questId") Long questId);
+
+
+ /**
+ * 问卷题目 答卷信息
+ *
+ * @param pageQuestnaireSubDetailsDTO 问卷ID
+ */
+ @PostMapping("/questnaire/qaqeustanswerdetails")
+ R qaQeustAnswerDetails(@RequestBody PageQuestnaireSubDetailsDTO pageQuestnaireSubDetailsDTO);
+
+
+ /**
+ * 社区问卷分页
+ * @param pageQuestnaireAnswerDTO 社区问卷分页参数
+ * @return 分页数据
+ */
+ @PostMapping("/questnaire/pagequestnaireanswer")
+ R pageQuestnaireAnswer(@RequestBody PageQuestnaireAnswerDTO pageQuestnaireAnswerDTO);
+
+
+ /**
+ * 居民填写问卷调查问卷
+ * @param usersAnswerQuestnaireVO 填写情况
+ */
+ @PostMapping("/questnaire/usersanswequestnaire")
+ R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO, @RequestParam("userId") Long userId);
+
+ /**
+ * 店铺列表-分页查询
+ * @param pageComShopStoreDTO 分页条件
+ */
+ @PostMapping("/shop/pageShopStore")
+ R pageStoreList(@RequestBody PageComShopStoreDTO pageComShopStoreDTO);
+
+ /**
+ * 保存店铺
+ * @param storeVO 数据
+ */
+ @PostMapping("/shop/saveStore")
+ R saveStore(@RequestBody ShopStoreVO storeVO);
+
+
+ /**
+ * 编辑店铺、启用、禁用
+ * @param storeVO 数据
+ * @param id 商铺id
+ */
+ @PostMapping("/shop/editStore/{id}")
+ R editStore(@RequestBody ShopStoreVO storeVO, @PathVariable("id") Long id);
+
+ /**
+ * 删除店铺
+ * @param id 商铺id
+ */
+ @PostMapping("/shop/deleteStore")
+ R deleteStore(@RequestBody Long[] id);
+
+ /**
+ * 获取详情
+ * @param id 商铺id
+ */
+ @GetMapping("/shop/getStoreInfo")
+ R getStoreInfo(@RequestParam("id")Long id);
+
+ /**
+ * 结果
+ * @param shopOperlog 商城后台操作日志
+ */
+ @PostMapping("/shop/addShopOperLog")
+ R addShopOperLog(@RequestBody ShopOperLogVO shopOperlog);
+
+ /**
+ * 分页查询 商家后台操作日志
+ * @param pageDTO 分页数据
+ * @return 分页日志
+ */
+ @PostMapping("/shop/pageShopOperLog")
+ R pageShopOperLog(@RequestBody PageDTO pageDTO);
}
--
Gitblit v1.7.1