From db7fbb65f1ffe3f1bec1b5d3bf6e7cc6044a7813 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 10 六月 2021 15:20:10 +0800
Subject: [PATCH] 取消视频验证80岁限制
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 102 +++++++++++++++++++++++++++++++++------------------
1 files changed, 66 insertions(+), 36 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 d5d3e5e..29977ba 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,5 +1,6 @@
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;
@@ -82,6 +83,8 @@
private EldersAuthService eldersAuthService;
@Resource
public ComMngPopulationDAO comMngPopulationDAO;
+ @Resource
+ public ComEldersAuthUserService comEldersAuthUserService;
/**
* 新增社区活动
@@ -464,6 +467,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();
+ }
/**
* 分页查询微心愿
*
@@ -1541,10 +1564,12 @@
@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 -> {
- boolean isElders = rt.getAge()>=80;
- if(isElders){
+ int age = IdCard.IdNOToAge(rt.getIdCard());
+ boolean isElders = age >= 80;
+ if (isElders) {
listRt.add(rt);
}
});
@@ -1554,43 +1579,36 @@
@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;
- }
+ ComEldersAuthUserDO authUserDO = comEldersAuthUserService.getById(eldersAuthAddByFamilyDTO.getFamilyUserId());
+ if(authUserDO == null){
+ return R.fail("未查询到老人信息");
}
- if(theFamily==null){
- return R.fail("家庭成员信息错误");
+ Long loginUserId = eldersAuthAddByFamilyDTO.getUserId();
+ EldersAuthDO eldersAuthDO = new EldersAuthDO();
+ eldersAuthDO.setSumitUserId(loginUserId);
+ eldersAuthDO.setCreateBy(loginUserId);
+ eldersAuthDO.setCreateAt(new Date());
+ eldersAuthDO.setIdCard(authUserDO.getIdCard());
+ eldersAuthDO.setAuthUserName(authUserDO.getName());
+ eldersAuthDO.setVideoUrl(eldersAuthAddByFamilyDTO.getVideoUrl());
+ eldersAuthDO.setFamilyUserId(authUserDO.getId());
+ eldersAuthDO.setAge(IdcardUtil.getAgeByIdCard(authUserDO.getIdCard()));
+ //根据身份证查询出籍贯 出生日期
+ //String domicile = IdCard.domicile(eldersAuthDO.getIdCard());
+ String domicile = eldersAuthService.queryDomicile(eldersAuthDO.getIdCard());
+ if(StringUtils.isEmpty(domicile)){
+ domicile = "暂无";
}
- 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");
+ 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());
}
+
return R.fail();
}
@@ -1611,10 +1629,11 @@
SysUserNoticeVO sysUserNoticeVO=new SysUserNoticeVO();
sysUserNoticeVO.setUserId(eldersAuthDO.getSumitUserId());
sysUserNoticeVO.setType(3);
- sysUserNoticeVO.setTitle("高龄认证社区社区反馈");
+ sysUserNoticeVO.setTitle("高龄认证社区反馈");
sysUserNoticeVO.setBusinessType(13);
sysUserNoticeVO.setBusinessTitle(" ");
- sysUserNoticeVO.setBusinessContent("你提交【" +eldersAuthDO.getAuthUserName() + "】的高龄认证，社区进行了反馈");
+ sysUserNoticeVO.setBusinessContent("你提交【" +eldersAuthDO.getAuthUserName() + "】的高龄认证，社区反馈:"
+ + eldersAuthFeedbackAddDTO.getFeedBack());
sysUserNoticeVO.setBusinessId(eldersAuthDO.getId());
sysUserNoticeVO.setStatus(0);
sysUserNoticeVO.setBusinessStatus(2);
@@ -1637,4 +1656,15 @@
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