From 2612206ed06d2dc0fd364672dfcaa6a19d5e16eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?scnoh=28=EB=85=B8=EC=8A=B9=EC=B2=A0=29?= Date: Tue, 4 Oct 2022 14:41:49 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=EC=9A=B4=ED=95=AD=20?= =?UTF-8?q?=EC=8A=A4=EC=BC=80=EC=A4=84=20=EB=AA=A9=EB=A1=9D=20-=20?= =?UTF-8?q?=EB=B9=84=ED=96=89=20=EC=83=81=ED=83=9C=20=EA=B0=92=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/api/bas/flight/model/BasFlightScheduleRs.java | 5 ++++- .../biz/jpa/repository/flt/FltPlanQueryRepository.java | 7 +++++-- .../biz/message/service/impl/MessageServiceImpl.java | 6 +++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightScheduleRs.java b/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightScheduleRs.java index b15c776..e9a950a 100644 --- a/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightScheduleRs.java +++ b/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightScheduleRs.java @@ -9,14 +9,17 @@ public class BasFlightScheduleRs { private String groupId; private String groupNm; - private String memberName; private String ownerNm; private String idntfNum; + private String startAddress; + private String endAddress; private Date schFltStDt; private Date schFltEndDt; private String cntrlId; private Date cntrlStDt; private Date cntrlEndDt; + + // BEFORE (B) : 비행 전, FLYING (F) : 비행 중, SUCCESS (S) : 비행 완료 private String statusCd; } diff --git a/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java index f17af07..534659e 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java @@ -10,6 +10,7 @@ import com.querydsl.core.types.ConstantImpl; import com.querydsl.core.types.ExpressionUtils; import com.querydsl.core.types.Predicate; import com.querydsl.core.types.Projections; +import com.querydsl.core.types.dsl.CaseBuilder; import com.querydsl.core.types.dsl.DateTemplate; import com.querydsl.core.types.dsl.Expressions; import com.querydsl.jpa.JPAExpressions; @@ -393,7 +394,6 @@ public class FltPlanQueryRepository { .from(groupBas) .where(groupBas.groupId.eq(fltPlanBas.groupId)),"groupNm" ), - fltPlanBas.memberName, fltPlanArcrft.ownerNm, fltPlanArcrft.idntfNum, ExpressionUtils.as( @@ -427,7 +427,10 @@ public class FltPlanQueryRepository { cntrlBas.cntrlId, cntrlBas.cntrlStDt, cntrlBas.cntrlEndDt, - cntrlBas.statusCd + new CaseBuilder() + .when(cntrlBas.statusCd.eq("01")).then("F") + .when(cntrlBas.statusCd.eq("99")).then("S") + .otherwise("B").as("statusCd") ) ) .from(fltPlanBas) diff --git a/src/main/java/com/palnet/biz/message/service/impl/MessageServiceImpl.java b/src/main/java/com/palnet/biz/message/service/impl/MessageServiceImpl.java index d9504e9..c0c32f1 100644 --- a/src/main/java/com/palnet/biz/message/service/impl/MessageServiceImpl.java +++ b/src/main/java/com/palnet/biz/message/service/impl/MessageServiceImpl.java @@ -108,11 +108,11 @@ public class MessageServiceImpl implements MessageService { model.setTypeCd("01"); model.setAreaTrnsYn("N"); model.setControlStartDt(DateUtils.getCurrentTime()); - - // 기체 식별번호의 관제 ID 저장 (single ton) - shareContext.putIdntfKey(model.getObjectId(), controlID); } + // 기체 식별번호의 관제 ID 저장 + shareContext.putIdntfKey(model.getObjectId(), model.getControlId()); + return model; }