From 5305f61a41fb4d487222dc8f219067a63e317ff2 Mon Sep 17 00:00:00 2001 From: hyojin kim Date: Mon, 12 Jan 2026 14:41:08 +0900 Subject: [PATCH] :mute: Ships API Log Control --- .../global/config/MaritimeApiWebClientConfig.java | 10 ++++++++++ .../jobs/event/batch/reader/EventDataReader.java | 11 ----------- .../jobs/pscInspection/batch/reader/PscApiReader.java | 7 ------- .../repository/PscAllCertificateRepositoryImpl.java | 2 +- .../repository/PscCertificateRepositoryImpl.java | 2 +- .../batch/repository/PscDefectRepositoryImpl.java | 2 +- .../batch/repository/PscInspectionRepositoryImpl.java | 2 +- .../batch/processor/ShipDetailDataProcessor.java | 2 +- .../batch/reader/ShipDetailUpdateDataReader.java | 8 -------- .../java/com/snp/batch/service/BatchDateService.java | 6 +++--- 10 files changed, 18 insertions(+), 34 deletions(-) diff --git a/src/main/java/com/snp/batch/global/config/MaritimeApiWebClientConfig.java b/src/main/java/com/snp/batch/global/config/MaritimeApiWebClientConfig.java index d05a2f9..d51cccb 100644 --- a/src/main/java/com/snp/batch/global/config/MaritimeApiWebClientConfig.java +++ b/src/main/java/com/snp/batch/global/config/MaritimeApiWebClientConfig.java @@ -61,6 +61,11 @@ public class MaritimeApiWebClientConfig { return WebClient.builder() .baseUrl(maritimeApiUrl) + .filter((request, next) -> { + // [핵심] 여기서 최종 완성된 URI를 로그로 출력합니다. + log.info(">>>> API Request: [{} {}]", request.method(), request.url()); + return next.exchange(request); + }) .defaultHeaders(headers -> headers.setBasicAuth(maritimeApiUsername, maritimeApiPassword)) .codecs(configurer -> configurer .defaultCodecs() @@ -93,6 +98,11 @@ public class MaritimeApiWebClientConfig { return WebClient.builder() .baseUrl(maritimeServiceApiUrl) + .filter((request, next) -> { + // [핵심] 여기서 최종 완성된 URI를 로그로 출력합니다. + log.info(">>>> API Request: [{} {}]", request.method(), request.url()); + return next.exchange(request); + }) .defaultHeaders(headers -> headers.setBasicAuth(maritimeApiUsername, maritimeApiPassword)) .codecs(configurer -> configurer .defaultCodecs() diff --git a/src/main/java/com/snp/batch/jobs/event/batch/reader/EventDataReader.java b/src/main/java/com/snp/batch/jobs/event/batch/reader/EventDataReader.java index d0a657e..7c704b6 100644 --- a/src/main/java/com/snp/batch/jobs/event/batch/reader/EventDataReader.java +++ b/src/main/java/com/snp/batch/jobs/event/batch/reader/EventDataReader.java @@ -61,7 +61,6 @@ public class EventDataReader extends BaseApiReader { @Override protected void beforeFetch() { // 1. 기간내 기록된 Event List 조회 (API 요청) - log.info("Event API 호출"); EventResponse response = callEventApiWithBatch(); // 2-1. Event List 에서 EventID List 추출 // 2-2. Event List 에서 Map> 추출 @@ -99,9 +98,6 @@ public class EventDataReader extends BaseApiReader { int currentBatchNumber = (currentBatchIndex / batchSize) + 1; int totalBatches = (int) Math.ceil((double) eventIds.size() / batchSize); - log.info("[{}] 배치 {}/{} 처리 중 (Event ID : {} 개)...", - getReaderName(), currentBatchNumber, totalBatches, currentBatch.size()); - try { // API 호출 EventDetailResponse response = callEventDetailApiWithBatch(currentBatch.get(0)); @@ -192,15 +188,8 @@ public class EventDataReader extends BaseApiReader { private EventResponse callEventApiWithBatch() { Map params = batchDateService.getDateRangeWithoutTimeParams(getApiKey()); - String url = getApiPath(); - log.info("[{}] Events API Date Range: {} → {}", - getReaderName(), - String.format("%s-%s-%s",params.get("fromYear"),params.get("fromMonth"),params.get("fromDay")), - String.format("%s-%s-%s",params.get("toYear"),params.get("toMonth"),params.get("toDay")) - ); - return webClient.get() .uri(url, uriBuilder -> uriBuilder // 맵에서 파라미터 값을 동적으로 가져와 세팅 diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/reader/PscApiReader.java b/src/main/java/com/snp/batch/jobs/pscInspection/batch/reader/PscApiReader.java index b97a65d..d2c2375 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/reader/PscApiReader.java +++ b/src/main/java/com/snp/batch/jobs/pscInspection/batch/reader/PscApiReader.java @@ -96,15 +96,8 @@ public class PscApiReader extends BaseApiReader { private List callApiWithBatch() { Map params = batchDateService.getDateRangeWithoutTimeParams(getApiKey()); - String url = getApiPath(); - log.info("[{}] PSC API Date Range: {} → {}", - getReaderName(), - String.format("%s-%s-%s",params.get("fromYear"),params.get("fromMonth"),params.get("fromDay")), - String.format("%s-%s-%s",params.get("toYear"),params.get("toMonth"),params.get("toDay")) - ); - String json = webClient.get() .uri(url, uriBuilder -> uriBuilder .queryParam("shipsCategory", params.get("shipsCategory")) diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscAllCertificateRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscAllCertificateRepositoryImpl.java index 28a8bbb..baea07d 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscAllCertificateRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscAllCertificateRepositoryImpl.java @@ -139,7 +139,7 @@ public class PscAllCertificateRepositoryImpl extends BaseJdbcRepository entities) { if (entities == null || entities.isEmpty()) return; - log.info("PSC AllCertificates 저장 시작 = {}건", entities.size()); +// log.info("PSC AllCertificates 저장 시작 = {}건", entities.size()); batchInsert(entities); } diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscCertificateRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscCertificateRepositoryImpl.java index b7ac013..3edf86c 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscCertificateRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscCertificateRepositoryImpl.java @@ -132,7 +132,7 @@ public class PscCertificateRepositoryImpl extends BaseJdbcRepository entities) { if (entities == null || entities.isEmpty()) return; - log.info("PSC Certificate 저장 시작 = {}건", entities.size()); +// log.info("PSC Certificate 저장 시작 = {}건", entities.size()); batchInsert(entities); } diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscDefectRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscDefectRepositoryImpl.java index 9fedb79..4919681 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscDefectRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscDefectRepositoryImpl.java @@ -156,7 +156,7 @@ public class PscDefectRepositoryImpl extends BaseJdbcRepository entities) { if (entities == null || entities.isEmpty()) return; - log.info("PSC Defect 저장 시작 = {}건", entities.size()); +// log.info("PSC Defect 저장 시작 = {}건", entities.size()); batchInsert(entities); } diff --git a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscInspectionRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscInspectionRepositoryImpl.java index e558071..4e86f14 100644 --- a/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscInspectionRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/pscInspection/batch/repository/PscInspectionRepositoryImpl.java @@ -165,7 +165,7 @@ public class PscInspectionRepositoryImpl extends BaseJdbcRepository entities) { if (entities == null || entities.isEmpty()) return; - log.info("PSC Inspection 저장 시작 = {}건", entities.size()); +// log.info("PSC Inspection 저장 시작 = {}건", entities.size()); batchInsert(entities); } diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/processor/ShipDetailDataProcessor.java b/src/main/java/com/snp/batch/jobs/shipdetail/batch/processor/ShipDetailDataProcessor.java index 8f6647c..25a9fb7 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/processor/ShipDetailDataProcessor.java +++ b/src/main/java/com/snp/batch/jobs/shipdetail/batch/processor/ShipDetailDataProcessor.java @@ -32,7 +32,7 @@ public class ShipDetailDataProcessor extends BaseProcessor uriBuilder // 맵에서 파라미터 값을 동적으로 가져와 세팅 diff --git a/src/main/java/com/snp/batch/service/BatchDateService.java b/src/main/java/com/snp/batch/service/BatchDateService.java index 46f71d2..fb93526 100644 --- a/src/main/java/com/snp/batch/service/BatchDateService.java +++ b/src/main/java/com/snp/batch/service/BatchDateService.java @@ -1,12 +1,12 @@ package com.snp.batch.service; -import com.snp.batch.global.model.BatchLastExecution; import com.snp.batch.global.repository.BatchLastExecutionRepository; -import jakarta.transaction.Transactional; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import java.time.*; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; import java.util.HashMap; import java.util.Map;