From 7c39a44694884c900767531d15d5251edfaf69a1 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 09:56:24 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B8=B0=EC=B2=B4=EB=B3=84=20=EB=B9=84?= =?UTF-8?q?=EC=A0=95=EC=83=81=20=EB=A1=9C=EA=B7=B8=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=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 | 25 +++++++++++++--- .../cntrl/model/CtrCntrlArcrftWarnModel.java | 19 ++++++++++++ .../ctr/cntrl/service/CtrCntrlService.java | 30 ++++++++++++++++--- .../ctr/CtrCntrlQueryRepository.java | 18 +++++------ .../ctr/CtrCntrlWarnLogRepository.java | 2 ++ 5 files changed, 77 insertions(+), 17 deletions(-) create mode 100644 src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlArcrftWarnModel.java 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 2c3e0a0..c20179e 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 @@ -2,6 +2,7 @@ package com.palnet.biz.api.ctr.cntrl.controller; import java.util.List; +import com.palnet.biz.api.ctr.cntrl.model.*; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -12,10 +13,6 @@ import com.palnet.biz.api.bas.flight.model.BasFlightPlanModel; import com.palnet.biz.api.comn.response.BasicResponse; import com.palnet.biz.api.comn.response.ErrorResponse; import com.palnet.biz.api.comn.response.SuccessResponse; -import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlDtlModel; -import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlPlanContainsRq; -import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlPlanContainsRs; -import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlWarnLogModel; import com.palnet.biz.api.ctr.cntrl.service.CtrCntrlService; import com.palnet.comn.model.GPHistoryModel; @@ -158,6 +155,26 @@ public class CtrCntrlController { return ResponseEntity.ok().body(new SuccessResponse(warnLog)); } + /** + * TODO 기체 별 최신 비정상 로그 및 비정상 로그 전체 개수 + * + * @param id + * @return + */ + @GetMapping(value = "/arcrft/warn") + public ResponseEntity arcrftWarn(@RequestParam("id") String id){ + List arcrftWarnList; + + try { + arcrftWarnList = service.getArcrftWarn(id); + } catch (Exception e) { + log.error("IGNORE : {}", e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(new ErrorResponse("Server Error", "-1")); + } + return ResponseEntity.ok().body(new SuccessResponse(arcrftWarnList)); + } + /** * TODO 비행 관제 구역 비정상 상황 체크 * diff --git a/src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlArcrftWarnModel.java b/src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlArcrftWarnModel.java new file mode 100644 index 0000000..d881fc1 --- /dev/null +++ b/src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlArcrftWarnModel.java @@ -0,0 +1,19 @@ +package com.palnet.biz.api.ctr.cntrl.model; + +import lombok.Data; + +import java.util.Date; + +@Data +public class CtrCntrlArcrftWarnModel { + + private String cntrlId; + private String warnType; + private String idntfNum; + private Date occurDt; + private Date createDt; + private String createUserId; + + private Integer warnCount; + +} 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 3741bf6..2148e0d 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 @@ -9,9 +9,7 @@ import com.palnet.biz.api.bas.flight.model.BasFlightPlanAreaCoordModel; import com.palnet.biz.api.bas.flight.model.BasFlightPlanAreaModel; import com.palnet.biz.api.bas.flight.model.BasFlightPlanModel; import com.palnet.biz.api.bas.flight.service.BasFlightMapper; -import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlPlanContainsRq; -import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlPlanContainsRs; -import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlWarnLogModel; +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; @@ -26,7 +24,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; -import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlDtlModel; import com.palnet.biz.jpa.repository.ctr.CtrCntrlQueryRepository; import com.palnet.comn.model.GPHistoryModel; @@ -185,6 +182,31 @@ public class CtrCntrlService { return warnLog; } + public List getArcrftWarn(String id) { + List result = new ArrayList<>(); + + String[] ids = id.indexOf(",") > -1 ? id.split(",") : id.split(""); + + for(String cntrlId : ids) { + CtrCntrlArcrftWarnModel model = new CtrCntrlArcrftWarnModel(); + + 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); + + result.add(model); + } + + return result; + } + /** * TODO 식별 번호에 해당되는 비행구역 조회 * diff --git a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java index b33bad5..d933d8b 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java @@ -235,15 +235,15 @@ public class CtrCntrlQueryRepository{ if(result == null) return new CtrCntrlDtlModel(); - if(!StringUtils.isEmpty(result.getOwnerNm())) { - result.setOwnerNm(EncryptUtils.decrypt(result.getOwnerNm())); - } - if(!StringUtils.isEmpty(result.getHpno())) { - result.setHpno(EncryptUtils.decrypt(result.getHpno())); - } - if(!StringUtils.isEmpty(result.getTelno())) { - result.setTelno(EncryptUtils.decrypt(result.getTelno())); - } +// if(!StringUtils.isEmpty(result.getOwnerNm())) { +// result.setOwnerNm(EncryptUtils.decrypt(result.getOwnerNm())); +// } +// if(!StringUtils.isEmpty(result.getHpno())) { +// result.setHpno(EncryptUtils.decrypt(result.getHpno())); +// } +// if(!StringUtils.isEmpty(result.getTelno())) { +// result.setTelno(EncryptUtils.decrypt(result.getTelno())); +// } return result; } diff --git a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlWarnLogRepository.java b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlWarnLogRepository.java index 34528db..fa16a01 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlWarnLogRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlWarnLogRepository.java @@ -8,4 +8,6 @@ import com.palnet.biz.jpa.entity.CtrCntrlWarnLog; public interface CtrCntrlWarnLogRepository extends JpaRepository { List findAllByCntrlId(String cntrlId); + CtrCntrlWarnLog findFirstByCntrlIdOrderByOccurDtDesc(String cntrlId); + Integer countByCntrlId(String cntrlId); }