PavServer -> Date 객체 Instant로 1차 변경

pav-server/src/main/java/com/palnet/biz/api/acnt/crtfyhp/service/AcntCrtfyhpService.java

@@ -1,5 +1,6 @@
 package com.palnet.biz.api.acnt.crtfyhp.service;
 
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -243,7 +244,7 @@ public class AcntCrtfyhpService {
 			if(certifNum != null) {
 				String encryptPw = EncryptUtils.sha256Encrypt(newPw);
 				certifNum.setUserPswd(encryptPw);
-				certifNum.setPswdUpdtDt(DateUtils.nowDate());
+				certifNum.setPswdUpdtDt(Instant.now());
 				ptyCstmrBasRepository.save(certifNum);
 				result = true;
 			}

pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/model/AcntCstmrEmModel.java

@@ -1,5 +1,6 @@
 package com.palnet.biz.api.acnt.cstmr.model;
 
+import java.time.Instant;
 import java.util.Date;
 
 import lombok.Data;
@@ -9,7 +10,7 @@ public class AcntCstmrEmModel {
 	
 	private String email;
 	
-	private Date updateDt;
+	private Instant updateDt;
 	
 	private String updateUserId;
 	

pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/model/AcntCstmrPwModel.java

@@ -1,5 +1,6 @@
 package com.palnet.biz.api.acnt.cstmr.model;
 
+import java.time.Instant;
 import java.util.Date;
 
 import lombok.Data;
@@ -7,7 +8,7 @@ import lombok.Data;
 @Data
 public class AcntCstmrPwModel {
 	
-	private Date pswdupdtDt;
+	private Instant pswdupdtDt;
 	
 	private String userPswd;
 	

pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/model/AnctCstmerRlModel.java

@@ -1,5 +1,6 @@
 package com.palnet.biz.api.acnt.cstmr.model;
 
+import java.time.Instant;
 import java.util.Date;
 
 import lombok.Data;
@@ -9,7 +10,7 @@ public class AnctCstmerRlModel {
 	
 	private String memberName;
 	
-	private Date brthdyDate;
+	private Instant brthdyDate;
 	
 	private String genderCd;
 	
@@ -21,7 +22,7 @@ public class AnctCstmerRlModel {
 	
 	private String userId;
 	
-	private Date updateDt;
+	private Instant updateDt;
 	
 	private String updateuserId;
 	

pav-server/src/main/java/com/palnet/biz/api/acnt/cstmr/service/AcntCstmrService.java

@@ -1,5 +1,6 @@
 package com.palnet.biz.api.acnt.cstmr.service;
 
+import java.time.Instant;
 import java.util.List;
 
 import javax.persistence.EntityManagerFactory;
@@ -144,7 +145,7 @@ public class AcntCstmrService {
 		basEntity.setSiteCode(rq.getSiteCode());
 		basEntity.setMemberDivCd(rq.getMemberDivCd());
 		basEntity.setUserPswd(rq.getUserPswd());
-		basEntity.setJoinDt(DateUtils.nowDate());
+		basEntity.setJoinDt(Instant.now() );
 		basEntity.setJoinIp(HttpUtils.getRequestIp());
 		basEntity.setTrmnlId(rq.getTrmnlId());
 		
@@ -165,7 +166,7 @@ public class AcntCstmrService {
 		dtlEntity.setEmail(rq.getEmail());
 		dtlEntity.setHpno(rq.getHpno());
 		dtlEntity.setClncd(rq.getClncd());
-		dtlEntity.setUpdateDt(DateUtils.nowDate());
+		dtlEntity.setUpdateDt(Instant.now() );
 		dtlEntity.setUpdateUserId(rq.getUserId());
 		
 		return ptyCstmrDtlRepository.save(dtlEntity);
@@ -177,11 +178,11 @@ public class AcntCstmrService {
 		agreeEntity.setCstmrSno(basEntity.getCstmrSno());
 		agreeEntity.setProcIp(HttpUtils.getRequestIp());
 		agreeEntity.setTermsSno(agree.getTermsSno());
-		agreeEntity.setUpdateDt(DateUtils.nowDate());
+		agreeEntity.setUpdateDt(Instant.now() );
 		agreeEntity.setUpdateUserId(basEntity.getUserId());
 		agreeEntity.setAgreeYn(agree.getAgreeYn());
 		if(agree.getAgreeYn().equals("Y")) {
-			agreeEntity.setAgreeDt(DateUtils.nowDate());
+			agreeEntity.setAgreeDt(Instant.now() );
 			
 		}
 		
@@ -221,7 +222,7 @@ public class AcntCstmrService {
   		
   		// 7. 유저 정보 저장
 		userEntity.setUserPswd(encryptNewPwd);
-  		userEntity.setPswdUpdtDt(DateUtils.nowDate());
+  		userEntity.setPswdUpdtDt(Instant.now() );
   		
   		PtyCstmrBas updateUserEntity =  ptyCstmrBasRepository.save(userEntity);
   		
@@ -267,7 +268,7 @@ public class AcntCstmrService {
 		PtyCstmrDtl userEntity = ptyCstmrDtlRepository.findById(cstmrSno).orElse(null);
 		
 		userEntity.setEmail(newEmail);
-		userEntity.setUpdateDt(DateUtils.nowDate());
+		userEntity.setUpdateDt(Instant.now() );
 		userEntity.setUpdateUserId(userId);
 		userEntity.setHpno(newHpno);
 		
@@ -311,7 +312,7 @@ public class AcntCstmrService {
 	}
 		PtyCstmrBas userEntity = ptyCstmrBasRepository.findByUserGroupId(cstmrSno);
 		userEntity.setCstmrStatusCd("W");
-		userEntity.setCstmrStatusCngDt(DateUtils.nowDate());
+		userEntity.setCstmrStatusCngDt(Instant.now() );
 		ptyCstmrBasRepository.save(userEntity);
 			
 		boolean result = true;

pav-server/src/main/java/com/palnet/biz/api/acnt/jwt/utils/JwtTokenUtil.java

@@ -14,6 +14,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.Serializable;
+import java.time.Instant;
 import java.util.*;
 import java.util.function.Function;
 

pav-server/src/main/java/com/palnet/biz/api/acnt/terms/model/AcntTermsRsModel.java

@@ -1,5 +1,6 @@
 package com.palnet.biz.api.acnt.terms.model;
 
+import java.time.Instant;
 import java.util.Date;
 
 import lombok.Data;
@@ -11,7 +12,7 @@ public class AcntTermsRsModel{
 	
 	private String siteCd;
 	
-	private Date estbshDate;
+	private Instant estbshDate;
 	
 	private String termsCtgryCd;
 	

pav-server/src/main/java/com/palnet/biz/api/anls/hstry/model/AnlsHstryDetailModel.java

@@ -1,5 +1,6 @@
 package com.palnet.biz.api.anls.hstry.model;
 
+import java.time.Instant;
 import java.util.Date;
 
 import lombok.Data;
@@ -39,9 +40,9 @@ public class AnlsHstryDetailModel{
 	
 	private Double bttrVltg;
 	
-	private Date trmnlRcvDt;
+	private Instant trmnlRcvDt;
 	
-	private Date srvrRcvDt;
+	private Instant  srvrRcvDt;
 		
 	
 }

pav-server/src/main/java/com/palnet/biz/api/anls/hstry/model/AnlsHstryModel.java

@@ -1,5 +1,6 @@
 package com.palnet.biz.api.anls.hstry.model;
 
+import java.time.Instant;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -26,13 +27,13 @@ public class AnlsHstryModel{
 
 	private String objectTypeCd;
 	
-	private Date flghtStDt;
+	private Instant flghtStDt;
 	
-	private Date flghtEndDt;
+	private Instant flghtEndDt;
 	
-	private Date cntrlStDt;
+	private Instant  cntrlStDt;
 	
-	private Date cntrlEndDt;
+	private Instant  cntrlEndDt;
 	
 	private Double ttlTime= 0.0;
 	
@@ -72,8 +73,8 @@ public class AnlsHstryModel{
 	
 	private String endArea = "";
 	
-	private Date createDt;
+	private Instant  createDt;
 	
-	private Date updateDt;
+	private Instant  updateDt;
 	
 }

pav-server/src/main/java/com/palnet/biz/api/anls/hstry/model/AnlsHstryRsModel.java

@@ -1,5 +1,6 @@
 package com.palnet.biz.api.anls.hstry.model;
 
+import java.time.Instant;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -26,13 +27,13 @@ public class AnlsHstryRsModel{
 
 	private String objectTypeCd;
 	
-	private Date flghtStDt;
+	private Instant flghtStDt;
 	
-	private Date flghtEndDt;
+	private Instant  flghtEndDt;
 	
-	private Date cntrlStDt;
+	private Instant  cntrlStDt;
 	
-	private Date cntrlEndDt;
+	private Instant  cntrlEndDt;
 	
 	private Double ttlTime= 0.0;
 	
@@ -76,8 +77,8 @@ public class AnlsHstryRsModel{
 	
 	private int cstmrSno;
 	
-	private Date createDt;
+	private Instant  createDt;
 	
-	private Date updateDt;
+	private Instant  updateDt;
 	
 }

pav-server/src/main/java/com/palnet/biz/api/anls/smlt/model/AnlsSmltDetailModel.java

@@ -1,5 +1,6 @@
 package com.palnet.biz.api.anls.smlt.model;
 
+import java.time.Instant;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -22,13 +23,13 @@ public class AnlsSmltDetailModel{
 
 	private String idntfNum;
 	
-	private Date flghtStDt;
+	private Instant flghtStDt;
 	
-	private Date flghtEndDt;
+	private Instant flghtEndDt;
 	
-	private Date cntrlStDt;
+	private Instant cntrlStDt;
 	
-	private Date cntrlEndDt;
+	private Instant cntrlEndDt;
 	
 	private Double ttlTime= 0.0;
 	

pav-server/src/main/java/com/palnet/biz/api/anls/smlt/model/AnlsSmltHistModel.java

@@ -1,9 +1,9 @@
 package com.palnet.biz.api.anls.smlt.model;
 
-import java.util.Date;
-
 import lombok.Data;
 
+import java.time.Instant;
+
 @Data
 public class AnlsSmltHistModel{
 	
@@ -39,8 +39,8 @@ public class AnlsSmltHistModel{
 	
 	private double bttrVltg;
 	
-	private Date trmnlRcvDt;
+	private Instant trmnlRcvDt;
 	
-	private Date srvrRcvDt;
+	private Instant srvrRcvDt;
 	
 }

pav-server/src/main/java/com/palnet/biz/api/bas/dron/model/BasDronModel.java

@@ -1,5 +1,6 @@
 package com.palnet.biz.api.bas.dron.model;
 
+import java.time.Instant;
 import java.util.Date;
 
 import lombok.Data;
@@ -27,7 +28,7 @@ public class BasDronModel {
 
 	private String cameraYn;
 
-	private Date createDt;
+	private Instant createDt;
 
 	private String createUserId;
 
@@ -35,13 +36,13 @@ public class BasDronModel {
 
 	private String prdctCmpnNm;
 
-	private Date prdctDate;
+	private Instant prdctDate;
 
 	private String prdctNum;
 
 	private double takeoffWght;
 
-	private Date updateDt;
+	private Instant updateDt;
 
 	private String updateUserId;
 	

pav-server/src/main/java/com/palnet/biz/api/bas/dron/model/BasIdntfModel.java

@@ -1,5 +1,6 @@
 package com.palnet.biz.api.bas.dron.model;
 
+import java.time.Instant;
 import java.util.Date;
 
 import lombok.Data;
@@ -20,9 +21,9 @@ public class BasIdntfModel {
 	
 	private String hpno;
 
-	private Date updateDt;
+	private Instant updateDt;
 	
-	private Date createDt;
+	private Instant createDt;
 	
 	private int cstmrSno;
 	

pav-server/src/main/java/com/palnet/biz/api/bas/dron/model/BasOwnerModel.java

@@ -1,5 +1,6 @@
 package com.palnet.biz.api.bas.dron.model;
 
+import java.time.Instant;
 import java.util.Date;
 
 import lombok.Data;
@@ -19,11 +20,11 @@ public class BasOwnerModel {
 	
 	private String useYn;
 	
-	private Date createDt;
+	private Instant createDt;
 	
 	private String createUserId;
 	
-	private Date updateDt;
+	private Instant updateDt;
 	
 	private String updateUserId;
 	

pav-server/src/main/java/com/palnet/biz/api/bas/dron/service/BasDronService.java

@@ -1,5 +1,6 @@
 package com.palnet.biz.api.bas.dron.service;
 
+import java.time.Instant;
 import java.util.List;
 import java.util.Optional;
 
@@ -92,7 +93,7 @@ public class BasDronService {
 	
 	/**
 	 * 상세 조회
-	 * @param cntrlId
+	 * @param arcrftSno
 	 * @return
 	 * @throws Exception
 	 */
@@ -193,8 +194,8 @@ public class BasDronService {
 
 			entity.setHpno(hpno);
 			entity.setArcrftSno(rq.getArcrftSno());
-			entity.setCreateDt(DateUtils.nowDate());
-			entity.setUpdateDt(DateUtils.nowDate());
+			entity.setCreateDt(Instant.now());
+			entity.setUpdateDt(Instant.now());
 			entity.setCstmrSno(cstmrSno);
 			log.debug(entity.toString());
 			
@@ -225,8 +226,8 @@ public class BasDronService {
 		
 		BeanUtils.copyProperties(model , basEntity);
 		
-		basEntity.setCreateDt(DateUtils.nowDate());
-		basEntity.setUpdateDt(DateUtils.nowDate());
+		basEntity.setCreateDt(Instant.now());
+		basEntity.setUpdateDt(Instant.now());
 		basEntity.setUseYn("Y");
 		
 		log.debug(basEntity.toString());
@@ -239,8 +240,8 @@ public class BasDronService {
 		ComIdntfBas entity = new ComIdntfBas();
 		
 		BeanUtils.copyProperties(model , entity);
-		entity.setCreateDt(DateUtils.nowDate());
-		entity.setUpdateDt(DateUtils.nowDate());
+		entity.setCreateDt(Instant.now());
+		entity.setUpdateDt(Instant.now());
 		log.debug(entity.toString());
 		
 		return comIdntBasRepository.save(entity);
@@ -344,7 +345,7 @@ public class BasDronService {
 		entity.setPrdctNum(model.getPrdctNum());
 		entity.setTakeoffWght(model.getTakeoffWght());
 		entity.setUpdateUserId(model.getUpdateUserId());
-		entity.setUpdateDt(DateUtils.nowDate());
+		entity.setUpdateDt(Instant.now());
 		
 		return comArcrftBasRepository.save(entity);
 		

pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanArcrftModel.java

@@ -2,6 +2,7 @@ package com.palnet.biz.api.bas.flight.model;
 
 import lombok.Data;
 
+import java.time.Instant;
 import java.util.Date;
 
 @Data
@@ -15,7 +16,7 @@ public class BasFlightPlanArcrftModel {
     private String arcrftTypeCd;
     private String arcrftModelNm;
     private String prdctCmpnNm;
-    private Date prdctDate;
+    private Instant prdctDate;
     private double arcrftLngth;
     private double arcrftWdth;
     private double arcrftHght;
@@ -28,9 +29,9 @@ public class BasFlightPlanArcrftModel {
     private String insrncYn;
     private String ownerNm;
     private String createUserId;
-    private Date createDt;
+    private Instant createDt;
     private String updateUserId;
-    private Date updateDt;
+    private Instant updateDt;
     private String docState = "R";
     private String idntfTypeCd;
 }

pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanAreaCoordModel.java

@@ -2,6 +2,7 @@ package com.palnet.biz.api.bas.flight.model;
 
 import lombok.Data;
 
+import java.time.Instant;
 import java.util.Date;
 
 @Data
@@ -11,6 +12,6 @@ public class BasFlightPlanAreaCoordModel {
     private double lat;
     private double lon;
     private String createUserId;
-    private Date createDt;
+    private Instant createDt;
     private String docState = "R";
 }

pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanAreaModel.java

@@ -2,6 +2,7 @@ package com.palnet.biz.api.bas.flight.model;
 
 import lombok.Data;
 
+import java.time.Instant;
 import java.util.Date;
 import java.util.List;
 
@@ -14,9 +15,9 @@ public class BasFlightPlanAreaModel {
     private Integer bufferZone;
     private String fltElev;
     private String createUserId;
-    private Date createDt;
+    private Instant createDt;
     private String updateUserId;
-    private Date updateDt;
+    private Instant  updateDt;
     private String docState = "R";
     private List<BasFlightPlanAreaCoordModel> coordList;
     private List<BasFlightPlanAreaCoordModel> bufferCoordList;

pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanListRq.java

@@ -2,6 +2,7 @@ package com.palnet.biz.api.bas.flight.model;
 
 import lombok.Data;
 
+import java.time.Instant;
 import java.util.Date;
 
 import com.palnet.biz.api.comn.model.ComnPagingModel;
@@ -13,8 +14,8 @@ public class BasFlightPlanListRq extends ComnPagingModel {
 
     private String groupId;
     private Integer cstmrSno;
-    private Date schFltStDt;
-    private Date schFltEndDt;
+    private Instant schFltStDt;
+    private Instant schFltEndDt;
     private String aprvlYn;
 
 }

pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanModel.java

@@ -2,6 +2,7 @@ package com.palnet.biz.api.bas.flight.model;
 
 import lombok.Data;
 
+import java.time.Instant;
 import java.util.Date;
 import java.util.List;
 
@@ -18,15 +19,15 @@ public class BasFlightPlanModel {
     private String addr;
     private String addrDtlCn;
     private String zip;
-    private Date schFltStDt;
-    private Date schFltEndDt;
+    private Instant schFltStDt;
+    private Instant schFltEndDt;
     private String fltPurpose;
     private String aprvlYn;
     private String delYn;
     private String createUserId;
-    private Date createDt;
+    private Instant createDt;
     private String updateUserId;
-    private Date updateDt;
+    private Instant updateDt;
     private String docState = "R";
     private List<BasFlightPlanAreaModel> areaList;
     private List<BasFlightPlanPilotModel> pilotList;

pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightPlanPilotModel.java

@@ -2,6 +2,7 @@ package com.palnet.biz.api.bas.flight.model;
 
 import lombok.Data;
 
+import java.time.Instant;
 import java.util.Date;
 
 @Data
@@ -20,8 +21,8 @@ public class BasFlightPlanPilotModel {
     private String qlfcNo;
     private String carrer;
     private String createUserId;
-    private Date createDt;
+    private Instant createDt;
     private String updateUserId;
-    private Date updateDt;
+    private Instant updateDt;
     private String docState = "R";
 }

pav-server/src/main/java/com/palnet/biz/api/bas/flight/model/BasFlightScheduleRs.java

@@ -2,6 +2,7 @@ package com.palnet.biz.api.bas.flight.model;
 
 import lombok.Data;
 
+import java.time.Instant;
 import java.util.Date;
 
 @Data
@@ -13,11 +14,11 @@ public class BasFlightScheduleRs {
     private String idntfNum;
     private String startAddress;
     private String endAddress;
-    private Date schFltStDt;
-    private Date schFltEndDt;
+    private Instant schFltStDt;
+    private Instant schFltEndDt;
     private String cntrlId;
-    private Date cntrlStDt;
-    private Date cntrlEndDt;
+    private Instant cntrlStDt;
+    private Instant cntrlEndDt;
     
     // BEFORE (B) : 비행 전, FLYING (F) : 비행 중, SUCCESS (S) : 비행 완료 
     private String statusCd;

pav-server/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupAprvModel.java

@@ -1,5 +1,6 @@
 package com.palnet.biz.api.bas.group.model;
 
+import java.time.Instant;
 import java.util.Date;
 
 import lombok.Data;
@@ -25,9 +26,9 @@ public class BasGroupAprvModel {
 	
 	private String userId;
 	
-	private Date aprvlDt;
+	private Instant aprvlDt;
 	
-	private Date joinDt;
+	private Instant joinDt;
 	
 	private String groupAuthCd;
 	

pav-server/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupJoinModel.java

@@ -1,5 +1,6 @@
 package com.palnet.biz.api.bas.group.model;
 
+import java.time.Instant;
 import java.util.Date;
 
 import lombok.Data;
@@ -21,15 +22,15 @@ public class BasGroupJoinModel {
 	
 	private String joinYn = "N";
 	
-	private Date joinDt;
+	private Instant joinDt;
 	
-	private Date aprvlDt;
+	private Instant aprvlDt;
 	
 	private String groupAuthCd;
 	
-	private Date createDt;
+	private Instant createDt;
 	
-	private Date updateDt;
+	private Instant updateDt;
 	
 	private String myGroupAuthCd;
 

pav-server/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupModel.java

@@ -1,5 +1,6 @@
 package com.palnet.biz.api.bas.group.model;
 
+import java.time.Instant;
 import java.util.Date;
 
 import lombok.Data;
@@ -15,9 +16,9 @@ public class BasGroupModel {
 	
 	private int cstmrSno;
 	
-	private Date createDt;
+	private Instant createDt;
 	
-	private Date updateDt;
+	private Instant updateDt;
 
 	private String trmnlId;
 

pav-server/src/main/java/com/palnet/biz/api/bas/group/model/BasGroupUserModel.java

@@ -1,5 +1,6 @@
 package com.palnet.biz.api.bas.group.model;
 
+import java.time.Instant;
 import java.util.Date;
 
 import lombok.Data;
@@ -21,9 +22,9 @@ public class BasGroupUserModel {
 	
 	private String userId;
 	
-	private Date aprvlDt;
+	private Instant aprvlDt;
 	
-	private Date joinDt;
+	private Instant  joinDt;
 	
 	private String joinYn;
 	

pav-server/src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlArcrftWarnModel.java

@@ -2,6 +2,7 @@ package com.palnet.biz.api.ctr.cntrl.model;
 
 import lombok.Data;
 
+import java.time.Instant;
 import java.util.Date;
 
 @Data
@@ -10,8 +11,8 @@ public class CtrCntrlArcrftWarnModel {
     private String cntrlId;
     private String warnType;
     private String idntfNum;
-    private Date occurDt;
-    private Date createDt;
+    private Instant occurDt;
+    private Instant createDt;
     private String createUserId;
 
     private Integer warnCount;

pav-server/src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlDtlModel.java

@@ -1,5 +1,6 @@
 package com.palnet.biz.api.ctr.cntrl.model;
 
+import java.time.Instant;
 import java.util.Date;
 
 import lombok.Data;
@@ -10,8 +11,8 @@ public class CtrCntrlDtlModel {
 private String messageTypeCd;
 	
 	private String cntrlId;
-	private Date cntrlStDt;
-	private Date cntrlEndDt;
+	private Instant cntrlStDt;
+	private Instant cntrlEndDt;
 	private int arcrftSno;
 	private String prdctNum;
 	private String arcrftTypeCd;

pav-server/src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlEndModel.java

@@ -1,5 +1,6 @@
 package com.palnet.biz.api.ctr.cntrl.model;
 
+import java.time.Instant;
 import java.util.Date;
 
 import lombok.Data;
@@ -9,13 +10,13 @@ public class CtrCntrlEndModel {
 	
 	private String cntrlId;
 	
-	private Date cntrlStdt;
+	private Instant cntrlStdt;
 	
-	private Date cntrlEndDt;
+	private Instant cntrlEndDt;
 	
 	private String statusCd;
 	
-	private Date srvrRcvDt;
+	private Instant srvrRcvDt;
 	
 	
 }

pav-server/src/main/java/com/palnet/biz/api/ctr/cntrl/model/CtrCntrlGroupArcrftModel.java

@@ -2,6 +2,7 @@ package com.palnet.biz.api.ctr.cntrl.model;
 
 import lombok.Data;
 
+import java.time.Instant;
 import java.util.Date;
 
 @Data
@@ -17,7 +18,7 @@ public class CtrCntrlGroupArcrftModel {
     private String arcrftTypeCd;
     private String arcrftModelNm;
     private String prdctCmpnNm;
-    private Date createDt;
-    private Date updateDt;
+    private Instant createDt;
+    private Instant updateDt;
 
 }

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

@@ -1,6 +1,8 @@
 package com.palnet.biz.api.ctr.cntrl.model;
 
 import lombok.Data;
+
+import java.time.Instant;
 import java.util.Date;
 import java.util.List;
 
@@ -12,7 +14,7 @@ public class CtrCntrlWarnLogModel {
 	private String idntfNum;
 	private String warnType;
 	private String cntrlId;
-	private Date createDt;
+	private Instant createDt;
 //	private List<CtrCntrlWarnLog> list;
 //	private Integer count;
 }

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

@@ -7,6 +7,7 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
+import java.time.Instant;
 import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -311,7 +312,7 @@ public class CtrCntrlService {
 				log.setLat(hisControl.getLat());
 				log.setLon(hisControl.getLon());
 				log.setElev(hisControl.getElev());
-				log.setCreateDt(DateUtils.nowDate());
+				log.setCreateDt(Instant.now());
 				log.setWarnType("PLAN");
 				warnLogRepository.save(log);
 			}
@@ -340,7 +341,7 @@ public class CtrCntrlService {
 	public List<BasFlightPlanModel> getFlightPlan(String idntfNum) {
 		List<BasFlightPlanModel> rs = new ArrayList<>();
 
-		Date fltNowDt = DateUtils.nowDate();
+		Instant fltNowDt = Instant.now();
 
 		// 기체 식별 정보 조회
 		ComIdntfBas idntfBas = idntfRepository.findById(idntfNum).orElse(null);
@@ -561,7 +562,7 @@ public class CtrCntrlService {
 			CtrCntrlHstry latestHistory = cntrlHstryRepository.findFirstByCntrlIdOrderBySrvrRcvDtDesc(latestControl.getCntrlId()).orElse(null);
 
 			if (latestHistory != null) {
-				long diffMinute = DateUtils.diffMinute(latestHistory.getSrvrRcvDt(), new Date());
+				long diffMinute = DateUtils.diffMinute(latestHistory.getSrvrRcvDt(), Instant.now());
 //				log.info("DIFF MINUTE : {}", diffMinute);
 
 				if ("01".equals(latestControl.getEndTypeCd()) || diffMinute > 5) {

pav-server/src/main/java/com/palnet/biz/api/main/dash/model/MainDashListModel.java

@@ -1,5 +1,6 @@
 package com.palnet.biz.api.main.dash.model;
 
+import java.time.Instant;
 import java.util.Date;
 
 import lombok.Data;
@@ -11,7 +12,7 @@ public class MainDashListModel {
 	
 	private String prdctNum = "";
 	
-	private Date createDt;
+	private Instant createDt;
 	
 	private String groupNm ="";
 	

pav-server/src/main/java/com/palnet/biz/jpa/entity/ComArcrftBas.java

@@ -6,6 +6,7 @@ import javax.persistence.*;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.Instant;
 import java.util.Date;
 
 
@@ -49,9 +50,9 @@ public class ComArcrftBas implements Serializable {
 	@Column(name="CAMERA_YN")
 	private String cameraYn;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="CREATE_DT")
-	private Date createDt;
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="CREATE_DT", columnDefinition = "TIMESTAMP")
+	private Instant createDt;
 
 	@Column(name="CREATE_USER_ID")
 	private String createUserId;
@@ -62,9 +63,9 @@ public class ComArcrftBas implements Serializable {
 	@Column(name="PRDCT_CMPN_NM")
 	private String prdctCmpnNm;
 
-	@Temporal(TemporalType.DATE)
-	@Column(name="PRDCT_DATE")
-	private Date prdctDate;
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="PRDCT_DATE", columnDefinition = "TIMESTAMP")
+	private Instant prdctDate;
 
 	@Column(name="PRDCT_NUM")
 	private String prdctNum;
@@ -75,9 +76,9 @@ public class ComArcrftBas implements Serializable {
 	@Column(name="USE_YN")
 	private String useYn;
 	
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="UPDATE_DT")
-	private Date updateDt;
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="UPDATE_DT", columnDefinition = "TIMESTAMP")
+	private Instant updateDt;
 
 	@Column(name="UPDATE_USER_ID")
 	private String updateUserId;

pav-server/src/main/java/com/palnet/biz/jpa/entity/ComAuthBas.java

@@ -22,8 +22,8 @@ public class ComAuthBas implements Serializable {
 	@Column(name="AUTH_NM")
 	private String authNm;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="CREATE_DT")
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="CREATE_DT", columnDefinition = "TIMESTAMP")
 	private Date createDt;
 
 	@Column(name="CREATE_USER_ID")
@@ -36,8 +36,8 @@ public class ComAuthBas implements Serializable {
 	@Column(name="SITE_CD")
 	private String siteCd;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="UPDATE_DT")
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="UPDATE_DT", columnDefinition = "TIMESTAMP")
 	private Date updateDt;
 
 	@Column(name="UPDATE_USER_ID")

pav-server/src/main/java/com/palnet/biz/jpa/entity/ComCdBas.java

@@ -21,8 +21,8 @@ public class ComCdBas implements Serializable {
 	@Column(name="ADD_INFO_VALUE")
 	private String addInfoValue;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="CREATE_DT")
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="CREATE_DT", columnDefinition = "TIMESTAMP")
 	private Date createDt;
 
 	@Column(name="CREATE_USER_ID")
@@ -31,8 +31,8 @@ public class ComCdBas implements Serializable {
 	@Column(name="SORT_ORDR")
 	private byte sortOrdr;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="UPDTE_DT")
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="UPDTE_DT", columnDefinition = "TIMESTAMP")
 	private Date updteDt;
 
 	@Column(name="UPDTE_USER_ID")

pav-server/src/main/java/com/palnet/biz/jpa/entity/ComCdGroupBas.java

@@ -2,6 +2,7 @@ package com.palnet.biz.jpa.entity;
 
 import java.io.Serializable;
 import javax.persistence.*;
+import java.time.Instant;
 import java.util.Date;
 
 
@@ -19,9 +20,8 @@ public class ComCdGroupBas implements Serializable {
 	@Column(name="GROUP_CD")
 	private String groupCd;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="CREATE_DT")
-	private Date createDt;
+	@Column(name="CREATE_DT", columnDefinition = "TIMESTAMP")
+	private Instant createDt;
 
 	@Column(name="CREATE_USER_ID")
 	private String createUserId;
@@ -36,9 +36,9 @@ public class ComCdGroupBas implements Serializable {
 	@Column(name="SITE_CD")
 	private String siteCd;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="UPDTE_DT")
-	private Date updteDt;
+
+	@Column(name="UPDTE_DT", columnDefinition = "TIMESTAMP")
+	private Instant updteDt;
 
 	@Column(name="UPDTE_USER_ID")
 	private String updteUserId;
@@ -54,11 +54,11 @@ public class ComCdGroupBas implements Serializable {
 		this.groupCd = groupCd;
 	}
 
-	public Date getCreateDt() {
+	public Instant getCreateDt() {
 		return this.createDt;
 	}
 
-	public void setCreateDt(Date createDt) {
+	public void setCreateDt(Instant createDt) {
 		this.createDt = createDt;
 	}
 
@@ -94,11 +94,11 @@ public class ComCdGroupBas implements Serializable {
 		this.siteCd = siteCd;
 	}
 
-	public Date getUpdteDt() {
+	public Instant getUpdteDt() {
 		return this.updteDt;
 	}
 
-	public void setUpdteDt(Date updteDt) {
+	public void setUpdteDt(Instant updteDt) {
 		this.updteDt = updteDt;
 	}
 

pav-server/src/main/java/com/palnet/biz/jpa/entity/ComCdLangCtg.java

@@ -21,8 +21,8 @@ public class ComCdLangCtg implements Serializable {
 	@Column(name="CD_NM")
 	private String cdNm;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="CREATE_DT")
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="CREATE_DT", columnDefinition = "TIMESTAMP")
 	private Date createDt;
 
 	@Column(name="CREATE_USER_ID")
@@ -32,8 +32,8 @@ public class ComCdLangCtg implements Serializable {
 	@Column(name="RM")
 	private String rm;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="UPDTE_DT")
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="UPDTE_DT", columnDefinition = "TIMESTAMP")
 	private Date updteDt;
 
 	@Column(name="UPDTE_USER_ID")

pav-server/src/main/java/com/palnet/biz/jpa/entity/ComIdntfBas.java

@@ -5,6 +5,7 @@ import javax.persistence.*;
 
 import lombok.Data;
 
+import java.time.Instant;
 import java.util.Date;
 
 
@@ -38,13 +39,13 @@ public class ComIdntfBas implements Serializable {
 	@Column(name="HPNO")
 	private String hpno;
 	
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="CREATE_DT")
-	private Date createDt;
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="CREATE_DT", columnDefinition = "TIMESTAMP")
+	private Instant createDt;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="UPDATE_DT")
-	private Date updateDt;
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="UPDATE_DT", columnDefinition = "TIMESTAMP")
+	private Instant updateDt;
 	
 	public ComIdntfBas() {
 	}

pav-server/src/main/java/com/palnet/biz/jpa/entity/ComSiteBas.java

@@ -19,8 +19,8 @@ public class ComSiteBas implements Serializable {
 	@Column(name="SITE_CD")
 	private String siteCd;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="CREATE_DT")
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="CREATE_DT", columnDefinition = "TIMESTAMP")
 	private Date createDt;
 
 	@Column(name="CREATE_USER_ID")
@@ -36,8 +36,8 @@ public class ComSiteBas implements Serializable {
 	@Column(name="SITE_URL")
 	private String siteUrl;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="UPDATE_DT")
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="UPDATE_DT", columnDefinition = "TIMESTAMP")
 	private Date updateDt;
 
 	@Column(name="UPDATE_USER_ID")

pav-server/src/main/java/com/palnet/biz/jpa/entity/ComTrmnlBas.java

@@ -22,8 +22,8 @@ public class ComTrmnlBas implements Serializable {
 	@Column(name="AUTH_KEY")
 	private String authKey;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="CREATE_DT")
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="CREATE_DT", columnDefinition = "TIMESTAMP")
 	private Date createDt;
 
 	@Column(name="CREATE_USER_ID")
@@ -35,8 +35,8 @@ public class ComTrmnlBas implements Serializable {
 	@Column(name="TRMNL_NM")
 	private String trmnlNm;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="UPDATE_DATE")
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="UPDATE_DATE", columnDefinition = "TIMESTAMP")
 	private Date updateDate;
 
 	@Column(name="UPDATE_USER_ID")

pav-server/src/main/java/com/palnet/biz/jpa/entity/CtrCntrlBas.java

@@ -5,6 +5,7 @@ import javax.persistence.*;
 
 import lombok.Data;
 
+import java.time.Instant;
 import java.util.Date;
 
 
@@ -32,28 +33,28 @@ public class CtrCntrlBas implements Serializable {
 	@Column(name="BTTR_CNSMPTN")
 	private Double bttrCnsmptn = 0.0;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="CNTRL_END_DT")
-	private Date cntrlEndDt;
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="CNTRL_END_DT", columnDefinition = "TIMESTAMP")
+	private Instant cntrlEndDt;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="CNTRL_ST_DT")
-	private Date cntrlStDt;
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="CNTRL_ST_DT", columnDefinition = "TIMESTAMP")
+	private Instant cntrlStDt;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="CREATE_DT")
-	private Date createDt;
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="CREATE_DT", columnDefinition = "TIMESTAMP")
+	private Instant createDt;
 
 	@Column(name="END_TYPE_CD")
 	private String endTypeCd;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="FLGHT_END_DT")
-	private Date flghtEndDt;
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="FLGHT_END_DT", columnDefinition = "TIMESTAMP")
+	private Instant flghtEndDt;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="FLGHT_ST_DT")
-	private Date flghtStDt;
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="FLGHT_ST_DT", columnDefinition = "TIMESTAMP")
+	private Instant flghtStDt;
 
 	@Column(name="IDNTF_NUM")
 	private String idntfNum;
@@ -79,9 +80,9 @@ public class CtrCntrlBas implements Serializable {
 	@Column(name="TTL_TIME_TYPE")
 	private String ttlTimeType;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="UPDATE_DT")
-	private Date updateDt;
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="UPDATE_DT", columnDefinition = "TIMESTAMP")
+	private Instant updateDt;
 	
 
 }

pav-server/src/main/java/com/palnet/biz/jpa/entity/CtrCntrlHstry.java

@@ -2,6 +2,7 @@ package com.palnet.biz.jpa.entity;
 
 import java.io.Serializable;
 import javax.persistence.*;
+import java.time.Instant;
 import java.util.Date;
 
 
@@ -59,9 +60,9 @@ public class CtrCntrlHstry implements Serializable {
 	@Column(name="SPEED_TYPE")
 	private String speedType;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="SRVR_RCV_DT")
-	private Date srvrRcvDt;
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="SRVR_RCV_DT", columnDefinition = "TIMESTAMP")
+	private Instant srvrRcvDt;
 
 	@Column(name="STATUS_CD")
 	private String statusCd;
@@ -69,9 +70,9 @@ public class CtrCntrlHstry implements Serializable {
 	@Column(name="TRMNL_ID")
 	private String trmnlId;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="TRMNL_RCV_DT")
-	private Date trmnlRcvDt;
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="TRMNL_RCV_DT", columnDefinition = "TIMESTAMP")
+	private Instant trmnlRcvDt;
 
 	// 환경센서 필드
 	@Column(name="SENSOR_CO")
@@ -200,11 +201,11 @@ public class CtrCntrlHstry implements Serializable {
 		this.speedType = speedType;
 	}
 
-	public Date getSrvrRcvDt() {
+	public Instant getSrvrRcvDt() {
 		return this.srvrRcvDt;
 	}
 
-	public void setSrvrRcvDt(Date srvrRcvDt) {
+	public void setSrvrRcvDt(Instant srvrRcvDt) {
 		this.srvrRcvDt = srvrRcvDt;
 	}
 
@@ -224,11 +225,11 @@ public class CtrCntrlHstry implements Serializable {
 		this.trmnlId = trmnlId;
 	}
 
-	public Date getTrmnlRcvDt() {
+	public Instant getTrmnlRcvDt() {
 		return this.trmnlRcvDt;
 	}
 
-	public void setTrmnlRcvDt(Date trmnlRcvDt) {
+	public void setTrmnlRcvDt(Instant trmnlRcvDt) {
 		this.trmnlRcvDt = trmnlRcvDt;
 	}
 

pav-server/src/main/java/com/palnet/biz/jpa/entity/CtrCntrlHstryArea.java

@@ -2,6 +2,7 @@ package com.palnet.biz.jpa.entity;
 
 import java.io.Serializable;
 import javax.persistence.*;
+import java.time.Instant;
 import java.util.Date;
 
 
@@ -41,9 +42,9 @@ public class CtrCntrlHstryArea implements Serializable {
 	@Column(name="CNTRL_ID")
 	private String cntrlId;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="CREATE_DT")
-	private Date createDt;
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="CREATE_DT", columnDefinition = "TIMESTAMP")
+	private Instant createDt;
 
 	@Column(name="HSTRY_SNO")
 	private int hstrySno;
@@ -63,9 +64,9 @@ public class CtrCntrlHstryArea implements Serializable {
 	@Column(name="PRCS_YN")
 	private String prcsYn;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="UPDATE_DT")
-	private Date updateDt;
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="UPDATE_DT", columnDefinition = "TIMESTAMP")
+	private Instant updateDt;
 
 	@Column(name="ZIP_CD")
 	private String zipCd;
@@ -137,11 +138,11 @@ public class CtrCntrlHstryArea implements Serializable {
 		this.cntrlId = cntrlId;
 	}
 
-	public Date getCreateDt() {
+	public Instant getCreateDt() {
 		return this.createDt;
 	}
 
-	public void setCreateDt(Date createDt) {
+	public void setCreateDt(Instant createDt) {
 		this.createDt = createDt;
 	}
 
@@ -193,11 +194,11 @@ public class CtrCntrlHstryArea implements Serializable {
 		this.prcsYn = prcsYn;
 	}
 
-	public Date getUpdateDt() {
+	public Instant getUpdateDt() {
 		return this.updateDt;
 	}
 
-	public void setUpdateDt(Date updateDt) {
+	public void setUpdateDt(Instant updateDt) {
 		this.updateDt = updateDt;
 	}
 

pav-server/src/main/java/com/palnet/biz/jpa/entity/CtrCntrlWarnLog.java

@@ -3,6 +3,7 @@ package com.palnet.biz.jpa.entity;
 import lombok.Data;
 
 import javax.persistence.*;
+import java.time.Instant;
 import java.util.Date;
 
 @Entity
@@ -25,7 +26,7 @@ public class CtrCntrlWarnLog {
     private String idntfNum;
 
     @Column(name = "OCCUR_DT")
-    private Date occurDt;
+    private Instant occurDt;
 
     @Column(name = "LAT")
     private double lat;
@@ -37,7 +38,7 @@ public class CtrCntrlWarnLog {
     private double elev;
 
     @Column(name = "CREATE_DT")
-    private Date createDt;
+    private Instant createDt;
 
     @Column(name = "CREATE_USER_ID")
     private String createUserId;

pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanArcrft.java

@@ -83,16 +83,16 @@ public class FltPlanArcrft {
     private String createUserId;
 
     @CreationTimestamp
-    @Temporal(TemporalType.TIMESTAMP)
-    @Column(name="CREATE_DT")
+//    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name="CREATE_DT", columnDefinition = "TIMESTAMP")
     private Date createDt;
 
     @Column(name="UPDATE_USER_ID")
     private String updateUserId;
 
     @UpdateTimestamp
-    @Temporal(TemporalType.TIMESTAMP)
-    @Column(name="update_DT")
+//    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name="update_DT", columnDefinition = "TIMESTAMP")
     private Date updateDt;
 
 

pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanArea.java

@@ -6,6 +6,7 @@ import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.UpdateTimestamp;
 
 import javax.persistence.*;
+import java.time.Instant;
 import java.util.Date;
 
 @Table(name = "FLT_PLAN_AREA")
@@ -38,17 +39,17 @@ public class FltPlanArea {
     private String createUserId;
 
     @CreationTimestamp
-    @Temporal(TemporalType.TIMESTAMP)
-    @Column(name = "CREATE_DT")
-    private Date createDt;
+//    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name = "CREATE_DT", columnDefinition = "TIMESTAMP")
+    private Instant createDt;
 
     @Column(name = "UPDATE_USER_ID")
     private String updateUserId;
 
     @UpdateTimestamp
-    @Temporal(TemporalType.TIMESTAMP)
-    @Column(name = "UPDATE_DT")
-    private Date updateDt;
+//    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name = "UPDATE_DT", columnDefinition = "TIMESTAMP")
+    private Instant updateDt;
 
 
 }

pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanAreaCoord.java

@@ -33,7 +33,7 @@ public class FltPlanAreaCoord {
     private String createUserId;
 
     @CreationTimestamp
-    @Temporal(TemporalType.TIMESTAMP)
-    @Column(name = "CREATE_DT")
+//    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name = "CREATE_DT", columnDefinition = "TIMESTAMP")
     private Date createDt;
 }

pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanBas.java

@@ -6,6 +6,7 @@ import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.UpdateTimestamp;
 
 import javax.persistence.*;
+import java.time.Instant;
 import java.time.LocalDateTime;
 import java.util.Date;
 
@@ -48,10 +49,10 @@ public class FltPlanBas {
     private String zip;
 
     @Column(name = "SCH_FLT_ST_DT")
-    private Date schFltStDt;
+    private Instant schFltStDt;
 
     @Column(name = "SCH_FLT_END_DT")
-    private Date schFltEndDt;
+    private Instant schFltEndDt;
 
     @Column(name = "FLT_PURPOSE")
     private String fltPurpose;
@@ -66,17 +67,17 @@ public class FltPlanBas {
     private String createUserId;
 
     @CreationTimestamp
-    @Temporal(TemporalType.TIMESTAMP)
-    @Column(name = "CREATE_DT")
-    private Date createDt;
+//    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name = "CREATE_DT", columnDefinition = "TIMESTAMP")
+    private Instant createDt;
 
     @Column(name = "UPDATE_USER_ID")
     private String updateUserId;
 
     @UpdateTimestamp
-    @Temporal(TemporalType.TIMESTAMP)
-    @Column(name = "UPDATE_DT")
-    private Date updateDt;
+//    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name = "UPDATE_DT", columnDefinition = "TIMESTAMP")
+    private Instant updateDt;
 
 }
 

pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanPilot.java

@@ -6,6 +6,7 @@ import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.UpdateTimestamp;
 
 import javax.persistence.*;
+import java.time.Instant;
 import java.util.Date;
 
 @Table(name = "FLT_PLAN_PILOT")
@@ -59,16 +60,16 @@ public class FltPlanPilot {
     private String createUserId;
 
     @CreationTimestamp
-    @Temporal(TemporalType.TIMESTAMP)
-    @Column(name = "CREATE_DT")
-    private Date createDt;
+//    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name = "CREATE_DT", columnDefinition = "TIMESTAMP")
+    private Instant createDt;
 
     @Column(name = "UPDATE_USER_ID")
     private String updateUserId;
 
     @UpdateTimestamp
-    @Temporal(TemporalType.TIMESTAMP)
-    @Column(name = "UPDATE_DT")
-    private Date updateDt;
+//    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name = "UPDATE_DT", columnDefinition = "TIMESTAMP")
+    private Instant updateDt;
 
 }

pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyCrtfyhpBas.java

@@ -5,6 +5,7 @@ import org.hibernate.annotations.CreationTimestamp;
 
 import javax.persistence.*;
 import java.io.Serializable;
+import java.time.Instant;
 import java.util.Date;
 
 
@@ -26,7 +27,7 @@ public class PtyCrtfyhpBas implements Serializable {
 
 	@CreationTimestamp
 	@Column(name="CREATE_DT")
-	private Date createDt;
+	private Instant createDt;
 
 	@Column(name="CRTFYHP_NO")
 	private String crtfyhpNo;

pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrBas.java

@@ -5,6 +5,7 @@ import javax.persistence.*;
 
 import lombok.Data;
 
+import java.time.Instant;
 import java.util.Date;
 
 
@@ -33,13 +34,13 @@ public class PtyCstmrBas implements Serializable {
 	@Column(name="CSTMR_STATUS_CD")
 	private String cstmrStatusCd;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="CSTMR_STATUS_CNG_DT")
-	private Date cstmrStatusCngDt;
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="CSTMR_STATUS_CNG_DT", columnDefinition = "TIMESTAMP")
+	private Instant cstmrStatusCngDt;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="JOIN_DT")
-	private Date joinDt;
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="JOIN_DT", columnDefinition = "TIMESTAMP")
+	private Instant joinDt;
 
 	@Column(name="JOIN_IP")
 	private String joinIp;
@@ -47,9 +48,9 @@ public class PtyCstmrBas implements Serializable {
 	@Column(name="MEMBER_DIV_CD")
 	private String memberDivCd;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="PSWD_UPDT_DT")
-	private Date pswdUpdtDt;
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="PSWD_UPDT_DT", columnDefinition = "TIMESTAMP")
+	private Instant pswdUpdtDt;
 
 	@Column(name="SITE_CODE")
 	private String siteCode;

pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrConectHist.java

@@ -19,8 +19,8 @@ public class PtyCstmrConectHist implements Serializable {
 	@Column(name="CSTMR_CONECT_HIST_SNO")
 	private int cstmrConectHistSno;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="CONECT_DT")
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="CONECT_DT", columnDefinition = "TIMESTAMP")
 	private Date conectDt;
 
 	@Column(name="CONECT_ERROR_CD")

pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrDtl.java

@@ -2,6 +2,7 @@ package com.palnet.biz.jpa.entity;
 
 import java.io.Serializable;
 import javax.persistence.*;
+import java.time.Instant;
 import java.util.Date;
 
 
@@ -25,9 +26,9 @@ public class PtyCstmrDtl implements Serializable {
 	@Column(name="ADDR_DTL_CN")
 	private String addrDtlCn;
 
-	@Temporal(TemporalType.DATE)
-	@Column(name="BRTHDY_DATE")
-	private Date brthdyDate;
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="BRTHDY_DATE", columnDefinition = "TIMESTAMP")
+	private Instant brthdyDate;
 
 	@Column(name="CLNCD")
 	private String clncd;
@@ -56,9 +57,9 @@ public class PtyCstmrDtl implements Serializable {
 	@Column(name="MEMBER_NAME")
 	private String memberName;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="UPDATE_DT")
-	private Date updateDt;
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="UPDATE_DT", columnDefinition = "TIMESTAMP")
+	private Instant updateDt;
 
 	@Column(name="UPDATE_USER_ID")
 	private String updateUserId;
@@ -93,11 +94,12 @@ public class PtyCstmrDtl implements Serializable {
 		this.addrDtlCn = addrDtlCn;
 	}
 
-	public Date getBrthdyDate() {
+	public Instant getBrthdyDate()
+	{
 		return this.brthdyDate;
 	}
 
-	public void setBrthdyDate(Date brthdyDate) {
+	public void setBrthdyDate(Instant brthdyDate) {
 		this.brthdyDate = brthdyDate;
 	}
 
@@ -173,11 +175,11 @@ public class PtyCstmrDtl implements Serializable {
 		this.memberName = memberName;
 	}
 
-	public Date getUpdateDt() {
+	public Instant getUpdateDt() {
 		return this.updateDt;
 	}
 
-	public void setUpdateDt(Date updateDt) {
+	public void setUpdateDt(Instant updateDt) {
 		this.updateDt = updateDt;
 	}
 

pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrGroup.java

@@ -19,8 +19,8 @@ public class PtyCstmrGroup implements Serializable {
 	@Column(name="CSTMR_GROUP_SNO")
 	private int cstmrGroupSno;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="APRVL_DT")
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="APRVL_DT", columnDefinition = "TIMESTAMP")
 	private Date aprvlDt;
 
 	@Column(name="APRVL_USER_ID")
@@ -38,15 +38,15 @@ public class PtyCstmrGroup implements Serializable {
 	@Column(name="GROUP_ID")
 	private String groupId;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="JOIN_DT")
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="JOIN_DT", columnDefinition = "TIMESTAMP")
 	private Date joinDt;
 
 	@Column(name="JOIN_YN")
 	private String joinYn;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="WTHDRW_DT")
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="WTHDRW_DT", columnDefinition = "TIMESTAMP")
 	private Date wthdrwDt;
 
 	@Column(name="TRMNL_ID")

pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyGroupBas.java

@@ -37,8 +37,8 @@ public class PtyGroupBas implements Serializable {
 	}
 
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="CREATE_DT")
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="CREATE_DT", columnDefinition = "TIMESTAMP")
 	public Date getCreateDt() {
 		return this.createDt;
 	}
@@ -68,8 +68,8 @@ public class PtyGroupBas implements Serializable {
 	}
 
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="UPDATE_DT")
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="UPDATE_DT", columnDefinition = "TIMESTAMP")
 	public Date getUpdateDt() {
 		return this.updateDt;
 	}

pav-server/src/main/java/com/palnet/biz/jpa/entity/PtySnsLoginRel.java

@@ -22,8 +22,8 @@ public class PtySnsLoginRel implements Serializable {
 	@Column(name="CSTMR_SNO")
 	private int cstmrSno;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="LINK_DT")
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="LINK_DT", columnDefinition = "TIMESTAMP")
 	private Date linkDt;
 
 	@Column(name="LINK_IP")
@@ -38,8 +38,8 @@ public class PtySnsLoginRel implements Serializable {
 	@Column(name="SNS_IDNTFR_ID")
 	private String snsIdntfrId;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="WTHDR_DT")
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="WTHDR_DT", columnDefinition = "TIMESTAMP")
 	private Date wthdrDt;
 
 	public PtySnsLoginRel() {

pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyTermsAgreeTxn.java

@@ -2,6 +2,7 @@ package com.palnet.biz.jpa.entity;
 
 import java.io.Serializable;
 import javax.persistence.*;
+import java.time.Instant;
 import java.util.Date;
 
 
@@ -20,9 +21,9 @@ public class PtyTermsAgreeTxn implements Serializable {
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private int agreeSno;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="AGREE_DT")
-	private Date agreeDt;
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="AGREE_DT", columnDefinition = "TIMESTAMP")
+	private Instant agreeDt;
 
 	@Column(name="AGREE_YN")
 	private String agreeYn;
@@ -36,9 +37,9 @@ public class PtyTermsAgreeTxn implements Serializable {
 	@Column(name="TERMS_SNO")
 	private int termsSno;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="UPDATE_DT")
-	private Date updateDt;
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="UPDATE_DT", columnDefinition = "TIMESTAMP")
+	private Instant updateDt;
 
 	@Column(name="UPDATE_USER_ID")
 	private String updateUserId;
@@ -54,11 +55,11 @@ public class PtyTermsAgreeTxn implements Serializable {
 		this.agreeSno = agreeSno;
 	}
 
-	public Date getAgreeDt() {
+	public Instant getAgreeDt() {
 		return this.agreeDt;
 	}
 
-	public void setAgreeDt(Date agreeDt) {
+	public void setAgreeDt(Instant agreeDt) {
 		this.agreeDt = agreeDt;
 	}
 
@@ -94,11 +95,11 @@ public class PtyTermsAgreeTxn implements Serializable {
 		this.termsSno = termsSno;
 	}
 
-	public Date getUpdateDt() {
+	public Instant getUpdateDt() {
 		return this.updateDt;
 	}
 
-	public void setUpdateDt(Date updateDt) {
+	public void setUpdateDt(Instant updateDt) {
 		this.updateDt = updateDt;
 	}
 

pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyTermsBas.java

@@ -19,15 +19,15 @@ public class PtyTermsBas implements Serializable {
 	@Column(name="TERMS_SNO")
 	private int termsSno;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="CREATE_DT")
+
+	@Column(name="CREATE_DT", columnDefinition = "TIMESTAMP")
 	private Date createDt;
 
 	@Column(name="CREATE_USER_ID")
 	private String createUserId;
 
-	@Temporal(TemporalType.DATE)
-	@Column(name="ESTBSH_DATE")
+
+	@Column(name="ESTBSH_DATE", columnDefinition = "TIMESTAMP")
 	private Date estbshDate;
 
 	@Column(name="LAST_TXN_YN")
@@ -39,8 +39,8 @@ public class PtyTermsBas implements Serializable {
 	@Column(name="TERMS_CTGRY_CD")
 	private String termsCtgryCd;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="UPDATE_DT")
+
+	@Column(name="UPDATE_DT", columnDefinition = "TIMESTAMP")
 	private Date updateDt;
 
 	@Column(name="UPDATE_USER_ID")

pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyTermsDtl.java

@@ -2,6 +2,7 @@ package com.palnet.biz.jpa.entity;
 
 import java.io.Serializable;
 import javax.persistence.*;
+import java.time.Instant;
 import java.util.Date;
 
 
@@ -18,9 +19,9 @@ public class PtyTermsDtl implements Serializable {
 	@EmbeddedId
 	private PtyTermsDtlPK id;
 
-	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="CREATE_DT")
-	private Date createDt;
+//	@Temporal(TemporalType.TIMESTAMP)
+	@Column(name="CREATE_DT", columnDefinition = "TIMESTAMP")
+	private Instant createDt;
 
 	@Column(name="CREATE_USER_ID")
 	private String createUserId;
@@ -51,11 +52,11 @@ public class PtyTermsDtl implements Serializable {
 		this.id = id;
 	}
 
-	public Date getCreateDt() {
+	public Instant getCreateDt() {
 		return this.createDt;
 	}
 
-	public void setCreateDt(Date createDt) {
+	public void setCreateDt(Instant createDt) {
 		this.createDt = createDt;
 	}
 

pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java

@@ -32,6 +32,7 @@ import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Repository;
 
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -59,15 +60,17 @@ public class CtrCntrlQueryRepository{
 		QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel;
 		QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas;
 		
-		BooleanBuilder builder = new BooleanBuilder();
 
-		builder.and(qCntrlBasEntity.statusCd.eq("99"));
 		Calendar end = Calendar.getInstance();
-		end.setTime(DateUtils.stringToDate(rq.getEndDate()));
+		end.setTime(Date.from(DateUtils.stringToDate(rq.getEndDate())));
 		end.add(Calendar.DATE, 1);
 		Date endDate = end.getTime();
+
+		BooleanBuilder builder = new BooleanBuilder();
+
+		builder.and(qCntrlBasEntity.statusCd.eq("99"));
 		builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate())));
-		builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate));
+		builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate.toInstant()));
 		builder.and(qCntrlBasEntity.statusCd.eq("99"));
 		builder.and(qFltPlanBas.aprvlYn.eq("Y"));
 		
@@ -163,11 +166,11 @@ public class CtrCntrlQueryRepository{
 		
 		builder.and(qCntrlBasEntity.statusCd.eq("99"));
 		Calendar end = Calendar.getInstance(); 
-		end.setTime(DateUtils.stringToDate(rq.getEndDate()));
+		end.setTime(Date.from(DateUtils.stringToDate(rq.getEndDate())));
 		end.add(Calendar.DATE, 1);
 		Date endDate = end.getTime();
 		builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate())));
-		builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate));
+		builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate.toInstant()));
 		builder.and(qFltPlanCtrCntrlRelEntity.groupId.eq(groupId));
 		if(!StringUtils.isEmpty(rq.getSearch1())) {
 			builder.and(qCntrlBasEntity.idntfNum.like("%" + rq.getSearch1() + "%"));
@@ -263,13 +266,13 @@ public class CtrCntrlQueryRepository{
 		BooleanBuilder pilotBuilder = new BooleanBuilder();
 		
 		Calendar end = Calendar.getInstance(); 
-		end.setTime(DateUtils.stringToDate(rq.getEndDate()));
+		end.setTime(Date.from(DateUtils.stringToDate(rq.getEndDate())));
 		end.add(Calendar.DATE, 1);
 		Date endDate = end.getTime();
 		
 		builder.and(qFltPlanCtrCntrlRelEntity.groupId.eq(rq.getGroupId()));
 		builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate())));
-		builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate));
+		builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate.toInstant()));
 		builder.and(qCntrlBasEntity.statusCd.eq("99"));
 		builder.and(qFltPlanBasEntity.aprvlYn.eq("Y"));
 		
@@ -393,11 +396,11 @@ public class CtrCntrlQueryRepository{
 		BooleanBuilder pilotBuilder = new BooleanBuilder();
 		
 		Calendar end = Calendar.getInstance(); 
-		end.setTime(DateUtils.stringToDate(rq.getEndDate()));
+		end.setTime(Date.from(DateUtils.stringToDate(rq.getEndDate())));
 		end.add(Calendar.DATE, 1);
 		Date endDate = end.getTime();
 		builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate())));
-		builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate));
+		builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate.toInstant()));
 		builder.and(qFltPlanBasEntity.aprvlYn.eq("Y"));
 		builder.and(qCntrlBasEntity.statusCd.eq("99"));
 		
@@ -517,11 +520,11 @@ public class CtrCntrlQueryRepository{
 		BooleanBuilder builder = new BooleanBuilder();
 
 		Calendar end = Calendar.getInstance(); 
-		end.setTime(DateUtils.stringToDate(rq.getEndDate()));
+		end.setTime(Date.from(DateUtils.stringToDate(rq.getEndDate())));
 		end.add(Calendar.DATE, 1);
 		Date endDate = end.getTime();
 		builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate())));
-		builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate));
+		builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate.toInstant()));
 		
 		builder.and(qCntrlBasEntity.statusCd.eq("99"));
 		builder.and(qCntrlBasEntity.idntfNum.eq(idntfNum));
@@ -617,13 +620,13 @@ public class CtrCntrlQueryRepository{
 		BooleanBuilder pilotBuilder = new BooleanBuilder();
 		
 		Calendar end = Calendar.getInstance(); 
-		end.setTime(DateUtils.stringToDate(rq.getEndDate()));
+		end.setTime(Date.from(DateUtils.stringToDate(rq.getEndDate())));
 		end.add(Calendar.DATE, 1);
 		Date endDate = end.getTime();
 		
 		builder.and(qFltPlanCtrCntrlRelEntity.groupId.eq(rq.getGroupId()));
 		builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate())));
-		builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate));
+		builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate.toInstant()));
 		builder.and(qFltPlanBasEntity.aprvlYn.eq("Y"));
 		builder.and(qCntrlBasEntity.statusCd.eq("99"));
 		
@@ -714,11 +717,11 @@ public class CtrCntrlQueryRepository{
 		BooleanBuilder pilotBuilder = new BooleanBuilder();
 		
 		Calendar end = Calendar.getInstance(); 
-		end.setTime(DateUtils.stringToDate(rq.getEndDate()));
+		end.setTime(Date.from(DateUtils.stringToDate(rq.getEndDate())));
 		end.add(Calendar.DATE, 1);
 		Date endDate = end.getTime();
 		builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate())));
-		builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate));
+		builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate.toInstant()));
 		builder.and(qFltPlanBasEntity.aprvlYn.eq("Y"));
 		builder.and(qCntrlBasEntity.statusCd.eq("99"));
 		
@@ -808,11 +811,11 @@ public class CtrCntrlQueryRepository{
 		BooleanBuilder builder = new BooleanBuilder();
 		
 		Calendar end = Calendar.getInstance(); 
-		end.setTime(DateUtils.stringToDate(rq.getEndDate()));
+		end.setTime(Date.from(DateUtils.stringToDate(rq.getEndDate())));
 		end.add(Calendar.DATE, 1);
 		Date endDate = end.getTime();
 		builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate())));
-		builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate));
+		builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate.toInstant()));
 		
 		builder.and(qFltPlanCtrCntrlRelEntity.planSno.eq(planSno));
 		builder.and(qCntrlBasEntity.statusCd.eq("99"));
@@ -904,12 +907,12 @@ public class CtrCntrlQueryRepository{
 		BooleanBuilder builder = new BooleanBuilder();
 		
 		Calendar end = Calendar.getInstance();
-		end.setTime(DateUtils.stringToDate(rq.getEndDate()));
+		end.setTime(Date.from(DateUtils.stringToDate(rq.getEndDate())));
 		end.add(Calendar.DATE, 1);
 		Date endDate = end.getTime();
 		builder.and(qFltPlanCtrCntrlRelEntity.groupId.eq(rq.getGroupId()));
 		builder.and(qCntrlBasEntity.cntrlStDt.goe(DateUtils.stringToDate(rq.getStDate())));
-		builder.and(qCntrlBasEntity.cntrlEndDt.loe(endDate));
+		builder.and(qCntrlBasEntity.cntrlEndDt.loe(endDate.toInstant()));
 		builder.and(qFltPlanBasEntity.aprvlYn.eq("Y"));
 		builder.and(qCntrlBasEntity.statusCd.eq("99"));
 		
@@ -946,12 +949,12 @@ public class CtrCntrlQueryRepository{
 		BooleanBuilder builder = new BooleanBuilder();
 
 		Calendar end = Calendar.getInstance();
-		end.setTime(DateUtils.stringToDate(rq.getEndDate()));
+		end.setTime(Date.from(DateUtils.stringToDate(rq.getEndDate())));
 		end.add(Calendar.DATE, 1);
 		Date endDate = end.getTime();
 		builder.and(qFltPlanCtrCntrlRelEntity.groupId.eq(rq.getGroupId()));
 		builder.and(qCntrlBasEntity.cntrlStDt.goe(DateUtils.stringToDate(rq.getStDate())));
-		builder.and(qCntrlBasEntity.cntrlEndDt.loe(endDate));
+		builder.and(qCntrlBasEntity.cntrlEndDt.loe(endDate.toInstant()));
 		builder.and(qFltPlanBasEntity.aprvlYn.eq("Y"));
 		builder.and(qCntrlBasEntity.statusCd.eq("99"));
 		
@@ -1206,9 +1209,9 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
 		Calendar end = Calendar.getInstance();
 		Date now = DateUtils.nowDate();
 		end.setTime(now);
-		Date endDate = end.getTime();
-		builder.and(qFltPlanBas.schFltStDt.loe(now));
-		builder.and(qFltPlanBas.schFltEndDt.goe(now));
+
+		builder.and(qFltPlanBas.schFltStDt.loe(Instant.now()));
+		builder.and(qFltPlanBas.schFltEndDt.goe(Instant.now()));
 
 		builder.and(qFltPlanBas.planSno.eq(planSno));
 		

pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanBasRepository.java

@@ -9,6 +9,7 @@ import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.Instant;
 import java.util.Collection;
 import java.util.Date;
 import java.util.List;
@@ -30,7 +31,7 @@ public interface FltPlanBasRepository extends JpaRepository<FltPlanBas, Integer>
             "and :fltNowDt <= f.schFltEndDt")
     Optional<FltPlanBas> findByGroupFlightPlan(@Param("planSno") Integer planSno,
                                            @Param("aprvlYn") String aprvlYn,
-                                           @Param("fltNowDt") Date fltNowDt);
+                                           @Param("fltNowDt") Instant fltNowDt);
 
     @Transactional
     @Modifying

pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java

@@ -1,5 +1,6 @@
 package com.palnet.biz.jpa.repository.flt;
 
+import java.time.Instant;
 import java.util.Date;
 import java.util.List;
 
@@ -563,11 +564,11 @@ public class FltPlanQueryRepository {
 
         BooleanBuilder builder = new BooleanBuilder();
 
-        DateTemplate<Date> flightStartDate = Expressions.dateTemplate(
-                Date.class,"DATE({0})", fltPlanBas.schFltStDt);
+        DateTemplate<Instant> flightStartDate = Expressions.dateTemplate(
+                Instant.class,"DATE({0})", fltPlanBas.schFltStDt);
 
-        DateTemplate<Date> flightEndDate = Expressions.dateTemplate(
-                Date.class,"DATE({0})", fltPlanBas.schFltEndDt);
+        DateTemplate<Instant> flightEndDate = Expressions.dateTemplate(
+                Instant.class,"DATE({0})", fltPlanBas.schFltEndDt);
 
         builder.and(flightStartDate.loe(DateUtils.stringToDate(searchDate)))
                 .and(flightEndDate.goe(DateUtils.stringToDate(searchDate)))
@@ -641,11 +642,11 @@ public class FltPlanQueryRepository {
 
         BooleanBuilder parameter = new BooleanBuilder();
 
-        DateTemplate<Date> flightStartDate = Expressions.dateTemplate(
-                Date.class,"DATE({0})", fltPlanBas.schFltStDt);
+        DateTemplate<Instant> flightStartDate = Expressions.dateTemplate(
+                Instant.class,"DATE({0})", fltPlanBas.schFltStDt);
 
-        DateTemplate<Date> flightEndDate = Expressions.dateTemplate(
-                Date.class,"DATE({0})", fltPlanBas.schFltEndDt);
+        DateTemplate<Instant> flightEndDate = Expressions.dateTemplate(
+                Instant.class,"DATE({0})", fltPlanBas.schFltEndDt);
 
         parameter.and(flightStartDate.loe(DateUtils.stringToDatetime(serverReceiveDate)))
                 .and(flightEndDate.goe(DateUtils.stringToDatetime(serverReceiveDate)))

pav-server/src/main/java/com/palnet/biz/jpa/service/ctr/CtrCntrlJpaService.java

@@ -1,5 +1,6 @@
 package com.palnet.biz.jpa.service.ctr;
 
+import java.time.Instant;
 import java.util.Optional;
 
 import org.apache.commons.lang3.StringUtils;
@@ -54,8 +55,8 @@ public class CtrCntrlJpaService {
 		entity.setStatusCd(data.getTypeCd());
 		entity.setProcStatusYn("N");
 		entity.setCntrlStDt(DateUtils.stringToDatetime(data.getControlStartDt()));
-		entity.setCreateDt(DateUtils.nowDate());
-		entity.setUpdateDt(DateUtils.nowDate());
+		entity.setCreateDt(Instant.now());
+		entity.setUpdateDt(Instant.now());
 		
 		return ctrCntrlBasRepository.save(entity);
 		
@@ -83,7 +84,7 @@ public class CtrCntrlJpaService {
 		entity.setAvrgSpeedType(null);
 		entity.setBttrCnsmptn(0.0);
 		entity.setEndTypeCd(data.getEndTypeCd());
-		entity.setUpdateDt(DateUtils.nowDate());
+		entity.setUpdateDt(Instant.now());
 		
 		return ctrCntrlBasRepository.save(entity);
 				
@@ -135,8 +136,8 @@ public class CtrCntrlJpaService {
 		entity.setLat(data.getLat());
 		entity.setLon(data.getLng());
 		entity.setHstrySno(hstrySno);
-		entity.setCreateDt(DateUtils.nowDate());
-		entity.setUpdateDt(DateUtils.nowDate());
+		entity.setCreateDt(Instant.now());
+		entity.setUpdateDt(Instant.now());
 		
 		return ctrCntrlHstryAreaRepository.save(entity);
 		
@@ -161,7 +162,7 @@ public class CtrCntrlJpaService {
 		entity.setLandNum(model.getLandNum());
 		entity.setAreaType(model.getAreaType());
 		entity.setAreaNm(model.getAreaNm());
-		entity.setUpdateDt(DateUtils.nowDate());
+		entity.setUpdateDt(Instant.now());
 		
 		return ctrCntrlHstryAreaRepository.save(entity);
 	}

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

@@ -1,5 +1,6 @@
 package com.palnet.biz.scheduler.ctr.service;
 
+import java.time.Instant;
 import java.util.*;
 
 import com.palnet.biz.jpa.repository.ctr.CtrCntrlBasRepository;
@@ -45,7 +46,7 @@ public class CtrSchedulerService {
 			CtrCntrlHstry history = ctrCntrlHstryRepository.findFirstByCntrlIdOrderBySrvrRcvDtDesc(value).orElse(null);
 
 			if(Objects.nonNull(history)) {
-				long diffMinute = DateUtils.diffMinute(history.getSrvrRcvDt(), new Date());
+				long diffMinute = DateUtils.diffMinute(history.getSrvrRcvDt(), Instant.now());
 
 				if(diffMinute > GP_END_TIME) {
 					ctrCntrlBasRepository.updateCntrlEndType("01", DateUtils.nowDate(), "99", history.getCntrlId());
@@ -59,8 +60,8 @@ public class CtrSchedulerService {
 					area.setLat(history.getLat());
 					area.setLon(history.getLon());
 					area.setHstrySno(history.getHstrySno());
-					area.setCreateDt(DateUtils.nowDate());
-					area.setUpdateDt(DateUtils.nowDate());
+					area.setCreateDt(Instant.now());
+					area.setUpdateDt(Instant.now());
 
 					ctrCntrlHstryAreaRepository.save(area);
 

pav-server/src/main/java/com/palnet/comn/utils/DateUtils.java

@@ -1,8 +1,10 @@
 package com.palnet.comn.utils;
 
 import java.text.SimpleDateFormat;
+import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
 import java.time.temporal.ChronoField;
@@ -20,56 +22,60 @@ public class DateUtils {
     }
 	
 	public static String stringToFormat(String str) {
-		Date date = stringToDatetime(str);
+		Instant date = stringToDatetime(str);
 		
 		return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date);
 	}
 	
 	
-	public static Date stringToDatetime(String date) {
+	public static Instant stringToDatetime(String date) {
 		
 		SimpleDateFormat transFormat = new SimpleDateFormat("yyyyMMddHHmmss");
-		Date result = null;
+		Date dateObject = null;
 		try {
 			if(date.length() == 14) {
-				result = transFormat.parse(date);
+				dateObject = transFormat.parse(date);
 			}
 		}catch(Exception e) {
 			e.printStackTrace();
 		}
 
+		Instant result = dateObject.toInstant();
+				
 		return result;
 	}
 	
-	public static Date stringToDate(String date) {
+	public static Instant stringToDate(String date) {
 		SimpleDateFormat transFormat = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat transFormat2 = new SimpleDateFormat("yyyyMMdd");
-		Date result = null;
+		Date dateObject = null;
 		try {
 			if(date.length() == 10) {
-				result = transFormat.parse(date);
+				dateObject = transFormat.parse(date);
 			}else if(date.length() == 8) {
-				result = transFormat2.parse(date);
+				dateObject = transFormat2.parse(date);
 			}
 		}catch(Exception e) {
 			e.printStackTrace();
 		}
 
+		Instant result = dateObject.toInstant();
+
 		return result;
 	}
 	
-	public static LocalDateTime stringToLocalDateTime(String date) {
+	public static Instant stringToInstant(String date) {
 		
 		DateTimeFormatter transFormat = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
 		LocalDateTime localDateTime = LocalDateTime.parse(date , transFormat);
 
-		return localDateTime;
+		return localDateTime.atZone(ZoneId.of("UTC")).toInstant();
 		
 	}
 	
 
 	
-	public static LocalDateTime stringToLocalDate(String date) {
+	public static Instant stringToLocalDate(String date) {
 		DateTimeFormatter transFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 		
 		DateTimeFormatter DATEFORMATTER = new DateTimeFormatterBuilder().append(transFormat)
@@ -78,10 +84,9 @@ public class DateUtils {
 			    .parseDefaulting(ChronoField.SECOND_OF_MINUTE, 0)
 			    .toFormatter();
 
-				
 		LocalDateTime localDateTime = LocalDateTime.parse(date , DATEFORMATTER);
 		
-		return localDateTime;
+		return localDateTime.atZone(ZoneId.of("UTC")).toInstant();
 	}
 	
 	
@@ -98,10 +103,10 @@ public class DateUtils {
 		
 	}
 	
-	public static long diffMinute(Date firstDate , Date secondDate) {
+	public static long diffMinute(Instant firstDate , Instant secondDate) {
 		
-		long diffDate = secondDate.getTime() - firstDate.getTime(); 
-		long diffTime = diffDate / (1000 * 60);
+		long diffDate = secondDate.getEpochSecond() - firstDate.getEpochSecond();
+		long diffTime = diffDate / (60);
 
 		return diffTime;