Merge commit '3a2a2f5d7cbe8eca946a16fd22a00936e232d632' into feature/repactoring/date_to_instant

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

@@ -4,7 +4,6 @@ import java.io.Serializable;
 import java.time.Instant;
 
 import javax.persistence.*;
-import java.util.Date;
 
 
 /**

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

@@ -4,7 +4,6 @@ import java.io.Serializable;
 import java.time.Instant;
 
 import javax.persistence.*;
-import java.util.Date;
 
 
 /**

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

@@ -4,8 +4,6 @@ import java.io.Serializable;
 import java.time. Instant;
 
 import javax.persistence.*;
-import java.util.Date;
-
 
 /**
  * The persistent class for the COM_CD_LANG_CTG database table.
@@ -25,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;
@@ -36,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;
@@ -60,7 +58,7 @@ public class ComCdLangCtg implements Serializable {
 		this.cdNm = cdNm;
 	}
 
-	public  Instant getCreateDt() {
+	public Instant  getCreateDt() {
 		return this.createDt;
 	}
 
@@ -84,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/ComTrmnlBas.java

@@ -4,8 +4,6 @@ import java.io.Serializable;
 import java.time.Instant;
 
 import javax.persistence.*;
-import java.util.Date;
-
 
 /**
  * The persistent class for the COM_TRMNL_BAS database table.
@@ -38,8 +36,8 @@ public class ComTrmnlBas implements Serializable {
 	private String trmnlNm;
 
 //	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="UPDATE_DATE", columnDefinition = "TIMESTAMP")
-	private Instant updateDate;
+	@Column(name="UPDATE_DT", columnDefinition = "TIMESTAMP")
+	private Instant updateDt;
 
 	@Column(name="UPDATE_USER_ID")
 	private String updateUserId;
@@ -99,11 +97,11 @@ public class ComTrmnlBas implements Serializable {
 	}
 
 	public Instant getUpdateDate() {
-		return this.updateDate;
+		return this.updateDt;
 	}
 
-	public void setUpdateDate(Instant updateDate) {
-		this.updateDate = updateDate;
+	public void setUpdateDate(Instant updateDt) {
+		this.updateDt = updateDt;
 	}
 
 	public String getUpdateUserId() {

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

@@ -8,7 +8,6 @@ import org.hibernate.annotations.UpdateTimestamp;
 import javax.persistence.*;
 
 import java.time.Instant;
-import java.util.Date;
 
 @Table(name = "FLT_PLAN_ARCRFT")
 @Entity
@@ -94,8 +93,19 @@ public class FltPlanArcrft {
 
     @UpdateTimestamp
 //    @Temporal(TemporalType.TIMESTAMP)
-    @Column(name="update_DT", columnDefinition = "TIMESTAMP")
+    @Column(name="UPDATE_DT", columnDefinition = "TIMESTAMP")
     private Instant updateDt;
 
+    // pav-kac 추가 필드
+    @Column(name="ACRFT_INSURANCE_YN")
+    private String acrftInsuranceYn;
+
+    @Column(name="INSURANCE_EXPERIOD")
+    private Instant insuranceExperiod;
+
+    @Column(name="CORPORATION_NM")
+    private String corporationNm;
+
+
 
 }

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

@@ -50,5 +50,9 @@ public class FltPlanArea {
     @Column(name = "UPDATE_DT", columnDefinition = "TIMESTAMP")
     private Instant updateDt;
 
+    // pav-kac 추가 필드
+    @Column(name="FLT_MOTHOE_RM")
+    private String fltMothoeRm;
+
 
 }

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

@@ -7,8 +7,6 @@ import org.hibernate.annotations.CreationTimestamp;
 import javax.persistence.*;
 
 import java.time.Instant;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 @Table(name = "FLT_PLAN_AREA_COORD")
 @Entity

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

@@ -77,6 +77,12 @@ public class FltPlanBas {
     @Column(name = "UPDATE_DT", columnDefinition = "TIMESTAMP")
     private Instant updateDt;
 
+    // pav-kac 추가 필드
+    @Column(name = "SERVICE_TYPE")
+    private String serviceType;
+    @Column(name = "CORP_REG_YN")
+    private String corpRegYn;
+
 }
 
 

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

@@ -4,8 +4,6 @@ import java.io.Serializable;
 import java.time.Instant;
 
 import javax.persistence.*;
-import java.util.Date;
-
 
 /**
  * The persistent class for the PTY_CSTMR_CONECT_HIST database table.

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

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

pav-server/src/main/resources/application-database.yml

@@ -5,8 +5,9 @@ spring:
   datasource:
     control:
       driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      jdbc-url: jdbc:log4jdbc:mysql://43.200.235.135:3306/PAV?characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-      username: pav
+#      jdbc-url: jdbc:log4jdbc:mysql://43.200.235.135:3306/PAV?characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+      jdbc-url: jdbc:log4jdbc:mysql://43.200.235.135:3306/PAV_KAC?characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+      username: pav-kac
       password: palnet!234
 #      minimumidle: 5
       maximumpoolsize: 1
@@ -22,8 +23,9 @@ spring:
   datasource:
     control:
       driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      jdbc-url: jdbc:log4jdbc:mysql://43.200.235.135:3306/PAV?characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-      username: pav
+#      jdbc-url: jdbc:log4jdbc:mysql://43.200.235.135:3306/PAV?characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+      jdbc-url: jdbc:log4jdbc:mysql://43.200.235.135:3306/PAV_KAC?characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+      username: pav-kac
       password: palnet!234
       minimumidle: 5
       maximumpoolsize: 5