Merge branch 'dev' into test

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

@@ -55,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));
@@ -68,7 +67,6 @@ public class DMRdmService {
 //                redisUtil.set(key, vo.getUid());
 //            }
 //        }
-        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return val;
     }
 
@@ -82,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));
@@ -95,7 +92,6 @@ public class DMRdmService {
 //                redisUtil.set(key, vo.getUid());
 //            }
 //        }
-        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return val;
     }
 
@@ -111,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();
@@ -121,7 +116,6 @@ public class DMRdmService {
 //
 //            if (null != vo) redisUtil.set(rk, vo);
 //        }
-        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return vo;
     }
 
@@ -137,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();
@@ -151,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;
     }
 
@@ -174,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();
@@ -184,7 +175,6 @@ public class DMRdmService {
 //
 //            if (!CollectionUtils.isEmpty(thirdPartInfoVos)) redisUtil.set(rk, thirdPartInfoVos);
 //        }
-        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return thirdPartInfoVos;
     }
 
@@ -239,7 +229,6 @@ public class DMRdmService {
 
     public List<AdamEntersVo> getEntersVoByUid(String uid) {
         String rk = AdamRedisConst.INFO_ENTERS.concat(uid);
-        long s = System.currentTimeMillis();
         ArrayList<AdamEntersVo> vos = (ArrayList<AdamEntersVo>) redisUtil.get(rk);
 //        if (CollectionUtils.isEmpty(vos)) {
 //            s = System.currentTimeMillis();
@@ -251,7 +240,6 @@ public class DMRdmService {
 //
 //            if (!CollectionUtils.isEmpty(vos)) redisUtil.set(rk, vos);
 //        }
-        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return vos;
     }
 
@@ -296,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();
@@ -308,7 +295,6 @@ public class DMRdmService {
 //
 //            if (!CollectionUtils.isEmpty(vos)) redisUtil.set(rk, vos);
 //        }
-        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return vos;
     }
 
@@ -358,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();
@@ -370,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;
     }
 
@@ -381,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();
@@ -395,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;
     }
 
@@ -407,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();
@@ -418,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;
     }
 
@@ -434,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();
@@ -446,7 +425,6 @@ public class DMRdmService {
 //
 //            if (!CollectionUtils.isEmpty(vos)) redisUtil.set(key, vos);
 //        }
-        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return vos;
     }
 
@@ -509,9 +487,7 @@ 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;
     }
 
@@ -543,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();
@@ -555,7 +530,6 @@ public class DMRdmService {
 //
 //            if (null != vo) redisUtil.set(key, vo);
 //        }
-        log.debug("#RDM耗时:{}ms", System.currentTimeMillis() - s);
         return vo;
     }
 
@@ -586,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();
@@ -597,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,9 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
                         addressesList.clear();
                     }
                 }
+                if (addressesList.size() > 0 && ct > 1000) {
+                    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,9 @@ public class DMCollectionProcessor extends DataMigrationProcessorService {
                         collectionList.clear();
                     }
                 }
+                if (collectionList.size() > 0 && ct > 1000) {
+                    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,9 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
                         entersList.clear();
                     }
                 }
+                if (entersList.size() > 0 && ct > 1000) {
+                    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,9 @@ public class DMMemberCodeProcessor extends DataMigrationProcessorService {
                         memberCodeList.clear();
                     }
                 }
+                if (memberCodeList.size() > 0 && ct > 1000) {
+                    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,9 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
                         memberOrderList.clear();
                     }
                 }
+                if (memberOrderList.size() > 0 && ct > 1000) {
+                    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,9 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
                         realNameList.clear();
                     }
                 }
+                if (realNameList.size() > 0 && ct > 1000) {
+                    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,9 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
                         thirdPartyList.clear();
                     }
                 }
+                if (thirdPartyList.size() > 0 && ct > 1000) {
+                    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/DMUserInformationProcessor.java

@@ -156,6 +156,9 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
                         userInfoList.clear();
                     }
                 }
+                if (userList.size() > 0 && ct > 1000) {
+                    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,9 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
                         userMemberList.clear();
                     }
                 }
+                if (userMemberList.size() > 0 && ct > 1000) {
+                    log.info("DM.execute.limit.result:{}", dmUserMemberService.saveBatch(userMemberList));
+                }
                 row.close();
                 statement.close();