From 3613e726ec84d7593c3d1f78df03b2515c0fff2e Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 20 五月 2021 15:16:44 +0800
Subject: [PATCH] Merge branch 'cedoodev' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 301 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 289 insertions(+), 12 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 5517e9e..4dea248 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
@@ -1,35 +1,42 @@
package com.panzhihua.service_community.api;
import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
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.vos.LoginUserInfoVO;
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.ComMngFamilyInfoVO;
+import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
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.common.service.user.UserService;
+import com.panzhihua.common.utlis.ClazzUtils;
+import com.panzhihua.common.utlis.IdCard;
+import com.panzhihua.common.utlis.IdCardUtil;
+import com.panzhihua.service_community.dao.ComMngPopulationDAO;
+import com.panzhihua.service_community.model.dos.*;
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.util.StringUtils;
import org.springframework.web.bind.annotation.*;
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.stream.Collectors;
@@ -69,6 +76,12 @@
private ComActMessageService comActMessageService;
@Resource
private ComActQuestnaireService comActQuestnaireService;
+ @Resource
+ private UserService userService;
+ @Resource
+ private EldersAuthService eldersAuthService;
+ @Resource
+ public ComMngPopulationDAO comMngPopulationDAO;
/**
* 新增社区活动
@@ -260,6 +273,11 @@
if (R.isOk(r)) {
List<ActivitySignVO> activitySignVOS = JSONArray.parseArray(JSONArray.toJSONString( r.getData()),ActivitySignVO.class);
if (!ObjectUtils.isEmpty(activitySignVOS)) {
+ for (ActivitySignVO signVO:activitySignVOS) {
+ if(StringUtils.isEmpty(signVO.getName())){
+ signVO.setName(signVO.getNickName());
+ }
+ }
List<ActivitySignVO> collect = activitySignVOS.stream().filter(activitySignVO1 -> activitySignVO1.getIsVolunteer() == 1).collect(Collectors.toList());
if (!ObjectUtils.isEmpty(collect)) {
int size = collect.size();
@@ -398,6 +416,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);
}
/**
@@ -786,6 +815,16 @@
}
/**
+ * 获取志愿者详情
+ * @param id
+ * @return
+ */
+ @GetMapping("getVolunteerById")
+ R getVolunteerById(@RequestParam("id")Long id){
+ return comMngVolunteerMngService.getVolunteerById(id);
+ }
+
+ /**
* 删除志愿者
* @param comMngVolunteerMngVO 手机号
* @return 删除结果
@@ -1096,6 +1135,15 @@
}
/**
+ * 定时任务刷新微心愿的状态
+ * @return 更新结果
+ */
+ @PostMapping("timedtaskactmicrowish")
+ R timedTaskActMicroWishAll(){
+ return comActMicroWishService.timedTaskActMicroWishAll();
+ }
+
+ /**
* 其他建筑详情
* @param id 主键id
* @return 建筑内容
@@ -1300,13 +1348,23 @@
}
/**
- * 查看用户问卷调查详细
+ * 查看问卷调查详细
* @param questId 问卷ID
* @return 用户问卷调查详细
*/
@GetMapping("questnaire/view")
- public R view(@RequestParam("questId") Long questId) {
- return comActQuestnaireService.infoQuestnaire(questId);
+ 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);
+ }
}
@@ -1328,7 +1386,13 @@
*/
@PostMapping("questnaire/pagequestnaire")
public R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO,@RequestParam("communityId") Long communityId) {
- return comActQuestnaireService.pageQuestnaire(pageQuestnaireDTO,communityId);
+ if(pageQuestnaireDTO.getForParty()==null){
+ pageQuestnaireDTO.setForParty(false);
+ }
+ if(pageQuestnaireDTO.getForVolunteer()==null){
+ pageQuestnaireDTO.setForVolunteer(false);
+ }
+ return comActQuestnaireService.pageQuestnaire(pageQuestnaireDTO, communityId);
}
/**
@@ -1363,4 +1427,217 @@
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);
+ }
+
+ /**
+ * 删除微心愿
+ * @param id
+ * @return
+ */
+ @PostMapping("deletemicrowish")
+ public R deletemicrowish(@RequestParam("id") Long id){
+ return comActMicroWishService.deleteMicroWish(id);
+ }
+
+
+
+
+ /**
+ * 新增高龄认证
+ * @param eldersAuthAddDTO
+ * @return 新增结果
+ */
+ @PostMapping("/eldersauth/add")
+ R add(@RequestBody EldersAuthAddDTO eldersAuthAddDTO){
+ return eldersAuthService.add(eldersAuthAddDTO);
+ };
+
+ /**
+ * 修改高龄认证
+ * @param eldersAuthEditDTO
+ * @return 维护结果
+ */
+ @PostMapping("/eldersauth/edit")
+ R edit(@RequestBody EldersAuthEditDTO eldersAuthEditDTO){
+ return eldersAuthService.edit(eldersAuthEditDTO);
+ };
+
+ /**
+ * 分页查找高龄认证
+ * @param pageEldersAuthDTO
+ * @return 维护结果
+ */
+ @PostMapping("/eldersauth/page")
+ R<IPage<EldersAuthVO>> query(@RequestBody PageEldersAuthDTO pageEldersAuthDTO){
+ return eldersAuthService.query(pageEldersAuthDTO);
+ };
+
+ /**
+ * 删除高龄认证
+ * @param EldersAuthDeleteDTO
+ * @return 平台用户信息
+ */
+ @PostMapping("/eldersauth/delete")
+ R delete(@RequestBody EldersAuthDeleteDTO EldersAuthDeleteDTO){
+ return eldersAuthService.delete(EldersAuthDeleteDTO);
+ };
+
+ /**
+ * 查询高龄认证详细信息
+ * @param id 高龄认证 id
+ * @return 查找结果
+ */
+ @PostMapping("/eldersauth/{id}")
+ R<EldersAuthDetailsVO> eldersAuthDetails(@PathVariable("id") Long id){
+ return eldersAuthService.eldersAuthDetails(id);
+ };
+
+ @PostMapping("/eldersauth/getMyfamilyElders/{userId}")
+ R<List<ComMngFamilyInfoVO>> getMyfamilyElders(@PathVariable("userId") Long userId){
+ List<ComMngFamilyInfoVO> list = comMngPopulationDAO.listFamilyByUserId(userId);
+
+ List<ComMngFamilyInfoVO> sortedList = list.stream().sorted(Comparator.comparing(ComMngFamilyInfoVO::getCreateAt).reversed()).collect(Collectors.toList());
+
+ List<ComMngFamilyInfoVO> listRt = new ArrayList<>();
+ sortedList.forEach(rt -> {
+ boolean isElders = rt.getAge()>=80;
+ if(isElders){
+ listRt.add(rt);
+ }
+ });
+ return R.ok(listRt);
+ }
+
+ @PostMapping("/eldersauth/addByFamilyUser")
+ R addByFamilyUser(@RequestBody EldersAuthAddByFamilyDTO eldersAuthAddByFamilyDTO){
+
+ List<ComMngFamilyInfoVO> list = comMngPopulationDAO.listFamilyByUserId(eldersAuthAddByFamilyDTO.getUserId());
+ ComMngFamilyInfoVO theFamily = null;
+ Long familyUserId = eldersAuthAddByFamilyDTO.getFamilyUserId();
+ for (ComMngFamilyInfoVO family : list) {
+ if (familyUserId == family.getId()) {
+ theFamily = family;
+ }
+ }
+
+ if(theFamily==null){
+ return R.fail("家庭成员信息错误");
+ }
+ Integer age = IdCard.IdNOToAge(theFamily.getIdCard());
+ if(age>=80){
+ Long loginUserId = eldersAuthAddByFamilyDTO.getUserId();
+ EldersAuthDO eldersAuthDO = new EldersAuthDO();
+ eldersAuthDO.setSumitUserId(eldersAuthAddByFamilyDTO.getSumitUserId());
+ eldersAuthDO.setCreateBy(loginUserId);
+ eldersAuthDO.setCreateAt(new Date());
+ eldersAuthDO.setIdCard(theFamily.getIdCard());
+ eldersAuthDO.setAuthUserName(theFamily.getName());
+ eldersAuthDO.setVideoUrl(eldersAuthAddByFamilyDTO.getVideoUrl());
+ eldersAuthDO.setFamilyUserId(eldersAuthAddByFamilyDTO.getFamilyUserId());
+ //根据身份证查询出籍贯 出生日期
+ //String domicile = IdCard.domicile(eldersAuthDO.getIdCard());
+ String domicile = eldersAuthService.queryDomicile(eldersAuthDO.getIdCard());
+
+ Date birthDay = IdCard.birthDay(eldersAuthDO.getIdCard());
+ eldersAuthDO.setDomicile(domicile);
+ eldersAuthDO.setBirthDay(birthDay);
+ int add = eldersAuthService.getBaseMapper().insert(eldersAuthDO);
+ if(add==1){
+ return R.ok(eldersAuthDO.getId());
+ }
+ }else{
+ return R.fail("家庭成员年龄还未达到80");
+ }
+ return R.fail();
+ }
+
+ /**
+ * 新增高龄认证社区反馈
+ * @param {classNameFirstLower}AddDTO 添加高龄认证社区反馈传递对象
+ * @return 新增结果
+ */
+ @PostMapping("/eldersauth/addFeedback")
+ R add(@RequestBody EldersAuthFeedbackAddDTO eldersAuthFeedbackAddDTO){
+ ClazzUtils.setIfStringIsEmpty(eldersAuthFeedbackAddDTO);
+ EldersAuthDO eldersAuthDO = eldersAuthService.getBaseMapper().selectById(eldersAuthFeedbackAddDTO.getAuthId());
+ if(eldersAuthDO==null){
+ return R.fail("认证记录不存在");
+ }
+ R addR = eldersAuthService.addFeedback(eldersAuthFeedbackAddDTO);
+ if(R.isOk(addR)){
+ SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO();
+ sysUserNoticeVO.setUserId(eldersAuthDO.getSumitUserId());
+ sysUserNoticeVO.setType(3);
+ sysUserNoticeVO.setTitle("高龄认证社区反馈");
+ sysUserNoticeVO.setBusinessType(13);
+ sysUserNoticeVO.setBusinessTitle(" ");
+ sysUserNoticeVO.setBusinessContent("你提交【" +eldersAuthDO.getAuthUserName() + "】的高龄认证，社区进行了反馈");
+ sysUserNoticeVO.setBusinessId(eldersAuthDO.getId());
+ sysUserNoticeVO.setStatus(0);
+ sysUserNoticeVO.setBusinessStatus(2);
+ R r1 = userService.addNotice(sysUserNoticeVO);
+ if (R.isOk(r1)) {
+ log.info("新增用户报名党建活动通知成功【{}】", JSONObject.toJSONString(sysUserNoticeVO));
+ }
+ }
+
+ return addR;
+ }
+
+
+ /**
+ * 查询导出高龄老人
+ * @param pageEldersAuthDTO
+ * @return
+ */
+ @PostMapping("/eldersauth/eldersAuthQuery")
+ R eldersAuthQuery(@RequestBody PageEldersAuthDTO pageEldersAuthDTO){
+ return eldersAuthService.queryExportData(pageEldersAuthDTO);
+ }
}
--
Gitblit v1.7.1