Merge branch 'develop' into feature/user

build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        spring = '3.2.1'
+        spring = '3.2.2'
         boot = 'org.springframework.boot'
         lombok = 'org.projectlombok:lombok'
     }

data/cns/src/main/java/kr/co/palnet/kac/data/cns/model/CnsFaqBas.java

@@ -15,13 +15,19 @@ import java.time.Instant;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@TableGenerator(
+        table = "COM_SEQ_BAS",
+        name = "CNS_FAQ_BAS_SEQ",
+        pkColumnValue = "FAQ_SNO",
+        allocationSize = 1
+)
 @Entity
 @Table(name = "CNS_FAQ_BAS")
 public class CnsFaqBas {
 
     // FAQ일련번호
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.TABLE, generator = "CNS_FAQ_BAS_SEQ")
     @Column(name = "FAQ_SNO") // mysql :: "int unsigned"
     private Long faqSno;
 

data/cns/src/main/java/kr/co/palnet/kac/data/cns/model/CnsQnaBas.java

@@ -6,8 +6,6 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.ColumnDefault;
-import org.hibernate.annotations.CreationTimestamp;
-import org.hibernate.annotations.UpdateTimestamp;
 
 import java.time.Instant;
 
@@ -16,13 +14,19 @@ import java.time.Instant;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@TableGenerator(
+        table = "COM_SEQ_BAS",
+        name = "CNS_QNA_BAS_SEQ",
+        pkColumnValue = "QNA_SNO",
+        allocationSize = 1
+)
 @Entity
 @Table(name = "CNS_QNA_BAS")
 public class CnsQnaBas {
 
     // QNA일련번호
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.TABLE, generator = "CNS_QNA_BAS_SEQ")
     @Column(name = "QNA_SNO") // mysql :: "int unsigned"
     private Long qnaSno;
 

data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComArcrftBas.java

@@ -12,13 +12,19 @@ import java.util.List;
 @NoArgsConstructor
 @Builder
 @ToString(exclude = {"comIdntfBasList"})
+@TableGenerator(
+        table = "COM_SEQ_BAS",
+        name = "COM_ARCRFT_BAS_SEQ",
+        pkColumnValue = "ARCRFT_SNO",
+        allocationSize = 1
+)
 @Entity
 @Table(name = "COM_ARCRFT_BAS")
 public class ComArcrftBas {
 
     // 기체일련번호
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.TABLE, generator = "COM_ARCRFT_BAS_SEQ")
     @Column(name = "ARCRFT_SNO") // mysql :: "int unsigned"
     private Long arcrftSno;
 

data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComConfirmBas.java

@@ -12,13 +12,19 @@ import java.time.Instant;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@TableGenerator(
+        table = "COM_SEQ_BAS",
+        name = "COM_CONFIRM_BAS_SEQ",
+        pkColumnValue = "CONFIRM_SNO",
+        allocationSize = 1
+)
 @Entity
 @Table(name = "COM_CONFIRM_BAS")
 public class ComConfirmBas {
 
     // 확인일련번호
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.TABLE, generator = "COM_CONFIRM_BAS_SEQ")
     @Column(name = "CONFIRM_SNO") // mysql :: "int unsigned"
     private Long confirmSno;
 

data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComFileBas.java

@@ -13,12 +13,18 @@ import java.time.Instant;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@TableGenerator(
+        table = "COM_SEQ_BAS",
+        name = "COM_FILE_BAS_SEQ",
+        pkColumnValue = "FILE_SNO",
+        allocationSize = 1
+)
 @Entity
 @Table(name = "COM_FILE_BAS")
 public class ComFileBas {
     // 파일일련번호
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.TABLE, generator = "COM_FILE_BAS_SEQ")
     @Column(name = "FILE_SNO") // mysql :: "int unsigned"
     private Long fileSno;
 

data/ctr/src/main/java/kr/co/palnet/kac/data/ctr/model/CtrCntrlHstry.java

@@ -12,13 +12,19 @@ import java.util.List;
 @AllArgsConstructor
 @Builder
 @ToString(exclude = {"ctrCntrlHstryAreaList", "ctrCntrlBas"})
+@TableGenerator(
+        table = "COM_SEQ_BAS",
+        name = "CTR_CNTRL_HSTRY_SEQ",
+        pkColumnValue = "HSTRY_SNO",
+        allocationSize = 1
+)
 @Entity
 @Table(name = "CTR_CNTRL_HSTRY")
 public class CtrCntrlHstry {
 
     // 이력일련번호
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.TABLE, generator = "CTR_CNTRL_HSTRY_SEQ")
     @Column(name = "HSTRY_SNO") // mysql :: "int unsigned"
     private Long hstrySno;
 

data/ctr/src/main/java/kr/co/palnet/kac/data/ctr/model/CtrCntrlHstryArea.java

@@ -11,13 +11,19 @@ import java.time.Instant;
 @AllArgsConstructor
 @Builder
 @ToString(exclude = {"ctrCntrlHstry"})
+@TableGenerator(
+        table = "COM_SEQ_BAS",
+        name = "CTR_CNTRL_HSTRY_AREA_SEQ",
+        pkColumnValue = "HSTRY_AREA_SNO",
+        allocationSize = 1
+)
 @Entity
 @Table(name = "CTR_CNTRL_HSTRY_AREA")
 public class CtrCntrlHstryArea {
 
     // 이력지역일련번호
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.TABLE, generator = "CTR_CNTRL_HSTRY_AREA_SEQ")
     @Column(name = "HSTRY_AREA_SNO") // mysql :: "int unsigned"
     private Long hstryAreaSno;
 

data/ctr/src/main/java/kr/co/palnet/kac/data/ctr/model/CtrCntrlWarnLog.java

@@ -12,13 +12,19 @@ import java.time.Instant;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@TableGenerator(
+        table = "COM_SEQ_BAS",
+        name = "CTR_CNTRL_WARN_LOG_SEQ",
+        pkColumnValue = "WARN_LOG_SNO",
+        allocationSize = 1
+)
 @Entity
 @Table(name = "CTR_CNTRL_WARN_LOG")
 public class CtrCntrlWarnLog {
 
     // 로그일련번호
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.TABLE, generator = "CTR_CNTRL_WARN_LOG_SEQ")
     @Column(name = "WARN_LOG_SNO") // mysql :: "int unsigned"
     private Integer warnLogSno;
 

data/flt/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanArcrft.java

@@ -12,13 +12,19 @@ import java.time.LocalDate;
 @AllArgsConstructor
 @Builder
 @ToString(exclude = {"fltPlanBas"})
+@TableGenerator(
+        table = "COM_SEQ_BAS",
+        name = "FLT_PLAN_ARCRFT_SEQ",
+        pkColumnValue = "PLAN_ARCRFT_SNO",
+        allocationSize = 1
+)
 @Table(name = "FLT_PLAN_ARCRFT")
 @Entity
 public class FltPlanArcrft {
 
     // 비행계획기체정보일련번호
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.TABLE, generator = "FLT_PLAN_ARCRFT_SEQ")
     @Column(name = "PLAN_ARCRFT_SNO") // mysql :: "int unsigned"
     private Long planArcrftSno;
 

data/flt/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanArea.java

@@ -13,13 +13,19 @@ import java.util.List;
 @AllArgsConstructor
 @Builder
 @ToString(exclude = {"fltPlanBas", "fltPlanAreaCoordList"})
+@TableGenerator(
+        table = "COM_SEQ_BAS",
+        name = "FLT_PLAN_AREA_SEQ",
+        pkColumnValue = "PLAN_AREA_SNO",
+        allocationSize = 1
+)
 @Entity
 @Table(name = "FLT_PLAN_AREA")
 public class FltPlanArea {
 
     // 비행계획비행구역일련번호
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.TABLE, generator = "FLT_PLAN_AREA_SEQ")
     @Column(name = "PLAN_AREA_SNO") // mysql :: "int unsigned"
     private Long planAreaSno;
 

data/flt/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanAreaCoord.java

@@ -11,13 +11,19 @@ import java.time.Instant;
 @AllArgsConstructor
 @Builder
 @ToString(exclude = {"fltPlanArea"})
+@TableGenerator(
+        table = "COM_SEQ_BAS",
+        name = "FLT_PLAN_AREA_COORD_SEQ",
+        pkColumnValue = "PLAN_AREA_COORD_SNO",
+        allocationSize = 1
+)
 @Entity
 @Table(name = "FLT_PLAN_AREA_COORD")
 public class FltPlanAreaCoord {
 
     // 비행계획비행구역좌표일련번호
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.TABLE, generator = "FLT_PLAN_AREA_COORD_SEQ")
     @Column(name = "PLAN_AREA_COORD_SNO") // mysql :: "int unsigned"
     private Long planAreaCoordSno;
 

data/flt/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanBas.java

@@ -11,13 +11,19 @@ import java.util.List;
 @AllArgsConstructor
 @Builder
 @ToString(exclude = {"fltPlanAreaList", "fltPlanArcrftList", "fltPlanPilotList", "fltPlanCtrCntrlRelList"})
+@TableGenerator(
+        table = "COM_SEQ_BAS",
+        name = "FLT_PLAN_BAS_SEQ",
+        pkColumnValue = "PLAN_SNO",
+        allocationSize = 1
+)
 @Entity
 @Table(name = "FLT_PLAN_BAS")
 public class FltPlanBas {
 
     // 비행계획서일련번호
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.TABLE, generator = "FLT_PLAN_BAS_SEQ")
     @Column(name = "PLAN_SNO") // mysql :: "int unsigned"
     private Long planSno;
 

data/flt/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanPilot.java

@@ -12,13 +12,19 @@ import java.time.Instant;
 @AllArgsConstructor
 @Builder
 @ToString(exclude = {"fltPlanBas"})
+@TableGenerator(
+        table = "COM_SEQ_BAS",
+        name = "FLT_PLAN_PILOT_SEQ",
+        pkColumnValue = "PLAN_PILOT_SNO",
+        allocationSize = 1
+)
 @Table(name = "FLT_PLAN_PILOT")
 @Entity
 public class FltPlanPilot {
 
     // 비행계획조종사일련번호
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.TABLE, generator = "FLT_PLAN_PILOT_SEQ")
     @Column(name = "PLAN_PILOT_SNO") // mysql :: "int unsigned"
     private Long planPilotSno;
 

data/other/src/main/java/kr/co/palnet/kac/data/other/model/SuredataEntity.java

@@ -11,12 +11,18 @@ import org.hibernate.annotations.ColumnDefault;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@TableGenerator(
+        table = "COM_SEQ_BAS",
+        name = "SUREData_SEQ",
+        pkColumnValue = "SEQNO",
+        allocationSize = 1
+)
 @Entity
 @Table(name = "SUREData")
 public class SuredataEntity {
 
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.TABLE, generator = "SUREData_SEQ")
     @Column(name = "SEQNO")
     private Long seqno;
 

data/pty/src/main/java/kr/co/palnet/kac/data/pty/model/PtyCrtfyhpBas.java

@@ -5,22 +5,26 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.hibernate.annotations.CreationTimestamp;
 
-import java.time.Instant;
 import java.time.LocalDateTime;
 
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@TableGenerator(
+        table = "COM_SEQ_BAS",
+        name = "PTY_CRTFYHP_BAS_SEQ",
+        pkColumnValue = "CRTFYHP_SNO",
+        allocationSize = 1
+)
 @Entity
 @Table(name = "PTY_CRTFYHP_BAS")
 public class PtyCrtfyhpBas {
 
     // 인증일련번호
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.TABLE, generator = "PTY_CRTFYHP_BAS_SEQ")
     @Column(name = "CRTFYHP_SNO") // mysql :: "int unsigned"
     private Long crtfyhpSno;
 

data/pty/src/main/java/kr/co/palnet/kac/data/pty/model/PtyCstmrBas.java

@@ -11,13 +11,19 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
+@TableGenerator(
+        table = "COM_SEQ_BAS",
+        name = "PTY_CSTMR_BAS_SEQ",
+        pkColumnValue = "CSTMR_SNO",
+        allocationSize = 1
+)
 @Entity
 @Table(name = "PTY_CSTMR_BAS")
 public class PtyCstmrBas {
 
     // 고객일련번호
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.TABLE, generator = "PTY_CSTMR_BAS_SEQ")
     @Column(name = "CSTMR_SNO") // mysql :: "int unsigned"
     private Long cstmrSno;
 

data/pty/src/main/java/kr/co/palnet/kac/data/pty/model/PtyTermsAgreeTxn.java

@@ -11,13 +11,19 @@ import java.time.LocalDateTime;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@TableGenerator(
+        table = "COM_SEQ_BAS",
+        name = "PTY_TERMS_AGREE_TXN_SEQ",
+        pkColumnValue = "AGREE_SNO",
+        allocationSize = 1
+)
 @Entity
 @Table(name = "PTY_TERMS_AGREE_TXN")
 public class PtyTermsAgreeTxn {
 
     // 동의일련번호
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @GeneratedValue(strategy = GenerationType.TABLE, generator = "PTY_TERMS_AGREE_TXN_SEQ")
     @Column(name = "AGREE_SNO") // mysql :: "int unsigned"
     private Long agreeSno;