From 4dffe4b0556bbb00cd0ddd553962723160feebf6 Mon Sep 17 00:00:00 2001 From: jiHyung Date: Thu, 27 Oct 2022 09:12:31 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B3=91=ED=95=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CrackdownStatusController.java | 5 ++--- .../mapper/CrackdownStatusMapper.java | 2 -- .../crackdownStatus/model/FishingBoat.java | 17 ++++------------- .../crackdownStatus/model/ProcessResult.java | 17 ++++------------- .../crackdownStatus/model/Sailor.java | 17 ++++------------- .../repository/FishingBoatRepository.java | 2 +- .../repository/ProcessResultRepository.java | 2 +- .../repository/SailorRepository.java | 2 +- .../service/CrackdownStatusService.java | 3 --- 9 files changed, 17 insertions(+), 50 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/CrackdownStatusController.java b/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/CrackdownStatusController.java index d8753954..cdc7137f 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/CrackdownStatusController.java +++ b/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/CrackdownStatusController.java @@ -1,12 +1,11 @@ package com.dbnt.faisp.faStatistics.crackdownStatus; -import com.dbnt.faisp.authMgt.service.AuthMgtService; import com.dbnt.faisp.faStatistics.crackdownStatus.model.CrackdownStatus; import com.dbnt.faisp.faStatistics.crackdownStatus.model.FishingBoat; import com.dbnt.faisp.faStatistics.crackdownStatus.model.ProcessResult; import com.dbnt.faisp.faStatistics.crackdownStatus.service.CrackdownStatusService; -import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest; -import com.dbnt.faisp.userInfo.model.UserInfo; +import com.dbnt.faisp.main.authMgt.service.AuthMgtService; +import com.dbnt.faisp.main.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/mapper/CrackdownStatusMapper.java b/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/mapper/CrackdownStatusMapper.java index bb25e07a..d6df23da 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/mapper/CrackdownStatusMapper.java +++ b/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/mapper/CrackdownStatusMapper.java @@ -1,8 +1,6 @@ package com.dbnt.faisp.faStatistics.crackdownStatus.mapper; import com.dbnt.faisp.faStatistics.crackdownStatus.model.CrackdownStatus; -import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest; -import com.dbnt.faisp.util.ParamMap; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/FishingBoat.java b/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/FishingBoat.java index 9d65557b..7ce80ea8 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/FishingBoat.java +++ b/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/FishingBoat.java @@ -1,13 +1,14 @@ package com.dbnt.faisp.faStatistics.crackdownStatus.model; import com.dbnt.faisp.config.BaseModel; -import lombok.*; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.*; -import java.io.Serializable; import java.time.LocalDateTime; @Getter @@ -17,14 +18,13 @@ import java.time.LocalDateTime; @DynamicInsert @DynamicUpdate @Table(name = "fishing_boat") -@IdClass(FishingBoat.FishingBoatId.class) public class FishingBoat extends BaseModel { @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "fb_key") private Integer fbKey; - @Id @Column(name = "cds_key") private Integer cdsKey; @@ -122,13 +122,4 @@ public class FishingBoat extends BaseModel { @Transient private String boatMaterialEtc; - - @Embeddable - @Data - @NoArgsConstructor - @AllArgsConstructor - public static class FishingBoatId implements Serializable { - private Integer fbKey; - private Integer cdsKey; - } } diff --git a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/ProcessResult.java b/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/ProcessResult.java index 7112f9ab..55f22366 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/ProcessResult.java +++ b/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/ProcessResult.java @@ -1,13 +1,14 @@ package com.dbnt.faisp.faStatistics.crackdownStatus.model; import com.dbnt.faisp.config.BaseModel; -import lombok.*; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.*; -import java.io.Serializable; import java.time.LocalDateTime; @Getter @@ -17,14 +18,13 @@ import java.time.LocalDateTime; @DynamicInsert @DynamicUpdate @Table(name = "process_result") -@IdClass(ProcessResult.ProcessResultId.class) public class ProcessResult extends BaseModel { @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "pr_key") private Integer prKey; - @Id @Column(name = "cds_key") private Integer cdsKey; @@ -131,13 +131,4 @@ public class ProcessResult extends BaseModel { @Transient private String processStatusEtc; - - @Embeddable - @Data - @NoArgsConstructor - @AllArgsConstructor - public static class ProcessResultId implements Serializable { - private Integer prKey; - private Integer cdsKey; - } } diff --git a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/Sailor.java b/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/Sailor.java index 8816f377..0878d05a 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/Sailor.java +++ b/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/Sailor.java @@ -1,13 +1,14 @@ package com.dbnt.faisp.faStatistics.crackdownStatus.model; import com.dbnt.faisp.config.BaseModel; -import lombok.*; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.*; -import java.io.Serializable; import java.time.LocalDateTime; @Getter @@ -17,14 +18,13 @@ import java.time.LocalDateTime; @DynamicInsert @DynamicUpdate @Table(name = "sailor") -@IdClass(Sailor.SailorId.class) public class Sailor extends BaseModel { @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "sailor_key") private Integer sailorKey; - @Id @Column(name = "fb_key") private Integer fbKey; @@ -88,13 +88,4 @@ public class Sailor extends BaseModel { @Column(name = "wrt_dt") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private LocalDateTime wrtDt; - - @Embeddable - @Data - @NoArgsConstructor - @AllArgsConstructor - public static class SailorId implements Serializable { - private Integer sailorKey; - private Integer fbKey; - } } diff --git a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/FishingBoatRepository.java b/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/FishingBoatRepository.java index 2d547182..649168aa 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/FishingBoatRepository.java +++ b/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/FishingBoatRepository.java @@ -3,6 +3,6 @@ package com.dbnt.faisp.faStatistics.crackdownStatus.repository; import com.dbnt.faisp.faStatistics.crackdownStatus.model.FishingBoat; import org.springframework.data.jpa.repository.JpaRepository; -public interface FishingBoatRepository extends JpaRepository { +public interface FishingBoatRepository extends JpaRepository { } diff --git a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/ProcessResultRepository.java b/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/ProcessResultRepository.java index abd1c8d5..6799b906 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/ProcessResultRepository.java +++ b/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/ProcessResultRepository.java @@ -3,6 +3,6 @@ package com.dbnt.faisp.faStatistics.crackdownStatus.repository; import com.dbnt.faisp.faStatistics.crackdownStatus.model.ProcessResult; import org.springframework.data.jpa.repository.JpaRepository; -public interface ProcessResultRepository extends JpaRepository { +public interface ProcessResultRepository extends JpaRepository { } diff --git a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/SailorRepository.java b/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/SailorRepository.java index d63c9ad1..413b34a8 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/SailorRepository.java +++ b/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/SailorRepository.java @@ -3,6 +3,6 @@ package com.dbnt.faisp.faStatistics.crackdownStatus.repository; import com.dbnt.faisp.faStatistics.crackdownStatus.model.Sailor; import org.springframework.data.jpa.repository.JpaRepository; -public interface SailorRepository extends JpaRepository { +public interface SailorRepository extends JpaRepository { } diff --git a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/service/CrackdownStatusService.java b/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/service/CrackdownStatusService.java index a5c93d00..427c46a2 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/service/CrackdownStatusService.java +++ b/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/service/CrackdownStatusService.java @@ -4,12 +4,9 @@ package com.dbnt.faisp.faStatistics.crackdownStatus.service; import com.dbnt.faisp.config.BaseService; import com.dbnt.faisp.faStatistics.crackdownStatus.mapper.CrackdownStatusMapper; import com.dbnt.faisp.faStatistics.crackdownStatus.model.CrackdownStatus; -import com.dbnt.faisp.faStatistics.crackdownStatus.model.ProcessResult; import com.dbnt.faisp.faStatistics.crackdownStatus.model.Sailor; import com.dbnt.faisp.faStatistics.crackdownStatus.model.Violation; import com.dbnt.faisp.faStatistics.crackdownStatus.repository.*; -import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest; -import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.SuspectPersonInfo; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional;