Merge remote-tracking branch 'origin/dev_epidemic_situation' into dev_epidemic_situation

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcNatDao.java

@@ -36,4 +36,10 @@ public interface IcNatDao extends BaseDao<IcNatEntity> {
      * @Description 删除/取消同步操作--物理删除业务数据
      **/
     int delById(@Param("icNatId") String icNatId);
+
+    /**
+     * 插入或者更新
+     * @param e
+     */
+    void insertOrUpdate(IcNatEntity e);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java

@@ -2,6 +2,7 @@ package com.epmet.service.impl;
 
 import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.NumConstant;
@@ -372,6 +373,13 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
      * @param entities
      */
     public void batchPersist(List<IcNatEntity> entities) {
-        insertBatch(entities);
+        //insertBatch(entities);
+        String currentUserId = EpmetRequestHolder.getHeader(AppClientConstant.USER_ID);
+        entities.forEach(e -> {
+            String id = IdWorker.getIdStr(e);
+            e.setId(id);
+            e.setUpdatedBy(currentUserId);
+            baseDao.insertOrUpdate(e);
+        });
     }
 }

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.28__nat_add_uniquekey.sql

@@ -0,0 +1 @@
+alter table ic_nat add unique index unq_nat(ID_CARD, NAT_TIME)

epmet-user/epmet-user-server/src/main/resources/mapper/IcNatDao.xml

@@ -67,4 +67,22 @@
         DELETE FROM ic_nat WHERE id = #{icNatId}
     </delete>
 
+    <insert id="insertOrUpdate">
+        INSERT INTO epmet_user.ic_nat
+        (ID, CUSTOMER_ID, AGENCY_ID, PIDS, USER_ID,
+         USER_TYPE, NAME, MOBILE, ID_CARD, NAT_TIME, NAT_RESULT, NAT_ADDRESS, FILE_NAME, ATTACHMENT_TYPE, ATTACHMENT_URL,
+         DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME)
+        VALUES (#{id}, #{customerId}, #{agencyId}, #{pids}, #{userId},
+                #{userType}, #{name}, #{mobile}, #{idCard}, #{natTime},
+                #{natResult}, #{natAddress}, #{fileName}, #{attachmentType}, #{attachmentUrl},
+                #{delFlag}, #{revision}, #{createdBy}, #{createdTime}, #{updatedBy},
+                #{updatedTime})
+        ON DUPLICATE KEY update
+            NAME=#{name},
+            MOBILE=#{mobile},
+            NAT_ADDRESS=#{natAddress},
+            NAT_RESULT=#{natResult},
+            UPDATED_BY=#{updatedBy},
+            UPDATED_TIME=NOW()
+    </insert>
 </mapper>