추가 필드 및 date to instant 변경

pav-server/src/main/java/com/palnet/biz/api/acnt/jwt/service/JwtService.java

@@ -1,5 +1,6 @@
 package com.palnet.biz.api.acnt.jwt.service;
 
+import java.time.Instant;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
@@ -171,7 +172,7 @@ public class JwtService {
 		entity.setConectSucesYn(loginYn);
 		entity.setConectErrorCd(errorCode);
 		entity.setConectIp(conectIp);
-		entity.setConectDt(DateUtils.nowDate());
+		entity.setConectDt(Instant.now());
 		return ptyCstmrConectHistRepository.save(entity);
 	}
 	

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

@@ -1,8 +1,8 @@
 package com.palnet.biz.jpa.entity;
 
-import java.io.Serializable;
 import javax.persistence.*;
-import java.util.Date;
+import java.io.Serializable;
+import java.time.Instant;
 
 
 /**
@@ -24,7 +24,7 @@ public class ComAuthBas implements Serializable {
 
 //	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name="CREATE_DT", columnDefinition = "TIMESTAMP")
-	private Date createDt;
+	private Instant createDt;
 
 	@Column(name="CREATE_USER_ID")
 	private String createUserId;
@@ -38,7 +38,7 @@ public class ComAuthBas implements Serializable {
 
 //	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name="UPDATE_DT", columnDefinition = "TIMESTAMP")
-	private Date updateDt;
+	private Instant updateDt;
 
 	@Column(name="UPDATE_USER_ID")
 	private String updateUserId;
@@ -65,11 +65,11 @@ public class ComAuthBas implements Serializable {
 		this.authNm = authNm;
 	}
 
-	public Date getCreateDt() {
+	public Instant getCreateDt() {
 		return this.createDt;
 	}
 
-	public void setCreateDt(Date createDt) {
+	public void setCreateDt(Instant createDt) {
 		this.createDt = createDt;
 	}
 
@@ -97,11 +97,11 @@ public class ComAuthBas implements Serializable {
 		this.siteCd = siteCd;
 	}
 
-	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/ComCdBas.java

@@ -1,8 +1,8 @@
 package com.palnet.biz.jpa.entity;
 
-import java.io.Serializable;
 import javax.persistence.*;
-import java.util.Date;
+import java.io.Serializable;
+import java.time.Instant;
 
 
 /**
@@ -23,7 +23,7 @@ public class ComCdBas implements Serializable {
 
 //	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name="CREATE_DT", columnDefinition = "TIMESTAMP")
-	private Date createDt;
+	private Instant createDt;
 
 	@Column(name="CREATE_USER_ID")
 	private String createUserId;
@@ -33,7 +33,7 @@ public class ComCdBas implements Serializable {
 
 //	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name="UPDTE_DT", columnDefinition = "TIMESTAMP")
-	private Date updteDt;
+	private Instant updteDt;
 
 	@Column(name="UPDTE_USER_ID")
 	private String updteUserId;
@@ -63,11 +63,11 @@ public class ComCdBas implements Serializable {
 		this.addInfoValue = addInfoValue;
 	}
 
-	public Date getCreateDt() {
+	public Instant getCreateDt() {
 		return this.createDt;
 	}
 
-	public void setCreateDt(Date createDt) {
+	public void setCreateDt(Instant createDt) {
 		this.createDt = createDt;
 	}
 
@@ -87,11 +87,11 @@ public class ComCdBas implements Serializable {
 		this.sortOrdr = sortOrdr;
 	}
 
-	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

@@ -1,8 +1,8 @@
 package com.palnet.biz.jpa.entity;
 
-import java.io.Serializable;
 import javax.persistence.*;
-import java.util.Date;
+import java.io.Serializable;
+import java.time.Instant;
 
 
 /**
@@ -23,7 +23,7 @@ public class ComCdLangCtg implements Serializable {
 
 //	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name="CREATE_DT", columnDefinition = "TIMESTAMP")
-	private Date 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 Date updteDt;
+	private Instant  updteDt;
 
 	@Column(name="UPDTE_USER_ID")
 	private String updteUserId;
@@ -58,11 +58,11 @@ public class ComCdLangCtg implements Serializable {
 		this.cdNm = cdNm;
 	}
 
-	public Date getCreateDt() {
+	public Instant  getCreateDt() {
 		return this.createDt;
 	}
 
-	public void setCreateDt(Date createDt) {
+	public void setCreateDt(Instant  createDt) {
 		this.createDt = createDt;
 	}
 
@@ -82,11 +82,11 @@ public class ComCdLangCtg implements Serializable {
 		this.rm = rm;
 	}
 
-	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/ComSiteBas.java

@@ -1,8 +1,8 @@
 package com.palnet.biz.jpa.entity;
 
-import java.io.Serializable;
 import javax.persistence.*;
-import java.util.Date;
+import java.io.Serializable;
+import java.time.Instant;
 
 
 /**
@@ -21,7 +21,7 @@ public class ComSiteBas implements Serializable {
 
 //	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name="CREATE_DT", columnDefinition = "TIMESTAMP")
-	private Date createDt;
+	private Instant createDt;
 
 	@Column(name="CREATE_USER_ID")
 	private String createUserId;
@@ -38,7 +38,7 @@ public class ComSiteBas implements Serializable {
 
 //	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name="UPDATE_DT", columnDefinition = "TIMESTAMP")
-	private Date updateDt;
+	private Instant updateDt;
 
 	@Column(name="UPDATE_USER_ID")
 	private String updateUserId;
@@ -57,11 +57,11 @@ public class ComSiteBas implements Serializable {
 		this.siteCd = siteCd;
 	}
 
-	public Date getCreateDt() {
+	public Instant getCreateDt() {
 		return this.createDt;
 	}
 
-	public void setCreateDt(Date createDt) {
+	public void setCreateDt(Instant createDt) {
 		this.createDt = createDt;
 	}
 
@@ -97,11 +97,11 @@ public class ComSiteBas implements Serializable {
 		this.siteUrl = siteUrl;
 	}
 
-	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/ComTrmnlBas.java

@@ -1,8 +1,8 @@
 package com.palnet.biz.jpa.entity;
 
-import java.io.Serializable;
 import javax.persistence.*;
-import java.util.Date;
+import java.io.Serializable;
+import java.time.Instant;
 
 
 /**
@@ -24,7 +24,7 @@ public class ComTrmnlBas implements Serializable {
 
 //	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name="CREATE_DT", columnDefinition = "TIMESTAMP")
-	private Date createDt;
+	private Instant createDt;
 
 	@Column(name="CREATE_USER_ID")
 	private String createUserId;
@@ -36,8 +36,8 @@ public class ComTrmnlBas implements Serializable {
 	private String trmnlNm;
 
 //	@Temporal(TemporalType.TIMESTAMP)
-	@Column(name="UPDATE_DATE", columnDefinition = "TIMESTAMP")
-	private Date updateDate;
+	@Column(name="UPDATE_DT", columnDefinition = "TIMESTAMP")
+	private Instant updateDt;
 
 	@Column(name="UPDATE_USER_ID")
 	private String updateUserId;
@@ -64,11 +64,11 @@ public class ComTrmnlBas implements Serializable {
 		this.authKey = authKey;
 	}
 
-	public Date getCreateDt() {
+	public Instant getCreateDt() {
 		return this.createDt;
 	}
 
-	public void setCreateDt(Date createDt) {
+	public void setCreateDt(Instant createDt) {
 		this.createDt = createDt;
 	}
 
@@ -96,12 +96,12 @@ public class ComTrmnlBas implements Serializable {
 		this.trmnlNm = trmnlNm;
 	}
 
-	public Date getUpdateDate() {
-		return this.updateDate;
+	public Instant getUpdateDate() {
+		return this.updateDt;
 	}
 
-	public void setUpdateDate(Date 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

@@ -6,7 +6,7 @@ import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.UpdateTimestamp;
 
 import javax.persistence.*;
-import java.util.Date;
+import java.time.Instant;
 
 @Table(name = "FLT_PLAN_ARCRFT")
 @Entity
@@ -44,7 +44,7 @@ public class FltPlanArcrft {
     private String prdctCmpnNm;
 
     @Column(name="PRDCT_DATE")
-    private Date prdctDate;
+    private Instant prdctDate;
 
     @Column(name="ARCRFT_LNGTH")
     private double arcrftLngth;
@@ -85,15 +85,26 @@ public class FltPlanArcrft {
     @CreationTimestamp
 //    @Temporal(TemporalType.TIMESTAMP)
     @Column(name="CREATE_DT", columnDefinition = "TIMESTAMP")
-    private Date createDt;
+    private Instant createDt;
 
     @Column(name="UPDATE_USER_ID")
     private String updateUserId;
 
     @UpdateTimestamp
 //    @Temporal(TemporalType.TIMESTAMP)
-    @Column(name="update_DT", columnDefinition = "TIMESTAMP")
-    private Date updateDt;
+    @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

@@ -5,8 +5,7 @@ import lombok.Setter;
 import org.hibernate.annotations.CreationTimestamp;
 
 import javax.persistence.*;
-import java.time.LocalDateTime;
-import java.util.Date;
+import java.time.Instant;
 
 @Table(name = "FLT_PLAN_AREA_COORD")
 @Entity
@@ -35,5 +34,5 @@ public class FltPlanAreaCoord {
     @CreationTimestamp
 //    @Temporal(TemporalType.TIMESTAMP)
     @Column(name = "CREATE_DT", columnDefinition = "TIMESTAMP")
-    private Date createDt;
+    private Instant createDt;
 }

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

@@ -1,8 +1,8 @@
 package com.palnet.biz.jpa.entity;
 
-import java.io.Serializable;
 import javax.persistence.*;
-import java.util.Date;
+import java.io.Serializable;
+import java.time.Instant;
 
 
 /**
@@ -21,7 +21,7 @@ public class PtyCstmrConectHist implements Serializable {
 
 //	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name="CONECT_DT", columnDefinition = "TIMESTAMP")
-	private Date conectDt;
+	private Instant conectDt;
 
 	@Column(name="CONECT_ERROR_CD")
 	private String conectErrorCd;
@@ -46,11 +46,11 @@ public class PtyCstmrConectHist implements Serializable {
 		this.cstmrConectHistSno = cstmrConectHistSno;
 	}
 
-	public Date getConectDt() {
+	public Instant getConectDt() {
 		return this.conectDt;
 	}
 
-	public void setConectDt(Date conectDt) {
+	public void setConectDt(Instant conectDt) {
 		this.conectDt = conectDt;
 	}
 

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

@@ -1,8 +1,8 @@
 package com.palnet.biz.jpa.entity;
 
-import java.io.Serializable;
 import javax.persistence.*;
-import java.util.Date;
+import java.io.Serializable;
+import java.time.Instant;
 
 
 /**
@@ -24,7 +24,7 @@ public class PtySnsLoginRel implements Serializable {
 
 //	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name="LINK_DT", columnDefinition = "TIMESTAMP")
-	private Date linkDt;
+	private Instant linkDt;
 
 	@Column(name="LINK_IP")
 	private String linkIp;
@@ -40,7 +40,7 @@ public class PtySnsLoginRel implements Serializable {
 
 //	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name="WTHDR_DT", columnDefinition = "TIMESTAMP")
-	private Date wthdrDt;
+	private Instant wthdrDt;
 
 	public PtySnsLoginRel() {
 	}
@@ -61,11 +61,11 @@ public class PtySnsLoginRel implements Serializable {
 		this.cstmrSno = cstmrSno;
 	}
 
-	public Date getLinkDt() {
+	public Instant getLinkDt() {
 		return this.linkDt;
 	}
 
-	public void setLinkDt(Date linkDt) {
+	public void setLinkDt(Instant linkDt) {
 		this.linkDt = linkDt;
 	}
 
@@ -101,11 +101,11 @@ public class PtySnsLoginRel implements Serializable {
 		this.snsIdntfrId = snsIdntfrId;
 	}
 
-	public Date getWthdrDt() {
+	public Instant getWthdrDt() {
 		return this.wthdrDt;
 	}
 
-	public void setWthdrDt(Date wthdrDt) {
+	public void setWthdrDt(Instant wthdrDt) {
 		this.wthdrDt = wthdrDt;
 	}