From cccef0bd977db42aa8c5f99824cac40c914041d7 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 27 Sep 2022 14:36:13 +0800
Subject: [PATCH] nat

---
 .../dto/result/NatUserInfoResultDTO.java      |  4 ++++
 .../java/com/epmet/entity/IcNatEntity.java    |  6 +++++
 .../impl/DataSyncConfigServiceImpl.java       | 24 ++++++++++++++++++-
 .../resources/mapper/DataSyncConfigDao.xml    | 12 ++++++----
 4 files changed, 41 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 627c31b480..10e611aa46 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
@@ -17,4 +17,8 @@ public class NatUserInfoResultDTO implements Serializable {
     private String idCard;
 
     private String userId;
+
+    private String agencyId;
+
+    private String pids;
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java
index 3e85131aa2..50a9eed8e7 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcNatEntity.java
@@ -89,6 +89,12 @@ public class IcNatEntity extends BaseEpmetEntity {
 	 */
 	private String attachmentUrl;
 
+	@TableField(exist = false)
+	private String agencyId;
+
+	@TableField(exist = false)
+	private String pids;
+
 	@TableField(exist = false)
 	private Boolean existStatus = false;
 
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 6ff99b7f5d..3bf86234fe 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
@@ -1,5 +1,4 @@
 package com.epmet.service.impl;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
@@ -25,8 +24,10 @@ import com.epmet.dto.result.NatUserInfoResultDTO;
 import com.epmet.entity.DataSyncConfigEntity;
 import com.epmet.entity.DataSyncScopeEntity;
 import com.epmet.entity.IcNatEntity;
+import com.epmet.entity.IcNatRelationEntity;
 import com.epmet.service.DataSyncConfigService;
 import com.epmet.service.DataSyncScopeService;
+import com.epmet.service.IcNatRelationService;
 import com.epmet.service.IcNatService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -57,6 +58,8 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
     private IcNatDao icNatDao;
     @Autowired
     private IcNatService icNatService;
+    @Autowired
+    private IcNatRelationService icNatRelationService;
 
     private QueryWrapper<DataSyncConfigEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get(FieldConstant.ID_HUMP);
@@ -226,6 +229,8 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
                         e.setNatTime(DateUtils.parseDate(natInfo.getTest_time(),DateUtils.DATE_TIME_PATTERN));
                         e.setNatResult(natInfo.getSample_result_pcr());
                         e.setNatAddress(natInfo.getSampling_org_pcr());
+                        e.setAgencyId(idCard.getAgencyId());
+                        e.setPids(idCard.getPids());
                         entities.add(e);
                     });
                 }
@@ -237,6 +242,23 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
                 if (CollectionUtils.isNotEmpty(groupByStatus.get(false))){
                     icNatService.insertBatch(groupByStatus.get(false));
                 }
+                //组织关系表
+                List<IcNatRelationEntity> relationEntities = new ArrayList<>();
+                entities.forEach(ne -> {
+                    // 不是居民的先不加关系表吧
+                    if (ne.getIsResiUser().equals(NumConstant.ONE_STR)){
+                        IcNatRelationEntity e = new IcNatRelationEntity();
+                        e.setCustomerId(customerId);
+                        e.setAgencyId(ne.getAgencyId());
+                        e.setPids(ne.getPids());
+                        e.setIcNatId(ne.getId());
+                        e.setUserType("sync");
+                        relationEntities.add(e);
+                    }
+                });
+                if (CollectionUtils.isNotEmpty(relationEntities)){
+                    icNatRelationService.insertBatch(relationEntities);
+                }
             }
         }
     }
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml
index 444758f388..c429000b1a 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml
@@ -54,8 +54,10 @@
     <!-- 根据范围查询居民证件号 -->
     <select id="getIdCardsByScope" resultType="com.epmet.dto.result.NatUserInfoResultDTO">
         SELECT
-            DISTINCT ID_CARD,
-            ID AS userId
+            DISTINCT ID_CARD AS idCard,
+            ID AS userId,
+            AGENCY_ID AS agencyId,
+            pids
         FROM ic_resi_user
         WHERE DEL_FLAG = '0'
           AND `STATUS` = '0'
@@ -71,8 +73,10 @@
     </select>
     <select id="getUserIdByIdCard" resultType="com.epmet.dto.result.NatUserInfoResultDTO">
         SELECT
-            DISTINCT ID_CARD,
-            ID AS userId
+            DISTINCT ID_CARD AS idCard,
+            ID AS userId,
+            AGENCY_ID AS agencyId,
+            pids
         FROM ic_resi_user
         WHERE DEL_FLAG = '0'
           AND `STATUS` = '0'