control id 발급 로직 수정

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

@@ -389,16 +389,22 @@ public class CtrCntrlService {
 		boolean isControl = false;
 
 		if(latestControl != null) {
-			CtrCntrlHstry latestHistory = cntrlHstryRepository.findFirstByCntrlIdOrderBySrvrRcvDtDesc(latestControl.getCntrlId());
-			long diffMinute = DateUtils.diffMinute(latestHistory.getSrvrRcvDt(), new Date());
-			log.info("DIFF MINUTE : {}", diffMinute);
+			CtrCntrlHstry latestHistory = cntrlHstryRepository.findFirstByCntrlIdOrderBySrvrRcvDtDesc(latestControl.getCntrlId()).orElse(null);
 
-			if("01".equals(latestControl.getEndTypeCd()) || diffMinute > 5) {
+			if(latestControl != null) {
+				long diffMinute = DateUtils.diffMinute(latestHistory.getSrvrRcvDt(), new Date());
+				log.info("DIFF MINUTE : {}", diffMinute);
+
+				if("01".equals(latestControl.getEndTypeCd()) || diffMinute > 5) {
+					isControl = false;
+				}
+				if(!"01".equals(latestControl.getEndTypeCd()) && diffMinute < 5) {
+					isControl = true;
+				}
+			} else {
 				isControl = false;
 			}
-			if(!"01".equals(latestControl.getEndTypeCd()) && diffMinute < 5) {
-				isControl = true;
-			}
+
 		} else {
 			isControl = false;
 		}

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

@@ -6,9 +6,10 @@ import org.springframework.stereotype.Repository;
 import com.palnet.biz.jpa.entity.CtrCntrlHstry;
 
 import java.util.List;
+import java.util.Optional;
 
 @Repository
 public interface CtrCntrlHstryRepository extends JpaRepository<CtrCntrlHstry, Integer>{
-    CtrCntrlHstry findFirstByCntrlIdOrderBySrvrRcvDtDesc(String cntrlId);
+    Optional<CtrCntrlHstry> findFirstByCntrlIdOrderBySrvrRcvDtDesc(String cntrlId);
     List<CtrCntrlHstry> findByCntrlIdOrderByHstrySno(String cntrlId);
 }

src/main/java/com/palnet/biz/message/service/impl/MessageServiceImpl.java

@@ -83,7 +83,7 @@ public class MessageServiceImpl implements MessageService {
 
         boolean isControl = false;
         if(latestControl != null) {
-            CtrCntrlHstry latestHistory = ctrCntrlHstryRepository.findFirstByCntrlIdOrderBySrvrRcvDtDesc(latestControl.getCntrlId());
+            CtrCntrlHstry latestHistory = ctrCntrlHstryRepository.findFirstByCntrlIdOrderBySrvrRcvDtDesc(latestControl.getCntrlId()).orElse(null);
             long diffMinute = DateUtils.diffMinute(latestHistory.getSrvrRcvDt(), new Date());
             log.info("DIFF MINUTE : {}", diffMinute);
 

src/main/java/com/palnet/biz/scheduler/ctr/service/CtrSchedulerService.java

@@ -76,7 +76,7 @@ public class CtrSchedulerService {
 		Map<String, String> keys = gpsDataContext.getAllKeys();
 
 		keys.forEach((key, value) -> {
-			CtrCntrlHstry history = ctrCntrlHstryRepository.findFirstByCntrlIdOrderBySrvrRcvDtDesc(value);
+			CtrCntrlHstry history = ctrCntrlHstryRepository.findFirstByCntrlIdOrderBySrvrRcvDtDesc(value).orElse(null);
 
 			if(Objects.nonNull(history)) {
 				long diffMinute = DateUtils.diffMinute(history.getSrvrRcvDt(), new Date());