From ac9a9743d185d46ec7dca7577402dfef6a553eed Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 27 四月 2022 11:09:00 +0800
Subject: [PATCH] Merge branch 'huacheng' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/DisabledPersonsServiceImpl.java | 51 ++++++++++++++++++++++++++-------------------------
1 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/DisabledPersonsServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/DisabledPersonsServiceImpl.java
index ad01206..bad19a4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/DisabledPersonsServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/DisabledPersonsServiceImpl.java
@@ -1,8 +1,16 @@
package com.panzhihua.service_community.service.impl;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.panzhihua.common.model.dtos.community.ComMngPopulationTagCardNoDTO;
import com.panzhihua.common.model.dtos.community.DisabledPersonsDTO;
import com.panzhihua.common.model.helper.AESUtil;
import com.panzhihua.common.model.vos.R;
@@ -11,13 +19,6 @@
import com.panzhihua.service_community.model.dos.DisabledPersonsDO;
import com.panzhihua.service_community.service.ComMngPopulationService;
import com.panzhihua.service_community.service.DisabledPersonsService;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import javax.annotation.Resource;
-import java.util.List;
/**
* 残疾人服务
@@ -26,7 +27,8 @@
* @date 2021/6/11 16:05
*/
@Service
-public class DisabledPersonsServiceImpl extends ServiceImpl<DisablePersonDAO, DisabledPersonsDO> implements DisabledPersonsService {
+public class DisabledPersonsServiceImpl extends ServiceImpl<DisablePersonDAO, DisabledPersonsDO>
+ implements DisabledPersonsService {
@Value("${domain.aesKey:}")
private String aesKey;
@@ -37,8 +39,9 @@
/**
* description 批量保存重点人群人员信息
*
- * @param list 重点人群信息
- * @return R 保存结果
+ * @param list
+ * 重点人群信息
+ * @return R 保存结果
* @author manailin
* @date 2021/6/10 17:00
*/
@@ -47,20 +50,23 @@
public R saveBatchDisabledPerson(List<DisabledPersonsDTO> list) {
list.forEach(disabledPersonsDTO -> {
DisabledPersonsDO dbKeyPerson = checkExistFromDb(disabledPersonsDTO);
+ ComMngPopulationDO population =
+ comMngPopulationService.getPopulationByCardNo(disabledPersonsDTO.getCardNo());
+ if (population != null) {
+ disabledPersonsDTO.setUserId(population.getId());
+ }
if (dbKeyPerson != null) {
- //已经存在数据，进行数据更新操作
+ // 已经存在数据，进行数据更新操作
DisabledPersonsDO disabledPersonsDO = new DisabledPersonsDO();
BeanUtils.copyProperties(disabledPersonsDTO, disabledPersonsDO);
disabledPersonsDO.setId(dbKeyPerson.getId());
- ComMngPopulationTagCardNoDTO comMngPopulationTagCardNoDTO = new ComMngPopulationTagCardNoDTO();
- comMngPopulationTagCardNoDTO.setCardNo(dbKeyPerson.getCardNo());
- ComMngPopulationDO population = comMngPopulationService.getPopulationByCardNo(disabledPersonsDTO.getCardNo());
- if (population != null) {
- disabledPersonsDO.setUserId(population.getId());
- }
try {
String aesCardNo = AESUtil.encrypt128(disabledPersonsDTO.getCardNo(), aesKey);
+ String phone = AESUtil.encrypt128(disabledPersonsDTO.getPhone(), aesKey);
+ String guardianPhone = AESUtil.encrypt128(disabledPersonsDTO.getGuardianPhone(), aesKey);
disabledPersonsDO.setCardNo(aesCardNo);
+ disabledPersonsDO.setPhone(phone);
+ disabledPersonsDO.setGuardianPhone(guardianPhone);
updateById(disabledPersonsDO);
} catch (Exception e) {
log.error("根据身份证查询残疾人群业务-加密证件信息出错");
@@ -74,17 +80,12 @@
return R.ok();
}
-
private DisabledPersonsDO checkExistFromDb(DisabledPersonsDTO DisabledPersonsDO) {
try {
String aesCardNo = AESUtil.encrypt128(DisabledPersonsDO.getCardNo(), aesKey);
- return baseMapper.selectOne(
- new QueryWrapper<DisabledPersonsDO>()
- .eq("act_id", DisabledPersonsDO.getActId())
- .eq("card_no", aesCardNo)
- );
+ return baseMapper.selectOne(new QueryWrapper<DisabledPersonsDO>().eq("act_id", DisabledPersonsDO.getActId())
+ .eq("card_no", aesCardNo));
} catch (Exception e) {
-
log.error("根据身份证查询残疾人群业务-加密证件信息出错");
}
return null;
--
Gitblit v1.7.1