From 7fc75c2aa55fe1b13ca9a89c23eea01d2d8942af Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期二, 07 九月 2021 09:37:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthApi.java | 191 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 158 insertions(+), 33 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthApi.java
index cdd5532..4344379 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthApi.java
@@ -1,22 +1,34 @@
package com.panzhihua.service_community.api;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import cn.hutool.core.util.IdcardUtil;
import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.vos.community.ComElderAuthRecordVO;
+import com.panzhihua.service_community.model.dos.ComEldersAuthElderlyDO;
+import com.panzhihua.service_community.service.ComElderAuthRecordsService;
+import com.panzhihua.service_community.service.ComEldersAuthElderlyService;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthPageDTO;
import com.panzhihua.common.model.dtos.elders.ComEldersAuthUserAddAppDTO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyDetailsVO;
import com.panzhihua.common.model.vos.elders.ComElderAuthUserDetailVO;
-import com.panzhihua.common.model.vos.community.SysConfVO;
+import com.panzhihua.common.utlis.DateUtils;
import com.panzhihua.service_community.model.dos.ComEldersAuthUserDO;
import com.panzhihua.service_community.model.dos.EldersAuthDO;
-import com.panzhihua.common.model.vos.community.ComEldersAuthElderlyDetailsVO;
import com.panzhihua.service_community.service.ComEldersAuthUserService;
import com.panzhihua.service_community.service.EldersAuthService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
/**
* @ClasssName EldersAuthApi
@@ -34,113 +46,226 @@
private ComEldersAuthUserService comEldersAuthUserService;
@Resource
private EldersAuthService eldersAuthService;
+ @Resource
+ private ComEldersAuthElderlyService comEldersAuthElderlyService;
+ @Resource
+ private ComElderAuthRecordsService comElderAuthRecordsService;
@PostMapping("/getAuth")
- public R getAuth(@RequestParam("authUserId") Long authUserId){
+ public R getAuth(@RequestParam("authUserId") Long authUserId) {
ComEldersAuthUserDO authUserDO = comEldersAuthUserService.getById(authUserId);
- if(authUserDO == null){
+
+ if (authUserDO == null) {
return R.fail("未查询到老人信息");
}
- if(authUserDO.getIsAuth().equals(ComEldersAuthUserDO.isAuth.yes)){
- return R.fail("该老人已认证");
+
+ //判断当前提交用户是否符合认证条件
+ ComEldersAuthElderlyDO authElderlyDO = comEldersAuthElderlyService.getOne(new QueryWrapper<ComEldersAuthElderlyDO>()
+ .lambda().eq(ComEldersAuthElderlyDO::getId,authUserDO.getBigAgeId()));
+ if(authElderlyDO == null){
+ return R.fail("未查询到老人信息");
+ }
+
+ int age = IdcardUtil.getAgeByIdCard(authElderlyDO.getIdCard());
+ if(age < 80 || authElderlyDO.getIsBigAge().equals(ComEldersAuthElderlyDO.isBigAge.no)
+ || authElderlyDO.getIsExist().equals(ComEldersAuthElderlyDO.isExist.no)){
+ return R.fail("未满足认证条件");
+ }
+
+ if (authUserDO.getIsAuth().equals(ComEldersAuthUserDO.isAuth.yes)) {
+ List<EldersAuthDO> eldersAuthDOList = eldersAuthService.list(new QueryWrapper<EldersAuthDO>().lambda()
+ .eq(EldersAuthDO::getType, 2).eq(EldersAuthDO::getFamilyUserId,authUserId)
+ .ge(EldersAuthDO::getCreateAt, DateUtils.getFirstDayOfMonth()));
+ if (!eldersAuthDOList.isEmpty()) {
+ return R.fail("该老人已认证");
+ }
+
}
ComElderAuthUserDetailVO authUserDetailVO = new ComElderAuthUserDetailVO();
- BeanUtils.copyProperties(authUserDO,authUserDetailVO);
+ BeanUtils.copyProperties(authUserDO, authUserDetailVO);
return R.ok(authUserDetailVO);
}
/**
* 人脸核验新增高龄认证记录
- * @param authGetResultDTO 请求参数
- * @return 新增结果
+ *
+ * @param authGetResultDTO
+ * 请求参数
+ * @return 新增结果
*/
@PostMapping("/add/auth")
- public R addAuth(@RequestBody ComEldersAuthGetResultDTO authGetResultDTO){
- return eldersAuthService.addAuthByEldersApp(authGetResultDTO);
+ public R addAuth(@RequestBody ComEldersAuthGetResultDTO authGetResultDTO) {
+ try {
+ return eldersAuthService.addAuthByEldersApp(authGetResultDTO);
+ } catch (Exception e) {
+ throw new ServiceException(e.getMessage());
+ }
}
/**
* 高龄认证分页接口
- * @param authPageDTO 请求参数
- * @return 查询结果
+ *
+ * @param authPageDTO
+ * 请求参数
+ * @return 查询结果
*/
@PostMapping("/page/auth")
- public R pageEldersByApp(@RequestBody ComEldersAuthPageDTO authPageDTO){
+ public R pageEldersByApp(@RequestBody ComEldersAuthPageDTO authPageDTO) throws Exception {
return eldersAuthService.pageEldersByApp(authPageDTO);
}
/**
* 添加高龄老人接口
- * @param authUserAddAppDTO 请求参数
- * @return 添加结果
+ *
+ * @param authUserAddAppDTO
+ * 请求参数
+ * @return 添加结果
*/
@PostMapping("/add")
- public R addEldersByApp(@RequestBody ComEldersAuthUserAddAppDTO authUserAddAppDTO){
+ public R addEldersByApp(@RequestBody ComEldersAuthUserAddAppDTO authUserAddAppDTO) {
return eldersAuthService.addEldersByApp(authUserAddAppDTO);
}
/**
* 修改高龄老人接口
- * @param authUserAddAppDTO 请求参数
- * @return 修改结果
+ *
+ * @param authUserAddAppDTO
+ * 请求参数
+ * @return 修改结果
*/
@PostMapping("/edit")
- public R editEldersByApp(@RequestBody ComEldersAuthUserAddAppDTO authUserAddAppDTO){
+ public R editEldersByApp(@RequestBody ComEldersAuthUserAddAppDTO authUserAddAppDTO) {
return eldersAuthService.editEldersByApp(authUserAddAppDTO);
}
-
/**
* 查询老龄认证记录
+ *
* @param pageComEldersRecordsDTO
* @return
*/
@PostMapping("/records")
- R queryEldersRecord(@RequestBody PageComEldersRecordsDTO pageComEldersRecordsDTO){
+ R queryEldersRecord(@RequestBody PageComEldersRecordsDTO pageComEldersRecordsDTO) {
return eldersAuthService.queryEldersRecord(pageComEldersRecordsDTO);
}
/**
* 查询老龄认证记录详细
+ *
* @param id
* @return
*/
@PostMapping("/records/deatils")
- R<ComEldersAuthElderlyDetailsVO> comEldersAuthElderlyDetails(@RequestParam("id") Long id){
+ R<ComEldersAuthElderlyDetailsVO> comEldersAuthElderlyDetails(@RequestParam("id") Long id) {
return eldersAuthService.comEldersAuthElderlyDetails(id);
}
/**
*
- * * 查询老龄认证社区认证方式
+ * * 查询老龄认证社区认证方式
+ *
* @param eldersAuthTypeQueryDTO
* @return
*/
@PostMapping("/authtype")
- R communityElderAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO){
+ R communityElderAuthType(@RequestBody EldersAuthTypeQueryDTO eldersAuthTypeQueryDTO) {
return eldersAuthService.communityAuthType(eldersAuthTypeQueryDTO);
}
-
/**
* 分页查询生存认证记录
+ *
* @param pageEldersAuthElderlyDTO
* @return
*/
@PostMapping("/records/page")
- R pageQueryEldersAuthRecord(@RequestBody PageEldersAuthRecordDTO pageEldersAuthElderlyDTO){
+ R pageQueryEldersAuthRecord(@RequestBody PageEldersAuthRecordDTO pageEldersAuthElderlyDTO) {
return eldersAuthService.pageQueryEldersAuthRecord(pageEldersAuthElderlyDTO);
}
@PostMapping("/getAuthHistoryList")
- public R getAuthHistoryList(@RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO){
+ public R getAuthHistoryList(@RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO) {
return eldersAuthService.getAuthHistoryList(pageEldersAuthElderlyDTO);
}
@PostMapping("/getAuthHistoryExport")
- public R getAuthHistoryExport(@RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO){
+ public R getAuthHistoryExport(@RequestBody PageEldersAuthHistoryDTO pageEldersAuthElderlyDTO) {
return eldersAuthService.getAuthHistoryExport(pageEldersAuthElderlyDTO);
}
+ @PostMapping("/auth/task")
+ public R timedTaskEldersAuthJobHandler() {
+ return eldersAuthService.timedTaskEldersAuthJobHandler();
+ }
+
+ /**
+ * 检测上月所有视频认证记录，取最后一条记录为认证成功记录
+ * @return 执行结果
+ */
+ @PostMapping("/auth/record/task")
+ public R timedTaskEldersRecordAuthJobHandler() {
+ return eldersAuthService.timedTaskEldersRecordAuthJobHandler();
+ }
+
+ //2021-8-30 身份认证改版（高龄老人认证管理）接口
+ /**
+ * 分页查询高龄老人认证记录 pageElderAuthRecords 分页查询高龄老人认证记录
+ * @param pageElderAuthRecordsDTO 查询参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/02 11:03
+ */
+ @PostMapping("/authRecords/page")
+ public R pageElderAuthRecords(@RequestBody PageElderAuthRecordsDTO pageElderAuthRecordsDTO) {
+ return comElderAuthRecordsService.pageElderAuthRecords(pageElderAuthRecordsDTO);
+ }
+
+ /**
+ * 根据高龄认证记录id查询详情 detailElderAuthRecords 根据高龄认证记录id查询详情
+ * @param authRecordId 高龄认证记录id
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/02 11:03
+ */
+ @GetMapping("/authRecords/detail")
+ public R detailElderAuthRecords(@RequestParam(value = "authRecordId") Long authRecordId) {
+ return comElderAuthRecordsService.detailElderAuthRecords(authRecordId);
+ }
+
+ /**
+ * 高龄认证审核 examineElderAuthRecords 高龄认证审核
+ * @param comElderAuthRecordVO 高龄认证审核参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/02 11:03
+ */
+ @PostMapping("/authRecords/examine")
+ public R examineElderAuthRecords(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO) {
+ return comElderAuthRecordsService.examineElderAuthRecords(comElderAuthRecordVO);
+ }
+
+ /**
+ * 高龄认证标记 examineElderAuthRecords 高龄认证标记
+ * @param comElderAuthRecordVO 高龄认证标记参数
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/02 11:03
+ */
+ @PostMapping("/authRecords/sign")
+ public R signElderAuthRecords(@RequestBody ComElderAuthRecordVO comElderAuthRecordVO) {
+ return comElderAuthRecordsService.signElderAuthRecords(comElderAuthRecordVO);
+ }
+
+ /**
+ * 根据高龄认证记录id批量查询 getElderAuthRecordsByIds 根据高龄认证记录id批量查询
+ * @param ids 高龄认证记录id集合
+ * @return R 查询结果
+ * @author txb
+ * @date 2021/9/02 11:03
+ */
+ @PostMapping("/authRecords/getList")
+ public R getElderAuthRecordsByIds(@RequestBody List<Long> ids){
+ return comElderAuthRecordsService.getElderAuthRecordsByIds(ids);
+ }
}
--
Gitblit v1.7.1