기체별 비정상 로그 조회 작업

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<List>(warnLog));
 	}
 
+	/**
+	 * TODO 기체 별 최신 비정상 로그 및 비정상 로그 전체 개수
+	 *
+	 * @param id
+	 * @return
+	 */
+	@GetMapping(value = "/arcrft/warn")
+	public ResponseEntity<? extends BasicResponse> arcrftWarn(@RequestParam("id") String id){
+		List<CtrCntrlArcrftWarnModel> 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<List>(arcrftWarnList));
+	}
+
 	/**
 	 * TODO 비행 관제 구역 비정상 상황 체크
 	 *

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;
+
+}

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<CtrCntrlArcrftWarnModel> getArcrftWarn(String id) {
+		List<CtrCntrlArcrftWarnModel> 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 식별 번호에 해당되는 비행구역 조회
 	 *

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;
 		
 	}

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<CtrCntrlWarnLog, Integer> {
 	List<CtrCntrlWarnLog> findAllByCntrlId(String cntrlId);
+	CtrCntrlWarnLog findFirstByCntrlIdOrderByOccurDtDesc(String cntrlId);
+	Integer countByCntrlId(String cntrlId);
 }