비정상 상황 알림 리스트 작업

src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java

@@ -58,6 +58,7 @@ public class BasFlightController {
     @GetMapping(value = "/plan/list")
     public ResponseEntity<? extends BasicResponse> listPlan(BasFlightPlanListRq rq) {
         List<BasFlightPlanModel> result = null;
+        System.out.println(rq);
         try {
             result = basFlightService.listPlan(rq);
         } catch (Exception e) {

src/main/java/com/palnet/biz/api/ctr/cntrl/controller/CtrCntrlController.java

@@ -2,20 +2,20 @@ package com.palnet.biz.api.ctr.cntrl.controller;
 
 import java.util.List;
 
-import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrGroupModel;
-import com.palnet.biz.api.bas.flight.model.BasFlightPlanModel;
-import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlPlanContainsRq;
-import com.palnet.biz.api.ctr.cntrl.model.CtrCntrlPlanContainsRs;
-import com.palnet.comn.model.GPModel;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrGroupModel;
+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;
 
@@ -57,7 +57,7 @@ public class CtrCntrlController {
 	/**
 	 * TODO 드론 관제 상세 정보
 	 *
- 	 * @param id
+ 	 * @param id - 관제 ID
 	 * @return
 	 */
 	@GetMapping(value = "/detail/{id}")
@@ -77,7 +77,7 @@ public class CtrCntrlController {
 	}
 
 	/**
-	 * TODO 드론 관제 이력 목록
+	 * TODO 드론 관제 '실시간' 이력 목록
 	 *
 	 * @param id - 관제 ID
 	 * @return
@@ -93,7 +93,6 @@ public class CtrCntrlController {
 			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
 					.body(new ErrorResponse("Server Error", "-1"));
 		}
-
 		return ResponseEntity.ok().body(new SuccessResponse<>(history));
 	}
 
@@ -139,6 +138,26 @@ public class CtrCntrlController {
 		return ResponseEntity.ok().body(new SuccessResponse<List>(list));
 	}
 	
+	/**
+	 * TODO 드론 운행 시작 후 알람 목록
+	 * 
+	 * @param id - 관제 ID
+	 * @return
+	 */
+	@GetMapping(value = "/warnLog/{id}")
+	public ResponseEntity<? extends BasicResponse> warnLog(@PathVariable String id){
+		List<CtrCntrlWarnLogModel> warnLog;
+		
+		try {
+			warnLog = service.getWarnLog(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<List>(warnLog));
+	}
+
 	/**
 	 * TODO 비행 관제 구역 비정상 상황 체크
 	 *

src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlWarnLogModel.java

@@ -0,0 +1,17 @@
+package com.palnet.biz.api.ctr.cntrl.model;
+
+import lombok.Data;
+import java.util.Date;
+import java.util.List;
+
+import com.palnet.biz.jpa.entity.CtrCntrlWarnLog;
+
+@Data
+public class CtrCntrlWarnLogModel {
+	private Integer warnLogSno;
+	private String warnType;
+	private String cntrlId;
+	private Date createDt;
+//	private List<CtrCntrlWarnLog> list;
+//	private Integer count;
+}

src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java

@@ -11,17 +11,16 @@ 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.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.CtrCntrlWarnLogRepository;
 import com.palnet.biz.jpa.repository.flt.*;
-import com.palnet.comn.model.GPModel;
 import com.palnet.comn.utils.AreaUtils;
 import com.palnet.comn.utils.DateUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.locationtech.jts.geom.Coordinate;
-import org.locationtech.jts.geom.GeometryFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -37,6 +36,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Log4j2
 public class CtrCntrlService {
 	private final CtrCntrlQueryRepository query;
+	private final CtrCntrlWarnLogRepository warnLogRepository;
 	private final ComIdntBasRepository idntfRepository;
 	private final ComArcrftBasRepository arcrftRepository;
 	private final FltPlanBasRepository planBasRepository;
@@ -48,6 +48,7 @@ public class CtrCntrlService {
 
 
 	public CtrCntrlService(CtrCntrlQueryRepository query,
+						   CtrCntrlWarnLogRepository warnLogRepository,
 						   ComIdntBasRepository idntfRepository,
 						   ComArcrftBasRepository arcrftRepository,
 						   FltPlanBasRepository planBasRepository,
@@ -57,6 +58,7 @@ public class CtrCntrlService {
 						   FltPlanAreaCoordRepository planCoordRepository,
 						   AreaUtils areaUtils) {
 		this.query = query;
+		this.warnLogRepository = warnLogRepository;
 		this.idntfRepository = idntfRepository;
 		this.arcrftRepository = arcrftRepository;
 		this.planBasRepository = planBasRepository;
@@ -141,6 +143,23 @@ public class CtrCntrlService {
 		return list;
 	}
 	
+	public List<CtrCntrlWarnLogModel> getWarnLog(String controlId) {
+		List<CtrCntrlWarnLog> logs = warnLogRepository.findAllByCntrlId(controlId);
+		List<CtrCntrlWarnLogModel> warnLog = new ArrayList<CtrCntrlWarnLogModel>();
+		
+		for(CtrCntrlWarnLog log : logs) {
+			CtrCntrlWarnLogModel model = new CtrCntrlWarnLogModel();
+			
+			model.setCntrlId(log.getCntrlId());
+			model.setCreateDt(log.getCreateDt());
+			model.setWarnLogSno(log.getWarnLogSno());
+			model.setWarnType(log.getWarnType());
+			
+			warnLog.add(model);
+		}
+		return warnLog;
+	}
+
 	@Transactional(readOnly = true)
 	public List<BasFlightPlanModel> getFlightPlan(String  idntfNum) {
 		List<BasFlightPlanModel> rs = new ArrayList<>();

src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlWarnLogRepository.java

@@ -1,8 +1,11 @@
 package com.palnet.biz.jpa.repository.ctr;
 
-import com.palnet.biz.jpa.entity.CtrCntrlWarnLog;
+import java.util.List;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface CtrCntrlWarnLogRepository extends JpaRepository<CtrCntrlWarnLog, Integer> {
+import com.palnet.biz.jpa.entity.CtrCntrlWarnLog;
 
+public interface CtrCntrlWarnLogRepository extends JpaRepository<CtrCntrlWarnLog, Integer> {
+	List<CtrCntrlWarnLog> findAllByCntrlId(String cntrlId);
 }