🗃️ Dark Activity Confirmed : area_country 컬럼 수집 추가

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;

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;

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())

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 함수 필요

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,