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

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

@@ -35,8 +35,8 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
 //            log.info("DM.flush.AdamEntersVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamEntersVo.class.getSimpleName()).getDeletedCount());
         }
 
-        String sqlCount = "select count(1) from (\n" +
-                "                  select row_number() over (partition by user_id,type,idcode,name order by updated_at desc) rn,e.* from enters e where e.is_certification = 'yes' and e.deleted_at is null and created_at" + (StringUtils.isBlank(incrDt) ? "<curdate()" : (">=curdate()-" + incrDt)) + "\n" +
+        String sqlCount = "select count(1) from (" +
+                "                  select row_number() over (partition by user_id,type,idcode,name order by updated_at desc) rn,e.* from enters e where e.is_certification = 'yes' and e.deleted_at is null and created_at" + (StringUtils.isBlank(incrDt) ? "<curdate()" : (">=curdate()-" + incrDt)) +
                 "                  ) tk where tk.rn=1 ";
         if (null != dg) {
             sqlCount = sqlCount + " and id%" + dG + "=" + dg;

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

@@ -37,8 +37,8 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
 //            log.info("DM.flush.AdamThirdPartInfoVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamThirdPartInfoVo.class.getSimpleName()).getDeletedCount());
         }
 
-        String sqlCount = "select count(1) from (\n" +
-                "                         select row_number() over (partition by uid,type order by created_at desc) rn,id,uid,open_id,avatar,nickname,type,created_at,updated_at from user_third_parts where `status`=1 and delete_tag in (0,1) and open_id<>'' and uid>0 and created_at" + (StringUtils.isBlank(incrDt) ? "<curdate()" : (">=curdate()-" + incrDt)) + "\n" +
+        String sqlCount = "select count(1) from (" +
+                "                         select row_number() over (partition by uid,type order by created_at desc) rn,id,uid,open_id,avatar,nickname,type,created_at,updated_at from user_third_parts where `status`=1 and delete_tag in (0,1) and open_id<>'' and uid>0 and created_at" + (StringUtils.isBlank(incrDt) ? "<curdate()" : (">=curdate()-" + incrDt)) +
                 "                     ) t where t.rn=1";
         if (null != dg) {
             sqlCount = sqlCount + " and id%" + dG + "=" + dg;

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

@@ -75,7 +75,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
         ResultSetImpl row = null;
         try {
             Class.forName(DB_DRIVER);
-//            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
+            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
             statement = connection.prepareStatement(sqlCount);
             row = (ResultSetImpl) statement.executeQuery();
             row.first();