diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/CompanyComplianceDto.java b/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/CompanyComplianceDto.java deleted file mode 100644 index 3153e9f..0000000 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/CompanyComplianceDto.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.snp.batch.jobs.shipdetail.batch.dto; - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; - -@Getter -@Setter -@ToString -@NoArgsConstructor -public class CompanyComplianceDto { - @Getter @Setter @ToString @NoArgsConstructor - public static class DataSetVersionDto { - @JsonProperty("DataSetVersion") - private String dataSetVersion; - } - @JsonProperty("DataSetVersion") - private DataSetVersionDto dataSetVersion; - - @JsonProperty("OwCode") private String owCode; - @JsonProperty("ShortCompanyName") private String shortCompanyName; - @JsonProperty("CompanyOnOFACSanctionList") private String companyOnOFACSanctionList; - @JsonProperty("CompanyOnUNSanctionList") private String companyOnUNSanctionList; - @JsonProperty("CompanyOnEUSanctionList") private String companyOnEUSanctionList; - @JsonProperty("CompanyOnBESSanctionList") private String companyOnBESSanctionList; - @JsonProperty("CompanyInOFACSanctionedCountry") private String companyInOFACSanctionedCountry; - @JsonProperty("CompanyInFATFJurisdiction") private String companyInFATFJurisdiction; - @JsonProperty("ParentCompanyComplianceRisk") private String parentCompanyComplianceRisk; - @JsonProperty("CompanyOverallComplianceStatus") private String companyOverallComplianceStatus; - @JsonProperty("CompanyOnAustralianSanctionList") private String companyOnAustralianSanctionList; - @JsonProperty("CompanyOnCanadianSanctionList") private String companyOnCanadianSanctionList; - @JsonProperty("CompanyOnSwissSanctionList") private String companyOnSwissSanctionList; - @JsonProperty("CompanyOnOFACSSIList") private String companyOnOFACSSIList; - @JsonProperty("CompanyOnOFACNonSDNSanctionList") private String companyOnOFACNonSDNSanctionList; - @JsonProperty("CompanyOnUAESanctionList") private String companyOnUAESanctionList; -} \ No newline at end of file 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 2045cc2..527257e 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,7 +2,6 @@ package com.snp.batch.jobs.shipdetail.batch.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.snp.batch.jobs.shipdetail.batch.entity.CompanyComplianceEntity; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -472,13 +471,6 @@ public class ShipDetailDto { @JsonProperty("CompanyVesselRelationships") private List CompanyVesselRelationships; - /** - * 회사 컴플라이언스 정보 List - * API: CompanyComplianceDetails - */ - @JsonProperty("CompanyComplianceDetails") - private List CompanyComplianceDetails; - /** * 다크활동이력 정보 List * API: DarkActivityConfirmed diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailUpdate.java b/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailUpdate.java index e752538..2c3f87e 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailUpdate.java +++ b/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/ShipDetailUpdate.java @@ -44,7 +44,6 @@ public class ShipDetailUpdate { private final List specialFeatureEntityList; private final List thrustersEntityList; private final List darkActivityConfirmedEntityList; - private final List companyComplianceEntityList; private final List companyVesselRelationshipEntityList; private final List companyDetailEntityList; } \ No newline at end of file diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/CompanyComplianceEntity.java b/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/CompanyComplianceEntity.java deleted file mode 100644 index af4025d..0000000 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/CompanyComplianceEntity.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.snp.batch.jobs.shipdetail.batch.entity; - -import com.snp.batch.common.batch.entity.BaseEntity; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class CompanyComplianceEntity extends BaseEntity { - private String datasetversion; - private String owcode; - private String shortcompanyname; - private String companyonofacsanctionlist; - private String companyonunsanctionlist; - private String companyoneusanctionlist; - private String companyonbessanctionlist; - private String companyinofacsanctionedcountry; - private String companyinfatfjurisdiction; - private String companyoverallcompliancestatus; - private String companyonaustraliansanctionlist; - private String companyoncanadiansanctionlist; - private String companyonswisssanctionlist; - private String companyonofacssilist; - private String companyonofacnonsdnsanctionlist; - private String companyonuaesanctionlist; - private String parentcompanycompliancerisk; -} \ No newline at end of file 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 9f6f89d..3c0e282 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 @@ -814,36 +814,36 @@ public class ShipDetailDataProcessor extends BaseProcessor makeCompanyComplianceEntityList(List dtoList){ - List entityList = new ArrayList<>(); - if (dtoList == null || dtoList.isEmpty()) { - return entityList; - } - for (CompanyComplianceDto dto : dtoList) { - String datasetVersion = (dto.getDataSetVersion() != null) ? dto.getDataSetVersion().getDataSetVersion() : null; - CompanyComplianceEntity entity = CompanyComplianceEntity.builder() - .datasetversion(datasetVersion) - .owcode(dto.getOwCode()) - .shortcompanyname(dto.getShortCompanyName()) - .companyonofacsanctionlist(dto.getCompanyOnOFACSanctionList()) - .companyonunsanctionlist(dto.getCompanyOnUNSanctionList()) - .companyoneusanctionlist(dto.getCompanyOnEUSanctionList()) - .companyonbessanctionlist(dto.getCompanyOnBESSanctionList()) - .companyinofacsanctionedcountry(dto.getCompanyInOFACSanctionedCountry()) - .companyinfatfjurisdiction(dto.getCompanyInFATFJurisdiction()) - .companyoverallcompliancestatus(dto.getCompanyOverallComplianceStatus()) - .companyonaustraliansanctionlist(dto.getCompanyOnAustralianSanctionList()) - .companyoncanadiansanctionlist(dto.getCompanyOnCanadianSanctionList()) - .companyonswisssanctionlist(dto.getCompanyOnSwissSanctionList()) - .companyonofacssilist(dto.getCompanyOnOFACSSIList()) - .companyonofacnonsdnsanctionlist(dto.getCompanyOnOFACNonSDNSanctionList()) - .companyonuaesanctionlist(dto.getCompanyOnUAESanctionList()) - .parentcompanycompliancerisk(dto.getParentCompanyComplianceRisk()) - .build(); - entityList.add(entity); - } - return entityList; - } +// private List makeCompanyComplianceEntityList(List dtoList){ +// List entityList = new ArrayList<>(); +// if (dtoList == null || dtoList.isEmpty()) { +// return entityList; +// } +// for (CompanyComplianceDto dto : dtoList) { +// String datasetVersion = (dto.getDataSetVersion() != null) ? dto.getDataSetVersion().getDataSetVersion() : null; +// CompanyComplianceEntity entity = CompanyComplianceEntity.builder() +// .datasetversion(datasetVersion) +// .owcode(dto.getOwCode()) +// .shortcompanyname(dto.getShortCompanyName()) +// .companyonofacsanctionlist(dto.getCompanyOnOFACSanctionList()) +// .companyonunsanctionlist(dto.getCompanyOnUNSanctionList()) +// .companyoneusanctionlist(dto.getCompanyOnEUSanctionList()) +// .companyonbessanctionlist(dto.getCompanyOnBESSanctionList()) +// .companyinofacsanctionedcountry(dto.getCompanyInOFACSanctionedCountry()) +// .companyinfatfjurisdiction(dto.getCompanyInFATFJurisdiction()) +// .companyoverallcompliancestatus(dto.getCompanyOverallComplianceStatus()) +// .companyonaustraliansanctionlist(dto.getCompanyOnAustralianSanctionList()) +// .companyoncanadiansanctionlist(dto.getCompanyOnCanadianSanctionList()) +// .companyonswisssanctionlist(dto.getCompanyOnSwissSanctionList()) +// .companyonofacssilist(dto.getCompanyOnOFACSSIList()) +// .companyonofacnonsdnsanctionlist(dto.getCompanyOnOFACNonSDNSanctionList()) +// .companyonuaesanctionlist(dto.getCompanyOnUAESanctionList()) +// .parentcompanycompliancerisk(dto.getParentCompanyComplianceRisk()) +// .build(); +// entityList.add(entity); +// } +// return entityList; +// } : 2026-01-16 Company Compliance 수집 API 분리로 인한 제거 private List makeCompanyDetailEntity(List dtoList) { List companyDetailEntityList = new ArrayList<>(); diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailRepository.java b/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailRepository.java index 588615d..11e1ce6 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailRepository.java +++ b/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailRepository.java @@ -59,8 +59,6 @@ public interface ShipDetailRepository { void saveAllDarkActivityConfirmedData(List entities); - void saveAllCompanyComplianceData(List entities); - void saveAllCompanyVesselRelationshipData(List entities); void saveAllCompanyDetailData(List entities); diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailRepositoryImpl.java index df18ae6..1fe3e28 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailRepositoryImpl.java @@ -1128,30 +1128,6 @@ public class ShipDetailRepositoryImpl extends BaseJdbcRepository entities) { - String entityName = "CompanyComplianceEntity"; - String sql = ShipDetailSql.getCompanyComplianceSql(); - - if (entities == null || entities.isEmpty()) { - return; - } - - log.debug("{} 배치 삽입 시작: {} 건", entityName, entities.size()); - - jdbcTemplate.batchUpdate(sql, entities, entities.size(), - (ps, entity) -> { - try { - setCompanyComplianceInsertParameters(ps, (CompanyComplianceEntity) entity); - } catch (Exception e) { - log.error("배치 삽입 파라미터 설정 실패 - " + entityName, e); - throw new RuntimeException(e); - } - }); - - log.info("{} 배치 삽입 완료: {} 건", entityName, entities.size()); - } - @Override public void saveAllCompanyVesselRelationshipData(List entities) { String entityName = "CompanyVesselRelationshipEntity"; @@ -1583,29 +1559,6 @@ public class ShipDetailRepositoryImpl extends BaseJdbcRepository { List specialFeatureListEntities = flattenEntities(items, ShipDetailUpdate::getSpecialFeatureEntityList); List thrustersListEntities = flattenEntities(items, ShipDetailUpdate::getThrustersEntityList); List darkActivityConfirmedEntities = flattenEntities(items, ShipDetailUpdate::getDarkActivityConfirmedEntityList); -// List companyComplianceEntities = flattenEntities(items, ShipDetailUpdate::getCompanyComplianceEntityList); : 2026-01-16 Company Compliance 수집 API 분리로 인한 제거 List companyVesselRelationshipEntities = flattenEntities(items, ShipDetailUpdate::getCompanyVesselRelationshipEntityList); List companyDetailEntities = flattenEntities(items, ShipDetailUpdate::getCompanyDetailEntityList); @@ -173,10 +172,6 @@ public class ShipDetailDataWriter extends BaseWriter { log.debug("DarkActivityConfirmed 저장 시작: {} 건", darkActivityConfirmedEntities.size()); shipDetailRepository.saveAllDarkActivityConfirmedData(darkActivityConfirmedEntities); - // CompanyCompliance 저장 -// log.debug("CompanyCompliance 저장 시작: {} 건", companyComplianceEntities.size()); : 2026-01-16 Company Compliance 수집 API 분리로 인한 제거 -// shipDetailRepository.saveAllCompanyComplianceData(companyComplianceEntities); : 2026-01-16 Company Compliance 수집 API 분리로 인한 제거 - // CompanyVesselRelationship 저장 log.debug("CompanyVesselRelationship 저장 시작: {} 건", companyVesselRelationshipEntities.size()); shipDetailRepository.saveAllCompanyVesselRelationshipData(companyVesselRelationshipEntities);