diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/config/ShipDetailUpdateJobConfig.java b/src/main/java/com/snp/batch/jobs/shipdetail/batch/config/ShipDetailUpdateJobConfig.java index 225971c..60d2c98 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/config/ShipDetailUpdateJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/shipdetail/batch/config/ShipDetailUpdateJobConfig.java @@ -103,7 +103,7 @@ public class ShipDetailUpdateJobConfig extends BaseJobConfig dbMasterHashes; private int currentBatchIndex = 0; - private final int batchSize = 1; + private final int batchSize = 20; public ShipDetailUpdateDataReader(WebClient webClient, JdbcTemplate jdbcTemplate, ObjectMapper objectMapper,BatchDateService batchDateService) { super(webClient); @@ -261,18 +261,12 @@ public class ShipDetailUpdateDataReader extends BaseApiReader uriBuilder // 맵에서 파라미터 값을 동적으로 가져와 세팅 .queryParam("shipsCategory", params.get("shipsCategory")) -// .queryParam("fromYear", params.get("fromYear")) -// .queryParam("fromMonth", params.get("fromMonth")) -// .queryParam("fromDay", params.get("fromDay")) -// .queryParam("toYear", params.get("toYear")) -// .queryParam("toMonth", params.get("toMonth")) -// .queryParam("toDay", params.get("toDay")) - .queryParam("fromYear", "2025") - .queryParam("fromMonth", "10") - .queryParam("fromDay", "15") - .queryParam("toYear", "2025") - .queryParam("toMonth", "12") - .queryParam("toDay", "17") + .queryParam("fromYear", params.get("fromYear")) + .queryParam("fromMonth", params.get("fromMonth")) + .queryParam("fromDay", params.get("fromDay")) + .queryParam("toYear", params.get("toYear")) + .queryParam("toMonth", params.get("toMonth")) + .queryParam("toDay", params.get("toDay")) .build()) .retrieve() .bodyToMono(ShipUpdateApiResponse.class) diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/writer/ShipDetailDataWriter.java b/src/main/java/com/snp/batch/jobs/shipdetail/batch/writer/ShipDetailDataWriter.java index c29b8da..c9033c8 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/writer/ShipDetailDataWriter.java +++ b/src/main/java/com/snp/batch/jobs/shipdetail/batch/writer/ShipDetailDataWriter.java @@ -76,8 +76,8 @@ public class ShipDetailDataWriter extends BaseWriter { // 2. 각 Repository에 전달 // ✅ 2-1. ShipDetailRepository (Core20 데이터) -// log.debug("Core20 데이터 저장 시작: {} 건", coreEntities.size()); -// shipDetailRepository.saveAllCoreData(coreEntities); + log.debug("Core20 데이터 저장 시작: {} 건", coreEntities.size()); + shipDetailRepository.saveAllCoreData(coreEntities); // // // ✅ 2-2. 추가적인 Array/List 데이터 // // OwnerHistory 저장 diff --git a/src/main/java/com/snp/batch/jobs/shipimport/batch/repository/ShipRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/shipimport/batch/repository/ShipRepositoryImpl.java index 0684917..14c8e94 100644 --- a/src/main/java/com/snp/batch/jobs/shipimport/batch/repository/ShipRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/shipimport/batch/repository/ShipRepositoryImpl.java @@ -26,7 +26,7 @@ public class ShipRepositoryImpl extends BaseJdbcRepository imp @Override protected String getTableName() { - return "ship_data"; + return "snp_data.ship_data"; } @Override @@ -47,7 +47,7 @@ public class ShipRepositoryImpl extends BaseJdbcRepository imp @Override protected String getInsertSql() { return """ - INSERT INTO ship_data (imo_number, core_ship_ind, dataset_version, import_date, created_at, updated_at, created_by, updated_by) + INSERT INTO snp_data.ship_data (imo_number, core_ship_ind, dataset_version, import_date, created_at, updated_at, created_by, updated_by) VALUES (?, ?, ?, ?, ?, ?, ?, ?) """; } @@ -55,7 +55,7 @@ public class ShipRepositoryImpl extends BaseJdbcRepository imp @Override protected String getUpdateSql() { return """ - UPDATE ship_data + UPDATE snp_data.ship_data SET core_ship_ind = ?, dataset_version = ?, import_date = ?, @@ -100,7 +100,7 @@ public class ShipRepositoryImpl extends BaseJdbcRepository imp */ @Override public Optional findByImoNumber(String imoNumber) { - String sql = "SELECT * FROM ship_data WHERE imo_number = ?"; + String sql = "SELECT * FROM snp_data.ship_data WHERE imo_number = ?"; return executeQueryForObject(sql, imoNumber); } @@ -109,7 +109,7 @@ public class ShipRepositoryImpl extends BaseJdbcRepository imp */ @Override public boolean existsByImoNumber(String imoNumber) { - String sql = "SELECT COUNT(*) FROM ship_data WHERE imo_number = ?"; + String sql = "SELECT COUNT(*) FROM snp_data.ship_data WHERE imo_number = ?"; Long count = jdbcTemplate.queryForObject(sql, Long.class, imoNumber); return count != null && count > 0; }