From bcf4f04040765bc6a1526505874e8cfc4f973925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?scnoh=28=EB=85=B8=EC=8A=B9=EC=B2=A0=29?=
 <stc9606@palnet.co.kr>
Date: Fri, 7 Oct 2022 11:27:15 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89=20=EC=9D=B4=EB=A0=A5=20?=
 =?UTF-8?q?=EA=B4=80=EA=B3=84=20=EB=A7=A4=ED=95=91=20=EC=9E=91=EC=97=85=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/MessageServiceImpl.java       | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

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 49d86fa..be1d5ba 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
@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.palnet.biz.api.bas.flight.model.BasFlightPlanArcrftModel;
 import com.palnet.biz.api.bas.flight.model.BasFlightPlanModel;
 import com.palnet.biz.jpa.entity.*;
+import com.palnet.biz.jpa.repository.com.ComArcrftBasRepository;
 import com.palnet.biz.jpa.repository.com.ComIdntBasRepository;
 import com.palnet.biz.jpa.repository.ctr.CtrCntrlBasRepository;
 import com.palnet.biz.jpa.repository.ctr.CtrCntrlHstryRepository;
@@ -29,10 +30,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.UUID;
+import java.util.*;
 
 @Service
 @Slf4j
@@ -42,6 +40,7 @@ public class MessageServiceImpl implements MessageService {
     private final CtrCntrlBasRepository ctrCntrlBasRepository;
     private final CtrCntrlHstryRepository ctrCntrlHstryRepository;
     private final PtyDronQueryRepository ptyDronQueryRepository;
+    private final ComArcrftBasRepository arcrftBasRepository;
     private final ComIdntBasRepository idntBasRepository;
     private final FltPlanQueryRepository fltPlanQueryRepository;
     private final FltPlanCtrCntrlRelRepository ctrCntrlRelRepository;
@@ -54,6 +53,7 @@ public class MessageServiceImpl implements MessageService {
                               CtrCntrlBasRepository ctrCntrlBasRepository,
                               CtrCntrlHstryRepository ctrCntrlHstryRepository,
                               PtyDronQueryRepository ptyDronQueryRepository,
+                              ComArcrftBasRepository arcrftBasRepository,
                               ComIdntBasRepository idntBasRepository,
                               FltPlanQueryRepository fltPlanQueryRepository,
                               FltPlanCtrCntrlRelRepository ctrCntrlRelRepository,
@@ -65,6 +65,7 @@ public class MessageServiceImpl implements MessageService {
         this.ctrCntrlBasRepository = ctrCntrlBasRepository;
         this.ctrCntrlHstryRepository = ctrCntrlHstryRepository;
         this.ptyDronQueryRepository = ptyDronQueryRepository;
+        this.arcrftBasRepository = arcrftBasRepository;
         this.idntBasRepository = idntBasRepository;
         this.fltPlanQueryRepository = fltPlanQueryRepository;
         this.ctrCntrlRelRepository = ctrCntrlRelRepository;
@@ -139,13 +140,17 @@ public class MessageServiceImpl implements MessageService {
             if (model.getObjectId().indexOf("PALDRONE") > -1) {
                 FltPlanCtrCntrlRel fltPlanCtrCntrlRel = new FltPlanCtrCntrlRel();
 
-                // 1. 식별번호의 소유자 정보 저장.
+                // 1. 식별 번호의 소유자 정보 저장.
                 ComIdntfBas idntfBas = idntBasRepository.findById(model.getObjectId()).orElse(null);
 
-                if (idntfBas != null) {
+                // 1-1. 식별 번호의 모델 정보 조회
+                ComArcrftBas arcrftBas = arcrftBasRepository.findById(idntfBas.getArcrftSno()).orElse(null);
+
+                if (idntfBas != null && arcrftBas != null) {
                     fltPlanCtrCntrlRel.setCntrlId(ctrCntrlBas.getCntrlId());
                     fltPlanCtrCntrlRel.setIdntfNum(ctrCntrlBas.getIdntfNum());
                     fltPlanCtrCntrlRel.setIdntfCstmrSno(idntfBas.getCstmrSno());
+                    fltPlanCtrCntrlRel.setGroupId(arcrftBas.getGroupId());
                 }
 
                 // 2. 해당 되는 비행계획서 정보 저장.
@@ -155,7 +160,6 @@ public class MessageServiceImpl implements MessageService {
                 if (!planArcrft.isEmpty()) {
                     for (FltPlanBas plan : planArcrft) {
                         fltPlanCtrCntrlRel.setPlanSno(plan.getPlanSno());
-                        fltPlanCtrCntrlRel.setGroupId(plan.getGroupId());
                     }
                 }