From cf66a80c9c8850366c99e5c7af2aa7798dd68ab7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= Date: Wed, 13 Sep 2023 15:55:46 +0900 Subject: [PATCH 1/2] =?UTF-8?q?db=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pav-server/src/main/resources/application-database.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pav-server/src/main/resources/application-database.yml b/pav-server/src/main/resources/application-database.yml index 084f0567..cb2fcb07 100644 --- a/pav-server/src/main/resources/application-database.yml +++ b/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 From 3a2a2f5d7cbe8eca946a16fd22a00936e232d632 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= Date: Thu, 14 Sep 2023 13:24:53 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=B6=94=EA=B0=80=20=ED=95=84=EB=93=9C=20?= =?UTF-8?q?=EB=B0=8F=20date=20to=20instant=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/api/acnt/jwt/service/JwtService.java | 3 ++- .../com/palnet/biz/jpa/entity/ComAuthBas.java | 16 +++++++------- .../com/palnet/biz/jpa/entity/ComCdBas.java | 16 +++++++------- .../palnet/biz/jpa/entity/ComCdLangCtg.java | 16 +++++++------- .../com/palnet/biz/jpa/entity/ComSiteBas.java | 16 +++++++------- .../palnet/biz/jpa/entity/ComTrmnlBas.java | 22 +++++++++---------- .../palnet/biz/jpa/entity/FltPlanArcrft.java | 21 +++++++++++++----- .../palnet/biz/jpa/entity/FltPlanArea.java | 4 ++++ .../biz/jpa/entity/FltPlanAreaCoord.java | 5 ++--- .../com/palnet/biz/jpa/entity/FltPlanBas.java | 6 +++++ .../biz/jpa/entity/PtyCstmrConectHist.java | 10 ++++----- .../palnet/biz/jpa/entity/PtySnsLoginRel.java | 16 +++++++------- 12 files changed, 86 insertions(+), 65 deletions(-) diff --git a/pav-server/src/main/java/com/palnet/biz/api/acnt/jwt/service/JwtService.java b/pav-server/src/main/java/com/palnet/biz/api/acnt/jwt/service/JwtService.java index 66e280f4..5a6739e2 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/acnt/jwt/service/JwtService.java +++ b/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); } diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/entity/ComAuthBas.java b/pav-server/src/main/java/com/palnet/biz/jpa/entity/ComAuthBas.java index 8d7ee08a..586ef67f 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/entity/ComAuthBas.java +++ b/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; } diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/entity/ComCdBas.java b/pav-server/src/main/java/com/palnet/biz/jpa/entity/ComCdBas.java index dfb24515..a7e17b34 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/entity/ComCdBas.java +++ b/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; } diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/entity/ComCdLangCtg.java b/pav-server/src/main/java/com/palnet/biz/jpa/entity/ComCdLangCtg.java index 355ce6a9..3ac5f6df 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/entity/ComCdLangCtg.java +++ b/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; } diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/entity/ComSiteBas.java b/pav-server/src/main/java/com/palnet/biz/jpa/entity/ComSiteBas.java index 6fac0b5d..a474a640 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/entity/ComSiteBas.java +++ b/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; } diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/entity/ComTrmnlBas.java b/pav-server/src/main/java/com/palnet/biz/jpa/entity/ComTrmnlBas.java index e7d16cc3..fd33f491 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/entity/ComTrmnlBas.java +++ b/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() { diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanArcrft.java b/pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanArcrft.java index ba35753f..e58429b8 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanArcrft.java +++ b/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; + } diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanArea.java b/pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanArea.java index 3bd445e4..76e5527d 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanArea.java +++ b/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; + } diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanAreaCoord.java b/pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanAreaCoord.java index 066811e1..a04ea87e 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanAreaCoord.java +++ b/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; } diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanBas.java b/pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanBas.java index ae82514e..9d8796ed 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/entity/FltPlanBas.java +++ b/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; + } diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrConectHist.java b/pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrConectHist.java index 65c4b812..a40ed64f 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/entity/PtyCstmrConectHist.java +++ b/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; } diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/entity/PtySnsLoginRel.java b/pav-server/src/main/java/com/palnet/biz/jpa/entity/PtySnsLoginRel.java index 4c31f14f..ada7cb96 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/entity/PtySnsLoginRel.java +++ b/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; }