From 36330d0dcf4838fcb0c53c1dae9ca259958b7e5c Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Wed, 9 Nov 2022 00:37:21 +0800
Subject: [PATCH] -

---
 .../java/com/epmet/dto/result/NatUserInfoResultDTO.java  | 9 +++++++++
 .../java/com/epmet/processor/YanTaiNatSyncProcessor.java | 2 +-
 .../epmet/service/impl/DataSyncConfigServiceImpl.java    | 9 ++++++---
 .../src/main/resources/mapper/IcNatDao.xml               | 3 ++-
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatUserInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatUserInfoResultDTO.java
index dc696ff8dc..e04cc469f3 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatUserInfoResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/NatUserInfoResultDTO.java
@@ -3,6 +3,7 @@ package com.epmet.dto.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Author zxc
@@ -37,4 +38,12 @@ public class NatUserInfoResultDTO implements Serializable {
      * ic_nat表ID
      */
     private String id;
+    
+    /** 
+     * 采样时间
+     * @author wxz
+     * @date 2022/11/9 上午12:22
+     * @param null 
+     */
+    private Date sampleTime;
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiNatSyncProcessor.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiNatSyncProcessor.java
index e3417c3811..1fbfb6a69f 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiNatSyncProcessor.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiNatSyncProcessor.java
@@ -53,7 +53,7 @@ public class YanTaiNatSyncProcessor {
      */
     @Scheduled(cron = "0/10 * * * * ? ")
     public void scanJobs() {
-        log.info("【异步数据更新】开始同步任务");
+        //log.info("【异步数据更新】开始同步任务");
 
         //String dataSyncEnable = redisUtils.getString("data:sync:enable");
         //if (StringUtils.isEmpty(dataSyncEnable)) {
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
index 60eb0b812f..bf6e4f5c47 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
@@ -906,7 +906,9 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
          * 数据库采样时间+idCard+userId 存在的 做更新
          * 数据库采样时间+idCard+userId 不存在的 新增
          */
-        entities.forEach(e -> existInfo.stream().filter(i -> i.getUserId().equals(e.getUserId()) && i.getIdCard().equals(e.getIdCard())).forEach(i -> {
+        entities.forEach(e -> existInfo.stream()
+                .filter(i -> i.getUserId().equals(e.getUserId()) && i.getIdCard().equals(e.getIdCard()) && i.getSampleTime().equals(e.getSampleTime()))
+                .forEach(i -> {
             e.setExistStatus(true);
             e.setId(i.getId());
         }));
@@ -1087,7 +1089,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
         Map<String, Object> args = new HashMap<>();
         args.put("idcards", idCards);
 
-        log.info("【更新核酸检测信息(from 兰图)】本批次身份证号为:{}", String.join(",", idCards));
+        //log.info("【更新核酸检测信息(from 兰图)】本批次身份证号为:{}", String.join(",", idCards));
 
         // 2.=====================核酸采样=========================
         // 这一批居民的核酸采样列表
@@ -1193,6 +1195,7 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
         int pageNo = 1;
         int pageSize = 1000;
         int updatedResiCount = 0;
+        log.info("【任务处理器同步数据】组织Id:{},开始同步数据,同步类型:{}", jobEntity.getOrgId(), jobEntity.getJobType());
         do {
             // 分页，一次查询1000居民，循环更新他们的核酸检测信息
             resis = getNatUserInfoFromDb(p, pageNo, pageSize);
@@ -1200,8 +1203,8 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
                 yantaiHsjcByDbView(resis, jobEntity.getCustomerId(), NumConstant.ONE_STR);
                 pageNo++;
                 updatedResiCount += resis.size();
-                log.info("【任务处理器同步数据】组织Id:{},同步类型:{},已完成居民数:{}", jobEntity.getOrgId(), jobEntity.getJobType(), updatedResiCount);
             }
         } while (CollectionUtils.isNotEmpty(resis));
+        log.info("【任务处理器同步数据】组织Id:{},同步类型:{},已完成居民数:{}", jobEntity.getOrgId(), jobEntity.getJobType(), updatedResiCount);
     }
 }
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml
index 37fcc7dc3b..f6daee080d 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml
@@ -161,7 +161,8 @@
             SELECT
                 ID,
             USER_ID,
-            ID_CARD
+            ID_CARD,
+            SAMPLE_TIME
             FROM ic_nat
             WHERE del_flag = '0'
             AND USER_ID = #{l.userId}