From 4cb51a8d6a46993cb30e22dcbaf85424a0ba9d43 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期四, 19 八月 2021 18:14:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 136 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 108 insertions(+), 28 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 d60ae2a..daf0835 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
@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.community.questnaire.StatisticsSummaryDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.community.*;
@@ -20,6 +21,7 @@
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.*;
+import com.panzhihua.service_community.dao.ComActActSignDAO;
import com.panzhihua.service_community.dao.ComEldersAuthHistoryRecordMapper;
import com.panzhihua.service_community.dao.ComMngPopulationDAO;
import com.panzhihua.service_community.model.dos.*;
@@ -34,10 +36,7 @@
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -82,6 +81,8 @@
private EldersAuthService eldersAuthService;
@Resource
public ComMngPopulationDAO comMngPopulationDAO;
+ @Resource
+ private ComActActSignDAO comActActSignDAO;
@Resource
public ComEldersAuthUserService comEldersAuthUserService;
@Resource
@@ -258,7 +259,7 @@
* @return 详情
*/
@PostMapping("detailactivity")
- public R detailActivity(@RequestParam("id") Long id, @RequestParam("userId") Long userId) {
+ public R detailActivity(@RequestParam("id") Long id, @RequestParam(value = "userId",required = false) Long userId) {
ComActActivityVO comActActivityVO = comActActivityService.inforActivity(id, userId);
if (ObjectUtils.isEmpty(comActActivityVO)) {
return R.fail("活动不存在");
@@ -379,7 +380,6 @@
return R.fail("未查到社区动态记录");
}
// Long id = comActDynVO.getId();
- BeanUtils.copyProperties(comActDynVO, comActDynDO);
Integer isTopping = comActDynVO.getIsTopping();
boolean b = isTopping.equals(1);
if(b){
@@ -388,6 +388,12 @@
return R.fail("待发布的社区动态不可置顶");
}
}
+
+// if(StringUtils.isEmpty(comActDynVO.getCover())){
+// comActDynVO.setCover(comActDynDO.getCover());
+// }
+ BeanUtils.copyProperties(comActDynVO, comActDynDO);
+
boolean update = comActDynService.updateById(comActDynDO);
if (update) {
// 最多只能设置三条置顶状态，后边设置会取消先前设置的置顶
@@ -1415,32 +1421,56 @@
}
}
+ /**
+ * 小程序-问卷调查详情
+ * @param userId 用户id
+ * @param questId 问卷id
+ * @return 问卷调查详情
+ */
+ @GetMapping("questnaire/view/detail")
+ public R viewDetail(@RequestParam("questId") Long questId,@RequestParam("userId") Long userId) {
+ return comActQuestnaireService.getQuesDetail(questId,userId);
+ }
+
+ /**
+ * 社区后台-查询问卷调查详情
+ * @param questId 问卷id
+ * @return 问卷调查详情
+ */
+ @GetMapping("questnaire/admin/detail")
+ public R quesDetail( @RequestParam("questId") Long questId) {
+ return comActQuestnaireService.getQuesDetailAdmin(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);
+ public R addQuestnaire(@RequestBody QuestnaireVO questnaireVO) {
+ return comActQuestnaireService.addQuestnaire(questnaireVO);
}
/**
- * 社区问卷列表
- * @param pageQuestnaireDTO
- * @return
+ * 小程序-社区问卷列表
+ * @param pageQuestnaireDTO 请求参数
+ * @return 社区问卷列表
*/
@PostMapping("questnaire/pagequestnaire")
- public R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO,@RequestParam("communityId") Long communityId) {
- if(pageQuestnaireDTO.getForParty()==null){
- pageQuestnaireDTO.setForParty(false);
- }
- if(pageQuestnaireDTO.getForVolunteer()==null){
- pageQuestnaireDTO.setForVolunteer(false);
- }
- return comActQuestnaireService.pageQuestnaire(pageQuestnaireDTO, communityId);
+ public R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO) {
+ return comActQuestnaireService.pageQuestnaire(pageQuestnaireDTO);
+ }
+
+ /**
+ * 社区后台-社区问卷列表
+ * @param pageQuestnaireDTO 请求参数
+ * @return 社区问卷列表
+ */
+ @PostMapping("questnaire/admin/pagequestnaire")
+ public R pageQuestnaireAdmin(@RequestBody PageQuestnaireDTO pageQuestnaireDTO) {
+ return comActQuestnaireService.pageQuestnaireAdmin(pageQuestnaireDTO);
}
/**
@@ -1448,7 +1478,6 @@
* @param questnaireVO
* @return
*/
- @Transactional(rollbackFor = Exception.class)
@PostMapping("questnaire/editquestnaire")
public R editQuestnaire(@RequestBody QuestnaireVO questnaireVO) {
return comActQuestnaireService.editQuestnaire(questnaireVO);
@@ -1460,8 +1489,8 @@
* @return
*/
@PostMapping("questnaire/editquestnairedo")
- public R editQuestnaireDO(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo, @RequestParam("userId") Long userId) {
- return comActQuestnaireService.editQuestnaireDO(editComActQuestnaireVo, userId);
+ public R editQuestnaireDO(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo) {
+ return comActQuestnaireService.editQuestnaireDO(editComActQuestnaireVo);
}
/**
@@ -1515,12 +1544,16 @@
}
/**
- * 居民填写问卷调查问卷
- * @param usersAnswerQuestnaireVO
+ * 居民填写问卷调查问卷questnaire/pagequestnaire
*/
@PostMapping("questnaire/usersanswequestnaire")
- public R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO,@RequestParam("userId") Long userId){
- return comActQuestnaireService.usersAnsweQuestnaire(usersAnswerQuestnaireVO,userId);
+ public R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO){
+ return comActQuestnaireService.usersAnsweQuestnaire(usersAnswerQuestnaireVO);
+ }
+
+ @GetMapping("questnaire/add/noNotice")
+ public R addNoNotice(@RequestParam("questId") Long questId,@RequestParam("userId") Long userId){
+ return comActQuestnaireService.addNoNotice(questId,userId);
}
/**
@@ -1699,8 +1732,21 @@
if (R.isOk(r1)) {
log.info("新增用户报名党建活动通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
}
- }
+ //用户高龄认证反馈，推送订阅消息给用户
+ Map<String,String> map = comActActSignDAO.getUserOpenId(eldersAuthDO.getSumitUserId());
+ if(map != null){
+ String openid = map.get("openid");
+ try {
+ WxXCXTempSend util = new WxXCXTempSend();
+ String accessToken = util.getAppAccessToken();
+ WxUtil.sendSubscribeRZSH(openid,accessToken,"高龄认证"
+ ,DateUtils.format(eldersAuthDO.getCreateAt(),DateUtils.ymdhms_format),eldersAuthFeedbackAddDTO.getFeedBack());
+ }catch (Exception e){
+ log.error("推送审核状态订阅消息失败，失败原因：" + e.getMessage());
+ }
+ }
+ }
return addR;
}
@@ -1784,4 +1830,38 @@
public R readUserReward(@RequestParam("userId") Long userId,@RequestParam("communityId") Long communityId) {
return comActEasyPhotoService.readUserReward(userId,communityId);
}
+
+ /**
+ * 定时任务检测即将开始的社区活动，并使用订阅消息通知用户
+ */
+ @PostMapping("timedTaskActivityNotice")
+ public R timedTaskActivityNotice(){
+ return comActActivityService.timedTaskActivityNotice();
+ }
+
+
+ @PostMapping("questnaire/statisticsSummary")
+ public R statisticsSummary(@RequestBody StatisticsSummaryDTO summaryDTO) {
+ return comActQuestnaireService.statisticsSummary(summaryDTO);
+ }
+
+ @GetMapping("questnaire/statisticsSummary/export")
+ public R statisticsSummaryExport(@RequestParam("questId") Long questId) {
+ return comActQuestnaireService.statisticsSummaryExport(questId);
+ }
+
+ @GetMapping("questnaire/statisticsSummary/header")
+ public R statisticsSummaryHeader(@RequestParam("questId") Long questId) {
+ return comActQuestnaireService.statisticsSummaryHeader(questId);
+ }
+
+ @PostMapping("timedTaskQuestionnaire")
+ public R timedTaskQuestionnaire(){
+ return comActQuestnaireService.timedTaskQuestionnaire();
+ }
+
+ @GetMapping("questnaire/add/view")
+ public R addQuestnaireView(@RequestParam("questId") Long questId) {
+ return comActQuestnaireService.addQuestnaireView(questId);
+ }
}
--
Gitblit v1.7.1