diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/AdditionalInformationDto.java b/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/AdditionalInformationDto.java index 2e16054..9afd0ec 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/AdditionalInformationDto.java +++ b/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/AdditionalInformationDto.java @@ -1,23 +1,25 @@ package com.snp.batch.jobs.shipdetail.batch.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; +import lombok.*; @Getter @Setter @ToString @NoArgsConstructor public class AdditionalInformationDto { - @Getter @Setter @ToString @NoArgsConstructor - public static class DataSetVersionDto { - @JsonProperty("DataSetVersion") - private String dataSetVersion; - } @JsonProperty("DataSetVersion") - private DataSetVersionDto dataSetVersion; + private DataSetVersion dataSetVersion; + + @Data + @NoArgsConstructor + @AllArgsConstructor + @JsonIgnoreProperties(ignoreUnknown = true) + public static class DataSetVersion { + @JsonProperty("DataSetVersion") + private String version; + } @JsonProperty("LRNO") private String lrno; @JsonProperty("ShipEmail") diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailDto.java b/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailDto.java index 527257e..b6e76b0 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailDto.java +++ b/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailDto.java @@ -2,10 +2,7 @@ package com.snp.batch.jobs.shipdetail.batch.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; import java.util.List; @@ -27,7 +24,17 @@ import java.util.List; @AllArgsConstructor @JsonIgnoreProperties(ignoreUnknown = true) public class ShipDetailDto { + @JsonProperty("DataSetVersion") + private DataSetVersion dataSetVersion; + @Data + @NoArgsConstructor + @AllArgsConstructor + @JsonIgnoreProperties(ignoreUnknown = true) + public static class DataSetVersion { + @JsonProperty("DataSetVersion") + private String version; + } /** * IMO 번호 * API: IHSLRorIMOShipNo diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/AdditionalInformationEntity.java b/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/AdditionalInformationEntity.java index de98856..06107b2 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/AdditionalInformationEntity.java +++ b/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/AdditionalInformationEntity.java @@ -26,4 +26,5 @@ public class AdditionalInformationEntity extends BaseEntity { private String tweendeckfixed; private String satcomid; private String satcomansback; + private String dataSetVersion; } diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ShipDetailEntity.java b/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ShipDetailEntity.java index aa7c9d2..a00778a 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ShipDetailEntity.java +++ b/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/ShipDetailEntity.java @@ -50,7 +50,7 @@ public class ShipDetailEntity extends BaseEntity { * mainenginetype varchar(2) NULL, -- 주기관 형식 * batch_flag varchar(1) DEFAULT 'N'::character varying NULL -- 업데이트 이력 확인 (N:대기,P:진행,S:완료) */ - + private String dataSetVersion; /** * 기본 키 (자동 생성) * 컬럼: id (BIGSERIAL) 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 e5343da..1a55189 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 @@ -211,6 +211,7 @@ public class ShipDetailDataProcessor extends BaseProcessor