From 7df36d4bf09248b6d4f82ef52b5cb2d197619bed Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 22 六月 2021 16:08:26 +0800
Subject: [PATCH] Merge branch 'test_screen' into 'test'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 274 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 270 insertions(+), 4 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 e770468..b668a7b 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,7 +1,11 @@
package com.panzhihua.service_community.api;
+import cn.hutool.core.util.IdcardUtil;
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.*;
@@ -11,22 +15,28 @@
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.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.*;
+import com.panzhihua.service_community.dao.ComEldersAuthHistoryRecordMapper;
+import com.panzhihua.service_community.dao.ComMngPopulationDAO;
+import com.panzhihua.service_community.model.dos.*;
import com.panzhihua.service_community.service.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
+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;
@@ -66,6 +76,16 @@
private ComActMessageService comActMessageService;
@Resource
private ComActQuestnaireService comActQuestnaireService;
+ @Resource
+ private UserService userService;
+ @Resource
+ private EldersAuthService eldersAuthService;
+ @Resource
+ public ComMngPopulationDAO comMngPopulationDAO;
+ @Resource
+ public ComEldersAuthUserService comEldersAuthUserService;
+ @Resource
+ private ComEldersAuthHistoryRecordMapper comEldersAuthHistoryRecordMapper;
/**
* 新增社区活动
@@ -257,6 +277,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();
@@ -443,6 +468,26 @@
return comActEasyPhotoService.detailEasyPhoto(id, userId);
}
+ /**
+ * 随手拍删除
+ *
+ * @param id 随手拍主键
+ * @param userId 登录用户
+ * @return 详情内容
+ */
+ @PostMapping("deleteEasyPhoto")
+ public R deleteEasyPhoto(@RequestParam("id") Long id, @RequestParam("userId") Long userId) {
+ ComActEasyPhotoDO comActEasyPhotoDO = comActEasyPhotoService.getBaseMapper().selectById(id);
+ if(comActEasyPhotoDO==null){
+ return R.fail("随手拍不存在");
+ }
+ comActEasyPhotoDO.setDelTag(1);
+ int updateById = comActEasyPhotoService.getBaseMapper().updateById(comActEasyPhotoDO);
+ if(updateById==1){
+ return R.ok();
+ }
+ return R.fail();
+ }
/**
* 分页查询微心愿
*
@@ -794,6 +839,16 @@
}
/**
+ * 获取志愿者详情
+ * @param id
+ * @return
+ */
+ @GetMapping("getVolunteerById")
+ R getVolunteerById(@RequestParam("id")Long id){
+ return comMngVolunteerMngService.getVolunteerById(id);
+ }
+
+ /**
* 删除志愿者
* @param comMngVolunteerMngVO 手机号
* @return 删除结果
@@ -1101,6 +1156,15 @@
@PostMapping("timedtaskactactivityall")
R timedTaskActActivityAll(){
return comActActivityService.timedTaskActActivityAll();
+ }
+
+ /**
+ * 定时任务刷新微心愿的状态
+ * @return 更新结果
+ */
+ @PostMapping("timedtaskactmicrowish")
+ R timedTaskActMicroWishAll(){
+ return comActMicroWishService.timedTaskActMicroWishAll();
}
/**
@@ -1435,4 +1499,206 @@
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> listRt = new ArrayList<>();
+ list.forEach(rt -> {
+ int age = IdCard.IdNOToAge(rt.getIdCard());
+ boolean isElders = age >= 80;
+ if (isElders) {
+ listRt.add(rt);
+ }
+ });
+ return R.ok(listRt);
+ }
+
+ @PostMapping("/eldersauth/addByFamilyUser")
+ @Transactional(rollbackFor = Exception.class)
+ R addByFamilyUser(@RequestBody EldersAuthAddByFamilyDTO eldersAuthAddByFamilyDTO){
+
+ ComEldersAuthUserDO authUserDO = comEldersAuthUserService.getById(eldersAuthAddByFamilyDTO.getFamilyUserId());
+ if(authUserDO == null){
+ return R.fail("未查询到老人信息");
+ }
+
+ Long elderId = authUserDO.getId();
+ boolean canReAuthThisMonth = comEldersAuthUserService.checkReAuthAgain(elderId);
+ if(!canReAuthThisMonth){
+ return R.fail("当月已认证，不能再次进行认证");
+ }
+
+ String idCard = authUserDO.getIdCard();
+
+ Long loginUserId = eldersAuthAddByFamilyDTO.getUserId();
+ EldersAuthDO eldersAuthDO = new EldersAuthDO();
+ eldersAuthDO.setSumitUserId(loginUserId);
+ eldersAuthDO.setCreateBy(loginUserId);
+ eldersAuthDO.setCreateAt(new Date());
+ eldersAuthDO.setIdCard(idCard);
+ eldersAuthDO.setAuthUserName(authUserDO.getName());
+ eldersAuthDO.setVideoUrl(eldersAuthAddByFamilyDTO.getVideoUrl());
+ eldersAuthDO.setFamilyUserId(authUserDO.getId());
+ eldersAuthDO.setAge(IdcardUtil.getAgeByIdCard(idCard));
+ //根据身份证查询出籍贯 出生日期
+ //String domicile = IdCard.domicile(eldersAuthDO.getIdCard());
+ String domicile = eldersAuthService.queryDomicile(eldersAuthDO.getIdCard());
+ if(StringUtils.isEmpty(domicile)){
+ domicile = "暂无";
+ }
+
+ Date birthDay = IdCard.birthDay(idCard);
+ eldersAuthDO.setDomicile(domicile);
+ eldersAuthDO.setBirthDay(birthDay);
+ int add = eldersAuthService.getBaseMapper().insert(eldersAuthDO);
+ if(add==1){
+ //设置认证成功
+ Long familyUserId = eldersAuthDO.getFamilyUserId();
+ ComEldersAuthUserDO comEldersAuthUserDO = new ComEldersAuthUserDO();
+ comEldersAuthUserDO.setId(familyUserId);
+ comEldersAuthUserDO.setIsAuth(1);
+ boolean updated = comEldersAuthUserService.updateById(comEldersAuthUserDO);
+ if(!updated){
+ throw new ServiceException("添加认证失败，更新认证状态");
+ }
+ //认证成功 添加认证记录
+ List<ComEldersAuthHistoryRecordDO> authHistoryRecordDOList = comEldersAuthHistoryRecordMapper.selectList(new QueryWrapper<ComEldersAuthHistoryRecordDO>()
+ .lambda().eq(ComEldersAuthHistoryRecordDO::getIdCard,idCard).ge(ComEldersAuthHistoryRecordDO::getCreateAt, DateUtils.getFirstDayOfMonth()));
+ if(authHistoryRecordDOList.isEmpty()){
+ ComEldersAuthHistoryRecordDO authHistoryRecordDO = new ComEldersAuthHistoryRecordDO();
+ authHistoryRecordDO.setUserId(eldersAuthAddByFamilyDTO.getFamilyUserId());
+ authHistoryRecordDO.setAuthId(eldersAuthDO.getId());
+ BeanUtils.copyProperties(eldersAuthDO,authHistoryRecordDO);
+ authHistoryRecordDO.setId(null);
+ authHistoryRecordDO.setBrithday(AgeUtils.getAgeFormatBirthday(IdcardUtil.getBirthByIdCard(idCard)));
+ authHistoryRecordDO.setAge(IdcardUtil.getAgeByIdCard(idCard));
+ authHistoryRecordDO.setIsAuth(1);
+ authHistoryRecordDO.setDomicile(domicile);
+ comEldersAuthHistoryRecordMapper.insert(authHistoryRecordDO);
+ }
+ return R.ok(eldersAuthDO.getId());
+ }
+
+ 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() + "】的高龄认证，社区反馈:"
+ + eldersAuthFeedbackAddDTO.getFeedBack());
+ 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);
+ }
+
+ /**
+ * 设置社区认证方式
+ * @param communityId 社区ID
+ * @param type 核验类型（1.视频认证 2.人脸核验）
+ * @return
+ */
+ @PostMapping("/elders/setCommunityAuthType")
+ R setCommunityAuthType(@RequestParam("communityId")Long communityId,@RequestParam("type") Integer type){
+ return eldersAuthService.setCommunityAuthType(communityId, type);
+ }
}
--
Gitblit v1.7.1