From 701ab6c309bdb62bdad864ab5190fdbf5259bd19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?scnoh=28=EB=85=B8=EC=8A=B9=EC=B2=A0=29?= Date: Fri, 2 Sep 2022 15:42:23 +0900 Subject: [PATCH] =?UTF-8?q?[=EA=B4=80=EC=A0=9C]=20=EA=B8=B0=EC=B2=B4=20?= =?UTF-8?q?=EB=B3=84=20=EB=B9=84=EC=A0=95=EC=83=81=20=EC=95=8C=EB=A6=BC=20?= =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=9E=91=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cntrl/controller/CtrCntrlController.java | 9 +++-- .../ctr/cntrl/service/CtrCntrlService.java | 36 ++++++++++++------- 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java b/src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java index c20179e..a140e45 100644 --- a/src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java +++ b/src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java @@ -1,6 +1,8 @@ package com.palnet.biz.api.ctr.cntrl.controller; +import java.util.HashMap; import java.util.List; +import java.util.Map; import com.palnet.biz.api.ctr.cntrl.model.*; import org.springframework.http.HttpStatus; @@ -141,7 +143,7 @@ public class CtrCntrlController { * @param id - 관제 ID * @return */ - @GetMapping(value = "/warnLog/{id}") + @GetMapping(value = "/warn/list/{id}") public ResponseEntity warnLog(@PathVariable String id){ List warnLog; @@ -161,12 +163,13 @@ public class CtrCntrlController { * @param id * @return */ - @GetMapping(value = "/arcrft/warn") + @GetMapping(value = "/arcrft/warn/list") public ResponseEntity arcrftWarn(@RequestParam("id") String id){ List arcrftWarnList; + Map result = new HashMap<>(); try { - arcrftWarnList = service.getArcrftWarn(id); + arcrftWarnList = service.getArcrftWarnList(id); } catch (Exception e) { log.error("IGNORE : {}", e); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) diff --git a/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java b/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java index 2148e0d..1f935fc 100644 --- a/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java +++ b/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java @@ -1,8 +1,6 @@ package com.palnet.biz.api.ctr.cntrl.service; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrGroupModel; import com.palnet.biz.api.bas.flight.model.BasFlightPlanAreaCoordModel; @@ -13,6 +11,7 @@ import com.palnet.biz.api.ctr.cntrl.model.*; 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.CtrCntrlWarnLogRepository; import com.palnet.biz.jpa.repository.flt.*; import com.palnet.comn.utils.AreaUtils; @@ -34,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional; @Log4j2 public class CtrCntrlService { private final CtrCntrlQueryRepository query; + private final CtrCntrlBasRepository cntrlBasRepository; private final CtrCntrlWarnLogRepository warnLogRepository; private final ComIdntBasRepository idntfRepository; private final ComArcrftBasRepository arcrftRepository; @@ -46,6 +46,7 @@ public class CtrCntrlService { public CtrCntrlService(CtrCntrlQueryRepository query, + CtrCntrlBasRepository cntrlBasRepository, CtrCntrlWarnLogRepository warnLogRepository, ComIdntBasRepository idntfRepository, ComArcrftBasRepository arcrftRepository, @@ -56,6 +57,7 @@ public class CtrCntrlService { FltPlanAreaCoordRepository planCoordRepository, AreaUtils areaUtils) { this.query = query; + this.cntrlBasRepository = cntrlBasRepository; this.warnLogRepository = warnLogRepository; this.idntfRepository = idntfRepository; this.arcrftRepository = arcrftRepository; @@ -182,26 +184,36 @@ public class CtrCntrlService { return warnLog; } - public List getArcrftWarn(String id) { + public List getArcrftWarnList(String id) { + Map map = new HashMap<>(); List result = new ArrayList<>(); - String[] ids = id.indexOf(",") > -1 ? id.split(",") : id.split(""); + if("".equals(id) || id == null) return null; + + String[] ids = id.indexOf(",") > -1 ? id.split(",") : new String[] {id}; for(String cntrlId : ids) { CtrCntrlArcrftWarnModel model = new CtrCntrlArcrftWarnModel(); + CtrCntrlBas control = cntrlBasRepository.findById(cntrlId).orElse(null); CtrCntrlWarnLog warnLog = warnLogRepository.findFirstByCntrlIdOrderByOccurDtDesc(cntrlId); Integer warnCount = warnLogRepository.countByCntrlId(cntrlId); - model.setCntrlId(warnLog.getCntrlId()); - model.setIdntfNum(warnLog.getIdntfNum()); - model.setWarnType(warnLog.getWarnType()); - model.setOccurDt(warnLog.getOccurDt()); - model.setCreateDt(warnLog.getCreateDt()); - model.setCreateUserId(warnLog.getCreateUserId()); - model.setWarnCount(warnCount); + if(control != null) { + if(warnLog != null) { + model.setWarnType(warnLog.getWarnType()); + model.setOccurDt(warnLog.getOccurDt()); + model.setCreateDt(warnLog.getCreateDt()); + model.setCreateUserId(warnLog.getCreateUserId()); + } + + model.setCntrlId(control.getCntrlId()); + model.setIdntfNum(control.getIdntfNum()); + model.setWarnCount(warnCount); + } result.add(model); +// map.put(cntrlId, model); } return result;