From a085711156e83fd4ca5f7d6ff52ea19cde79b983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= Date: Mon, 5 Feb 2024 13:12:59 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20data=20module=20=EB=B6=84=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/kac-app/build.gradle | 2 +- common/util/build.gradle | 2 +- .../co/palnet/kac/util/UtilApplication.java | 11 ++++++++ data/cns/build.gradle | 27 +++++++++++++++++++ .../palnet/kac/data/cns/model/CnsFaqBas.java | 0 .../palnet/kac/data/cns/model/CnsQnaBas.java | 0 .../cns/repository/CnsFaqBasRepository.java | 0 .../cns/repository/CnsQnaBasRepository.java | 0 .../data/com/domain}/ComAdmDistrictBas.java | 2 +- .../kac/data/com/domain}/ComArcrftBas.java | 2 +- .../kac/data/com/domain}/ComAuthBas.java | 2 +- .../kac/data/com/domain}/ComConfirmBas.java | 4 +-- .../kac/data/com/domain}/ComFileBas.java | 2 +- .../kac/data/com/domain}/ComIdntfBas.java | 2 +- .../kac/data/com/domain}/ComRiseSetBas.java | 2 +- .../kac/data/com/domain}/ComSiteBas.java | 3 +-- .../kac/data/com/domain}/ComTrmnlBas.java | 2 +- .../ComAdmDistrictBasRepository.java | 2 +- .../repository/ComArcrftBasRepository.java | 2 +- .../repository/ComConfirmBasRepository.java | 2 +- .../com/repository/ComFileBasRepository.java | 2 +- .../com/repository/ComIdntBasRepository.java | 2 +- .../repository/ComRiseSetBasRepository.java | 2 +- data/ctr/build.gradle | 27 +++++++++++++++++++ .../kac/data/ctr/model/CtrCntrlBas.java | 0 .../kac/data/ctr/model/CtrCntrlHstry.java | 0 .../kac/data/ctr/model/CtrCntrlHstryArea.java | 0 .../kac/data/ctr/model/CtrCntrlWarnLog.java | 0 .../ctr/repository/CtrCntrlBasRepository.java | 0 .../CtrCntrlHstryAreaRepository.java | 0 .../repository/CtrCntrlHstryRepository.java | 0 .../repository/CtrCntrlWarnLogRepository.java | 0 data/flt/build.gradle | 27 +++++++++++++++++++ .../flt/model/FltCptAuthAdmDistrictRel.java | 0 .../kac/data/flt/model/FltCptAuthBas.java | 0 .../kac/data/flt/model/FltPlanArcrft.java | 0 .../kac/data/flt/model/FltPlanArea.java | 0 .../kac/data/flt/model/FltPlanAreaCoord.java | 0 .../palnet/kac/data/flt/model/FltPlanBas.java | 0 .../data/flt/model/FltPlanCtrCntrlRel.java | 0 .../kac/data/flt/model/FltPlanPilot.java | 0 .../FltCptAuthAdmDistrictBasRepository.java | 0 .../FltCptAuthAdmDistrictRelRepository.java | 0 .../repository/FltPlanArcrftRepository.java | 0 .../FltPlanAreaCoordRepository.java | 0 .../flt/repository/FltPlanAreaRepository.java | 0 .../flt/repository/FltPlanBasRepository.java | 0 .../FltPlanCtrCntrlRelRepository.java | 0 .../repository/FltPlanPilotRepository.java | 0 data/other/build.gradle | 27 +++++++++++++++++++ .../kac/data/other/model/SuredataEntity.java | 0 .../other/repository/SuredataRepository.java | 0 52 files changed, 137 insertions(+), 19 deletions(-) create mode 100644 common/util/src/main/java/kr/co/palnet/kac/util/UtilApplication.java create mode 100644 data/cns/build.gradle rename {app/kac-app => data/cns}/src/main/java/kr/co/palnet/kac/data/cns/model/CnsFaqBas.java (100%) rename {app/kac-app => data/cns}/src/main/java/kr/co/palnet/kac/data/cns/model/CnsQnaBas.java (100%) rename {app/kac-app => data/cns}/src/main/java/kr/co/palnet/kac/data/cns/repository/CnsFaqBasRepository.java (100%) rename {app/kac-app => data/cns}/src/main/java/kr/co/palnet/kac/data/cns/repository/CnsQnaBasRepository.java (100%) rename {app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model => data/com/src/main/java/kr/co/palnet/kac/data/com/domain}/ComAdmDistrictBas.java (96%) rename {app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model => data/com/src/main/java/kr/co/palnet/kac/data/com/domain}/ComArcrftBas.java (98%) rename {app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model => data/com/src/main/java/kr/co/palnet/kac/data/com/domain}/ComAuthBas.java (96%) rename {app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model => data/com/src/main/java/kr/co/palnet/kac/data/com/domain}/ComConfirmBas.java (97%) rename {app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model => data/com/src/main/java/kr/co/palnet/kac/data/com/domain}/ComFileBas.java (97%) rename {app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model => data/com/src/main/java/kr/co/palnet/kac/data/com/domain}/ComIdntfBas.java (96%) rename {app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model => data/com/src/main/java/kr/co/palnet/kac/data/com/domain}/ComRiseSetBas.java (98%) rename {app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model => data/com/src/main/java/kr/co/palnet/kac/data/com/domain}/ComSiteBas.java (94%) rename {app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model => data/com/src/main/java/kr/co/palnet/kac/data/com/domain}/ComTrmnlBas.java (96%) rename {app/kac-app => data/com}/src/main/java/kr/co/palnet/kac/data/com/repository/ComAdmDistrictBasRepository.java (77%) rename {app/kac-app => data/com}/src/main/java/kr/co/palnet/kac/data/com/repository/ComArcrftBasRepository.java (78%) rename {app/kac-app => data/com}/src/main/java/kr/co/palnet/kac/data/com/repository/ComConfirmBasRepository.java (78%) rename {app/kac-app => data/com}/src/main/java/kr/co/palnet/kac/data/com/repository/ComFileBasRepository.java (79%) rename {app/kac-app => data/com}/src/main/java/kr/co/palnet/kac/data/com/repository/ComIdntBasRepository.java (78%) rename {app/kac-app => data/com}/src/main/java/kr/co/palnet/kac/data/com/repository/ComRiseSetBasRepository.java (80%) create mode 100644 data/ctr/build.gradle rename {app/kac-app => data/ctr}/src/main/java/kr/co/palnet/kac/data/ctr/model/CtrCntrlBas.java (100%) rename {app/kac-app => data/ctr}/src/main/java/kr/co/palnet/kac/data/ctr/model/CtrCntrlHstry.java (100%) rename {app/kac-app => data/ctr}/src/main/java/kr/co/palnet/kac/data/ctr/model/CtrCntrlHstryArea.java (100%) rename {app/kac-app => data/ctr}/src/main/java/kr/co/palnet/kac/data/ctr/model/CtrCntrlWarnLog.java (100%) rename {app/kac-app => data/ctr}/src/main/java/kr/co/palnet/kac/data/ctr/repository/CtrCntrlBasRepository.java (100%) rename {app/kac-app => data/ctr}/src/main/java/kr/co/palnet/kac/data/ctr/repository/CtrCntrlHstryAreaRepository.java (100%) rename {app/kac-app => data/ctr}/src/main/java/kr/co/palnet/kac/data/ctr/repository/CtrCntrlHstryRepository.java (100%) rename {app/kac-app => data/ctr}/src/main/java/kr/co/palnet/kac/data/ctr/repository/CtrCntrlWarnLogRepository.java (100%) create mode 100644 data/flt/build.gradle rename {app/kac-app => data/flt}/src/main/java/kr/co/palnet/kac/data/flt/model/FltCptAuthAdmDistrictRel.java (100%) rename {app/kac-app => data/flt}/src/main/java/kr/co/palnet/kac/data/flt/model/FltCptAuthBas.java (100%) rename {app/kac-app => data/flt}/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanArcrft.java (100%) rename {app/kac-app => data/flt}/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanArea.java (100%) rename {app/kac-app => data/flt}/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanAreaCoord.java (100%) rename {app/kac-app => data/flt}/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanBas.java (100%) rename {app/kac-app => data/flt}/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanCtrCntrlRel.java (100%) rename {app/kac-app => data/flt}/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanPilot.java (100%) rename {app/kac-app => data/flt}/src/main/java/kr/co/palnet/kac/data/flt/repository/FltCptAuthAdmDistrictBasRepository.java (100%) rename {app/kac-app => data/flt}/src/main/java/kr/co/palnet/kac/data/flt/repository/FltCptAuthAdmDistrictRelRepository.java (100%) rename {app/kac-app => data/flt}/src/main/java/kr/co/palnet/kac/data/flt/repository/FltPlanArcrftRepository.java (100%) rename {app/kac-app => data/flt}/src/main/java/kr/co/palnet/kac/data/flt/repository/FltPlanAreaCoordRepository.java (100%) rename {app/kac-app => data/flt}/src/main/java/kr/co/palnet/kac/data/flt/repository/FltPlanAreaRepository.java (100%) rename {app/kac-app => data/flt}/src/main/java/kr/co/palnet/kac/data/flt/repository/FltPlanBasRepository.java (100%) rename {app/kac-app => data/flt}/src/main/java/kr/co/palnet/kac/data/flt/repository/FltPlanCtrCntrlRelRepository.java (100%) rename {app/kac-app => data/flt}/src/main/java/kr/co/palnet/kac/data/flt/repository/FltPlanPilotRepository.java (100%) create mode 100644 data/other/build.gradle rename {app/kac-app => data/other}/src/main/java/kr/co/palnet/kac/data/other/model/SuredataEntity.java (100%) rename {app/kac-app => data/other}/src/main/java/kr/co/palnet/kac/data/other/repository/SuredataRepository.java (100%) diff --git a/app/kac-app/build.gradle b/app/kac-app/build.gradle index f5f584e..0ea76a3 100644 --- a/app/kac-app/build.gradle +++ b/app/kac-app/build.gradle @@ -39,7 +39,7 @@ dependencies { implementation project(":common-security") implementation project(":web-api-com") // TDOO: 제거... - compileOnly project(":data-com") +// compileOnly project(":data-com") } ext { diff --git a/common/util/build.gradle b/common/util/build.gradle index 31a311a..2bfd5cc 100644 --- a/common/util/build.gradle +++ b/common/util/build.gradle @@ -2,6 +2,6 @@ dependencies { // implementation "$boot:spring-boot-starter" +// implementation "$boot:spring-boot-starter-json" implementation "$boot:spring-boot-starter-json" } - diff --git a/common/util/src/main/java/kr/co/palnet/kac/util/UtilApplication.java b/common/util/src/main/java/kr/co/palnet/kac/util/UtilApplication.java new file mode 100644 index 0000000..a26caf5 --- /dev/null +++ b/common/util/src/main/java/kr/co/palnet/kac/util/UtilApplication.java @@ -0,0 +1,11 @@ +package kr.co.palnet.kac.util; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class UtilApplication { + public static void main(String[] args) { + SpringApplication.run(UtilApplication.class, args); + } +} diff --git a/data/cns/build.gradle b/data/cns/build.gradle new file mode 100644 index 0000000..8b8d407 --- /dev/null +++ b/data/cns/build.gradle @@ -0,0 +1,27 @@ + +dependencies { + implementation "$boot:spring-boot-starter-data-jpa" + + implementation "com.querydsl:querydsl-jpa:5.0.0:jakarta" + annotationProcessor "com.querydsl:querydsl-apt:5.0.0:jakarta" + annotationProcessor "jakarta.annotation:jakarta.annotation-api" + annotationProcessor "jakarta.persistence:jakarta.persistence-api" + + + + testRuntimeOnly("com.h2database:h2") +} + +def querydslDir = layout.buildDirectory.dir("generated/querydsl").get().asFile + +sourceSets { + main.java.srcDir(querydslDir) +} + +tasks.withType(JavaCompile) { + options.getGeneratedSourceOutputDirectory().set(file(querydslDir)) +} + +clean { + delete file(querydslDir) +} diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/cns/model/CnsFaqBas.java b/data/cns/src/main/java/kr/co/palnet/kac/data/cns/model/CnsFaqBas.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/cns/model/CnsFaqBas.java rename to data/cns/src/main/java/kr/co/palnet/kac/data/cns/model/CnsFaqBas.java diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/cns/model/CnsQnaBas.java b/data/cns/src/main/java/kr/co/palnet/kac/data/cns/model/CnsQnaBas.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/cns/model/CnsQnaBas.java rename to data/cns/src/main/java/kr/co/palnet/kac/data/cns/model/CnsQnaBas.java diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/cns/repository/CnsFaqBasRepository.java b/data/cns/src/main/java/kr/co/palnet/kac/data/cns/repository/CnsFaqBasRepository.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/cns/repository/CnsFaqBasRepository.java rename to data/cns/src/main/java/kr/co/palnet/kac/data/cns/repository/CnsFaqBasRepository.java diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/cns/repository/CnsQnaBasRepository.java b/data/cns/src/main/java/kr/co/palnet/kac/data/cns/repository/CnsQnaBasRepository.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/cns/repository/CnsQnaBasRepository.java rename to data/cns/src/main/java/kr/co/palnet/kac/data/cns/repository/CnsQnaBasRepository.java diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComAdmDistrictBas.java b/data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComAdmDistrictBas.java similarity index 96% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComAdmDistrictBas.java rename to data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComAdmDistrictBas.java index 92f9e0f..848d3fc 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComAdmDistrictBas.java +++ b/data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComAdmDistrictBas.java @@ -1,4 +1,4 @@ -package kr.co.palnet.kac.data.com.model; +package kr.co.palnet.kac.data.com.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComArcrftBas.java b/data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComArcrftBas.java similarity index 98% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComArcrftBas.java rename to data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComArcrftBas.java index 96f0b2e..43bb60f 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComArcrftBas.java +++ b/data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComArcrftBas.java @@ -1,4 +1,4 @@ -package kr.co.palnet.kac.data.com.model; +package kr.co.palnet.kac.data.com.domain; import jakarta.persistence.*; import lombok.AllArgsConstructor; diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComAuthBas.java b/data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComAuthBas.java similarity index 96% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComAuthBas.java rename to data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComAuthBas.java index 3de0e04..42927f1 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComAuthBas.java +++ b/data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComAuthBas.java @@ -1,4 +1,4 @@ -package kr.co.palnet.kac.data.com.model; +package kr.co.palnet.kac.data.com.domain; import jakarta.persistence.*; import lombok.AllArgsConstructor; diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComConfirmBas.java b/data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComConfirmBas.java similarity index 97% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComConfirmBas.java rename to data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComConfirmBas.java index b92eafb..7cb35da 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComConfirmBas.java +++ b/data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComConfirmBas.java @@ -1,5 +1,6 @@ -package kr.co.palnet.kac.data.com.model; +package kr.co.palnet.kac.data.com.domain; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -7,7 +8,6 @@ import lombok.NoArgsConstructor; import org.hibernate.annotations.CreationTimestamp; import org.hibernate.annotations.UpdateTimestamp; -import jakarta.persistence.*; import java.time.Instant; @Data diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComFileBas.java b/data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComFileBas.java similarity index 97% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComFileBas.java rename to data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComFileBas.java index 226362b..1cad74f 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComFileBas.java +++ b/data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComFileBas.java @@ -1,4 +1,4 @@ -package kr.co.palnet.kac.data.com.model; +package kr.co.palnet.kac.data.com.domain; import jakarta.persistence.*; import lombok.AllArgsConstructor; diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComIdntfBas.java b/data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComIdntfBas.java similarity index 96% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComIdntfBas.java rename to data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComIdntfBas.java index 7abe4b7..f31d95d 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComIdntfBas.java +++ b/data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComIdntfBas.java @@ -1,4 +1,4 @@ -package kr.co.palnet.kac.data.com.model; +package kr.co.palnet.kac.data.com.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComRiseSetBas.java b/data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComRiseSetBas.java similarity index 98% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComRiseSetBas.java rename to data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComRiseSetBas.java index 1e5d8fb..1b11b42 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComRiseSetBas.java +++ b/data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComRiseSetBas.java @@ -1,4 +1,4 @@ -package kr.co.palnet.kac.data.com.model; +package kr.co.palnet.kac.data.com.domain; import jakarta.persistence.*; import lombok.AllArgsConstructor; diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComSiteBas.java b/data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComSiteBas.java similarity index 94% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComSiteBas.java rename to data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComSiteBas.java index b2df01b..8e7ba3e 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComSiteBas.java +++ b/data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComSiteBas.java @@ -1,4 +1,4 @@ -package kr.co.palnet.kac.data.com.model; +package kr.co.palnet.kac.data.com.domain; import jakarta.persistence.*; import lombok.AllArgsConstructor; @@ -6,7 +6,6 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.io.Serializable; import java.time.Instant; diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComTrmnlBas.java b/data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComTrmnlBas.java similarity index 96% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComTrmnlBas.java rename to data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComTrmnlBas.java index b43ac6a..94a2406 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/model/ComTrmnlBas.java +++ b/data/com/src/main/java/kr/co/palnet/kac/data/com/domain/ComTrmnlBas.java @@ -1,4 +1,4 @@ -package kr.co.palnet.kac.data.com.model; +package kr.co.palnet.kac.data.com.domain; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/repository/ComAdmDistrictBasRepository.java b/data/com/src/main/java/kr/co/palnet/kac/data/com/repository/ComAdmDistrictBasRepository.java similarity index 77% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/com/repository/ComAdmDistrictBasRepository.java rename to data/com/src/main/java/kr/co/palnet/kac/data/com/repository/ComAdmDistrictBasRepository.java index 4549ed3..1c7663c 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/repository/ComAdmDistrictBasRepository.java +++ b/data/com/src/main/java/kr/co/palnet/kac/data/com/repository/ComAdmDistrictBasRepository.java @@ -1,6 +1,6 @@ package kr.co.palnet.kac.data.com.repository; -import kr.co.palnet.kac.data.com.model.ComAdmDistrictBas; +import kr.co.palnet.kac.data.com.domain.ComAdmDistrictBas; import org.springframework.data.jpa.repository.JpaRepository; public interface ComAdmDistrictBasRepository extends JpaRepository { diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/repository/ComArcrftBasRepository.java b/data/com/src/main/java/kr/co/palnet/kac/data/com/repository/ComArcrftBasRepository.java similarity index 78% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/com/repository/ComArcrftBasRepository.java rename to data/com/src/main/java/kr/co/palnet/kac/data/com/repository/ComArcrftBasRepository.java index 9a709c9..c842153 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/repository/ComArcrftBasRepository.java +++ b/data/com/src/main/java/kr/co/palnet/kac/data/com/repository/ComArcrftBasRepository.java @@ -1,6 +1,6 @@ package kr.co.palnet.kac.data.com.repository; -import kr.co.palnet.kac.data.com.model.ComArcrftBas; +import kr.co.palnet.kac.data.com.domain.ComArcrftBas; import org.springframework.data.jpa.repository.JpaRepository; public interface ComArcrftBasRepository extends JpaRepository { diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/repository/ComConfirmBasRepository.java b/data/com/src/main/java/kr/co/palnet/kac/data/com/repository/ComConfirmBasRepository.java similarity index 78% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/com/repository/ComConfirmBasRepository.java rename to data/com/src/main/java/kr/co/palnet/kac/data/com/repository/ComConfirmBasRepository.java index 2e0624f..16dfcd1 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/repository/ComConfirmBasRepository.java +++ b/data/com/src/main/java/kr/co/palnet/kac/data/com/repository/ComConfirmBasRepository.java @@ -1,6 +1,6 @@ package kr.co.palnet.kac.data.com.repository; -import kr.co.palnet.kac.data.com.model.ComConfirmBas; +import kr.co.palnet.kac.data.com.domain.ComConfirmBas; import org.springframework.data.jpa.repository.JpaRepository; public interface ComConfirmBasRepository extends JpaRepository { diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/repository/ComFileBasRepository.java b/data/com/src/main/java/kr/co/palnet/kac/data/com/repository/ComFileBasRepository.java similarity index 79% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/com/repository/ComFileBasRepository.java rename to data/com/src/main/java/kr/co/palnet/kac/data/com/repository/ComFileBasRepository.java index c3b1084..5fa21ef 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/repository/ComFileBasRepository.java +++ b/data/com/src/main/java/kr/co/palnet/kac/data/com/repository/ComFileBasRepository.java @@ -1,6 +1,6 @@ package kr.co.palnet.kac.data.com.repository; -import kr.co.palnet.kac.data.com.model.ComFileBas; +import kr.co.palnet.kac.data.com.domain.ComFileBas; import org.springframework.data.jpa.repository.JpaRepository; public interface ComFileBasRepository extends JpaRepository { diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/repository/ComIdntBasRepository.java b/data/com/src/main/java/kr/co/palnet/kac/data/com/repository/ComIdntBasRepository.java similarity index 78% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/com/repository/ComIdntBasRepository.java rename to data/com/src/main/java/kr/co/palnet/kac/data/com/repository/ComIdntBasRepository.java index 04270ab..04dd382 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/repository/ComIdntBasRepository.java +++ b/data/com/src/main/java/kr/co/palnet/kac/data/com/repository/ComIdntBasRepository.java @@ -1,6 +1,6 @@ package kr.co.palnet.kac.data.com.repository; -import kr.co.palnet.kac.data.com.model.ComIdntfBas; +import kr.co.palnet.kac.data.com.domain.ComIdntfBas; import org.springframework.data.jpa.repository.JpaRepository; public interface ComIdntBasRepository extends JpaRepository { diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/repository/ComRiseSetBasRepository.java b/data/com/src/main/java/kr/co/palnet/kac/data/com/repository/ComRiseSetBasRepository.java similarity index 80% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/com/repository/ComRiseSetBasRepository.java rename to data/com/src/main/java/kr/co/palnet/kac/data/com/repository/ComRiseSetBasRepository.java index 79db33f..c1c359d 100644 --- a/app/kac-app/src/main/java/kr/co/palnet/kac/data/com/repository/ComRiseSetBasRepository.java +++ b/data/com/src/main/java/kr/co/palnet/kac/data/com/repository/ComRiseSetBasRepository.java @@ -1,6 +1,6 @@ package kr.co.palnet.kac.data.com.repository; -import kr.co.palnet.kac.data.com.model.ComRiseSetBas; +import kr.co.palnet.kac.data.com.domain.ComRiseSetBas; import org.springframework.data.jpa.repository.JpaRepository; public interface ComRiseSetBasRepository extends JpaRepository { diff --git a/data/ctr/build.gradle b/data/ctr/build.gradle new file mode 100644 index 0000000..8b8d407 --- /dev/null +++ b/data/ctr/build.gradle @@ -0,0 +1,27 @@ + +dependencies { + implementation "$boot:spring-boot-starter-data-jpa" + + implementation "com.querydsl:querydsl-jpa:5.0.0:jakarta" + annotationProcessor "com.querydsl:querydsl-apt:5.0.0:jakarta" + annotationProcessor "jakarta.annotation:jakarta.annotation-api" + annotationProcessor "jakarta.persistence:jakarta.persistence-api" + + + + testRuntimeOnly("com.h2database:h2") +} + +def querydslDir = layout.buildDirectory.dir("generated/querydsl").get().asFile + +sourceSets { + main.java.srcDir(querydslDir) +} + +tasks.withType(JavaCompile) { + options.getGeneratedSourceOutputDirectory().set(file(querydslDir)) +} + +clean { + delete file(querydslDir) +} diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/ctr/model/CtrCntrlBas.java b/data/ctr/src/main/java/kr/co/palnet/kac/data/ctr/model/CtrCntrlBas.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/ctr/model/CtrCntrlBas.java rename to data/ctr/src/main/java/kr/co/palnet/kac/data/ctr/model/CtrCntrlBas.java diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/ctr/model/CtrCntrlHstry.java b/data/ctr/src/main/java/kr/co/palnet/kac/data/ctr/model/CtrCntrlHstry.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/ctr/model/CtrCntrlHstry.java rename to data/ctr/src/main/java/kr/co/palnet/kac/data/ctr/model/CtrCntrlHstry.java diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/ctr/model/CtrCntrlHstryArea.java b/data/ctr/src/main/java/kr/co/palnet/kac/data/ctr/model/CtrCntrlHstryArea.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/ctr/model/CtrCntrlHstryArea.java rename to data/ctr/src/main/java/kr/co/palnet/kac/data/ctr/model/CtrCntrlHstryArea.java diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/ctr/model/CtrCntrlWarnLog.java b/data/ctr/src/main/java/kr/co/palnet/kac/data/ctr/model/CtrCntrlWarnLog.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/ctr/model/CtrCntrlWarnLog.java rename to data/ctr/src/main/java/kr/co/palnet/kac/data/ctr/model/CtrCntrlWarnLog.java diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/ctr/repository/CtrCntrlBasRepository.java b/data/ctr/src/main/java/kr/co/palnet/kac/data/ctr/repository/CtrCntrlBasRepository.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/ctr/repository/CtrCntrlBasRepository.java rename to data/ctr/src/main/java/kr/co/palnet/kac/data/ctr/repository/CtrCntrlBasRepository.java diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/ctr/repository/CtrCntrlHstryAreaRepository.java b/data/ctr/src/main/java/kr/co/palnet/kac/data/ctr/repository/CtrCntrlHstryAreaRepository.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/ctr/repository/CtrCntrlHstryAreaRepository.java rename to data/ctr/src/main/java/kr/co/palnet/kac/data/ctr/repository/CtrCntrlHstryAreaRepository.java diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/ctr/repository/CtrCntrlHstryRepository.java b/data/ctr/src/main/java/kr/co/palnet/kac/data/ctr/repository/CtrCntrlHstryRepository.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/ctr/repository/CtrCntrlHstryRepository.java rename to data/ctr/src/main/java/kr/co/palnet/kac/data/ctr/repository/CtrCntrlHstryRepository.java diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/ctr/repository/CtrCntrlWarnLogRepository.java b/data/ctr/src/main/java/kr/co/palnet/kac/data/ctr/repository/CtrCntrlWarnLogRepository.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/ctr/repository/CtrCntrlWarnLogRepository.java rename to data/ctr/src/main/java/kr/co/palnet/kac/data/ctr/repository/CtrCntrlWarnLogRepository.java diff --git a/data/flt/build.gradle b/data/flt/build.gradle new file mode 100644 index 0000000..8b8d407 --- /dev/null +++ b/data/flt/build.gradle @@ -0,0 +1,27 @@ + +dependencies { + implementation "$boot:spring-boot-starter-data-jpa" + + implementation "com.querydsl:querydsl-jpa:5.0.0:jakarta" + annotationProcessor "com.querydsl:querydsl-apt:5.0.0:jakarta" + annotationProcessor "jakarta.annotation:jakarta.annotation-api" + annotationProcessor "jakarta.persistence:jakarta.persistence-api" + + + + testRuntimeOnly("com.h2database:h2") +} + +def querydslDir = layout.buildDirectory.dir("generated/querydsl").get().asFile + +sourceSets { + main.java.srcDir(querydslDir) +} + +tasks.withType(JavaCompile) { + options.getGeneratedSourceOutputDirectory().set(file(querydslDir)) +} + +clean { + delete file(querydslDir) +} diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/model/FltCptAuthAdmDistrictRel.java b/data/flt/src/main/java/kr/co/palnet/kac/data/flt/model/FltCptAuthAdmDistrictRel.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/model/FltCptAuthAdmDistrictRel.java rename to data/flt/src/main/java/kr/co/palnet/kac/data/flt/model/FltCptAuthAdmDistrictRel.java diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/model/FltCptAuthBas.java b/data/flt/src/main/java/kr/co/palnet/kac/data/flt/model/FltCptAuthBas.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/model/FltCptAuthBas.java rename to data/flt/src/main/java/kr/co/palnet/kac/data/flt/model/FltCptAuthBas.java diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanArcrft.java b/data/flt/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanArcrft.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanArcrft.java rename to data/flt/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanArcrft.java diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanArea.java b/data/flt/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanArea.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanArea.java rename to data/flt/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanArea.java diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanAreaCoord.java b/data/flt/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanAreaCoord.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanAreaCoord.java rename to data/flt/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanAreaCoord.java diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanBas.java b/data/flt/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanBas.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanBas.java rename to data/flt/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanBas.java diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanCtrCntrlRel.java b/data/flt/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanCtrCntrlRel.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanCtrCntrlRel.java rename to data/flt/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanCtrCntrlRel.java diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanPilot.java b/data/flt/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanPilot.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanPilot.java rename to data/flt/src/main/java/kr/co/palnet/kac/data/flt/model/FltPlanPilot.java diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/repository/FltCptAuthAdmDistrictBasRepository.java b/data/flt/src/main/java/kr/co/palnet/kac/data/flt/repository/FltCptAuthAdmDistrictBasRepository.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/repository/FltCptAuthAdmDistrictBasRepository.java rename to data/flt/src/main/java/kr/co/palnet/kac/data/flt/repository/FltCptAuthAdmDistrictBasRepository.java diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/repository/FltCptAuthAdmDistrictRelRepository.java b/data/flt/src/main/java/kr/co/palnet/kac/data/flt/repository/FltCptAuthAdmDistrictRelRepository.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/repository/FltCptAuthAdmDistrictRelRepository.java rename to data/flt/src/main/java/kr/co/palnet/kac/data/flt/repository/FltCptAuthAdmDistrictRelRepository.java diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/repository/FltPlanArcrftRepository.java b/data/flt/src/main/java/kr/co/palnet/kac/data/flt/repository/FltPlanArcrftRepository.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/repository/FltPlanArcrftRepository.java rename to data/flt/src/main/java/kr/co/palnet/kac/data/flt/repository/FltPlanArcrftRepository.java diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/repository/FltPlanAreaCoordRepository.java b/data/flt/src/main/java/kr/co/palnet/kac/data/flt/repository/FltPlanAreaCoordRepository.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/repository/FltPlanAreaCoordRepository.java rename to data/flt/src/main/java/kr/co/palnet/kac/data/flt/repository/FltPlanAreaCoordRepository.java diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/repository/FltPlanAreaRepository.java b/data/flt/src/main/java/kr/co/palnet/kac/data/flt/repository/FltPlanAreaRepository.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/repository/FltPlanAreaRepository.java rename to data/flt/src/main/java/kr/co/palnet/kac/data/flt/repository/FltPlanAreaRepository.java diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/repository/FltPlanBasRepository.java b/data/flt/src/main/java/kr/co/palnet/kac/data/flt/repository/FltPlanBasRepository.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/repository/FltPlanBasRepository.java rename to data/flt/src/main/java/kr/co/palnet/kac/data/flt/repository/FltPlanBasRepository.java diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/repository/FltPlanCtrCntrlRelRepository.java b/data/flt/src/main/java/kr/co/palnet/kac/data/flt/repository/FltPlanCtrCntrlRelRepository.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/repository/FltPlanCtrCntrlRelRepository.java rename to data/flt/src/main/java/kr/co/palnet/kac/data/flt/repository/FltPlanCtrCntrlRelRepository.java diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/repository/FltPlanPilotRepository.java b/data/flt/src/main/java/kr/co/palnet/kac/data/flt/repository/FltPlanPilotRepository.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/flt/repository/FltPlanPilotRepository.java rename to data/flt/src/main/java/kr/co/palnet/kac/data/flt/repository/FltPlanPilotRepository.java diff --git a/data/other/build.gradle b/data/other/build.gradle new file mode 100644 index 0000000..8b8d407 --- /dev/null +++ b/data/other/build.gradle @@ -0,0 +1,27 @@ + +dependencies { + implementation "$boot:spring-boot-starter-data-jpa" + + implementation "com.querydsl:querydsl-jpa:5.0.0:jakarta" + annotationProcessor "com.querydsl:querydsl-apt:5.0.0:jakarta" + annotationProcessor "jakarta.annotation:jakarta.annotation-api" + annotationProcessor "jakarta.persistence:jakarta.persistence-api" + + + + testRuntimeOnly("com.h2database:h2") +} + +def querydslDir = layout.buildDirectory.dir("generated/querydsl").get().asFile + +sourceSets { + main.java.srcDir(querydslDir) +} + +tasks.withType(JavaCompile) { + options.getGeneratedSourceOutputDirectory().set(file(querydslDir)) +} + +clean { + delete file(querydslDir) +} diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/other/model/SuredataEntity.java b/data/other/src/main/java/kr/co/palnet/kac/data/other/model/SuredataEntity.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/other/model/SuredataEntity.java rename to data/other/src/main/java/kr/co/palnet/kac/data/other/model/SuredataEntity.java diff --git a/app/kac-app/src/main/java/kr/co/palnet/kac/data/other/repository/SuredataRepository.java b/data/other/src/main/java/kr/co/palnet/kac/data/other/repository/SuredataRepository.java similarity index 100% rename from app/kac-app/src/main/java/kr/co/palnet/kac/data/other/repository/SuredataRepository.java rename to data/other/src/main/java/kr/co/palnet/kac/data/other/repository/SuredataRepository.java