From 18ab11068af3d63968308917a92541ea8eb3b929 Mon Sep 17 00:00:00 2001
From: Kim JiMyeung <jmkim@gcsc8932.onmicrosoft.com>
Date: Tue, 2 Dec 2025 12:50:28 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B9=88=20=EB=B0=B0=EC=97=B4=20=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC=20=EB=A1=9C=EC=A7=81=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/batch/reader/BaseApiReader.java    | 25 +++++++++++++++++--
 .../batch/reader/ShipMovementReader.java      | 19 +++-----------
 src/main/resources/application.yml            |  2 +-
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/snp/batch/common/batch/reader/BaseApiReader.java b/src/main/java/com/snp/batch/common/batch/reader/BaseApiReader.java
index 664c8de..6edbc66 100644
--- a/src/main/java/com/snp/batch/common/batch/reader/BaseApiReader.java
+++ b/src/main/java/com/snp/batch/common/batch/reader/BaseApiReader.java
@@ -254,21 +254,42 @@ public abstract class BaseApiReader<T> implements ItemReader<T> {
         }
 
         // currentBatch가 비어있으면 다음 배치 로드
-        if (currentBatch == null || !currentBatch.hasNext()) {
+        /*if (currentBatch == null || !currentBatch.hasNext()) {
             List<T> nextBatch = fetchNextBatch();
 
             // 더 이상 데이터가 없으면 종료
-            if (nextBatch == null || nextBatch.isEmpty()) {
+//            if (nextBatch == null || nextBatch.isEmpty()) {
+            if (nextBatch == null ) {
                 afterFetch(null);
                 log.info("[{}] 모든 배치 처리 완료", getReaderName());
                 return null;
             }
 
+
             // Iterator 갱신
+            currentBatch = nextBatch.iterator();
+            log.debug("[{}] 배치 로드 완료: {} 건", getReaderName(), nextBatch.size());
+        }*/
+        // currentBatch가 비어있으면 다음 배치 로드
+        while (currentBatch == null || !currentBatch.hasNext()) {
+            List<T> nextBatch = fetchNextBatch();
+
+            if (nextBatch == null) { // 진짜 종료
+                afterFetch(null);
+                log.info("[{}] 모든 배치 처리 완료", getReaderName());
+                return null;
+            }
+
+            if (nextBatch.isEmpty()) { // emptyList면 다음 batch를 시도
+                log.warn("[{}] 빈 배치 수신 → 다음 배치 재요청", getReaderName());
+                continue; // while 반복문으로 다시 fetch
+            }
+
             currentBatch = nextBatch.iterator();
             log.debug("[{}] 배치 로드 완료: {} 건", getReaderName(), nextBatch.size());
         }
 
+
         // Iterator에서 1건씩 반환
         return currentBatch.next();
     }
diff --git a/src/main/java/com/snp/batch/jobs/shipMovement/batch/reader/ShipMovementReader.java b/src/main/java/com/snp/batch/jobs/shipMovement/batch/reader/ShipMovementReader.java
index f251206..612a1be 100644
--- a/src/main/java/com/snp/batch/jobs/shipMovement/batch/reader/ShipMovementReader.java
+++ b/src/main/java/com/snp/batch/jobs/shipMovement/batch/reader/ShipMovementReader.java
@@ -50,7 +50,7 @@ public class ShipMovementReader extends BaseApiReader<PortCallDto> {
     // DB 해시값을 저장할 맵
     private Map<String, String> dbMasterHashes;
     private int currentBatchIndex = 0;
-    private final int batchSize = 50;
+    private final int batchSize = 10;
 
     @Value("#{jobParameters['startDate']}")
     private String startDate;
@@ -91,7 +91,8 @@ public class ShipMovementReader extends BaseApiReader<PortCallDto> {
     }
 
     private static final String GET_ALL_IMO_QUERY =
-            "SELECT imo_number FROM ship_data ORDER BY id";
+//            "SELECT imo_number FROM ship_data ORDER BY id";
+            "SELECT imo_number FROM snp_data.ship_data where imo_number > (select max(imo) from snp_data.t_ship_stpov_info) ORDER BY imo_number";
 
     private static final String FETCH_ALL_HASHES_QUERY =
             "SELECT imo_number, ship_detail_hash FROM ship_detail_hash_json ORDER BY imo_number";
@@ -112,20 +113,6 @@ public class ShipMovementReader extends BaseApiReader<PortCallDto> {
         log.info("[{}] {}개씩 배치로 분할하여 API 호출 예정", getReaderName(), batchSize);
         log.info("[{}] 예상 배치 수: {} 개", getReaderName(), totalBatches);
 
-  /*      // Step 2. 전 배치 결과 imo_number, ship_detail_json, ship_detail_hash 데이터 전체 조회
-        log.info("[{}] DB Master Hash 전체 조회 시작...", getReaderName());
-
-        // 1-1. DB에서 모든 IMO와 Hash 조회
-        dbMasterHashes = jdbcTemplate.query(FETCH_ALL_HASHES_QUERY, rs -> {
-            Map<String, String> map = new HashMap<>();
-            while (rs.next()) {
-                map.put(rs.getString("imo_number"), rs.getString("ship_detail_hash"));
-            }
-            return map;
-        });
-
-        log.info("[{}] DB Master Hash 조회 완료. 총 {}건.", getReaderName(), dbMasterHashes.size());*/
-
         // API 통계 초기화
         updateApiCallStats(totalBatches, 0);
     }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index daaab5f..33e7908 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -55,7 +55,7 @@ spring:
 
 # Server Configuration
 server:
-  port: 8081
+  port: 8041
   servlet:
     context-path: /snp-api