From 6be90723b4951f3592e380d52f010c640752539e Mon Sep 17 00:00:00 2001
From: hyojin kim <hjkim4@gcsc.co.kr>
Date: Tue, 25 Nov 2025 18:39:30 +0900
Subject: [PATCH] =?UTF-8?q?:heavy=5Fplus=5Fsign:=20Core20=20=ED=85=8C?=
 =?UTF-8?q?=EC=9D=B4=EB=B8=94=20AIS=20=EC=BB=AC=EB=9F=BC=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80=20(COG,=20NavStat)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../batch/processor/ShipDetailDataProcessor.java         | 1 -
 .../shipdetail/batch/reader/ShipDetailDataReader.java    | 2 +-
 .../batch/repository/ShipDetailRepositoryImpl.java       | 9 ++-------
 .../batch/repository/ShipLastPositionRepositoryImpl.java | 6 ++++++
 4 files changed, 9 insertions(+), 9 deletions(-)

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 6c8bec8..1be7f93 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
@@ -95,7 +95,6 @@ public class ShipDetailDataProcessor extends BaseProcessor<ShipDetailComparisonD
                 .grossTonnage(safeGetString(dto.getGrossTonnage()))
                 .deadWeight(safeGetString(dto.getDeadweight()))
                 .teu(safeGetString(dto.getTeu()))
-                .speedService(safeGetDouble(dto.getSpeedservice()))
                 .mainEngineType(safeGetString(dto.getMainenginetype()))
                 .shipStatus(safeGetString(dto.getShipStatus()))
                 .operator(safeGetString(dto.getOperator()))
diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/reader/ShipDetailDataReader.java b/src/main/java/com/snp/batch/jobs/shipdetail/batch/reader/ShipDetailDataReader.java
index 3070467..ae72051 100644
--- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/reader/ShipDetailDataReader.java
+++ b/src/main/java/com/snp/batch/jobs/shipdetail/batch/reader/ShipDetailDataReader.java
@@ -70,7 +70,7 @@ public class ShipDetailDataReader extends BaseApiReader<ShipDetailComparisonData
     }
 
     private static final String GET_ALL_IMO_QUERY =
-            "SELECT imo_number FROM ship_data ORDER BY id";
+            "select imo_number from ship_data where imo_number > (select max(imo_number) from ship_detail_hash_json) order by imo_number asc";
 
     private static final String FETCH_ALL_HASHES_QUERY =
             "SELECT imo_number, ship_detail_hash FROM ship_detail_hash_json ORDER BY imo_number";
diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailRepositoryImpl.java
index 3ff9a49..96c35d1 100644
--- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailRepositoryImpl.java
+++ b/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailRepositoryImpl.java
@@ -50,8 +50,8 @@ public class ShipDetailRepositoryImpl extends BaseJdbcRepository<ShipDetailEntit
                         callsign, flagname, portofregistry, classificationsociety, shiptypelevel5,
                         shiptypelevel5subtype, yearofbuild, shipbuilder, lengthoverallloa, breadthmoulded,
                         "depth", draught, grosstonnage, deadweight, teu,
-                        speedservice, mainenginetype, status, operator, flagcode, shiptypelevel2
-                    ) VALUES (nextval('test_s_p.core20_index_seq'::regclass), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+                        mainenginetype, status, operator, flagcode, shiptypelevel2
+                    ) VALUES (nextval('test_s_p.core20_index_seq'::regclass), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
                     ON CONFLICT (ihslrorimoshipno)
                     DO UPDATE SET
                         vesselid = EXCLUDED.vesselid,
@@ -72,7 +72,6 @@ public class ShipDetailRepositoryImpl extends BaseJdbcRepository<ShipDetailEntit
                         grosstonnage = EXCLUDED.grosstonnage,
                         deadweight = EXCLUDED.deadweight,
                         teu = EXCLUDED.teu,
-                        speedservice = EXCLUDED.speedservice,
                         mainenginetype = EXCLUDED.mainenginetype,
                         status = EXCLUDED.status,
                         operator = EXCLUDED.operator,
@@ -103,7 +102,6 @@ public class ShipDetailRepositoryImpl extends BaseJdbcRepository<ShipDetailEntit
                         grosstonnage = ?,
                         deadweight = ?,
                         teu = ?,
-                        speedservice = ?,
                         mainenginetype = ?,
                         batch_flag = 'N'::character varying,
                         status = ?,
@@ -136,7 +134,6 @@ public class ShipDetailRepositoryImpl extends BaseJdbcRepository<ShipDetailEntit
         ps.setString(idx++, entity.getGrossTonnage());
         ps.setString(idx++, entity.getDeadWeight());
         ps.setString(idx++, entity.getTeu());
-        setDoubleOrNull(ps, idx++, entity.getSpeedService());
         ps.setString(idx++, entity.getMainEngineType());
         ps.setString(idx++, entity.getShipStatus());
         ps.setString(idx++, entity.getOperator());
@@ -181,7 +178,6 @@ public class ShipDetailRepositoryImpl extends BaseJdbcRepository<ShipDetailEntit
         ps.setString(idx++, entity.getGrossTonnage());
         ps.setString(idx++, entity.getDeadWeight());
         ps.setString(idx++, entity.getTeu());
-        ps.setDouble(idx++, entity.getSpeedService());
         ps.setString(idx++, entity.getMainEngineType());
         ps.setString(idx++, entity.getShipStatus());
         ps.setString(idx++, entity.getOperator());
@@ -302,7 +298,6 @@ public class ShipDetailRepositoryImpl extends BaseJdbcRepository<ShipDetailEntit
                     .grossTonnage(rs.getString("grosstonnage"))
                     .deadWeight(rs.getString("deadweight"))
                     .teu(rs.getString("teu"))
-                    .speedService(rs.getDouble("speedservice"))
                     .mainEngineType(rs.getString("mainenginetype"))
                     .batchFlag(rs.getString("batch_flag"))
                     .shipTypeLevel2(rs.getString("shiptypelevel2"))
diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipLastPositionRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipLastPositionRepositoryImpl.java
index 1380d54..008c2ed 100644
--- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipLastPositionRepositoryImpl.java
+++ b/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipLastPositionRepositoryImpl.java
@@ -49,6 +49,9 @@ public class ShipLastPositionRepositoryImpl extends BaseJdbcRepository<TargetEnh
                     destination = ?,
                     eta = ?::timestamptz,
                     heading = ?,
+                    speedservice = ?,
+                    cog = ?,
+                    navstat = ?,
                     batch_flag = 'N'
               WHERE ihslrorimoshipno = ?;
              """;
@@ -69,6 +72,9 @@ public class ShipLastPositionRepositoryImpl extends BaseJdbcRepository<TargetEnh
         ps.setString(idx++, entity.getDestination()); // destination : destination (String)
         ps.setString(idx++, entity.getEta()); // eta : eta (Datetime)
         ps.setDouble(idx++, entity.getHeading()); // heading : heading (Double)
+        ps.setDouble(idx++, entity.getSog()); // sog : speedservice (Double)
+        ps.setDouble(idx++, entity.getCog()); // cog : cog (Double)
+        ps.setString(idx++, entity.getStatus()); // status : navstat (String)
         ps.setString(idx++, entity.getImoVerified()); // imoVerified : imo (String)
     }