diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanArcrftDTO.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanArcrftDTO.java index 73dcc38..ef54552 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanArcrftDTO.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanArcrftDTO.java @@ -1,5 +1,6 @@ package kr.co.palnet.kac.api.v1.flight.laanc.model; +import kr.co.palnet.kac.api.v1.flight.laanc.model.constant.ArcrftWghtCd; import kr.co.palnet.kac.api.v1.flight.laanc.model.create.BasLaancArcrftModel; import kr.co.palnet.kac.data.flt.model.FltPlanArcrft; import lombok.Data; @@ -56,7 +57,7 @@ public class FltPlanArcrftDTO { dto.setArcrftWdth(model.getArcrftWdth()); dto.setArcrftHght(model.getArcrftHght()); dto.setArcrftWght(model.getArcrftWght()); - dto.setArcrftWghtCd(model.getWghtTypeCd()); + dto.setArcrftWghtCd(model.getArcrftWghtCd().getCode()); dto.setWghtTypeCd(model.getWghtTypeCd()); dto.setImageUrl(model.getImageUrl()); dto.setTakeoffWght(model.getTakeoffWght()); diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanAreaDTO.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanAreaDTO.java index 90edbe2..1aa0de7 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanAreaDTO.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/model/FltPlanAreaDTO.java @@ -30,6 +30,7 @@ public class FltPlanAreaDTO { dto.setAreaType(model.getAreaType()); dto.setFltMethod(model.getFltMethod()); dto.setFltMothoeRm(model.getFltMothoeRm()); + dto.setFltAreaAddr(model.getFltAreaAddr()); dto.setBufferZone(model.getBufferZone()); dto.setFltElev(model.getFltElev()); dto.setCreateUserId(model.getCreateUserId()); diff --git a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/service/FlightLaancService.java b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/service/FlightLaancService.java index 22075be..a9ea4b6 100644 --- a/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/service/FlightLaancService.java +++ b/web/api-flight/src/main/java/kr/co/palnet/kac/api/v1/flight/laanc/service/FlightLaancService.java @@ -5,6 +5,7 @@ import kr.co.palnet.kac.api.external.model.TsQRcodeRQ; import kr.co.palnet.kac.api.external.service.CtrTrnsLctnService; import kr.co.palnet.kac.api.external.service.TsService; import kr.co.palnet.kac.api.util.*; +import kr.co.palnet.kac.api.v1.flight.laanc.model.constant.FltType; import kr.co.palnet.kac.api.v1.flight.laanc.model.create.CstmrModel; import kr.co.palnet.kac.api.v1.flight.laanc.model.*; import kr.co.palnet.kac.api.v1.flight.laanc.model.create.*; @@ -518,6 +519,9 @@ public class FlightLaancService { for(FltPlanBas fltPlanBas : fltPlanBasList){ SearchLaancAprvRS node = SearchLaancAprvRS.toModel(fltPlanBas); + node.setHpno(EncryptUtil.decrypt(node.getHpno())); + node.setEmail(EncryptUtil.decrypt(node.getEmail())); + node.setFltTypeNm(node.getFltType().getValue()); Long planSno = node.getPlanSno();