From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthApi.java | 88 +++++++++++++++++++++++++------------------
1 files changed, 51 insertions(+), 37 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 c075247..17cca0d 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,26 +1,31 @@
package com.panzhihua.service_community.api;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+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.community.*;
+import com.panzhihua.common.model.dtos.community.EldersAuthTypeQueryDTO;
+import com.panzhihua.common.model.dtos.community.PageComEldersRecordsDTO;
+import com.panzhihua.common.model.dtos.community.PageEldersAuthHistoryDTO;
+import com.panzhihua.common.model.dtos.community.PageEldersAuthRecordDTO;
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 java.util.List;
+import lombok.extern.slf4j.Slf4j;
/**
* @ClasssName EldersAuthApi
@@ -40,31 +45,33 @@
private EldersAuthService eldersAuthService;
@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)){
- List<EldersAuthDO> eldersAuthDOList = eldersAuthService.list(new QueryWrapper<EldersAuthDO>()
- .lambda().eq(EldersAuthDO::getType,2).ge(EldersAuthDO::getCreateAt, DateUtils.getFirstDayOfMonth()));
- if(!eldersAuthDOList.isEmpty()){
+ if (authUserDO.getIsAuth().equals(ComEldersAuthUserDO.isAuth.yes)) {
+ List<EldersAuthDO> eldersAuthDOList = eldersAuthService.list(new QueryWrapper<EldersAuthDO>().lambda()
+ .eq(EldersAuthDO::getType, 2).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){
+ public R addAuth(@RequestBody ComEldersAuthGetResultDTO authGetResultDTO) {
try {
return eldersAuthService.addAuthByEldersApp(authGetResultDTO);
} catch (Exception e) {
@@ -74,86 +81,93 @@
/**
* 高龄认证分页接口
- * @param authPageDTO 请求参数
- * @return 查询结果
+ *
+ * @param authPageDTO
+ * 请求参数
+ * @return 查询结果
*/
@PostMapping("/page/auth")
- public R pageEldersByApp(@RequestBody ComEldersAuthPageDTO authPageDTO) throws Exception{
+ 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);
}
-
}
--
Gitblit v1.7.1