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/DataMigrationProcessorService.java

@@ -46,5 +46,5 @@ public abstract class DataMigrationProcessorService {
         return DriverManager.getConnection(DB_URL + DB_NAME_MALL, DB_USER, DB_PWD);
     }
 
-    protected abstract void dataProcessing(Connection connection, Integer dg, Integer lS, String incrDt, String flg, String flu);
+    protected abstract void dataProcessing(Integer dg, Integer lS, String incrDt, String flg, String flu);
 }

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

@@ -28,7 +28,7 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    public void dataProcessing(Connection connection, Integer dg, Integer dG, String incrDt, String flg, String flu) {
+    public void dataProcessing(Integer dg, Integer dG, String incrDt, String flg, String flu) {
         if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.addresses:{}", userMapper.executeForDM("adam_addresses"));
 //            log.info("DM.flush.AdamAddressesVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamAddressesVo.class.getSimpleName()).getDeletedCount());
@@ -48,12 +48,12 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
-//        Connection connection = null;
+        Connection connection = null;
         PreparedStatement statement = null;
         ResultSetImpl row = null;
         try {
-//            Class.forName(DB_DRIVER);
-//            connection = DriverManager.getConnection(DB_URL + DB_NAME_MALL, DB_USER, DB_PWD);
+            Class.forName(DB_DRIVER);
+            connection = DriverManager.getConnection(DB_URL + DB_NAME_MALL, DB_USER, DB_PWD);
             statement = connection.prepareStatement(sqlCount);
             row = (ResultSetImpl) statement.executeQuery();
             row.first();
@@ -118,7 +118,7 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
             }
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
         } catch (Exception e) {
-            log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage());
+            log.error("ex:getConnection,dG/dg:{}/{}", dG, dg, e);
         }
         try {
             if (null != row) row.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

@@ -28,7 +28,7 @@ public class DMCollectionProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    public void dataProcessing(Connection connection, Integer dg, Integer dG, String incrDt, String flg, String flu) {
+    public void dataProcessing(Integer dg, Integer dG, String incrDt, String flg, String flu) {
         if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.collection:{}", userMapper.executeForDM("adam_collection"));
 
@@ -49,12 +49,12 @@ public class DMCollectionProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
-//        Connection connection = null;
+        Connection connection = null;
         PreparedStatement statement = null;
         ResultSetImpl row = null;
         try {
-//            Class.forName(DB_DRIVER);
-//            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
+            Class.forName(DB_DRIVER);
+            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
             statement = connection.prepareStatement(sqlCount);
             row = (ResultSetImpl) statement.executeQuery();
             row.first();
@@ -109,7 +109,7 @@ public class DMCollectionProcessor extends DataMigrationProcessorService {
             }
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
         } catch (Exception e) {
-            log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage());
+            log.error("ex:getConnection,dG/dg:{}/{}", dG, dg, e);
         }
         try {
             if (null != row) row.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

@@ -28,7 +28,7 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    public void dataProcessing(Connection connection, Integer dg, Integer dG, String incrDt, String flg, String flu) {
+    public void dataProcessing(Integer dg, Integer dG, String incrDt, String flg, String flu) {
         if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.enters:{}", userMapper.executeForDM("adam_enters"));
 
@@ -51,12 +51,12 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
-//        Connection connection = null;
+        Connection connection = null;
         PreparedStatement statement = null;
         ResultSetImpl row = null;
         try {
-//            Class.forName(DB_DRIVER);
-//            connection = DriverManager.getConnection(DB_URL + DB_NAME_MALL, DB_USER, DB_PWD);
+            Class.forName(DB_DRIVER);
+            connection = DriverManager.getConnection(DB_URL + DB_NAME_MALL, DB_USER, DB_PWD);
             statement = connection.prepareStatement(sqlCount);
             row = (ResultSetImpl) statement.executeQuery();
             row.first();
@@ -122,7 +122,7 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
             }
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
         } catch (Exception e) {
-            log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage());
+            log.error("ex:getConnection,dG/dg:{}/{}", dG, dg, e);
         }
         try {
             if (null != row) row.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

@@ -182,7 +182,7 @@ public class DMMemberCodeProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    public void dataProcessing(Connection connection, Integer dg, Integer dG, String incrDt, String flg, String flu) {
+    public void dataProcessing(Integer dg, Integer dG, String incrDt, String flg, String flu) {
         if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.member_code:{}", userMapper.executeForDM("adam_member_code"));
 
@@ -199,12 +199,12 @@ public class DMMemberCodeProcessor extends DataMigrationProcessorService {
         String sql = sqlCount.replace("count(1)", field);
         sql += " order by id limit ?,?";
 
-//        Connection connection = null;
+        Connection connection = null;
         PreparedStatement statement = null;
         ResultSetImpl row = null;
         try {
-//            Class.forName(DB_DRIVER);
-//            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
+            Class.forName(DB_DRIVER);
+            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
             statement = connection.prepareStatement(sqlCount);
             row = (ResultSetImpl) statement.executeQuery();
             row.first();
@@ -273,7 +273,7 @@ public class DMMemberCodeProcessor extends DataMigrationProcessorService {
             }
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
         } catch (Exception e) {
-            log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage());
+            log.error("ex:getConnection,dG/dg:{}/{}", dG, dg, e);
         }
         try {
             if (null != row) row.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

@@ -52,7 +52,7 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    public void dataProcessing(Connection connection, Integer dg, Integer dG, String incrDt, String flg, String flu) {
+    public void dataProcessing(Integer dg, Integer dG, String incrDt, String flg, String flu) {
         if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.member_order:{}", userMapper.executeForDM("adam_member_order"));
 
@@ -74,12 +74,12 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
-//        Connection connection = null;
+        Connection connection = null;
         PreparedStatement statement = null;
         ResultSetImpl row = null;
         try {
-//            Class.forName(DB_DRIVER);
-//            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
+            Class.forName(DB_DRIVER);
+            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
             statement = connection.prepareStatement(sqlCount);
             row = (ResultSetImpl) statement.executeQuery();
             row.first();
@@ -154,7 +154,7 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
             }
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
         } catch (Exception e) {
-            log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage());
+            log.error("ex:getConnection,dG/dg:{}/{}", dG, dg, e);
         }
         try {
             if (null != row) row.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

@@ -28,7 +28,7 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    public void dataProcessing(Connection connection, Integer dg, Integer dG, String incrDt, String flg, String flu) {
+    public void dataProcessing(Integer dg, Integer dG, String incrDt, String flg, String flu) {
         if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.real_name:{}", userMapper.executeForDM("adam_real_name"));
 
@@ -49,12 +49,12 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
-//        Connection connection = null;
+        Connection connection = null;
         PreparedStatement statement = null;
         ResultSetImpl row = null;
         try {
-//            Class.forName(DB_DRIVER);
-//            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
+            Class.forName(DB_DRIVER);
+            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
             statement = connection.prepareStatement(sqlCount);
             row = (ResultSetImpl) statement.executeQuery();
             row.first();
@@ -121,7 +121,7 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
             }
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
         } catch (Exception e) {
-            log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage());
+            log.error("ex:getConnection,dG/dg:{}/{}", dG, dg, e);
         }
         try {
             if (null != row) row.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

@@ -30,7 +30,7 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    public void dataProcessing(Connection connection, Integer dg, Integer dG, String incrDt, String flg, String flu) {
+    public void dataProcessing(Integer dg, Integer dG, String incrDt, String flg, String flu) {
         if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.third_party:{}", userMapper.executeForDM("adam_third_party"));
 
@@ -54,12 +54,12 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
         sql += " order by id limit ?,?";
 
         LocalDateTime currentYear = DateUtil.Formatter.yyyyMMddHHmmss.parse("2021-01-01 00:00:00");
-//        Connection connection = null;
+        Connection connection = null;
         PreparedStatement statement = null;
         ResultSetImpl row = null;
         try {
-//            Class.forName(DB_DRIVER);
-//            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
+            Class.forName(DB_DRIVER);
+            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
             statement = connection.prepareStatement(sqlCount);
             row = (ResultSetImpl) statement.executeQuery();
             row.first();
@@ -130,7 +130,7 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
             }
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
         } catch (Exception e) {
-            log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage());
+            log.error("ex:getConnection,dG/dg:{}/{}", dG, dg, e);
         }
         try {
             if (null != row) row.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

@@ -32,7 +32,7 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService {
     AdamMemberPriceMapper memberPriceMapper;
 
     @Override
-    public void dataProcessing(Connection connection, Integer dg, Integer dG, String incrDt, String flg, String flu) {
+    public void dataProcessing(Integer dg, Integer dG, String incrDt, String flg, String flu) {
         if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.member:{}", userMapper.executeForDM("adam_member"));
             log.info("DM.flush.member_price:{}", userMapper.executeForDM("adam_member_price"));

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

@@ -47,7 +47,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    public void dataProcessing(Connection connection, Integer dg, Integer dG, String incrDt, String flg, String flu) {
+    public void dataProcessing(Integer dg, Integer dG, String incrDt, String flg, String flu) {
         if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.user:{}", userMapper.executeForDM("adam_user"));
             log.info("DM.flush.user_info:{}", userMapper.executeForDM("adam_user_info"));
@@ -70,8 +70,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
         }
         sql += " order by uid limit ?,?";
 
-        LocalDateTime currentYear = DateUtil.Formatter.yyyyMMddHHmmss.parse("2021-01-01 00:00:00");
-//        Connection connection = null;
+        Connection connection = null;
         PreparedStatement statement = null;
         ResultSetImpl row = null;
         try {
@@ -170,7 +169,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
             }
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
         } catch (Exception e) {
-            log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage());
+            log.error("ex:getConnection,dG/dg:{}/{}", dG, dg, e);
         }
         try {
             if (null != row) row.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

@@ -28,7 +28,7 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    public void dataProcessing(Connection connection, Integer dg, Integer dG, String incrDt, String flg, String flu) {
+    public void dataProcessing(Integer dg, Integer dG, String incrDt, String flg, String flu) {
         if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.user_member:{}", userMapper.executeForDM("adam_user_member"));
 
@@ -49,12 +49,12 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
-//        Connection connection = null;
+        Connection connection = null;
         PreparedStatement statement = null;
         ResultSetImpl row = null;
         try {
-//            Class.forName(DB_DRIVER);
-//            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
+            Class.forName(DB_DRIVER);
+            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
             statement = connection.prepareStatement(sqlCount);
             row = (ResultSetImpl) statement.executeQuery();
             row.first();
@@ -127,7 +127,7 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
                 dmRdmService.setMaxMemberNo(Integer.parseInt(max.getMemberNo()));
             }
         } catch (Exception e) {
-            log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage());
+            log.error("ex:getConnection,dG/dg:{}/{}", dG, dg, e);
         }
         try {
             if (null != row) row.close();