From eda58e0e6d4abdd2b060e28867d103045845aa69 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 30 八月 2021 13:13:18 +0800
Subject: [PATCH] Merge branch 'test' into 'yuyue_dev'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/KeyPersonInfoServiceImpl.java | 46 +++++++++++++++++++++-------------------------
1 files changed, 21 insertions(+), 25 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/KeyPersonInfoServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/KeyPersonInfoServiceImpl.java
index b497207..53fef7e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/KeyPersonInfoServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/KeyPersonInfoServiceImpl.java
@@ -1,5 +1,15 @@
package com.panzhihua.service_community.service.impl;
+import java.util.Date;
+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.enums.KeyPersonLabelEnum;
@@ -12,24 +22,15 @@
import com.panzhihua.service_community.model.dos.KeyPersonInfoDO;
import com.panzhihua.service_community.service.ComMngPopulationService;
import com.panzhihua.service_community.service.KeyPersonInfoService;
-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.Date;
-import java.util.List;
/**
- * program 攀枝花智慧社区项目
- * description 特殊人群管理API
+ * program 攀枝花智慧社区项目 description 特殊人群管理API
*
- * @author manailin
- * Date 2021-01-22 15:30
+ * @author manailin Date 2021-01-22 15:30
**/
@Service
-public class KeyPersonInfoServiceImpl extends ServiceImpl<KeyPersonInfoDAO, KeyPersonInfoDO> implements KeyPersonInfoService {
+public class KeyPersonInfoServiceImpl extends ServiceImpl<KeyPersonInfoDAO, KeyPersonInfoDO>
+ implements KeyPersonInfoService {
@Resource
private ComMngPopulationService comMngPopulationService;
@@ -38,12 +39,11 @@
private String aesKey;
/**
- * description 批量保存重点人群人员信息
- * 处理逻辑：同一个人的信息可以被多个社区重复录入
- * 一个人的信息如果被同一个社区重复导入。以最新的导入数据为准。将之前的数据进行更新操作。
+ * description 批量保存重点人群人员信息 处理逻辑：同一个人的信息可以被多个社区重复录入 一个人的信息如果被同一个社区重复导入。以最新的导入数据为准。将之前的数据进行更新操作。
*
- * @param list 重点人群信息
- * @return R 保存结果
+ * @param list
+ * 重点人群信息
+ * @return R 保存结果
* @author manailin
* @date 2021/6/10 17:00
*/
@@ -57,7 +57,7 @@
keyPersonInfoDTO.setUserId(population.getId());
}
if (dbKeyPerson != null) {
- //已经存在数据，进行数据更新操作
+ // 已经存在数据，进行数据更新操作
KeyPersonInfoDO keyPersonInfoDO = new KeyPersonInfoDO();
BeanUtils.copyProperties(keyPersonInfoDTO, keyPersonInfoDO);
keyPersonInfoDO.setId(dbKeyPerson.getId());
@@ -111,12 +111,8 @@
private KeyPersonInfoDO checkExistFromDb(KeyPersonInfoDTO keyPersonInfoDTO) {
try {
String aesCardNo = AESUtil.encrypt128(keyPersonInfoDTO.getCardNo(), aesKey);
- return baseMapper.selectOne(
- new QueryWrapper<KeyPersonInfoDO>()
- .eq("act_id", keyPersonInfoDTO.getActId())
- .eq("card_no", aesCardNo)
- .eq("visiter_type", keyPersonInfoDTO.getVisiterType())
- );
+ return baseMapper.selectOne(new QueryWrapper<KeyPersonInfoDO>().eq("act_id", keyPersonInfoDTO.getActId())
+ .eq("card_no", aesCardNo).eq("visiter_type", keyPersonInfoDTO.getVisiterType()));
} catch (Exception e) {
log.error("根据身份证查询特殊人群业务-加密证件信息出错");
}
--
Gitblit v1.7.1