mvmn_type on conflict추가

src/main/java/com/snp/batch/jobs/shipMovement/batch/repository/ShipMovementRepositoryImpl.java

@@ -69,7 +69,7 @@ public class ShipMovementRepositoryImpl extends BaseJdbcRepository<ShipMovementE
             iso2_ntn_cd,
             lcinfo
         ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-        ON CONFLICT (imo, mvmn_dt)
+        ON CONFLICT (imo, mvmn_type, mvmn_dt)
         DO UPDATE SET
             mvmn_type = EXCLUDED.mvmn_type,
             mvmn_dt = EXCLUDED.mvmn_dt,

src/main/java/com/snp/batch/jobs/shipMovementAnchorageCalls/batch/repository/AnchorageCallsRepositoryImpl.java

@@ -68,7 +68,7 @@ public class AnchorageCallsRepositoryImpl extends BaseJdbcRepository<AnchorageCa
             iso2_ntn_cd,
             lcinfo
         ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-        ON CONFLICT (imo, mvmn_dt)
+        ON CONFLICT (imo,mvmn_type, mvmn_dt)
         DO UPDATE SET
             mvmn_type = EXCLUDED.mvmn_type,
             mvmn_dt = EXCLUDED.mvmn_dt,

src/main/java/com/snp/batch/jobs/shipMovementBerthCalls/batch/repository/BerthCallsRepositoryImpl.java

@@ -68,7 +68,7 @@ public class BerthCallsRepositoryImpl extends BaseJdbcRepository<BerthCallsEntit
             evt_start_dt,
             lcinfo
         ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-        ON CONFLICT (imo, mvmn_dt)
+        ON CONFLICT (imo, mvmn_type, mvmn_dt)
         DO UPDATE SET
             mvmn_type = EXCLUDED.mvmn_type,
             mvmn_dt = EXCLUDED.mvmn_dt,

src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/config/CurrentlyAtJobConfig.java

@@ -1,11 +1,11 @@
-package com.snp.batch.jobs.shipCurrentlyAt.batch.config;
+package com.snp.batch.jobs.shipMovementCurrentlyAt.batch.config;
 
 import com.snp.batch.common.batch.config.BaseJobConfig;
-import com.snp.batch.jobs.shipCurrentlyAt.batch.dto.CurrentlyAtDto;
+import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.dto.CurrentlyAtDto;
-import com.snp.batch.jobs.shipCurrentlyAt.batch.entity.CurrentlyAtEntity;
+import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.entity.CurrentlyAtEntity;
-import com.snp.batch.jobs.shipCurrentlyAt.batch.processor.CurrentlyAtProcessor;
+import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.processor.CurrentlyAtProcessor;
-import com.snp.batch.jobs.shipCurrentlyAt.batch.reader.CurrentlyAtReader;
+import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.reader.CurrentlyAtReader;
-import com.snp.batch.jobs.shipCurrentlyAt.batch.writer.CurrentlyAtWriter;
+import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.writer.CurrentlyAtWriter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.Step;

src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/dto/CurrentlyAtDto.java

@@ -1,4 +1,4 @@
-package com.snp.batch.jobs.shipCurrentlyAt.batch.dto;
+package com.snp.batch.jobs.shipMovementCurrentlyAt.batch.dto;
 
 import com.snp.batch.jobs.shipMovement.batch.dto.PortCallsPositionDto;
 import lombok.Data;

src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/dto/CurrentlyAtPositionDto.java

@@ -1,4 +1,4 @@
-package com.snp.batch.jobs.shipCurrentlyAt.batch.dto;
+package com.snp.batch.jobs.shipMovementCurrentlyAt.batch.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;

src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/entity/CurrentlyAtEntity.java

@@ -1,4 +1,4 @@
-package com.snp.batch.jobs.shipCurrentlyAt.batch.entity;
+package com.snp.batch.jobs.shipMovementCurrentlyAt.batch.entity;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import jakarta.persistence.GeneratedValue;

src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/processor/CurrentlyAtProcessor.java

@@ -1,10 +1,10 @@
-package com.snp.batch.jobs.shipCurrentlyAt.batch.processor;
+package com.snp.batch.jobs.shipMovementCurrentlyAt.batch.processor;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.snp.batch.common.batch.processor.BaseProcessor;
-import com.snp.batch.jobs.shipCurrentlyAt.batch.dto.CurrentlyAtDto;
+import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.dto.CurrentlyAtDto;
-import com.snp.batch.jobs.shipCurrentlyAt.batch.entity.CurrentlyAtEntity;
+import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.entity.CurrentlyAtEntity;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 

src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/reader/CurrentlyAtReader.java

@@ -1,7 +1,7 @@
-package com.snp.batch.jobs.shipCurrentlyAt.batch.reader;
+package com.snp.batch.jobs.shipMovementCurrentlyAt.batch.reader;
 
 import com.snp.batch.common.batch.reader.BaseApiReader;
-import com.snp.batch.jobs.shipCurrentlyAt.batch.dto.CurrentlyAtDto;
+import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.dto.CurrentlyAtDto;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.batch.core.configuration.annotation.StepScope;
 import org.springframework.jdbc.core.JdbcTemplate;

src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/repository/CurrentlyAtRepository.java

@@ -1,6 +1,6 @@
-package com.snp.batch.jobs.shipCurrentlyAt.batch.repository;
+package com.snp.batch.jobs.shipMovementCurrentlyAt.batch.repository;
 
-import com.snp.batch.jobs.shipCurrentlyAt.batch.entity.CurrentlyAtEntity;
+import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.entity.CurrentlyAtEntity;
 
 import java.util.List;
 

src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/repository/CurrentlyAtRepositoryImpl.java

@@ -1,19 +1,14 @@
-package com.snp.batch.jobs.shipCurrentlyAt.batch.repository;
+package com.snp.batch.jobs.shipMovementCurrentlyAt.batch.repository;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.snp.batch.common.batch.repository.BaseJdbcRepository;
-import com.snp.batch.jobs.shipCurrentlyAt.batch.entity.CurrentlyAtEntity;
+import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.entity.CurrentlyAtEntity;
-import com.snp.batch.jobs.shipMovement.batch.entity.ShipMovementEntity;
-import com.snp.batch.jobs.shipMovement.batch.repository.ShipMovementRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Repository;
 
 import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.util.List;
 
@@ -71,7 +66,7 @@ public class CurrentlyAtRepositoryImpl extends BaseJdbcRepository<CurrentlyAtEnt
             iso2_ntn_cd,
             lcinfo
         ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-        ON CONFLICT (imo, mvmn_dt)
+        ON CONFLICT (imo, mvmn_type, mvmn_dt)
         DO UPDATE SET
             mvmn_type = EXCLUDED.mvmn_type,
             mvmn_dt = EXCLUDED.mvmn_dt,

src/main/java/com/snp/batch/jobs/shipMovementCurrentlyAt/batch/writer/CurrentlyAtWriter.java

@@ -1,8 +1,8 @@
-package com.snp.batch.jobs.shipCurrentlyAt.batch.writer;
+package com.snp.batch.jobs.shipMovementCurrentlyAt.batch.writer;
 
 import com.snp.batch.common.batch.writer.BaseWriter;
-import com.snp.batch.jobs.shipCurrentlyAt.batch.entity.CurrentlyAtEntity;
+import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.entity.CurrentlyAtEntity;
-import com.snp.batch.jobs.shipCurrentlyAt.batch.repository.CurrentlyAtRepository;
+import com.snp.batch.jobs.shipMovementCurrentlyAt.batch.repository.CurrentlyAtRepository;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 

src/main/java/com/snp/batch/jobs/shipMovementDarkActivity/batch/repository/DarkActivityRepositoryImpl.java

@@ -66,7 +66,7 @@ public class DarkActivityRepositoryImpl extends BaseJdbcRepository<DarkActivityE
             evt_start_dt,
             lcinfo
         ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-        ON CONFLICT (imo, mvmn_dt)
+        ON CONFLICT (imo, mvmn_type, mvmn_dt)
         DO UPDATE SET
             mvmn_type = EXCLUDED.mvmn_type,
             mvmn_dt = EXCLUDED.mvmn_dt,

src/main/java/com/snp/batch/jobs/shipMovementDestination/batch/repository/DestinationRepositoryImpl.java

@@ -57,7 +57,7 @@ public class DestinationRepositoryImpl extends BaseJdbcRepository<DestinationEnt
             iso2_ntn_cd,
             lcinfo
         ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-        ON CONFLICT (imo, mvmn_dt)
+        ON CONFLICT (imo, mvmn_type, mvmn_dt)
         DO UPDATE SET
             mvmn_type = EXCLUDED.mvmn_type,
             mvmn_dt = EXCLUDED.mvmn_dt,

src/main/java/com/snp/batch/jobs/shipMovementStsOperations/batch/repository/StsOperationRepositoryImpl.java

@@ -67,7 +67,7 @@ public class StsOperationRepositoryImpl extends BaseJdbcRepository<StsOperationE
             evt_start_dt,
             lcinfo
         ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-        ON CONFLICT (imo, mvmn_dt)
+        ON CONFLICT (imo, mvmn_type, mvmn_dt)
         DO UPDATE SET
             mvmn_type = EXCLUDED.mvmn_type,
             mvmn_dt = EXCLUDED.mvmn_dt,

src/main/java/com/snp/batch/jobs/shipMovementTerminalCalls/batch/repository/TerminalCallsRepositoryImpl.java

@@ -66,7 +66,7 @@ public class TerminalCallsRepositoryImpl extends BaseJdbcRepository<TerminalCall
             evt_start_dt,
             lcinfo
         ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-        ON CONFLICT (imo, mvmn_dt)
+        ON CONFLICT (imo, mvmn_type, mvmn_dt)
         DO UPDATE SET
             mvmn_type = EXCLUDED.mvmn_type,
             mvmn_dt = EXCLUDED.mvmn_dt,

src/main/java/com/snp/batch/jobs/shipMovementTransits/batch/repository/TransitlsRepositoryImpl.java

@@ -51,7 +51,7 @@ public class TransitlsRepositoryImpl extends BaseJdbcRepository<TransitsEntity,
             fclty_type,
             draft
         ) VALUES (?, ?, ?, ?, ?, ?)
-        ON CONFLICT (imo, mvmn_dt)
+        ON CONFLICT (imo, mvmn_type, mvmn_dt)
         DO UPDATE SET
             mvmn_type = EXCLUDED.mvmn_type,
             mvmn_dt = EXCLUDED.mvmn_dt,