From 33827fad16beb2c646ce50f90daa1dfa50ee57e6 Mon Sep 17 00:00:00 2001 From: Lim Jonguk Date: Mon, 7 Feb 2022 18:56:26 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20relation=20=EC=9E=AC=EC=A0=95=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - MinSimsa680, MinSimsaUser680 relation 재정의 - 프로젝트 정보 변경 --- build.gradle | 4 +++- gradlew | 2 +- gradlew.bat | 2 +- settings.gradle | 2 +- .../com/xit/biz/ctgy/entity/MinSimsa680.java | 15 +++++++++++++ .../xit/biz/ctgy/entity/MinSimsaUser680.java | 19 +++++++++++----- .../resources/config/application-local.yml | 22 +++++++++---------- src/main/resources/logback-spring.xml | 4 ++-- 8 files changed, 47 insertions(+), 23 deletions(-) mode change 100644 => 100755 gradlew diff --git a/build.gradle b/build.gradle index e1c2f68..2b476c3 100644 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,7 @@ plugins { // buildscript group = 'com.xit' version = '0.0.1-SNAPSHOT' -description = 'xit-framework' +description = 'xit-opst-bo' sourceCompatibility = '11' // WAS로 배포하는 경우 : bootWar.enabled = false @@ -190,6 +190,8 @@ dependencies { // simple captcha implementation fileTree(dir: 'repo', include: ['*.jar']) + //implementation fileTree(dir: 'repo', include: 'simplecaptcha-1.2.1.jar') + //implementation fileTree(dir: 'repo', include: 'ojdbc8.jar') // amazon aws s3 implementation 'com.amazonaws:aws-java-sdk-s3:1.12.131' diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 index 1b6c787..e2f64f6 --- a/gradlew +++ b/gradlew @@ -61,7 +61,7 @@ # You can find Gradle at https://github.com/gradle/gradle/. # ############################################################################## - +export JAVA_HOME=/Library/Java/JavaVirtualMachines/zulu-11.jdk/Contents/Home # Attempt to set APP_HOME # Resolve links: $0 may be a link diff --git a/gradlew.bat b/gradlew.bat index b51bfba..af34846 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -21,7 +21,7 @@ @rem @rem ########################################################################## -set JAVA_HOME=C:\tools\java\azul-11.0.13 +set JAVA_HOME=/usr/bin/java @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal diff --git a/settings.gradle b/settings.gradle index 15f7773..9325096 100644 --- a/settings.gradle +++ b/settings.gradle @@ -2,4 +2,4 @@ * This file was generated by the Gradle 'init' task. */ -rootProject.name = 'xit-framework' +rootProject.name = 'xit-opst-bo' diff --git a/src/main/java/com/xit/biz/ctgy/entity/MinSimsa680.java b/src/main/java/com/xit/biz/ctgy/entity/MinSimsa680.java index d034f6e..8df99df 100644 --- a/src/main/java/com/xit/biz/ctgy/entity/MinSimsa680.java +++ b/src/main/java/com/xit/biz/ctgy/entity/MinSimsa680.java @@ -1,5 +1,6 @@ package com.xit.biz.ctgy.entity; +import com.xit.biz.cmm.entity.CmmUser; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -7,6 +8,8 @@ import lombok.Generated; import lombok.NoArgsConstructor; import javax.persistence.*; +import java.util.HashSet; +import java.util.Set; @Schema(name = "MinSimsa680", description = "민원심사") @NoArgsConstructor @@ -25,6 +28,18 @@ public class MinSimsa680 { /*private Long msMaincode;*/ private Tf680Recall tf680Recall; + + + + + @OneToMany(targetEntity = MinSimsaUser680.class, cascade = CascadeType.ALL, orphanRemoval = true) + @JoinColumn(name = "MSU_MAINCODE") + private final Set minSimsaUser680ss = new HashSet<>(); + + + + + @Schema(required = true, title = "접수번호", example = " ", description = "Input Description...") @Column(name = "MS_SEQ", nullable = false) private String msSeq; diff --git a/src/main/java/com/xit/biz/ctgy/entity/MinSimsaUser680.java b/src/main/java/com/xit/biz/ctgy/entity/MinSimsaUser680.java index 04bf626..bdf9c0e 100644 --- a/src/main/java/com/xit/biz/ctgy/entity/MinSimsaUser680.java +++ b/src/main/java/com/xit/biz/ctgy/entity/MinSimsaUser680.java @@ -21,12 +21,19 @@ public class MinSimsaUser680 { @Column(name = "MSU_CODE", nullable = false) private Long msuCode; - @Schema(required = true, title = "민원코드", example = " ", description = "Input Description...") -// @Column(name = "MSU_MAINCODE", nullable = false) - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "MS_MAINCODE") -// private Long msuMaincode; - private MinSimsa680 minSimsa680; + + + +// @Schema(required = true, title = "민원코드", example = " ", description = "Input Description...") +// //@Column(name = "MSU_MAINCODE", nullable = false) +// @ManyToOne(fetch = FetchType.LAZY) +// @JoinColumn(table = "MIN_SIMSA680", name = "MSU_MAINCODE", referencedColumnName = "") +//// private Long msuMaincode; +// private MinSimsa680 minSimsa680; + + + + @Schema(required = true, title = "민원심사사용자코드", example = " ", description = "Input Description...") // @Column(name = "MSU_USERID", nullable = false) diff --git a/src/main/resources/config/application-local.yml b/src/main/resources/config/application-local.yml index 7a4298a..c183c45 100644 --- a/src/main/resources/config/application-local.yml +++ b/src/main/resources/config/application-local.yml @@ -17,14 +17,14 @@ spring: # database setting # ================================================================================================================== datasource: -# driver-class-name: org.h2.Driver -# url: jdbc:h2:mem:xitdb;MODE=PostgreSQL;DATABASE_TO_LOWER=TRUE;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE -# username: sa -# password: '' - driver-class-name: oracle.jdbc.driver.OracleDriver - url: jdbc:oracle:thin:@211.119.124.118:1521:bustms - username: traffic - password: xhdgkq0 + driver-class-name: org.h2.Driver + url: jdbc:h2:mem:xitdb;MODE=Oracle;DATABASE_TO_LOWER=TRUE;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE + username: sa + password: '' +# driver-class-name: oracle.jdbc.OracleDriver +# url: jdbc:oracle:thin:@211.119.124.118:1521:bustms +# username: traffic +# password: xhdgkq0 hikari: driver-class-name: ${spring.datasource.driver-class-name} jdbc-url: ${spring.datasource.url} @@ -36,14 +36,14 @@ spring: # JPA setting # ================================================================================================================== jpa: -# database-platform: org.hibernate.dialect.H2Dialect - database-platform: org.hibernate.dialect.Oracle10gDialect + database-platform: org.hibernate.dialect.H2Dialect +# database-platform: org.hibernate.dialect.Oracle10gDialect #show-sql: false properties: hibernate: hbm2ddl: # create / create-drop / update / validate / none - auto: none + auto: create-drop h2: console: diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 5e63306..969cdbe 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -4,11 +4,11 @@ - + - +