记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 9cbdf052 authored by 张国柄's avatar 张国柄
Browse files
Options

Merge branch 'dev' into test

parents 3ec31878 ea94bbaa
Show whitespace changes
Inline Side-by-side
Showing with 132 additions and 215 deletions
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/adam/PlatformDMController.java
View file @ 9cbdf052
...@@ -16,8 +16,6 @@ import org.springframework.validation.annotation.Validated; ...@@ -16,8 +16,6 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.sql.Connection;
import java.sql.SQLException;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.temporal.ChronoField; import java.time.temporal.ChronoField;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
...@@ -76,28 +74,20 @@ public class PlatformDMController { ...@@ -76,28 +74,20 @@ public class PlatformDMController {
@RequestParam(required = false) String flg, @RequestParam(required = false) String flg,
@RequestParam(required = false) String flu @RequestParam(required = false) String flu
) { ) {
Connection connection = dmUserInformationProcessor.getConnection();
log.info("===dG:{},incrDt:{},flg:{},flu:{}", dG, incrDt, flg, flu); log.info("===dG:{},incrDt:{},flg:{},flu:{}", dG, incrDt, flg, flu);
try {
if (null != dG) { if (null != dG) {
ExecutorService exec = Executors.newFixedThreadPool(dG); ExecutorService exec = Executors.newFixedThreadPool(dG);
for (int i = 0; i < dG; i++) { for (int i = 0; i < dG; i++) {
final int k = i; final int k = i;
exec.execute(() -> { exec.execute(() -> {
log.info("==================" + k); log.info("==================" + k);
dmUserInformationProcessor.dataProcessing(connection, k, dG, null, null, k == 0 ? "1" : ""); dmUserInformationProcessor.dataProcessing(k, dG, null, null, k == 0 ? "1" : "");
}); });
try { Thread.sleep(100L); } catch (InterruptedException ignored) {} try { Thread.sleep(100L); } catch (InterruptedException ignored) {}
} }
exec.shutdown(); exec.shutdown();
} else { } else {
dmUserInformationProcessor.dataProcessing(connection,null, null, incrDt, flg, flu); dmUserInformationProcessor.dataProcessing(null, null, incrDt, flg, flu);
}
} finally {
try {
if (null != connection) connection.close();
} catch (SQLException ignored) {
}
} }
return ResponseDto.success(dG); return ResponseDto.success(dG);
} }
...@@ -113,27 +103,19 @@ public class PlatformDMController { ...@@ -113,27 +103,19 @@ public class PlatformDMController {
@RequestParam(required = false) String flg, @RequestParam(required = false) String flg,
@RequestParam(required = false) String flu @RequestParam(required = false) String flu
) { ) {
Connection connection = dmUserInformationProcessor.getConnection();
try {
if (null != dG) { if (null != dG) {
ExecutorService exec = Executors.newFixedThreadPool(dG); ExecutorService exec = Executors.newFixedThreadPool(dG);
for (int i = 0; i < dG; i++) { for (int i = 0; i < dG; i++) {
final int k = i; final int k = i;
exec.execute(() -> { exec.execute(() -> {
log.info("==================" + k); log.info("==================" + k);
dmThirdPartsProcessor.dataProcessing(connection, k, dG, null, null, k == 0 ? "1" : ""); dmThirdPartsProcessor.dataProcessing(k, dG, null, null, k == 0 ? "1" : "");
}); });
try { Thread.sleep(100L); } catch (InterruptedException ignored) {} try { Thread.sleep(100L); } catch (InterruptedException ignored) {}
} }
exec.shutdown(); exec.shutdown();
} else { } else {
dmThirdPartsProcessor.dataProcessing(connection,null, null, incrDt, flg, flu); dmThirdPartsProcessor.dataProcessing(null, null, incrDt, flg, flu);
}
} finally {
try {
if (null != connection) connection.close();
} catch (SQLException ignored) {
}
} }
return ResponseDto.success(dG); return ResponseDto.success(dG);
} }
...@@ -149,27 +131,19 @@ public class PlatformDMController { ...@@ -149,27 +131,19 @@ public class PlatformDMController {
@RequestParam(required = false) String flg, @RequestParam(required = false) String flg,
@RequestParam(required = false) String flu @RequestParam(required = false) String flu
) { ) {
Connection connection = dmUserInformationProcessor.getConnection();
try {
if (null != dG) { if (null != dG) {
ExecutorService exec = Executors.newFixedThreadPool(dG); ExecutorService exec = Executors.newFixedThreadPool(dG);
for (int i = 0; i < dG; i++) { for (int i = 0; i < dG; i++) {
final int k = i; final int k = i;
exec.execute(() -> { exec.execute(() -> {
log.info("==================" + k); log.info("==================" + k);
dmRealNameProcessor.dataProcessing(connection, k, dG, null, null, k == 0 ? "1" : ""); dmRealNameProcessor.dataProcessing(k, dG, null, null, k == 0 ? "1" : "");
}); });
try { Thread.sleep(100L); } catch (InterruptedException ignored) {} try { Thread.sleep(100L); } catch (InterruptedException ignored) {}
} }
exec.shutdown(); exec.shutdown();
} else { } else {
dmRealNameProcessor.dataProcessing(connection, null, null, incrDt, flg, flu); dmRealNameProcessor.dataProcessing(null, null, incrDt, flg, flu);
}
} finally {
try {
if (null != connection) connection.close();
} catch (SQLException ignored) {
}
} }
return ResponseDto.success(dG); return ResponseDto.success(dG);
} }
...@@ -185,27 +159,19 @@ public class PlatformDMController { ...@@ -185,27 +159,19 @@ public class PlatformDMController {
@RequestParam(required = false) String flg, @RequestParam(required = false) String flg,
@RequestParam(required = false) String flu @RequestParam(required = false) String flu
) { ) {
Connection connection = dmUserInformationProcessor.getConnection();
try {
if (null != dG) { if (null != dG) {
ExecutorService exec = Executors.newFixedThreadPool(dG); ExecutorService exec = Executors.newFixedThreadPool(dG);
for (int i = 0; i < dG; i++) { for (int i = 0; i < dG; i++) {
final int k = i; final int k = i;
exec.execute(() -> { exec.execute(() -> {
log.info("==================" + k); log.info("==================" + k);
dmCollectionProcessor.dataProcessing(connection, k, dG, null, null, k == 0 ? "1" : ""); dmCollectionProcessor.dataProcessing(k, dG, null, null, k == 0 ? "1" : "");
}); });
try { Thread.sleep(100L); } catch (InterruptedException ignored) {} try { Thread.sleep(100L); } catch (InterruptedException ignored) {}
} }
exec.shutdown(); exec.shutdown();
} else { } else {
dmCollectionProcessor.dataProcessing(connection, null, null, incrDt, flg, flu); dmCollectionProcessor.dataProcessing(null, null, incrDt, flg, flu);
}
} finally {
try {
if (null != connection) connection.close();
} catch (SQLException ignored) {
}
} }
return ResponseDto.success(dG); return ResponseDto.success(dG);
} }
...@@ -221,27 +187,19 @@ public class PlatformDMController { ...@@ -221,27 +187,19 @@ public class PlatformDMController {
@RequestParam(required = false) String flg, @RequestParam(required = false) String flg,
@RequestParam(required = false) String flu @RequestParam(required = false) String flu
) { ) {
Connection connection = dmUserInformationProcessor.getConnection();
try {
if (null != dG) { if (null != dG) {
ExecutorService exec = Executors.newFixedThreadPool(dG); ExecutorService exec = Executors.newFixedThreadPool(dG);
for (int i = 0; i < dG; i++) { for (int i = 0; i < dG; i++) {
final int k = i; final int k = i;
exec.execute(() -> { exec.execute(() -> {
log.info("==================" + k); log.info("==================" + k);
dmEntersProcessor.dataProcessing(connection, k, dG, null, null, k == 0 ? "1" : ""); dmEntersProcessor.dataProcessing(k, dG, null, null, k == 0 ? "1" : "");
}); });
try { Thread.sleep(100L); } catch (InterruptedException ignored) {} try { Thread.sleep(100L); } catch (InterruptedException ignored) {}
} }
exec.shutdown(); exec.shutdown();
} else { } else {
dmEntersProcessor.dataProcessing(connection, null, null, incrDt, flg, flu); dmEntersProcessor.dataProcessing(null, null, incrDt, flg, flu);
}
} finally {
try {
if (null != connection) connection.close();
} catch (SQLException ignored) {
}
} }
return ResponseDto.success(dG); return ResponseDto.success(dG);
} }
...@@ -257,27 +215,19 @@ public class PlatformDMController { ...@@ -257,27 +215,19 @@ public class PlatformDMController {
@RequestParam(required = false) String flg, @RequestParam(required = false) String flg,
@RequestParam(required = false) String flu @RequestParam(required = false) String flu
) { ) {
Connection connection = dmUserInformationProcessor.getConnection();
try {
if (null != dG) { if (null != dG) {
ExecutorService exec = Executors.newFixedThreadPool(dG); ExecutorService exec = Executors.newFixedThreadPool(dG);
for (int i = 0; i < dG; i++) { for (int i = 0; i < dG; i++) {
final int k = i; final int k = i;
exec.execute(() -> { exec.execute(() -> {
log.info("==================" + k); log.info("==================" + k);
dmAddressesProcessor.dataProcessing(connection, k, dG, null, null, k == 0 ? "1" : ""); dmAddressesProcessor.dataProcessing(k, dG, null, null, k == 0 ? "1" : "");
}); });
try { Thread.sleep(100L); } catch (InterruptedException ignored) {} try { Thread.sleep(100L); } catch (InterruptedException ignored) {}
} }
exec.shutdown(); exec.shutdown();
} else { } else {
dmAddressesProcessor.dataProcessing(connection, null, null, incrDt, flg, flu); dmAddressesProcessor.dataProcessing(null, null, incrDt, flg, flu);
}
} finally {
try {
if (null != connection) connection.close();
} catch (SQLException ignored) {
}
} }
return ResponseDto.success(dG); return ResponseDto.success(dG);
} }
...@@ -293,27 +243,19 @@ public class PlatformDMController { ...@@ -293,27 +243,19 @@ public class PlatformDMController {
@RequestParam(required = false) String flg, @RequestParam(required = false) String flg,
@RequestParam(required = false) String flu @RequestParam(required = false) String flu
) { ) {
Connection connection = dmUserInformationProcessor.getConnection();
try {
if (null != dG) { if (null != dG) {
ExecutorService exec = Executors.newFixedThreadPool(dG); ExecutorService exec = Executors.newFixedThreadPool(dG);
for (int i = 0; i < dG; i++) { for (int i = 0; i < dG; i++) {
final int k = i; final int k = i;
exec.execute(() -> { exec.execute(() -> {
log.info("==================" + k); log.info("==================" + k);
dmUserMemberProcessor.dataProcessing(connection, k, dG, null, null, k == 0 ? "1" : ""); dmUserMemberProcessor.dataProcessing(k, dG, null, null, k == 0 ? "1" : "");
}); });
try { Thread.sleep(100L); } catch (InterruptedException ignored) {} try { Thread.sleep(100L); } catch (InterruptedException ignored) {}
} }
exec.shutdown(); exec.shutdown();
} else { } else {
dmUserMemberProcessor.dataProcessing(connection, null, null, incrDt, flg, flu); dmUserMemberProcessor.dataProcessing(null, null, incrDt, flg, flu);
}
} finally {
try {
if (null != connection) connection.close();
} catch (SQLException ignored) {
}
} }
return ResponseDto.success(dG); return ResponseDto.success(dG);
} }
...@@ -326,15 +268,7 @@ public class PlatformDMController { ...@@ -326,15 +268,7 @@ public class PlatformDMController {
@RequestParam(required = false) String flg, @RequestParam(required = false) String flg,
@RequestParam(required = false) String flu @RequestParam(required = false) String flu
) { ) {
Connection connection = dmUserInformationProcessor.getConnection(); dmMemberOrderProcessor.dataProcessing(null, null, incrDt, flg, flu);
try {
dmMemberOrderProcessor.dataProcessing(connection, null, null, incrDt, flg, flu);
} finally {
try {
if (null != connection) connection.close();
} catch (SQLException ignored) {
}
}
return ResponseDto.success(dG); return ResponseDto.success(dG);
} }
...@@ -346,15 +280,7 @@ public class PlatformDMController { ...@@ -346,15 +280,7 @@ public class PlatformDMController {
@RequestParam(required = false) String flg, @RequestParam(required = false) String flg,
@RequestParam(required = false) String flu @RequestParam(required = false) String flu
) { ) {
Connection connection = dmUserInformationProcessor.getConnection(); dmMemberCodeProcessor.dataProcessing(null, null, incrDt, flg, flu);
try {
dmMemberCodeProcessor.dataProcessing(connection, null, null, incrDt, flg, flu);
} finally {
try {
if (null != connection) connection.close();
} catch (SQLException ignored) {
}
}
return ResponseDto.success(dG); return ResponseDto.success(dG);
} }
...@@ -366,15 +292,7 @@ public class PlatformDMController { ...@@ -366,15 +292,7 @@ public class PlatformDMController {
@RequestParam(required = false) String flg, @RequestParam(required = false) String flg,
@RequestParam(required = false) String flu @RequestParam(required = false) String flu
) { ) {
Connection connection = dmUserInformationProcessor.getConnection(); dmTracesInfoProcessor.dataProcessing(null, null, incrDt, flg, flu);
try {
dmTracesInfoProcessor.dataProcessing(connection, null, null, incrDt, flg, flu);
} finally {
try {
if (null != connection) connection.close();
} catch (SQLException ignored) {
}
}
return ResponseDto.success(dG); return ResponseDto.success(dG);
} }
} }
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/DataMigrationProcessorService.java
View file @ 9cbdf052
...@@ -46,5 +46,5 @@ public abstract class DataMigrationProcessorService { ...@@ -46,5 +46,5 @@ public abstract class DataMigrationProcessorService {
return DriverManager.getConnection(DB_URL + DB_NAME_MALL, DB_USER, DB_PWD); 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
View file @ 9cbdf052
...@@ -28,7 +28,7 @@ public class DMAddressesProcessor extends DataMigrationProcessorService { ...@@ -28,7 +28,7 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
@SneakyThrows @SneakyThrows
@Override @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)) { if (StringUtils.isNotEmpty(flu)) {
log.info("DM.flush.addresses:{}", userMapper.executeForDM("adam_addresses")); 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()); // 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 { ...@@ -48,12 +48,12 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
} }
sql += " order by id limit ?,?"; sql += " order by id limit ?,?";
// Connection connection = null; Connection connection = null;
PreparedStatement statement = null; PreparedStatement statement = null;
ResultSetImpl row = null; ResultSetImpl row = null;
try { try {
// Class.forName(DB_DRIVER); Class.forName(DB_DRIVER);
// connection = DriverManager.getConnection(DB_URL + DB_NAME_MALL, DB_USER, DB_PWD); connection = DriverManager.getConnection(DB_URL + DB_NAME_MALL, DB_USER, DB_PWD);
statement = connection.prepareStatement(sqlCount); statement = connection.prepareStatement(sqlCount);
row = (ResultSetImpl) statement.executeQuery(); row = (ResultSetImpl) statement.executeQuery();
row.first(); row.first();
...@@ -118,7 +118,7 @@ public class DMAddressesProcessor extends DataMigrationProcessorService { ...@@ -118,7 +118,7 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
} }
log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl); log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
} catch (Exception e) { } catch (Exception e) {
log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage()); log.error("ex:getConnection,dG/dg:{}/{}", dG, dg, e);
} }
try { try {
if (null != row) row.close(); 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
View file @ 9cbdf052
...@@ -28,7 +28,7 @@ public class DMCollectionProcessor extends DataMigrationProcessorService { ...@@ -28,7 +28,7 @@ public class DMCollectionProcessor extends DataMigrationProcessorService {
@SneakyThrows @SneakyThrows
@Override @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)) { if (StringUtils.isNotEmpty(flu)) {
log.info("DM.flush.collection:{}", userMapper.executeForDM("adam_collection")); log.info("DM.flush.collection:{}", userMapper.executeForDM("adam_collection"));
...@@ -49,12 +49,12 @@ public class DMCollectionProcessor extends DataMigrationProcessorService { ...@@ -49,12 +49,12 @@ public class DMCollectionProcessor extends DataMigrationProcessorService {
} }
sql += " order by id limit ?,?"; sql += " order by id limit ?,?";
// Connection connection = null; Connection connection = null;
PreparedStatement statement = null; PreparedStatement statement = null;
ResultSetImpl row = null; ResultSetImpl row = null;
try { try {
// Class.forName(DB_DRIVER); 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); statement = connection.prepareStatement(sqlCount);
row = (ResultSetImpl) statement.executeQuery(); row = (ResultSetImpl) statement.executeQuery();
row.first(); row.first();
...@@ -109,7 +109,7 @@ public class DMCollectionProcessor extends DataMigrationProcessorService { ...@@ -109,7 +109,7 @@ public class DMCollectionProcessor extends DataMigrationProcessorService {
} }
log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl); log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
} catch (Exception e) { } catch (Exception e) {
log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage()); log.error("ex:getConnection,dG/dg:{}/{}", dG, dg, e);
} }
try { try {
if (null != row) row.close(); 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
View file @ 9cbdf052
...@@ -28,7 +28,7 @@ public class DMEntersProcessor extends DataMigrationProcessorService { ...@@ -28,7 +28,7 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
@SneakyThrows @SneakyThrows
@Override @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)) { if (StringUtils.isNotEmpty(flu)) {
log.info("DM.flush.enters:{}", userMapper.executeForDM("adam_enters")); log.info("DM.flush.enters:{}", userMapper.executeForDM("adam_enters"));
...@@ -51,12 +51,12 @@ public class DMEntersProcessor extends DataMigrationProcessorService { ...@@ -51,12 +51,12 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
} }
sql += " order by id limit ?,?"; sql += " order by id limit ?,?";
// Connection connection = null; Connection connection = null;
PreparedStatement statement = null; PreparedStatement statement = null;
ResultSetImpl row = null; ResultSetImpl row = null;
try { try {
// Class.forName(DB_DRIVER); Class.forName(DB_DRIVER);
// connection = DriverManager.getConnection(DB_URL + DB_NAME_MALL, DB_USER, DB_PWD); connection = DriverManager.getConnection(DB_URL + DB_NAME_MALL, DB_USER, DB_PWD);
statement = connection.prepareStatement(sqlCount); statement = connection.prepareStatement(sqlCount);
row = (ResultSetImpl) statement.executeQuery(); row = (ResultSetImpl) statement.executeQuery();
row.first(); row.first();
...@@ -122,7 +122,7 @@ public class DMEntersProcessor extends DataMigrationProcessorService { ...@@ -122,7 +122,7 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
} }
log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl); log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
} catch (Exception e) { } catch (Exception e) {
log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage()); log.error("ex:getConnection,dG/dg:{}/{}", dG, dg, e);
} }
try { try {
if (null != row) row.close(); 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
View file @ 9cbdf052
...@@ -182,7 +182,7 @@ public class DMMemberCodeProcessor extends DataMigrationProcessorService { ...@@ -182,7 +182,7 @@ public class DMMemberCodeProcessor extends DataMigrationProcessorService {
@SneakyThrows @SneakyThrows
@Override @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)) { if (StringUtils.isNotEmpty(flu)) {
log.info("DM.flush.member_code:{}", userMapper.executeForDM("adam_member_code")); log.info("DM.flush.member_code:{}", userMapper.executeForDM("adam_member_code"));
...@@ -199,12 +199,12 @@ public class DMMemberCodeProcessor extends DataMigrationProcessorService { ...@@ -199,12 +199,12 @@ public class DMMemberCodeProcessor extends DataMigrationProcessorService {
String sql = sqlCount.replace("count(1)", field); String sql = sqlCount.replace("count(1)", field);
sql += " order by id limit ?,?"; sql += " order by id limit ?,?";
// Connection connection = null; Connection connection = null;
PreparedStatement statement = null; PreparedStatement statement = null;
ResultSetImpl row = null; ResultSetImpl row = null;
try { try {
// Class.forName(DB_DRIVER); 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); statement = connection.prepareStatement(sqlCount);
row = (ResultSetImpl) statement.executeQuery(); row = (ResultSetImpl) statement.executeQuery();
row.first(); row.first();
...@@ -273,7 +273,7 @@ public class DMMemberCodeProcessor extends DataMigrationProcessorService { ...@@ -273,7 +273,7 @@ public class DMMemberCodeProcessor extends DataMigrationProcessorService {
} }
log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl); log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
} catch (Exception e) { } catch (Exception e) {
log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage()); log.error("ex:getConnection,dG/dg:{}/{}", dG, dg, e);
} }
try { try {
if (null != row) row.close(); 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
View file @ 9cbdf052
...@@ -52,7 +52,7 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService { ...@@ -52,7 +52,7 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
@SneakyThrows @SneakyThrows
@Override @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)) { if (StringUtils.isNotEmpty(flu)) {
log.info("DM.flush.member_order:{}", userMapper.executeForDM("adam_member_order")); log.info("DM.flush.member_order:{}", userMapper.executeForDM("adam_member_order"));
...@@ -74,12 +74,12 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService { ...@@ -74,12 +74,12 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
} }
sql += " order by id limit ?,?"; sql += " order by id limit ?,?";
// Connection connection = null; Connection connection = null;
PreparedStatement statement = null; PreparedStatement statement = null;
ResultSetImpl row = null; ResultSetImpl row = null;
try { try {
// Class.forName(DB_DRIVER); 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); statement = connection.prepareStatement(sqlCount);
row = (ResultSetImpl) statement.executeQuery(); row = (ResultSetImpl) statement.executeQuery();
row.first(); row.first();
...@@ -154,7 +154,7 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService { ...@@ -154,7 +154,7 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
} }
log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl); log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
} catch (Exception e) { } catch (Exception e) {
log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage()); log.error("ex:getConnection,dG/dg:{}/{}", dG, dg, e);
} }
try { try {
if (null != row) row.close(); 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
View file @ 9cbdf052
...@@ -28,7 +28,7 @@ public class DMRealNameProcessor extends DataMigrationProcessorService { ...@@ -28,7 +28,7 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
@SneakyThrows @SneakyThrows
@Override @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)) { if (StringUtils.isNotEmpty(flu)) {
log.info("DM.flush.real_name:{}", userMapper.executeForDM("adam_real_name")); log.info("DM.flush.real_name:{}", userMapper.executeForDM("adam_real_name"));
...@@ -49,12 +49,12 @@ public class DMRealNameProcessor extends DataMigrationProcessorService { ...@@ -49,12 +49,12 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
} }
sql += " order by id limit ?,?"; sql += " order by id limit ?,?";
// Connection connection = null; Connection connection = null;
PreparedStatement statement = null; PreparedStatement statement = null;
ResultSetImpl row = null; ResultSetImpl row = null;
try { try {
// Class.forName(DB_DRIVER); 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); statement = connection.prepareStatement(sqlCount);
row = (ResultSetImpl) statement.executeQuery(); row = (ResultSetImpl) statement.executeQuery();
row.first(); row.first();
...@@ -121,7 +121,7 @@ public class DMRealNameProcessor extends DataMigrationProcessorService { ...@@ -121,7 +121,7 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
} }
log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl); log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
} catch (Exception e) { } catch (Exception e) {
log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage()); log.error("ex:getConnection,dG/dg:{}/{}", dG, dg, e);
} }
try { try {
if (null != row) row.close(); 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
View file @ 9cbdf052
...@@ -30,7 +30,7 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService { ...@@ -30,7 +30,7 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
@SneakyThrows @SneakyThrows
@Override @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)) { if (StringUtils.isNotEmpty(flu)) {
log.info("DM.flush.third_party:{}", userMapper.executeForDM("adam_third_party")); log.info("DM.flush.third_party:{}", userMapper.executeForDM("adam_third_party"));
...@@ -54,12 +54,12 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService { ...@@ -54,12 +54,12 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
sql += " order by id limit ?,?"; sql += " order by id limit ?,?";
LocalDateTime currentYear = DateUtil.Formatter.yyyyMMddHHmmss.parse("2021-01-01 00:00:00"); LocalDateTime currentYear = DateUtil.Formatter.yyyyMMddHHmmss.parse("2021-01-01 00:00:00");
// Connection connection = null; Connection connection = null;
PreparedStatement statement = null; PreparedStatement statement = null;
ResultSetImpl row = null; ResultSetImpl row = null;
try { try {
// Class.forName(DB_DRIVER); 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); statement = connection.prepareStatement(sqlCount);
row = (ResultSetImpl) statement.executeQuery(); row = (ResultSetImpl) statement.executeQuery();
row.first(); row.first();
...@@ -130,7 +130,7 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService { ...@@ -130,7 +130,7 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
} }
log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl); log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
} catch (Exception e) { } catch (Exception e) {
log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage()); log.error("ex:getConnection,dG/dg:{}/{}", dG, dg, e);
} }
try { try {
if (null != row) row.close(); 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
View file @ 9cbdf052
...@@ -32,7 +32,7 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService { ...@@ -32,7 +32,7 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService {
AdamMemberPriceMapper memberPriceMapper; AdamMemberPriceMapper memberPriceMapper;
@Override @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)) { if (StringUtils.isNotEmpty(flu)) {
log.info("DM.flush.member:{}", userMapper.executeForDM("adam_member")); log.info("DM.flush.member:{}", userMapper.executeForDM("adam_member"));
log.info("DM.flush.member_price:{}", userMapper.executeForDM("adam_member_price")); 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
View file @ 9cbdf052
...@@ -47,7 +47,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService { ...@@ -47,7 +47,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
@SneakyThrows @SneakyThrows
@Override @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)) { if (StringUtils.isNotEmpty(flu)) {
log.info("DM.flush.user:{}", userMapper.executeForDM("adam_user")); log.info("DM.flush.user:{}", userMapper.executeForDM("adam_user"));
log.info("DM.flush.user_info:{}", userMapper.executeForDM("adam_user_info")); log.info("DM.flush.user_info:{}", userMapper.executeForDM("adam_user_info"));
...@@ -70,8 +70,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService { ...@@ -70,8 +70,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
} }
sql += " order by uid limit ?,?"; 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; PreparedStatement statement = null;
ResultSetImpl row = null; ResultSetImpl row = null;
try { try {
...@@ -170,7 +169,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService { ...@@ -170,7 +169,7 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
} }
log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl); log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
} catch (Exception e) { } catch (Exception e) {
log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage()); log.error("ex:getConnection,dG/dg:{}/{}", dG, dg, e);
} }
try { try {
if (null != row) row.close(); 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
View file @ 9cbdf052
...@@ -28,7 +28,7 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService { ...@@ -28,7 +28,7 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
@SneakyThrows @SneakyThrows
@Override @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)) { if (StringUtils.isNotEmpty(flu)) {
log.info("DM.flush.user_member:{}", userMapper.executeForDM("adam_user_member")); log.info("DM.flush.user_member:{}", userMapper.executeForDM("adam_user_member"));
...@@ -49,12 +49,12 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService { ...@@ -49,12 +49,12 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
} }
sql += " order by id limit ?,?"; sql += " order by id limit ?,?";
// Connection connection = null; Connection connection = null;
PreparedStatement statement = null; PreparedStatement statement = null;
ResultSetImpl row = null; ResultSetImpl row = null;
try { try {
// Class.forName(DB_DRIVER); 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); statement = connection.prepareStatement(sqlCount);
row = (ResultSetImpl) statement.executeQuery(); row = (ResultSetImpl) statement.executeQuery();
row.first(); row.first();
...@@ -127,7 +127,7 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService { ...@@ -127,7 +127,7 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
dmRdmService.setMaxMemberNo(Integer.parseInt(max.getMemberNo())); dmRdmService.setMaxMemberNo(Integer.parseInt(max.getMemberNo()));
} }
} catch (Exception e) { } catch (Exception e) {
log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage()); log.error("ex:getConnection,dG/dg:{}/{}", dG, dg, e);
} }
try { try {
if (null != row) row.close(); if (null != row) row.close();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment