gc/snp-batch-validation
1
0
포크 0
코드 이슈 풀 리퀘스트 Actions 위키 활동

Merge branch 'dev_movements' into develop

소스 검색
This commit is contained in:
hyojin kim 2026-01-21 14:36:14 +09:00
커밋 3cbc2d2e94
11개의 변경된 파일과 75개의 추가작업 그리고 47개의 파일을 삭제
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/snp/batch/jobs/movement/batch/config/BerthCallsJobConfig.java
파일 보기

@ -2,7 +2,7 @@ package com.snp.batch.jobs.movement.batch.config;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.snp.batch.common.batch.config.BaseJobConfig;
import com.snp.batch.jobs.movement.batch.entiity.BerthCallsEntity;
import com.snp.batch.jobs.movement.batch.entity.BerthCallsEntity;
import com.snp.batch.jobs.movement.batch.processor.BerthCallsProcessor;
import com.snp.batch.jobs.movement.batch.writer.BerthCallsWriter;
import com.snp.batch.jobs.movement.batch.dto.BerthCallsDto;

2
src/main/java/com/snp/batch/jobs/movement/batch/config/BerthCallsRangJobConfig.java
파일 보기

@ -2,7 +2,7 @@ package com.snp.batch.jobs.movement.batch.config;
import com.snp.batch.common.batch.config.BaseMultiStepJobConfig;
import com.snp.batch.jobs.movement.batch.dto.BerthCallsDto;
import com.snp.batch.jobs.movement.batch.entiity.BerthCallsEntity;
import com.snp.batch.jobs.movement.batch.entity.BerthCallsEntity;
import com.snp.batch.jobs.movement.batch.processor.BerthCallsProcessor;
import com.snp.batch.jobs.movement.batch.reader.BerthCallsRangeReader;
import com.snp.batch.jobs.movement.batch.writer.BerthCallsWriter;

11
src/main/java/com/snp/batch/jobs/movement/batch/dto/TerminalCallsDto.java
파일 보기

@ -1,5 +1,6 @@
package com.snp.batch.jobs.movement.batch.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
@Data
@ -29,4 +30,14 @@ public class TerminalCallsDto {
private Integer parentCallId;
private String iso2;
private String eventStartDate;
@JsonProperty("subFacilityId")
private Integer subFacilityId;
@JsonProperty("subFacilityName")
private String subFacilityName;
@JsonProperty("subFacilityType")
private String subFacilityType;
}

2
src/main/java/com/snp/batch/jobs/movement/batch/entiity/BerthCallsEntity.java → src/main/java/com/snp/batch/jobs/movement/batch/entity/BerthCallsEntity.java
파일 보기

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

5
src/main/java/com/snp/batch/jobs/movement/batch/entity/TerminalCallsEntity.java
파일 보기

@ -1,5 +1,6 @@
package com.snp.batch.jobs.movement.batch.entity;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.JsonNode;
import lombok.AllArgsConstructor;
import lombok.Data;
@ -40,4 +41,8 @@ public class TerminalCallsEntity {
private Integer parentCallId;
private String iso2;
private LocalDateTime eventStartDate;
private Integer subFacilityId;
private String subFacilityName;
private String subFacilityType;
}

2
src/main/java/com/snp/batch/jobs/movement/batch/processor/BerthCallsProcessor.java
파일 보기

@ -4,7 +4,7 @@ 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.movement.batch.dto.BerthCallsDto;
import com.snp.batch.jobs.movement.batch.entiity.BerthCallsEntity;
import com.snp.batch.jobs.movement.batch.entity.BerthCallsEntity;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

3
src/main/java/com/snp/batch/jobs/movement/batch/processor/TerminalCallsProcessor.java
파일 보기

@ -60,6 +60,9 @@ public class TerminalCallsProcessor extends BaseProcessor<TerminalCallsDto, Term
.parentCallId(dto.getParentCallId())
.iso2(dto.getIso2())
.eventStartDate(LocalDateTime.parse(dto.getEventStartDate()))
.subFacilityId(dto.getSubFacilityId())
.subFacilityName(dto.getSubFacilityName())
.subFacilityType(dto.getSubFacilityType())
.build();
return entity;

2
src/main/java/com/snp/batch/jobs/movement/batch/repository/BerthCallsRepository.java
파일 보기

@ -1,6 +1,6 @@
package com.snp.batch.jobs.movement.batch.repository;
import com.snp.batch.jobs.movement.batch.entiity.BerthCallsEntity;
import com.snp.batch.jobs.movement.batch.entity.BerthCallsEntity;
import java.util.List;

2
src/main/java/com/snp/batch/jobs/movement/batch/repository/BerthCallsRepositoryImpl.java
파일 보기

@ -3,7 +3,7 @@ package com.snp.batch.jobs.movement.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.movement.batch.entiity.BerthCallsEntity;
import com.snp.batch.jobs.movement.batch.entity.BerthCallsEntity;
import lombok.extern.slf4j.Slf4j;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper;

15
src/main/java/com/snp/batch/jobs/movement/batch/repository/TerminalCallsRepositoryImpl.java
파일 보기

@ -64,8 +64,11 @@ public class TerminalCallsRepositoryImpl extends BaseJdbcRepository<TerminalCall
prnt_call_id,
iso2_ntn_cd,
evt_start_dt,
lcinfo
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
lcinfo,
sub_fclty_id,
sub_fclty_nm,
sub_fclty_type
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
ON CONFLICT (imo, mvmn_type, mvmn_dt)
DO UPDATE SET
mvmn_type = EXCLUDED.mvmn_type,
@ -84,7 +87,10 @@ public class TerminalCallsRepositoryImpl extends BaseJdbcRepository<TerminalCall
prnt_call_id = EXCLUDED.prnt_call_id,
iso2_ntn_cd = EXCLUDED.iso2_ntn_cd,
evt_start_dt = EXCLUDED.evt_start_dt,
lcinfo = EXCLUDED.lcinfo
lcinfo = EXCLUDED.lcinfo,
sub_fclty_id = EXCLUDED.sub_fclty_id,
sub_fclty_nm = EXCLUDED.sub_fclty_nm,
sub_fclty_type = EXCLUDED.sub_fclty_type
""";
}
@ -119,6 +125,9 @@ public class TerminalCallsRepositoryImpl extends BaseJdbcRepository<TerminalCall
} else {
ps.setNull(i++, java.sql.Types.OTHER);
}
ps.setObject(i++, e.getSubFacilityId());
ps.setString(i++, e.getSubFacilityName());
ps.setString(i++, e.getSubFacilityType());
}
private void setDoubleOrNull(PreparedStatement ps, int index, Double value) throws Exception {

2
src/main/java/com/snp/batch/jobs/movement/batch/writer/BerthCallsWriter.java
파일 보기

@ -2,7 +2,7 @@ package com.snp.batch.jobs.movement.batch.writer;
import com.snp.batch.common.batch.writer.BaseWriter;
import com.snp.batch.jobs.movement.batch.repository.BerthCallsRepository;
import com.snp.batch.jobs.movement.batch.entiity.BerthCallsEntity;
import com.snp.batch.jobs.movement.batch.entity.BerthCallsEntity;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;