From d07b02f12c47f0e513d98a49d1106d22416868c0 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 11 六月 2021 13:37:29 +0800
Subject: [PATCH] bugfixed
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthElderlyApi.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/elders/ComEldersAuthUserAddAppDTO.java | 4 ++++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEldersAuthElderlyServiceImpl.java | 4 ++++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthDetailsVO.java | 4 ++++
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthElderlyDTO.java | 4 ++--
5 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthElderlyDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthElderlyDTO.java
index 757ec99..ffd68e9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthElderlyDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/EldersAuthElderlyDTO.java
@@ -24,9 +24,9 @@
@ApiModelProperty(value = "身份证号码")
private String idCard;
- @ApiModelProperty(value = "是否健在",example = "1是，0否")
+ @ApiModelProperty(value = "是否健在",example = "1是，2否")
private Integer isExist;
- @ApiModelProperty(value = "是否办理高龄津贴",example = "1是，0否")
+ @ApiModelProperty(value = "是否办理高龄津贴",example = "1是，2否")
private Integer isBigAge;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/elders/ComEldersAuthUserAddAppDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/elders/ComEldersAuthUserAddAppDTO.java
index 22a0930..da025ad 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/elders/ComEldersAuthUserAddAppDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/elders/ComEldersAuthUserAddAppDTO.java
@@ -1,11 +1,14 @@
package com.panzhihua.common.model.dtos.elders;
+import com.panzhihua.common.model.helper.encrypt.EncryptQuery;
+import com.panzhihua.common.model.helper.encrypt.EncryptQueryClass;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel("人脸核身获取结果请求参数")
+@EncryptQueryClass
public class ComEldersAuthUserAddAppDTO {
@ApiModelProperty(value = "用户id",hidden = true)
@@ -15,6 +18,7 @@
private String name;
@ApiModelProperty(value = "身份证号码")
+ @EncryptQuery
private String idCard;
@ApiModelProperty(value = "与本人关系(1.父母 2.配偶 3.子女 4.兄弟姐妹 5.祖/外祖父母 6.本人 7.其他)")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthDetailsVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthDetailsVO.java
index 785f9a1..ce5e3b0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthDetailsVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/EldersAuthDetailsVO.java
@@ -2,6 +2,8 @@
import java.util.*;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptClass;
+import com.panzhihua.common.model.helper.encrypt.EncryptDecryptField;
import com.panzhihua.common.model.helper.sensitive.Sensitive;
import com.panzhihua.common.model.helper.sensitive.SensitiveStrategy;
import io.swagger.annotations.ApiModel;
@@ -18,6 +20,7 @@
* */
@Data
@ApiModel("高龄认证返回参数")
+@EncryptDecryptClass
public class EldersAuthDetailsVO {
@ApiModelProperty(value = "ID")
@@ -39,6 +42,7 @@
@ApiModelProperty(value = "身份证")
@Sensitive(strategy = SensitiveStrategy.ID_CARD)
+ @EncryptDecryptField
private String idCard;
@ApiModelProperty(value = "认证人姓名")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthElderlyApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthElderlyApi.java
index 959826c..23405da 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthElderlyApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/EldersAuthElderlyApi.java
@@ -46,7 +46,7 @@
@PostMapping("/batchSave")
R batchSave(@RequestBody List<EldersAuthElderlyExcelVO> eldersAuthElderlyExcelVOS,@RequestParam("communityId") Long communityId,@RequestParam("createBy") Long createBy){
if(eldersAuthElderlyExcelVOS==null||eldersAuthElderlyExcelVOS.size()==0){
- return R.fail("模板为空");
+ return R.fail("模板高龄老人数据为空");
}
return comEldersAuthElderlyService.batchSave(eldersAuthElderlyExcelVOS,communityId,createBy);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEldersAuthElderlyServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEldersAuthElderlyServiceImpl.java
index 9747128..28c8549 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEldersAuthElderlyServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComEldersAuthElderlyServiceImpl.java
@@ -90,6 +90,10 @@
if(!ObjectUtils.isEmpty(eldersAuthElderlyDTO.getName())){
comEldersAuthElderlyDO.setName(eldersAuthElderlyDTO.getName());
}
+ if(eldersAuthElderlyDTO.getIsExist()!=null&&
+ eldersAuthElderlyDTO.getIsExist().intValue()!=1 && eldersAuthElderlyDTO.getIsExist()!=2){
+ return R.fail("参数错误，是否健在只能为1或2");
+ }
comEldersAuthElderlyDO.setIsExist(eldersAuthElderlyDTO.getIsExist());
comEldersAuthElderlyDO.setIsBigAge(eldersAuthElderlyDTO.getIsBigAge());
baseMapper.updateEldersAuthElderly(comEldersAuthElderlyDO);
--
Gitblit v1.7.1