Merge branch 'dev' into test

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamRealInfoVo.java

 package com.liquidnet.service.adam.dto.vo;
 
-import com.liquidnet.commons.lang.util.SensitizeUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/docu/db_ln_adam_initialdata.sql

@@ -18,6 +18,7 @@ create table adam_third_party
 
 create index idx_third_party_uid_platform on adam_third_party (uid, platform);
 create index idx_third_party_state on adam_third_party (state);
+# MDB.idx:uid,state
 -- >>------------------------------------------------------------------------------------
 # drop table if exists adam_login;
 # create table adam_login
@@ -109,6 +110,7 @@ create unique index idx_real_name_id on adam_real_name (real_name_id);
 create index idx_real_name_id_card_type on adam_real_name (id_card, type);
 create index idx_real_name_uid on adam_real_name (uid);
 create index idx_real_name_state on adam_real_name (state);
+# MDB.idx:uid,state
 -- >>------------------------------------------------------------------------------------
 drop table if exists adam_enters;
 create table adam_enters

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/admin/AdamDMAdminController.java

@@ -37,8 +37,10 @@ public class AdamDMAdminController extends AdamBaseController {
     DMTracesInfoProcessor dmTracesInfoProcessor;
     @Autowired
     DMMemberOrderProcessor dmMemberOrderProcessor;
+    @Autowired
+    DMMemberCodeProcessor dmMemberCodeProcessor;
 
-    @ApiOperationSupport(order = 0)
+    @ApiOperationSupport(order = 1)
     @ApiOperation(value = "user")
     @GetMapping(value = {"user"})
     public ResponseDto<Object> dataMigrationForUser() {
@@ -46,7 +48,7 @@ public class AdamDMAdminController extends AdamBaseController {
         return ResponseDto.success();
     }
 
-    @ApiOperationSupport(order = 1)
+    @ApiOperationSupport(order = 2)
     @ApiOperation(value = "tpa")
     @GetMapping(value = {"tpa"})
     public ResponseDto<Object> dataMigrationForTpa() {
@@ -54,7 +56,7 @@ public class AdamDMAdminController extends AdamBaseController {
         return ResponseDto.success();
     }
 
-    @ApiOperationSupport(order = 2)
+    @ApiOperationSupport(order = 3)
     @ApiOperation(value = "real")
     @GetMapping(value = {"real"})
     public ResponseDto<Object> dataMigrationForReal() {
@@ -62,7 +64,7 @@ public class AdamDMAdminController extends AdamBaseController {
         return ResponseDto.success();
     }
 
-    @ApiOperationSupport(order = 3)
+    @ApiOperationSupport(order = 4)
     @ApiOperation(value = "vip")
     @GetMapping(value = {"vip"})
     public ResponseDto<Object> dataMigrationForVip() {
@@ -70,7 +72,7 @@ public class AdamDMAdminController extends AdamBaseController {
         return ResponseDto.success();
     }
 
-    @ApiOperationSupport(order = 4)
+    @ApiOperationSupport(order = 5)
     @ApiOperation(value = "traces")
     @GetMapping(value = {"traces"})
     public ResponseDto<Object> dataMigrationForTraces() {
@@ -78,7 +80,7 @@ public class AdamDMAdminController extends AdamBaseController {
         return ResponseDto.success();
     }
 
-    @ApiOperationSupport(order = 5)
+    @ApiOperationSupport(order = 6)
     @ApiOperation(value = "enters")
     @GetMapping(value = {"enters"})
     public ResponseDto<Object> dataMigrationForEnters() {
@@ -86,7 +88,7 @@ public class AdamDMAdminController extends AdamBaseController {
         return ResponseDto.success();
     }
 
-    @ApiOperationSupport(order = 6)
+    @ApiOperationSupport(order = 7)
     @ApiOperation(value = "addr")
     @GetMapping(value = {"addr"})
     public ResponseDto<Object> dataMigrationForAddr() {
@@ -94,11 +96,19 @@ public class AdamDMAdminController extends AdamBaseController {
         return ResponseDto.success();
     }
 
-    @ApiOperationSupport(order = 7)
+    @ApiOperationSupport(order = 8)
     @ApiOperation(value = "morder")
     @GetMapping(value = {"morder"})
     public ResponseDto<Object> dataMigrationForMOrder() {
         dmMemberOrderProcessor.handler();
         return ResponseDto.success();
     }
+
+    @ApiOperationSupport(order = 9)
+    @ApiOperation(value = "mcode")
+    @GetMapping(value = {"mcode"})
+    public ResponseDto<Object> dataMigrationForMCode() {
+        dmMemberCodeProcessor.handler();
+        return ResponseDto.success();
+    }
 }

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

@@ -48,8 +48,8 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
         statement = connection.prepareStatement(sqlCount);
         row = (ResultSetImpl) statement.executeQuery();
         row.first();
-        int ct = row.getInt(1), pSize = 1000, num = 0, tl = 0;
-        log.info("DM.execute.counts:{} ----------------------------> start", ct);
+        int ct = row.getInt(1), pSize = 1000, num = 0, tl = 0, pl = ct;
+        log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> start", pl, num, pSize, tl);
 
         while (ct > 0) {
             statement = connection.prepareStatement(sql);
@@ -94,6 +94,6 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
             num++;
             ct -= pSize;
         }
-        log.info("DM.execute.counts:{} ~ {} ----------------------------> end", num * pSize, tl);
+        log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
     }
 }

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

@@ -49,8 +49,8 @@ public class DMCollectionProcessor extends DataMigrationProcessorService {
         statement = connection.prepareStatement(sqlCount);
         row = (ResultSetImpl) statement.executeQuery();
         row.first();
-        int ct = row.getInt(1), pSize = 1000, num = 0, tl = 0;
-        log.info("DM.execute.counts:{} ----------------------------> start", ct);
+        int ct = row.getInt(1), pSize = 1000, num = 0, tl = 0, pl = ct;
+        log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> start", pl, num, pSize, tl);
 
         while (ct > 0) {
             statement = connection.prepareStatement(sql);
@@ -87,6 +87,6 @@ public class DMCollectionProcessor extends DataMigrationProcessorService {
             num++;
             ct -= pSize;
         }
-        log.info("DM.execute.counts:{} ~ {} ----------------------------> end", num * pSize, tl);
+        log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
     }
 }

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

@@ -49,8 +49,8 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
         statement = connection.prepareStatement(sqlCount);
         row = (ResultSetImpl) statement.executeQuery();
         row.first();
-        int ct = row.getInt(1), pSize = 1000, num = 0, tl = 0;
-        log.info("DM.execute.counts:{} ----------------------------> start", ct);
+        int ct = row.getInt(1), pSize = 1000, num = 0, tl = 0, pl = ct;
+        log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> start", pl, num, pSize, tl);
 
         while (ct > 0) {
             statement = connection.prepareStatement(sql);
@@ -93,6 +93,6 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
             num++;
             ct -= pSize;
         }
-        log.info("DM.execute.counts:{} ~ {} ----------------------------> end", num * pSize, tl);
+        log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
     }
 }

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

@@ -199,8 +199,8 @@ public class DMMemberCodeProcessor extends DataMigrationProcessorService {
         statement = connection.prepareStatement(sqlCount);
         row = (ResultSetImpl) statement.executeQuery();
         row.first();
-        int ct = row.getInt(1), pSize = 1000, num = 0, tl = 0;
-        log.info("DM.execute.counts:{} ----------------------------> start", ct);
+        int ct = row.getInt(1), pSize = 1000, num = 0, tl = 0, pl = ct;
+        log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> start", pl, num, pSize, tl);
 
         while (ct > 0) {
             statement = connection.prepareStatement(sql);
@@ -246,6 +246,6 @@ public class DMMemberCodeProcessor extends DataMigrationProcessorService {
             num++;
             ct -= pSize;
         }
-        log.info("DM.execute.counts:{} ~ {} ----------------------------> end", num * pSize, tl);
+        log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
     }
 }

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

@@ -73,9 +73,8 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
         statement = connection.prepareStatement(sqlCount);
         row = (ResultSetImpl) statement.executeQuery();
         row.first();
-        int ct = row.getInt(1), pSize = 1000, num = 0, tl = 0;
-        log.info("DM.execute.counts:{} ----------------------------> start", ct);
-
+        int ct = row.getInt(1), pSize = 1000, num = 0, tl = 0, pl = ct;
+        log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> start", pl, num, pSize, tl);
 
         while (ct > 0) {
             statement = connection.prepareStatement(sql);
@@ -130,6 +129,6 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
             num++;
             ct -= pSize;
         }
-        log.info("DM.execute.counts:{} ~ {} ----------------------------> end", num * pSize, tl);
+        log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
     }
 }

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

@@ -49,8 +49,8 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
         statement = connection.prepareStatement(sqlCount);
         row = (ResultSetImpl) statement.executeQuery();
         row.first();
-        int ct = row.getInt(1), pSize = 1000, num = 0, tl = 0;
-        log.info("DM.execute.counts:{} ----------------------------> start", ct);
+        int ct = row.getInt(1), pSize = 1000, num = 0, tl = 0, pl = ct;
+        log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> start", pl, num, pSize, tl);
 
         while (ct > 0) {
             statement = connection.prepareStatement(sql);
@@ -96,6 +96,6 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
             num++;
             ct -= pSize;
         }
-        log.info("DM.execute.counts:{} ~ {} ----------------------------> end", num * pSize, tl);
+        log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
     }
 }

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

@@ -51,8 +51,8 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
         statement = connection.prepareStatement(sqlCount);
         row = (ResultSetImpl) statement.executeQuery();
         row.first();
-        int ct = row.getInt(1), pSize = 1000, num = 0, tl = 0;
-        log.info("DM.execute.counts:{} ----------------------------> start", ct);
+        int ct = row.getInt(1), pSize = 1000, num = 0, tl = 0, pl = ct;
+        log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> start", pl, num, pSize, tl);
 
         while (ct > 0) {
             statement = connection.prepareStatement(sql);
@@ -101,6 +101,6 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
             num++;
             ct -= pSize;
         }
-        log.info("DM.execute.counts:{} ~ {} ----------------------------> end", num * pSize, tl);
+        log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
     }
 }

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

@@ -71,8 +71,8 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
         statement = connection.prepareStatement(sqlCount);
         row = (ResultSetImpl) statement.executeQuery();
         row.first();
-        int ct = row.getInt(1), pSize = 1000, num = 0, tl = 0;
-        log.info("DM.execute.counts:{} ----------------------------> start", ct);
+        int ct = row.getInt(1), pSize = 1000, num = 0, tl = 0, pl = ct;
+        log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> start", pl, num, pSize, tl);
 
         while (ct > 0) {
             statement = connection.prepareStatement(sql);
@@ -151,6 +151,6 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
             num++;
             ct -= pSize;
         }
-        log.info("DM.execute.counts:{} ~ {} ----------------------------> end", num * pSize, tl);
+        log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
     }
 }

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

@@ -49,8 +49,8 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
         statement = connection.prepareStatement(sqlCount);
         row = (ResultSetImpl) statement.executeQuery();
         row.first();
-        int ct = row.getInt(1), pSize = 1000, num = 0, tl = 0;
-        log.info("DM.execute.counts:{} ----------------------------> start", ct);
+        int ct = row.getInt(1), pSize = 1000, num = 0, tl = 0, pl = ct;
+        log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> start", pl, num, pSize, tl);
 
         while (ct > 0) {
             statement = connection.prepareStatement(sql);
@@ -97,6 +97,6 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
             num++;
             ct -= pSize;
         }
-        log.info("DM.execute.counts:{} ~ {} ----------------------------> end", num * pSize, tl);
+        log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
     }
 }