Merge commit '067cacdc3edfd01e05b8d52108d55b41902600ee' into develop

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

@@ -1,9 +1,10 @@
 package com.palnet.biz.jpa.entity;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.time.Instant;
 
+import javax.persistence.*;
+
 
 /**
  * The persistent class for the COM_AUTH_BAS database table.

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

@@ -1,9 +1,10 @@
 package com.palnet.biz.jpa.entity;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.time.Instant;
 
+import javax.persistence.*;
+
 
 /**
  * The persistent class for the COM_CD_BAS database table.

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

@@ -1,9 +1,9 @@
 package com.palnet.biz.jpa.entity;
 
-import javax.persistence.*;
 import java.io.Serializable;
-import java.time.Instant;
+import java.time. Instant;
 
+import javax.persistence.*;
 
 /**
  * The persistent class for the COM_CD_LANG_CTG database table.
@@ -23,7 +23,7 @@ public class ComCdLangCtg implements Serializable {
 
 //	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name="CREATE_DT", columnDefinition = "TIMESTAMP")
-	private Instant  createDt;
+	private Instant createDt;
 
 	@Column(name="CREATE_USER_ID")
 	private String createUserId;
@@ -34,7 +34,7 @@ public class ComCdLangCtg implements Serializable {
 
 //	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name="UPDTE_DT", columnDefinition = "TIMESTAMP")
-	private Instant  updteDt;
+	private Instant updteDt;
 
 	@Column(name="UPDTE_USER_ID")
 	private String updteUserId;
@@ -62,7 +62,7 @@ public class ComCdLangCtg implements Serializable {
 		return this.createDt;
 	}
 
-	public void setCreateDt(Instant  createDt) {
+	public void setCreateDt(Instant createDt) {
 		this.createDt = createDt;
 	}
 
@@ -82,7 +82,7 @@ public class ComCdLangCtg implements Serializable {
 		this.rm = rm;
 	}
 
-	public Instant  getUpdteDt() {
+	public Instant getUpdteDt() {
 		return this.updteDt;
 	}
 

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

@@ -1,9 +1,10 @@
 package com.palnet.biz.jpa.entity;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.time.Instant;
 
+import javax.persistence.*;
+
 
 /**
  * The persistent class for the COM_SITE_BAS database table.

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

@@ -1,9 +1,9 @@
 package com.palnet.biz.jpa.entity;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.time.Instant;
 
+import javax.persistence.*;
 
 /**
  * The persistent class for the COM_TRMNL_BAS database table.

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

@@ -6,6 +6,7 @@ import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.UpdateTimestamp;
 
 import javax.persistence.*;
+
 import java.time.Instant;
 
 @Table(name = "FLT_PLAN_ARCRFT")

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

@@ -5,6 +5,7 @@ import lombok.Setter;
 import org.hibernate.annotations.CreationTimestamp;
 
 import javax.persistence.*;
+
 import java.time.Instant;
 
 @Table(name = "FLT_PLAN_AREA_COORD")

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

@@ -1,9 +1,9 @@
 package com.palnet.biz.jpa.entity;
 
-import javax.persistence.*;
 import java.io.Serializable;
 import java.time.Instant;
 
+import javax.persistence.*;
 
 /**
  * The persistent class for the PTY_CSTMR_CONECT_HIST database table.

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

@@ -4,18 +4,12 @@ import lombok.extern.slf4j.Slf4j;
 
 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;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 @Slf4j
 public class DateUtils {

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

@@ -1,12 +1,17 @@
 package com.palnet.comn.utils;
 
 import java.text.SimpleDateFormat;
+import java.time.Instant;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
 import java.time.temporal.ChronoField;
 import java.util.Date;
 
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
 public class DateUtils {
 
 	public static String getCurrentTime(){
@@ -14,56 +19,71 @@ 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) {
-		
-		DateTimeFormatter transFormat = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
-		LocalDateTime localDateTime = LocalDateTime.parse(date , transFormat);
-		
-		return localDateTime;
+	public static Instant stringToInstant(String date) {
+
+		log.error("date -> {}", date);
+
+		DateTimeFormatter formatter;
+
+		if(date.length() == 10) formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+		else formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+		try {
+			LocalDateTime localDateTime = LocalDateTime.parse(date, formatter);
+
+			return localDateTime.atZone(ZoneId.of("UTC")).toInstant();
+		} catch (Exception e){
+			e.printStackTrace();
+			return null;
+		}
 		
 	}
 	
 
 	
-	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)
@@ -71,11 +91,10 @@ public class DateUtils {
 			    .parseDefaulting(ChronoField.MINUTE_OF_HOUR, 0)
 			    .parseDefaulting(ChronoField.SECOND_OF_MINUTE, 0)
 			    .toFormatter();
-		
-				
+
 		LocalDateTime localDateTime = LocalDateTime.parse(date , DATEFORMATTER);
 		
-		return localDateTime;
+		return localDateTime.atZone(ZoneId.of("UTC")).toInstant();
 	}
 	
 	
@@ -92,14 +111,16 @@ public class DateUtils {
 		
 	}
 	
-	public static long diffMinute(Date firstDate , Date secondDate) {
-		
-		long diffDate = secondDate.getTime() - firstDate.getTime(); 
-		long diffTime = diffDate / (1000 * 60);
+	public static long diffMinute(Instant firstDate , Instant secondDate) {
 		
+		long diffDate = secondDate.getEpochSecond() - firstDate.getEpochSecond();
+		long diffTime = diffDate / (60);
+
 		return diffTime;
 		
 	}
+
+
 	
 	
 	
@@ -150,4 +171,4 @@ public class DateUtils {
 ////		}
 //	
 //	}
-}
+}

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

@@ -1,12 +1,17 @@
 package com.palnet.comn.utils;
 
 import java.text.SimpleDateFormat;
+import java.time.Instant;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
 import java.time.temporal.ChronoField;
 import java.util.Date;
 
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
 public class DateUtils {
 
 	public static String getCurrentTime(){
@@ -14,56 +19,71 @@ 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) {
-		
-		DateTimeFormatter transFormat = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
-		LocalDateTime localDateTime = LocalDateTime.parse(date , transFormat);
-		
-		return localDateTime;
+	public static Instant stringToInstant(String date) {
+
+		log.error("date -> {}", date);
+
+		DateTimeFormatter formatter;
+
+		if(date.length() == 10) formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+		else formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+		try {
+			LocalDateTime localDateTime = LocalDateTime.parse(date, formatter);
+
+			return localDateTime.atZone(ZoneId.of("UTC")).toInstant();
+		} catch (Exception e){
+			e.printStackTrace();
+			return null;
+		}
 		
 	}
 	
 
 	
-	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)
@@ -71,11 +91,10 @@ public class DateUtils {
 			    .parseDefaulting(ChronoField.MINUTE_OF_HOUR, 0)
 			    .parseDefaulting(ChronoField.SECOND_OF_MINUTE, 0)
 			    .toFormatter();
-		
-				
+
 		LocalDateTime localDateTime = LocalDateTime.parse(date , DATEFORMATTER);
 		
-		return localDateTime;
+		return localDateTime.atZone(ZoneId.of("UTC")).toInstant();
 	}
 	
 	
@@ -92,14 +111,16 @@ public class DateUtils {
 		
 	}
 	
-	public static long diffMinute(Date firstDate , Date secondDate) {
-		
-		long diffDate = secondDate.getTime() - firstDate.getTime(); 
-		long diffTime = diffDate / (1000 * 60);
+	public static long diffMinute(Instant firstDate , Instant secondDate) {
 		
+		long diffDate = secondDate.getEpochSecond() - firstDate.getEpochSecond();
+		long diffTime = diffDate / (60);
+
 		return diffTime;
 		
 	}
+
+
 	
 	
 	

pav-websocket/src/main/java/com/palnet/process/scheduler/GpHistoryScheduler.java

@@ -7,6 +7,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import java.time.Instant;
 import java.util.Date;
 import java.util.Map;
 import java.util.Objects;
@@ -30,8 +31,8 @@ public class GpHistoryScheduler {
         // Key 의 존재하는 데이터는 마지막 서버수신 History Data
         if(Objects.nonNull(allHistory)) {
             allHistory.forEach((k, v) -> {
-                Date serverRcvDt = DateUtils.stringToDatetime(v.getServerRcvDt());
-                long diffSecond = DateUtils.diffSecond(serverRcvDt, new Date());
+                Instant serverRcvDt = DateUtils.stringToDatetime(v.getServerRcvDt());
+                long diffSecond = DateUtils.diffMinute(serverRcvDt, Instant.now());
 
                 if(diffSecond > timeLimit) {
                     gpHistoryShareContext.removeHistory(k);