[관제] 기체 별 비정상 알림 리스트 작업

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<? extends BasicResponse> warnLog(@PathVariable String id){
 		List<CtrCntrlWarnLogModel> warnLog;
 		
@@ -161,12 +163,13 @@ public class CtrCntrlController {
 	 * @param id
 	 * @return
 	 */
-	@GetMapping(value = "/arcrft/warn")
+	@GetMapping(value = "/arcrft/warn/list")
 	public ResponseEntity<? extends BasicResponse> arcrftWarn(@RequestParam("id") String id){
 		List<CtrCntrlArcrftWarnModel> arcrftWarnList;
+		Map<String, CtrCntrlArcrftWarnModel> 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)

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<CtrCntrlArcrftWarnModel> getArcrftWarn(String id) {
+	public List<CtrCntrlArcrftWarnModel> getArcrftWarnList(String id) {
+		Map<String, CtrCntrlArcrftWarnModel> map = new HashMap<>();
 		List<CtrCntrlArcrftWarnModel> 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;