src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/CrackdownStatusController.java

@@ -1,10 +1,10 @@
 package com.dbnt.faisp.main.faStatistics.crackdownsStatus;
 
-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.main.authMgt.service.AuthMgtService;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.CrackdownStatus;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.FishingBoat;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.ProcessResult;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.service.CrackdownStatusService;
 import com.dbnt.faisp.main.userInfo.model.UserInfo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/mapper/CrackdownStatusMapper.java

@@ -2,7 +2,6 @@ package com.dbnt.faisp.main.faStatistics.crackdownsStatus.mapper;
 
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.CrackdownStatus;
 import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest;
-import com.dbnt.faisp.faStatistics.crackdownStatus.model.CrackdownStatus;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/FishingBoat.java

@@ -1,14 +1,13 @@
 package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model;
 
 import com.dbnt.faisp.config.BaseModel;
-import lombok.Getter;
+import lombok.*;
-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
@@ -18,13 +17,14 @@ 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,4 +122,13 @@ 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;
+    }
 }

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/ProcessResult.java

@@ -1,14 +1,13 @@
 package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model;
 
 import com.dbnt.faisp.config.BaseModel;
-import lombok.Getter;
+import lombok.*;
-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
@@ -18,13 +17,14 @@ 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,4 +131,13 @@ 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;
+    }
 }

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/Sailor.java

@@ -1,14 +1,13 @@
 package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model;
 
 import com.dbnt.faisp.config.BaseModel;
-import lombok.Getter;
+import lombok.*;
-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
@@ -18,13 +17,14 @@ 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,4 +88,13 @@ 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;
+    }
 }

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/FishingBoatRepository.java

@@ -3,6 +3,6 @@ package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.FishingBoat;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface FishingBoatRepository extends JpaRepository<FishingBoat, Integer> {
+public interface FishingBoatRepository extends JpaRepository<FishingBoat, FishingBoat.FishingBoatId> {
 
 }

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ProcessResultRepository.java

@@ -3,6 +3,6 @@ package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.ProcessResult;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface ProcessResultRepository extends JpaRepository<ProcessResult, Integer> {
+public interface ProcessResultRepository extends JpaRepository<ProcessResult, ProcessResult.ProcessResultId> {
 
 }

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/SailorRepository.java

@@ -3,6 +3,6 @@ package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.Sailor;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface SailorRepository extends JpaRepository<Sailor, Integer> {
+public interface SailorRepository extends JpaRepository<Sailor, Sailor.SailorId> {
 
 }

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/CrackdownStatusService.java

@@ -9,11 +9,6 @@ import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.Violation;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.*;
 import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest;
 import com.dbnt.faisp.faStatistics.internationalCrimeArrest.model.SuspectPersonInfo;
-import com.dbnt.faisp.faStatistics.crackdownStatus.mapper.CrackdownStatusMapper;
-import com.dbnt.faisp.faStatistics.crackdownStatus.model.CrackdownStatus;
-import com.dbnt.faisp.faStatistics.crackdownStatus.model.Sailor;
-import com.dbnt.faisp.faStatistics.crackdownStatus.model.Violation;
-import com.dbnt.faisp.faStatistics.crackdownStatus.repository.*;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;