From eace93dfad7a822f6cf93a9d7e0d65a2872946f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lkd9125=28=EC=9D=B4=EA=B2=BD=EB=8F=84=29?=
 <lkd9125@naver.com>
Date: Wed, 15 Nov 2023 17:41:01 +0900
Subject: [PATCH] =?UTF-8?q?=ED=83=80=EC=9E=85=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../palnet/biz/jpa/repository/ctr/CtrCntrlBasRepository.java  | 3 ++-
 .../palnet/biz/scheduler/ctr/service/CtrSchedulerService.java | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlBasRepository.java b/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlBasRepository.java
index 251d9f1..efa43cb 100644
--- a/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlBasRepository.java
+++ b/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlBasRepository.java
@@ -9,6 +9,7 @@ import org.springframework.stereotype.Repository;
 import com.palnet.biz.jpa.entity.CtrCntrlBas;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.Instant;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
@@ -23,7 +24,7 @@ public interface CtrCntrlBasRepository extends JpaRepository<CtrCntrlBas, String
             "SET c.endTypeCd = :endTypeCd, c.cntrlEndDt = :cntrlEndDt, c.statusCd = :statusCd " +
             "WHERE c.cntrlId = :cntrlId")
     int updateCntrlEndType(@Param("endTypeCd") String endTypeCd,
-                           @Param("cntrlEndDt") Date cntrlEndDt,
+                           @Param("cntrlEndDt") Instant cntrlEndDt,
                            @Param("statusCd") String statusCd,
                            @Param("cntrlId") String cntrlId);
 
diff --git a/pav-server/src/main/java/com/palnet/biz/scheduler/ctr/service/CtrSchedulerService.java b/pav-server/src/main/java/com/palnet/biz/scheduler/ctr/service/CtrSchedulerService.java
index b2756d2..10f7d1f 100644
--- a/pav-server/src/main/java/com/palnet/biz/scheduler/ctr/service/CtrSchedulerService.java
+++ b/pav-server/src/main/java/com/palnet/biz/scheduler/ctr/service/CtrSchedulerService.java
@@ -23,6 +23,7 @@ import com.palnet.biz.jpa.repository.ctr.CtrCntrlQueryRepository;
 import com.palnet.biz.jpa.service.ctr.CtrCntrlJpaService;
 import com.palnet.biz.scheduler.ctr.model.CtrTrnsLctnModel;
 import com.palnet.comn.utils.DateUtils;
+import com.palnet.comn.utils.InstantUtils;
 
 @Service
 @RequiredArgsConstructor
@@ -55,7 +56,8 @@ public class CtrSchedulerService {
 				long diffMinute = DateUtils.diffMinute(history.getSrvrRcvDt(), Instant.now());
 
 				if(diffMinute > GP_END_TIME) {
-					ctrCntrlBasRepository.updateCntrlEndType("01", DateUtils.nowDate(), "99", history.getCntrlId());
+					
+					ctrCntrlBasRepository.updateCntrlEndType("01", Instant.now(), "99", history.getCntrlId());
 
 					/* 종료지점 주소 저장 */
 					CtrCntrlHstryArea area = new CtrCntrlHstryArea();