Merge branch 'dev_movements' into develop
This commit is contained in:
hyojin kim
커밋
3cbc2d2e94
@ -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,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;
|
||||
|
||||
@ -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;
|
||||
|
||||
}
|
||||
|
||||
@ -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;
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -46,46 +46,52 @@ public class TerminalCallsRepositoryImpl extends BaseJdbcRepository<TerminalCall
|
||||
// return """
|
||||
// INSERT INTO snp_data.t_terminalcall(
|
||||
return """
|
||||
INSERT INTO new_snp.t_terminalcall(
|
||||
imo,
|
||||
mvmn_type,
|
||||
mvmn_dt,
|
||||
fclty_id,
|
||||
fclty_nm,
|
||||
fclty_type,
|
||||
up_fclty_id,
|
||||
up_fclty_nm,
|
||||
up_fclty_type,
|
||||
ntn_cd,
|
||||
ntn_nm,
|
||||
draft,
|
||||
lat,
|
||||
lon,
|
||||
prnt_call_id,
|
||||
iso2_ntn_cd,
|
||||
evt_start_dt,
|
||||
lcinfo
|
||||
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||
ON CONFLICT (imo, mvmn_type, mvmn_dt)
|
||||
DO UPDATE SET
|
||||
mvmn_type = EXCLUDED.mvmn_type,
|
||||
mvmn_dt = EXCLUDED.mvmn_dt,
|
||||
fclty_id = EXCLUDED.fclty_id,
|
||||
fclty_nm = EXCLUDED.fclty_nm,
|
||||
fclty_type = EXCLUDED.fclty_type,
|
||||
up_fclty_id = EXCLUDED.up_fclty_id,
|
||||
up_fclty_nm = EXCLUDED.up_fclty_nm,
|
||||
up_fclty_type = EXCLUDED.up_fclty_type,
|
||||
ntn_cd = EXCLUDED.ntn_cd,
|
||||
ntn_nm = EXCLUDED.ntn_nm,
|
||||
draft = EXCLUDED.draft,
|
||||
lat = EXCLUDED.lat,
|
||||
lon = EXCLUDED.lon,
|
||||
prnt_call_id = EXCLUDED.prnt_call_id,
|
||||
iso2_ntn_cd = EXCLUDED.iso2_ntn_cd,
|
||||
evt_start_dt = EXCLUDED.evt_start_dt,
|
||||
lcinfo = EXCLUDED.lcinfo
|
||||
""";
|
||||
INSERT INTO new_snp.t_terminalcall(
|
||||
imo,
|
||||
mvmn_type,
|
||||
mvmn_dt,
|
||||
fclty_id,
|
||||
fclty_nm,
|
||||
fclty_type,
|
||||
up_fclty_id,
|
||||
up_fclty_nm,
|
||||
up_fclty_type,
|
||||
ntn_cd,
|
||||
ntn_nm,
|
||||
draft,
|
||||
lat,
|
||||
lon,
|
||||
prnt_call_id,
|
||||
iso2_ntn_cd,
|
||||
evt_start_dt,
|
||||
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,
|
||||
mvmn_dt = EXCLUDED.mvmn_dt,
|
||||
fclty_id = EXCLUDED.fclty_id,
|
||||
fclty_nm = EXCLUDED.fclty_nm,
|
||||
fclty_type = EXCLUDED.fclty_type,
|
||||
up_fclty_id = EXCLUDED.up_fclty_id,
|
||||
up_fclty_nm = EXCLUDED.up_fclty_nm,
|
||||
up_fclty_type = EXCLUDED.up_fclty_type,
|
||||
ntn_cd = EXCLUDED.ntn_cd,
|
||||
ntn_nm = EXCLUDED.ntn_nm,
|
||||
draft = EXCLUDED.draft,
|
||||
lat = EXCLUDED.lat,
|
||||
lon = EXCLUDED.lon,
|
||||
prnt_call_id = EXCLUDED.prnt_call_id,
|
||||
iso2_ntn_cd = EXCLUDED.iso2_ntn_cd,
|
||||
evt_start_dt = EXCLUDED.evt_start_dt,
|
||||
lcinfo = EXCLUDED.lcinfo,
|
||||
sub_fclty_id = EXCLUDED.sub_fclty_id,
|
||||
sub_fclty_nm = EXCLUDED.sub_fclty_nm,
|
||||
sub_fclty_type = EXCLUDED.sub_fclty_type
|
||||
""";
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -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,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;
|
||||
|
||||
|
||||
불러오는 중...
Reference in New Issue
Block a user