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

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/HttpUtil.java

 package com.liquidnet.commons.lang.util;
 
+import com.liquidnet.commons.lang.util.spring.RestTemplateConfig;
 import org.springframework.http.*;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -14,7 +15,7 @@ public class HttpUtil {
     private static RestTemplate restTemplate;
 
     static {
-        restTemplate = new RestTemplate();
+        restTemplate = RestTemplateConfig.getRestTemplate();
     }
 
     /**

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/spring/RestTemplateConfig.java

+package com.liquidnet.commons.lang.util.spring;
+
+import org.apache.http.client.HttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.web.client.DefaultResponseErrorHandler;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author AnJiabin <anjiabin@zhengzai.tv>
+ * @version V1.0
+ * @Description: TODO
+ * @class: RestTemplateConfig
+ * @Package com.liquidnet.commons.lang.util.spring
+ * @Copyright: LightNet @ Copyright (c) 2021
+ * @date 2021/7/31 14:57
+ */
+public class RestTemplateConfig {
+    private static RestTemplate restTemplate;
+
+    static {
+        // 长链接保持时间长度20秒
+        PoolingHttpClientConnectionManager poolConnManager =
+                new PoolingHttpClientConnectionManager(20, TimeUnit.SECONDS);
+        // 设置最大链接数
+        poolConnManager.setMaxTotal(500*getMaxCpuCore() + 500 );
+        // 单路由的并发数
+        poolConnManager.setDefaultMaxPerRoute(500*getMaxCpuCore());
+
+        HttpClientBuilder httpClientBuilder = HttpClients.custom();
+        httpClientBuilder.setConnectionManager(poolConnManager);
+
+        // 重试次数3次，并开启
+//        httpClientBuilder.setRetryHandler(new DefaultHttpRequestRetryHandler(3,true));
+        HttpClient httpClient = httpClientBuilder.build();
+//        // 保持长链接配置，keep-alive
+//        httpClientBuilder.setKeepAliveStrategy(new DefaultConnectionKeepAliveStrategy());
+
+        HttpComponentsClientHttpRequestFactory httpComponentsClientHttpRequestFactory = new HttpComponentsClientHttpRequestFactory(httpClient);
+
+        // 链接超时配置 5秒
+        httpComponentsClientHttpRequestFactory.setConnectTimeout(5000);
+        // 连接读取超时配置
+//        httpComponentsClientHttpRequestFactory.setReadTimeout(10000);
+        // 连接池不够用时候等待时间长度设置，分词那边 500毫秒 ，我们这边设置成1秒
+        httpComponentsClientHttpRequestFactory.setConnectionRequestTimeout(5000);
+
+        // 缓冲请求数据，POST大量数据，可以设定为true 我们这边机器比较内存较大
+        httpComponentsClientHttpRequestFactory.setBufferRequestBody(true);
+
+        restTemplate = new RestTemplate();
+        restTemplate.setRequestFactory(httpComponentsClientHttpRequestFactory);
+        restTemplate.setErrorHandler(new DefaultResponseErrorHandler());
+    }
+
+    public static RestTemplate getRestTemplate(){
+        return restTemplate;
+    }
+
+    private static int getMaxCpuCore(){
+        int cpuCore = Runtime.getRuntime().availableProcessors();
+        return  cpuCore;
+    }
+}

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/mongo_db_del.sql

@@ -15,4 +15,4 @@ db.KylinTicketTimesPartnerVo.deleteMany({});
 db.PerformanceMemberAuditParam.deleteMany({});
 db.AdminUpushVo.deleteMany({});
 
-
+-- db.KylinOrderTicketVo.deleteMany({createdAt:/^2021-04.*/})

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/DMRdmService.java

@@ -6,6 +6,7 @@ import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.dto.vo.*;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
+import com.liquidnet.service.platform.utils.ObjectUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -24,10 +25,6 @@ public class DMRdmService {
     @Autowired
     RedisUtil redisUtil;
 
-    public void setSwitch(String rk, int val) {
-        redisUtil.set(rk, val);
-    }
-
     /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | Switch config */
 
     public Integer getSwitch(String rk) {
@@ -58,7 +55,6 @@ public class DMRdmService {
 
     public String getUidByMobile(String mobile) {
         String key = AdamRedisConst.IDENTITY_MOBILE.concat(mobile);
-        long s = System.currentTimeMillis();
         String val = (String) redisUtil.get(key);
 //        if (StringUtils.isEmpty(val)) {
 //            Query query = Query.query(Criteria.where("mobile").is(mobile).and("state").is(1));
@@ -71,7 +67,6 @@ public class DMRdmService {
 //                redisUtil.set(key, vo.getUid());
 //            }
 //        }
-        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return val;
     }
 
@@ -85,7 +80,6 @@ public class DMRdmService {
 
     public String getUidByPlatformOpenId(String platform, String openId) {
         String key = AdamRedisConst.IDENTITY_THIRD_PARTY + platform + ":" + openId;
-        long s = System.currentTimeMillis();
         String val = (String) redisUtil.get(key);
 //        if (StringUtils.isEmpty(val)) {
 //            Query query = Query.query(Criteria.where("openId").is(openId).and("platform").is(platform).and("state").is(1));
@@ -98,7 +92,6 @@ public class DMRdmService {
 //                redisUtil.set(key, vo.getUid());
 //            }
 //        }
-        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return val;
     }
 
@@ -114,7 +107,6 @@ public class DMRdmService {
 
     public AdamUserInfoVo getUserInfoVoByUid(String uid) {
         String rk = AdamRedisConst.INFO_USER.concat(uid);
-        long s = System.currentTimeMillis();
         AdamUserInfoVo vo = (AdamUserInfoVo) redisUtil.get(rk);
 //        if (null == vo) {
 //            s = System.currentTimeMillis();
@@ -124,7 +116,6 @@ public class DMRdmService {
 //
 //            if (null != vo) redisUtil.set(rk, vo);
 //        }
-        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return vo;
     }
 
@@ -140,7 +131,6 @@ public class DMRdmService {
 
     public AdamRealInfoVo getRealInfoVoByUid(String uid) {
         String rk = AdamRedisConst.INFO_REAL_NAME.concat(uid);
-        long s = System.currentTimeMillis();
         AdamRealInfoVo vo = (AdamRealInfoVo) redisUtil.get(rk);
 //        if (null == vo) {
 //            s = System.currentTimeMillis();
@@ -154,7 +144,6 @@ public class DMRdmService {
             vo.setName(SensitizeUtil.chineseName(vo.getName()));
             vo.setIdCard(SensitizeUtil.custom(vo.getIdCard(), 3, 2));
         }
-        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return vo;
     }
 
@@ -177,7 +166,6 @@ public class DMRdmService {
 
     public List<AdamThirdPartInfoVo> getThirdPartVoListByUid(String uid) {
         String rk = AdamRedisConst.INFO_THIRD_PARTY.concat(uid);
-        long s = System.currentTimeMillis();
         List<AdamThirdPartInfoVo> thirdPartInfoVos = (List<AdamThirdPartInfoVo>) redisUtil.get(rk);
 //        if (CollectionUtils.isEmpty(thirdPartInfoVos)) {
 //            s = System.currentTimeMillis();
@@ -187,19 +175,35 @@ public class DMRdmService {
 //
 //            if (!CollectionUtils.isEmpty(thirdPartInfoVos)) redisUtil.set(rk, thirdPartInfoVos);
 //        }
-        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return thirdPartInfoVos;
     }
 
     public boolean addThirdPartVoListByUid(String uid, List<AdamThirdPartInfoVo> vos, AdamThirdPartInfoVo vo) {
-        if (CollectionUtils.isEmpty(vos)) {
-            vos = Collections.singletonList(vo);
-        } else {
+        if (null == vos) {
+            vos = ObjectUtil.getAdamThirdPartInfoVoArrayList();
+        }
         vos.add(vo);
+        return redisUtil.set(AdamRedisConst.INFO_THIRD_PARTY + uid, vos);
+    }
+
+    public boolean rmvThirdPartVoListByUid(String uid, List<AdamThirdPartInfoVo> vos, String platform) {
+        if (CollectionUtils.isEmpty(vos)) {
+            return true;
         }
+        vos.removeIf(r -> r.getPlatform().equals(platform));
         return redisUtil.set(AdamRedisConst.INFO_THIRD_PARTY + uid, vos);
     }
 
+    public AdamThirdPartInfoVo getThirdPartVoByUidPlatform(List<AdamThirdPartInfoVo> vos, String platform) {
+        if (!CollectionUtils.isEmpty(vos)) {
+            Optional<AdamThirdPartInfoVo> any = vos.stream().filter(r -> r.getPlatform().equals(platform)).findAny();
+            if (any.isPresent()) {
+                return any.get();
+            }
+        }
+        return null;
+    }
+
     public AdamThirdPartInfoVo getThirdPartVoByUidPlatform(String uid, String platform) {
         List<AdamThirdPartInfoVo> vos = this.getThirdPartVoListByUid(uid);
         if (!CollectionUtils.isEmpty(vos)) {
@@ -225,8 +229,7 @@ public class DMRdmService {
 
     public List<AdamEntersVo> getEntersVoByUid(String uid) {
         String rk = AdamRedisConst.INFO_ENTERS.concat(uid);
-        long s = System.currentTimeMillis();
-        List<AdamEntersVo> vos = (List<AdamEntersVo>) redisUtil.get(rk);
+        ArrayList<AdamEntersVo> vos = (ArrayList<AdamEntersVo>) redisUtil.get(rk);
 //        if (CollectionUtils.isEmpty(vos)) {
 //            s = System.currentTimeMillis();
 //            vos = mongoTemplate.find(
@@ -237,16 +240,14 @@ public class DMRdmService {
 //
 //            if (!CollectionUtils.isEmpty(vos)) redisUtil.set(rk, vos);
 //        }
-        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return vos;
     }
 
     public boolean addEntersVoByUid(String uid, List<AdamEntersVo> vos, AdamEntersVo vo) {
-        if (CollectionUtils.isEmpty(vos)) {
-            vos = Collections.singletonList(vo);
-        } else {
-            vos.add(vo);
+        if (null == vos) {
+            vos = ObjectUtil.getAdamEntersVoArrayList();
         }
+        vos.add(vo);
         return redisUtil.set(AdamRedisConst.INFO_ENTERS + uid, vos);
     }
 
@@ -283,7 +284,6 @@ public class DMRdmService {
 
     public List<AdamAddressesVo> getAddressesVoByUid(String uid) {
         String rk = AdamRedisConst.INFO_ADDRESSES.concat(uid);
-        long s = System.currentTimeMillis();
         List<AdamAddressesVo> vos = (List<AdamAddressesVo>) redisUtil.get(rk);
 //        if (CollectionUtils.isEmpty(vos)) {
 //            s = System.currentTimeMillis();
@@ -295,16 +295,14 @@ public class DMRdmService {
 //
 //            if (!CollectionUtils.isEmpty(vos)) redisUtil.set(rk, vos);
 //        }
-        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return vos;
     }
 
     public boolean addAddressesVoByUid(String uid, List<AdamAddressesVo> vos, AdamAddressesVo vo) {
-        if (CollectionUtils.isEmpty(vos)) {
-            vos = Collections.singletonList(vo);
-        } else {
-            vos.add(vo);
+        if (null == vos) {
+            vos = ObjectUtil.getAdamAddressesVoArrayList();
         }
+        vos.add(vo);
         return redisUtil.set(AdamRedisConst.INFO_ADDRESSES + uid, vos);
     }
 
@@ -346,7 +344,6 @@ public class DMRdmService {
 
     public AdamUserMemberVo getUserMemberVoByUid(String uid) {
         String rk = AdamRedisConst.INFO_USER_MEMBER.concat(uid);
-        long s = System.currentTimeMillis();
         AdamUserMemberVo vo = (AdamUserMemberVo) redisUtil.get(rk);
 //        if (null == vo) {
 //            s = System.currentTimeMillis();
@@ -358,7 +355,6 @@ public class DMRdmService {
         if (null != vo) {
             vo.setState(vo.getState() == 1 ? (vo.getExpiryAt().isAfter(LocalDateTime.now()) ? 1 : 2) : vo.getState());
         }
-        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return vo;
     }
 
@@ -369,7 +365,6 @@ public class DMRdmService {
     /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <MEMBER_SIMPLE_INFO> */
 
     public AdamMemberSimpleVo getMemberSimpleVo() {
-        long s = System.currentTimeMillis();
         AdamMemberSimpleVo vo = (AdamMemberSimpleVo) redisUtil.get(AdamRedisConst.INFO_MEMBER_SIMPLE);
 //        if (null == vo) {
 //            long s = System.currentTimeMillis();
@@ -383,7 +378,6 @@ public class DMRdmService {
 //
 //            if (null != vo) redisUtil.set(AdamRedisConst.INFO_MEMBER_SIMPLE, vo);
 //        }
-        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return vo;
     }
 
@@ -395,7 +389,6 @@ public class DMRdmService {
 
     public AdamMemberVo getMemberVoByMemberId(String memberId) {
         String key = AdamRedisConst.INFO_MEMBER_CATEGORY.concat(memberId);
-        long s = System.currentTimeMillis();
         AdamMemberVo vo = (AdamMemberVo) redisUtil.get(key);
 //        if (null == vo) {
 //            s = System.currentTimeMillis();
@@ -406,7 +399,6 @@ public class DMRdmService {
 //            log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
 //            if (null != vo) redisUtil.set(key, vo);
 //        }
-        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return vo;
     }
 
@@ -422,7 +414,6 @@ public class DMRdmService {
 
     public List<AdamMemberPriceVo> getMemberPriceVoByMemberId(String memberId) {
         String key = AdamRedisConst.INFO_MEMBER_PRICE.concat(memberId);
-        long s = System.currentTimeMillis();
         List<AdamMemberPriceVo> vos = (List<AdamMemberPriceVo>) redisUtil.get(key);
 //        if (CollectionUtils.isEmpty(vos)) {
 //            s = System.currentTimeMillis();
@@ -434,7 +425,6 @@ public class DMRdmService {
 //
 //            if (!CollectionUtils.isEmpty(vos)) redisUtil.set(key, vos);
 //        }
-        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return vos;
     }
 
@@ -497,18 +487,15 @@ public class DMRdmService {
     }
 
     public ArrayList<AdamMemberOrderVo> getMemberOrderVosByUid(String uid) {
-        long s = System.currentTimeMillis();
         ArrayList<AdamMemberOrderVo> vos = (ArrayList<AdamMemberOrderVo>) redisUtil.get(AdamRedisConst.INFO_MEMBER_ORDER + uid);
-        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return vos;
     }
 
     public boolean addMemberOrderVoByUid(String uid, List<AdamMemberOrderVo> vos, AdamMemberOrderVo vo) {
-        if (CollectionUtils.isEmpty(vos)) {
-            vos = Collections.singletonList(vo);
-        } else {
-            vos.add(vo);
+        if (null == vos) {
+            vos = ObjectUtil.getAdamMemberOrderVoArrayList();
         }
+        vos.add(vo);
         return redisUtil.set(AdamRedisConst.INFO_MEMBER_ORDER + uid, vos);
     }
 
@@ -532,7 +519,6 @@ public class DMRdmService {
 
     public AdamMemberOrderVo getShotMemberOrderVoByOrderNo(String orderNo) {
         String key = AdamRedisConst.SHOT_MEMBER_ORDER + orderNo;
-        long s = System.currentTimeMillis();
         AdamMemberOrderVo vo = (AdamMemberOrderVo) redisUtil.get(key);
 //        if (null == vo) {
 //            s = System.currentTimeMillis();
@@ -544,7 +530,6 @@ public class DMRdmService {
 //
 //            if (null != vo) redisUtil.set(key, vo);
 //        }
-        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return vo;
     }
 
@@ -575,7 +560,6 @@ public class DMRdmService {
 
     public AdamMemberCodeVo getMemberCodeVoByCode(String memberCode) {
         String key = AdamRedisConst.INFO_MEMBER_CODE.concat(memberCode);
-        long s = System.currentTimeMillis();
         AdamMemberCodeVo vo = (AdamMemberCodeVo) redisUtil.get(key);
 //        if (null == vo) {
 //            s = System.currentTimeMillis();
@@ -586,7 +570,6 @@ public class DMRdmService {
 //            log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
 //            if (null != vo && vo.getState() == 0) redisUtil.set(AdamRedisConst.INFO_MEMBER_CODE.concat(memberCode), vo);
 //        }
-        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return vo;
     }
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMAddressesProcessor.java

@@ -104,6 +104,10 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
                         addressesList.clear();
                     }
                 }
+                if (addressesList.size() > 0 && ct > 1000) {
+                    tl += addressesList.size();
+                    log.info("DM.execute.limit.result:{}", dmAddressesService.saveBatch(addressesList));
+                }
                 row.close();
                 statement.close();
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMCollectionProcessor.java

@@ -95,6 +95,10 @@ public class DMCollectionProcessor extends DataMigrationProcessorService {
                         collectionList.clear();
                     }
                 }
+                if (collectionList.size() > 0 && ct > 1000) {
+                    tl += collectionList.size();
+                    log.info("DM.execute.limit.result:{}", dmCollectionService.saveBatch(collectionList));
+                }
                 row.close();
                 statement.close();
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMEntersProcessor.java

@@ -108,6 +108,10 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
                         entersList.clear();
                     }
                 }
+                if (entersList.size() > 0 && ct > 1000) {
+                    tl += entersList.size();
+                    log.info("DM.execute.limit.result:{}", dmEntersService.saveBatch(entersList));
+                }
                 row.close();
                 statement.close();
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMMemberCodeProcessor.java

@@ -259,6 +259,10 @@ public class DMMemberCodeProcessor extends DataMigrationProcessorService {
                         memberCodeList.clear();
                     }
                 }
+                if (memberCodeList.size() > 0 && ct > 1000) {
+                    tl += memberCodeList.size();
+                    log.info("DM.execute.limit.result:{}", dmMemberCodeService.saveBatch(memberCodeList));
+                }
                 row.close();
                 statement.close();
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMMemberOrderProcessor.java

@@ -140,6 +140,10 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
                         memberOrderList.clear();
                     }
                 }
+                if (memberOrderList.size() > 0 && ct > 1000) {
+                    tl += memberOrderList.size();
+                    log.info("DM.execute.limit.result:{}", dmMemberOrderService.saveBatch(memberOrderList));
+                }
                 row.close();
                 statement.close();
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMRealNameProcessor.java

@@ -107,6 +107,10 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
                         realNameList.clear();
                     }
                 }
+                if (realNameList.size() > 0 && ct > 1000) {
+                    tl += realNameList.size();
+                    log.info("DM.execute.limit.result:{}", dmRealNameService.saveBatch(realNameList));
+                }
                 row.close();
                 statement.close();
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMThirdPartsProcessor.java

@@ -116,6 +116,10 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
                         thirdPartyList.clear();
                     }
                 }
+                if (thirdPartyList.size() > 0 && ct > 1000) {
+                    tl += thirdPartyList.size();
+                    log.info("DM.execute.limit.result:{}", dmThirdPartyService.saveBatch(thirdPartyList));
+                }
                 row.close();
                 statement.close();
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMTracesInfoProcessor.java

 package com.liquidnet.service.platform.service.impl.adam.dm.processor;
 
+import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.service.adam.dto.vo.AdamMemberPriceVo;
 import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
 import com.liquidnet.service.adam.entity.AdamMember;
@@ -141,7 +142,9 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService {
 
             AdamMemberPriceVo vo = AdamMemberPriceVo.getNew().copy(o);
 
-            dmRdmService.setMemberPriceVoByMemberId(vo.getMemberId(), Collections.singletonList(vo));
+            ArrayList<AdamMemberPriceVo> objectArrayList = new ArrayList<>();
+            objectArrayList.add(vo);
+            dmRdmService.setMemberPriceVoByMemberId(vo.getMemberId(), objectArrayList);
 
             memberPriceMapper.insert(o);
 //            mongoTemplate.insert(vo, AdamMemberPriceVo.class.getSimpleName());

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMUserInformationProcessor.java

@@ -156,6 +156,10 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
                         userInfoList.clear();
                     }
                 }
+                if (userList.size() > 0 && ct > 1000) {
+                    tl += userList.size();
+                    log.info("DM.execute.result:{} - {}", dmUserService.saveBatch(userList), dmUserInfoService.saveBatch(userInfoList));
+                }
                 row.close();
                 statement.close();
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMUserMemberProcessor.java

@@ -107,6 +107,10 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
                         userMemberList.clear();
                     }
                 }
+                if (userMemberList.size() > 0 && ct > 1000) {
+                    tl += userMemberList.size();
+                    log.info("DM.execute.limit.result:{}", dmUserMemberService.saveBatch(userMemberList));
+                }
                 row.close();
                 statement.close();
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/ObjectUtil.java

 package com.liquidnet.service.platform.utils;
 
-import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
+import com.liquidnet.service.adam.dto.vo.*;
+import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderListVo;
 import com.mongodb.BasicDBObject;
 import org.springframework.stereotype.Component;
@@ -31,4 +32,67 @@ public class ObjectUtil {
     public static BasicDBObject cloneBasicDBObject() {
         return (BasicDBObject) basicDBObject.clone();
     }
+
+
+
+
+
+
+
+    private static final ArrayList<AdamTagParentVo> adamTagParentVoArrayList = new ArrayList<>();
+    private static final ArrayList<AdamTagVo> adamTagVoArrayList = new ArrayList<>();
+    private static final ArrayList<AdamMemberOrderSimpleVo> adamMemberOrderSimpleVoArrayList = new ArrayList<>();
+    private static final ArrayList<AdamThirdPartInfoVo> adamThirdPartInfoVoArrayList = new ArrayList<>();
+    private static final ArrayList<AdamEntersVo> adamEntersVoArrayList = new ArrayList<>();
+    private static final ArrayList<AdamAddressesVo> adamAddressesVoArrayList = new ArrayList<>();
+    private static final ArrayList<AdamMemberOrderVo> adamMemberOrderVoArrayList = new ArrayList<>();
+
+    private static final PagedResult<AdamCollectVo> adamCollectVoPagedResult = new PagedResult<>();
+    private static final PagedResult<AdamMemberOrderSimpleVo> adamMemberOrderSimpleVoPagedResult = new PagedResult<>();
+    private static final PagedResult<AdamDisposedVo> adamDisposedVoPagedResult = new PagedResult<>();
+    private static final PagedResult<AdamDisposedUserVo> adamDisposedUserVoPagedResult = new PagedResult<>();
+
+    public static ArrayList<AdamTagParentVo> getAdamTagParentVoArrayList() {
+        return (ArrayList<AdamTagParentVo>) adamTagParentVoArrayList.clone();
+    }
+
+    public static ArrayList<AdamTagVo> getAdamTagVoArrayList() {
+        return (ArrayList<AdamTagVo>) adamTagVoArrayList.clone();
+    }
+
+    public static ArrayList<AdamMemberOrderSimpleVo> getAdamMemberOrderSimpleVoArrayList() {
+        return (ArrayList<AdamMemberOrderSimpleVo>) adamMemberOrderSimpleVoArrayList.clone();
+    }
+
+    public static ArrayList<AdamThirdPartInfoVo> getAdamThirdPartInfoVoArrayList() {
+        return (ArrayList<AdamThirdPartInfoVo>) adamThirdPartInfoVoArrayList.clone();
+    }
+
+    public static ArrayList<AdamEntersVo> getAdamEntersVoArrayList() {
+        return (ArrayList<AdamEntersVo>) adamEntersVoArrayList.clone();
+    }
+
+    public static ArrayList<AdamAddressesVo> getAdamAddressesVoArrayList() {
+        return (ArrayList<AdamAddressesVo>) adamAddressesVoArrayList.clone();
+    }
+
+    public static ArrayList<AdamMemberOrderVo> getAdamMemberOrderVoArrayList() {
+        return (ArrayList<AdamMemberOrderVo>) adamMemberOrderVoArrayList.clone();
+    }
+
+    public static PagedResult<AdamCollectVo> getAdamCollectVoPagedResult() {
+        return adamCollectVoPagedResult.clone();
+    }
+
+    public static PagedResult<AdamMemberOrderSimpleVo> getAdamMemberOrderSimpleVoPagedResult() {
+        return adamMemberOrderSimpleVoPagedResult.clone();
+    }
+
+    public static PagedResult<AdamDisposedVo> getAdamDisposedVoPagedResult() {
+        return adamDisposedVoPagedResult.clone();
+    }
+
+    public static PagedResult<AdamDisposedUserVo> getAdamDisposedUserVoPagedResult() {
+        return adamDisposedUserVoPagedResult.clone();
+    }
 }