diff --git a/pav-server/src/main/java/com/palnet/biz/api/external/service/TsService.java b/pav-server/src/main/java/com/palnet/biz/api/external/service/TsService.java index 4c89c8c..59bc833 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/external/service/TsService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/external/service/TsService.java @@ -10,6 +10,7 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import org.springframework.web.reactive.function.client.WebClient; +import org.springframework.web.reactive.function.client.WebClientResponseException; import org.springframework.web.util.DefaultUriBuilderFactory; import org.springframework.web.util.UriComponentsBuilder; import org.springframework.web.util.UriUtils; @@ -45,7 +46,10 @@ public class TsService { for (PilotValidRq rq : rqList) { PilotValidRs pilotValidRs = this.callAccountValidate(rq); if (pilotValidRs == null) { - pilotValidRs = new PilotValidRs(); + pilotValidRs = PilotValidRs.builder() + .rspCode("500") + .rspMessage("TS API error") + .build(); } pilotValidRs.setRq(rq); rsList.add(pilotValidRs); @@ -72,11 +76,31 @@ public class TsService { .defaultHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) .build(); - ResponseEntity resp = client.get() - .uri(uriStr) - .retrieve() - .toEntity(PilotValidRs.class) - .block(); + ResponseEntity resp = null; + try { + resp = client.get() + .uri(uriStr) + .retrieve() + .toEntity(PilotValidRs.class) + .block(); + } catch (Exception e) { + log.error("TS API 호출 중 오류가 발생하였습니다. {}", e.getMessage()); + String erroCode = "500"; + String errorMessage = "TS API error"; + if(e instanceof WebClientResponseException){ + WebClientResponseException wcre = (WebClientResponseException) e; + erroCode = String.valueOf(wcre.getRawStatusCode()); + errorMessage = wcre.getStatusText(); + } + resp = ResponseEntity.ok().body(PilotValidRs.builder() + .rspCode(erroCode) + .rspMessage(errorMessage) +// .pilotcredentialyn("N") +// .arcrftinsuranceyn("N") +// .arcrftdeclaration("N") +// .corpregyn("N") + .build()); + } PilotValidRs rs = null; if (resp != null) { diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/entity/FltCptAuthAdmDistrictRel.java b/pav-server/src/main/java/com/palnet/biz/jpa/entity/FltCptAuthAdmDistrictRel.java index 2a8f7c9..08b0d17 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/entity/FltCptAuthAdmDistrictRel.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/entity/FltCptAuthAdmDistrictRel.java @@ -3,6 +3,7 @@ package com.palnet.biz.jpa.entity; import lombok.Data; import javax.persistence.*; +import java.time.Instant; /** * packageName : com.palnet.biz.jpa.entity @@ -23,9 +24,10 @@ public class FltCptAuthAdmDistrictRel { @EmbeddedId private FltCptAuthAdmDistrictRelPk id; - @Column(name = "UPDATE_DT") - private String UPDATE_DT; - @Column(name = "CREATE_DT") - private String CREATE_DT; + @Column(name = "UPDATE_DT", columnDefinition = "TIMESTAMP") + private Instant UPDATE_DT; + + @Column(name = "CREATE_DT", columnDefinition = "TIMESTAMP", updatable = false) + private Instant CREATE_DT; } diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/entity/FltCptAuthAdmDistrictRelPk.java b/pav-server/src/main/java/com/palnet/biz/jpa/entity/FltCptAuthAdmDistrictRelPk.java index 0287b75..f9c7c43 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/entity/FltCptAuthAdmDistrictRelPk.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/entity/FltCptAuthAdmDistrictRelPk.java @@ -27,5 +27,7 @@ public class FltCptAuthAdmDistrictRelPk implements Serializable { private String CPT_AUTH_CODE; @Column(name = "ADM_CD") private String ADM_CD; + @Column(name = "TYPE") + private String type; } diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/entity/FltCptAuthBas.java b/pav-server/src/main/java/com/palnet/biz/jpa/entity/FltCptAuthBas.java index c7c763b..4df4db4 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/entity/FltCptAuthBas.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/entity/FltCptAuthBas.java @@ -26,12 +26,14 @@ public class FltCptAuthBas { @Id @Column(name = "CPT_AUTH_CODE") private String cptAuthCode; - @Column(name = "APT_AUTH_NM") - private String aptAuthNm; - @Column(name = "APT_AUTH_TP") - private String aptAuthTp; - @Column(name = "APT_AUTH_FAX") - private String aptAuthFax; + @Column(name = "CPT_AUTH_NM") + private String cptAuthNm; + @Column(name = "CPT_AUTH_TP") + private String cptAuthTp; + @Column(name = "CPT_AUTH_FAX") + private String cptAuthFax; + @Column(name = "RM") + private String rm; @Column(name = "UPDATE_DT", columnDefinition = "TIMESTAMP") private Instant updateDt; @Column(name = "CREATE_DT", columnDefinition = "TIMESTAMP", updatable = false)