From 05e09236c52ddc3a8f0c653d525deec439b6965b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lkd9125=28=EC=9D=B4=EA=B2=BD=EB=8F=84=29?= Date: Thu, 22 Feb 2024 10:49:12 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20Flt=EB=AA=A8=EB=93=88=20-=20Laanc?= =?UTF-8?q?=EC=8A=B9=EC=9D=B8=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EB=B6=88?= =?UTF-8?q?=EB=9F=AC=EC=98=A4=EA=B8=B0=20=EA=B8=B0=EB=8A=A5=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=EB=B3=B4=EC=99=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kac/api/v1/flight/laanc/model/FltPlanArcrftDTO.java | 3 ++- .../palnet/kac/api/v1/flight/laanc/model/FltPlanAreaDTO.java | 1 + .../kac/api/v1/flight/laanc/service/FlightLaancService.java | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) 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();