From 7a1b24e3817540f11664ad5ada92d0c0cb57cb07 Mon Sep 17 00:00:00 2001
From: hyojin kim <hjkim4@gcsc.co.kr>
Date: Wed, 21 Jan 2026 13:30:26 +0900
Subject: [PATCH] =?UTF-8?q?:card=5Ffile=5Fbox:=20Dark=20Activity=20Confirm?=
 =?UTF-8?q?ed=20:=20area=5Fcountry=20=EC=BB=AC=EB=9F=BC=20=EC=88=98?=
 =?UTF-8?q?=EC=A7=91=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jobs/shipdetail/batch/dto/DarkActivityConfirmedDto.java  | 1 +
 .../shipdetail/batch/entity/DarkActivityConfirmedEntity.java | 2 +-
 .../shipdetail/batch/processor/ShipDetailDataProcessor.java  | 1 +
 .../batch/repository/ShipDetailRepositoryImpl.java           | 1 +
 .../jobs/shipdetail/batch/repository/ShipDetailSql.java      | 5 +++--
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/DarkActivityConfirmedDto.java b/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/DarkActivityConfirmedDto.java
index 2e2a4db..918374d 100644
--- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/DarkActivityConfirmedDto.java
+++ b/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/DarkActivityConfirmedDto.java
@@ -27,6 +27,7 @@ public class DarkActivityConfirmedDto {
     @JsonProperty("Dark_Status") private String darkStatus;
     @JsonProperty("Area_Id") private String areaId;
     @JsonProperty("Area_Name") private String areaName;
+    @JsonProperty("Area_Country") private String areaCountry;
     @JsonProperty("Dark_Time") private String darkTime;
     @JsonProperty("Dark_Latitude") private String darkLatitude;
     @JsonProperty("Dark_Longitude") private String darkLongitude;
diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/DarkActivityConfirmedEntity.java b/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/DarkActivityConfirmedEntity.java
index ae4c70a..f121368 100644
--- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/DarkActivityConfirmedEntity.java
+++ b/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/DarkActivityConfirmedEntity.java
@@ -1,6 +1,5 @@
 package com.snp.batch.jobs.shipdetail.batch.entity;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.snp.batch.common.batch.entity.BaseEntity;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -23,6 +22,7 @@ public class DarkActivityConfirmedEntity extends BaseEntity {
     private String dark_status;
     private String area_id;
     private String area_name;
+    private String area_country;
     private String dark_time;
     private String dark_latitude;
     private String dark_longitude;
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 3c0e282..e5343da 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
@@ -790,6 +790,7 @@ public class ShipDetailDataProcessor extends BaseProcessor<ShipDetailComparisonD
                     .dark_status(dto.getDarkStatus())
                     .area_id(dto.getAreaId())
                     .area_name(dto.getAreaName())
+                    .area_country(dto.getAreaCountry())
                     .dark_time(dto.getDarkTime())
                     .dark_latitude(dto.getDarkLatitude())
                     .dark_longitude(dto.getDarkLongitude())
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 aa0b989..a6a567d 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
@@ -1571,6 +1571,7 @@ public class ShipDetailRepositoryImpl extends BaseJdbcRepository<ShipDetailEntit
         setIntegerOrNull(ps, idx++, entity.getDark_status());
         setIntegerOrNull(ps, idx++, entity.getArea_id());
         ps.setString(idx++, entity.getArea_name());
+        ps.setString(idx++, entity.getArea_country());
 
         // 타임스탬프 및 실수형 처리
         setTimestampOrNull(ps, idx++, entity.getDark_time()); // 별도의 파싱 로직 포함된 SqlUtils 함수 필요
diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailSql.java b/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailSql.java
index 3cffcfb..b01d75c 100644
--- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailSql.java
+++ b/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailSql.java
@@ -543,13 +543,13 @@ public class ShipDetailSql {
         return """
         INSERT INTO snp_data.darkactivityconfirmed (
             datasetversion, lrno, mmsi, vessel_name, dark_hours, dark_activity, dark_status, 
-            area_id, area_name, dark_time, dark_latitude, dark_longitude, dark_speed, 
+            area_id, area_name, area_country, dark_time, dark_latitude, dark_longitude, dark_speed, 
             dark_heading, dark_draught, nextseen, nextseen_speed, nextseen_draught, 
             nextseen_heading, dark_reported_destination, last_port_of_call, 
             last_port_country_code,last_port_country, nextseen_latitude, nextseen_longitude, 
             nextseen_reported_destination, vesselid
         ) VALUES (
-            ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?
+            ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?,?
         )
         ON CONFLICT (lrno, mmsi, dark_time, dark_status)
         DO UPDATE SET
@@ -559,6 +559,7 @@ public class ShipDetailSql {
             dark_activity = EXCLUDED.dark_activity,
             area_id = EXCLUDED.area_id,
             area_name = EXCLUDED.area_name,
+            area_country = EXCLUDED.area_country,
             dark_latitude = EXCLUDED.dark_latitude,
             dark_longitude = EXCLUDED.dark_longitude,
             dark_speed = EXCLUDED.dark_speed,