패키지 경로 변경. 중간저장.

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

@@ -2,10 +2,9 @@ package com.dbnt.faisp.main.faStatistics.crackdownsStatus;
 
 import com.dbnt.faisp.main.authMgt.service.AuthMgtService;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatus;
-import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.FishingBoat;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.FishingBoat;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatusVersion;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.processResult.ProcessResult;
-import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.processResult.ProcessResultVersion;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.*;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.service.CrackdownStatusService;
 import com.dbnt.faisp.main.userInfo.model.UserInfo;

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

@@ -3,7 +3,7 @@ package com.dbnt.faisp.main.faStatistics.crackdownsStatus;
 import com.dbnt.faisp.main.authMgt.service.AuthMgtService;
 import com.dbnt.faisp.main.codeMgt.service.CodeMgtService;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatus;
-import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.FishingBoat;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.FishingBoat;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.processResult.ProcessResult;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.service.FishingBoatService;
 import com.dbnt.faisp.main.userInfo.model.UserInfo;

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

@@ -2,10 +2,9 @@ package com.dbnt.faisp.main.faStatistics.crackdownsStatus;
 
 import com.dbnt.faisp.main.authMgt.service.AuthMgtService;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatus;
-import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.FishingBoat;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.FishingBoat;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.processResult.ProcessResult;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.processResult.ProcessResultVersion;
-import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.sailor.Sailor;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.*;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.service.ProcessResultService;
 import com.dbnt.faisp.main.userInfo.model.UserInfo;

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

@@ -2,7 +2,7 @@ package com.dbnt.faisp.main.faStatistics.crackdownsStatus;
 
 import com.dbnt.faisp.main.authMgt.service.AuthMgtService;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatus;
-import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.FishingBoat;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.FishingBoat;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.sailor.Sailor;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.sailor.SailorVersion;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.*;

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatus.java

@@ -1,8 +1,7 @@
 package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus;
 
-import com.dbnt.faisp.config.BaseModel;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.FishingBoat;
-import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.FishingBoat;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.Violation;
-import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.Violation;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.processResult.ProcessResult;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.sailor.Sailor;
 import lombok.Getter;
@@ -10,11 +9,8 @@ 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.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.List;
 
 @Getter

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatusBaseEntity.java

@@ -1,21 +1,13 @@
 package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus;
 
 import com.dbnt.faisp.config.BaseModel;
-import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.FishingBoat;
-import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.Violation;
-import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.processResult.ProcessResult;
-import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.sailor.Sailor;
 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.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.List;
 
 @Getter
 @Setter

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

@@ -0,0 +1,47 @@
+package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat;
+
+import com.dbnt.faisp.config.BaseModel;
+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.time.LocalDateTime;
+
+@Getter
+@Setter
+@Entity
+@NoArgsConstructor
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "fishing_boat")
+public class FishingBoat extends FishingBoatBaseEntity {
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Column(name = "fb_key")
+  private Integer fbKey;
+
+  @Transient
+  private String year;
+  @Transient
+  private String caseAgency;
+  @Transient
+  private String crackdownPolice;
+  @Transient
+  private String crackdownBoat;
+  @Transient
+  private String boatNny;
+  @Transient
+  private String processStatus;
+  @Transient
+  private String violation;
+
+  @Transient
+  private String boatMaterialEtc;
+  @Transient
+  private String fisheryTypeEtc;
+}

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/FishingBoatBaseEntity.java

@@ -1,11 +1,9 @@
-package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model;
+package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat;
 
 import com.dbnt.faisp.config.BaseModel;
 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.*;
@@ -13,17 +11,10 @@ import java.time.LocalDateTime;
 
 @Getter
 @Setter
-@Entity
 @NoArgsConstructor
-@DynamicInsert
+@MappedSuperclass
-@DynamicUpdate
+public class FishingBoatBaseEntity extends BaseModel {
-@Table(name = "fishing_boat")
-public class FishingBoat extends BaseModel {
 
-  @Id
-  @GeneratedValue(strategy = GenerationType.IDENTITY)
-  @Column(name = "fb_key")
-  private Integer fbKey;
   @Column(name = "cds_key")
   private Integer cdsKey;
   @Column(name = "boat_name_kr")
@@ -97,23 +88,4 @@ public class FishingBoat extends BaseModel {
   @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
   private LocalDateTime wrtDt;
 
-  @Transient
-  private String year;
-  @Transient
-  private String caseAgency;
-  @Transient
-  private String crackdownPolice;
-  @Transient
-  private String crackdownBoat;
-  @Transient
-  private String boatNny;
-  @Transient
-  private String processStatus;
-  @Transient
-  private String violation;
-
-  @Transient
-  private String boatMaterialEtc;
-  @Transient
-  private String fisheryTypeEtc;
 }

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/FishingBoatVersion.java

@@ -0,0 +1,35 @@
+package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat;
+
+import lombok.*;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Getter
+@Setter
+@Entity
+@NoArgsConstructor
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "fishing_boat_version")
+@IdClass(FishingBoatVersion.FishingBoatVersionId.class)
+public class FishingBoatVersion extends FishingBoatBaseEntity {
+
+  @Id
+  @Column(name = "fb_key")
+  private Integer fbKey;
+  @Id
+  @Column(name = "version_no")
+  private Integer versionNo;
+
+  @Embeddable
+  @Data
+  @NoArgsConstructor
+  @AllArgsConstructor
+  public static class FishingBoatVersionId implements Serializable {
+    private Integer fbKey;
+    private Integer versionNo;
+  }
+}

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/Violation.java

@@ -1,4 +1,4 @@
-package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model;
+package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat;
 
 import com.dbnt.faisp.config.BaseModel;
 import lombok.*;

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/ViolationVersion.java

@@ -0,0 +1,41 @@
+package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat;
+
+import com.dbnt.faisp.config.BaseModel;
+import lombok.*;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Getter
+@Setter
+@Entity
+@NoArgsConstructor
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "violation_version")
+@IdClass(ViolationVersion.ViolationVersionId.class)
+public class ViolationVersion extends BaseModel {
+  @Id
+  @Column(name = "violation_key")
+  private Integer violationKey;
+  @Id
+  @Column(name = "fb_key")
+  private Integer fbKey;
+  @Id
+  @Column(name = "version_no")
+  private Integer versionNo;
+  @Column(name = "violation")
+  private String violation;
+
+  @Embeddable
+  @Data
+  @NoArgsConstructor
+  @AllArgsConstructor
+  public static class ViolationVersionId implements Serializable{
+    private Integer violationKey;
+    private Integer fbKey;
+    private Integer versionNo;
+  }
+}

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

@@ -1,8 +1,8 @@
 package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.processResult;
 
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatus;
-import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.FishingBoat;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.FishingBoat;
-import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.Violation;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.Violation;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/processResult/ProcessResultVersion.java

@@ -1,7 +1,7 @@
 package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.processResult;
 
-import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.FishingBoat;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.FishingBoat;
-import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.Violation;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.Violation;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatus;
 import lombok.*;
 import org.hibernate.annotations.DynamicInsert;

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

@@ -1,8 +1,8 @@
 package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.sailor;
 
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatus;
-import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.FishingBoat;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.FishingBoat;
-import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.Violation;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.Violation;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;

src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/sailor/SailorVersion.java

@@ -1,7 +1,7 @@
 package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.sailor;
 
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatus;
-import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.FishingBoat;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.FishingBoat;
 import lombok.*;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;

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

@@ -1,6 +1,6 @@
 package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository;
 
-import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.FishingBoat;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.FishingBoat;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.Optional;

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

@@ -0,0 +1,11 @@
+package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository;
+
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.FishingBoat;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.FishingBoatVersion;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import java.util.Optional;
+
+public interface FishingBoatVersionRepository extends JpaRepository<FishingBoatVersion, FishingBoatVersion.FishingBoatVersionId> {
+  Optional<FishingBoatVersion> findTop1ByFbKeyOrderByVersionNoDesc(Integer fbKey);
+}

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

@@ -1,6 +1,6 @@
 package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository;
 
-import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.Violation;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.Violation;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;

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

@@ -0,0 +1,8 @@
+package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository;
+
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.ViolationVersion;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface ViolationVersionRepository extends JpaRepository<ViolationVersion, ViolationVersion.ViolationVersionId> {
+
+}

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

@@ -5,10 +5,8 @@ import com.dbnt.faisp.config.BaseService;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.mapper.CrackdownStatusMapper;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatus;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatusVersion;
-import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.processResult.ProcessResult;
-import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.processResult.ProcessResultVersion;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.sailor.Sailor;
-import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.Violation;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.Violation;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.*;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

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

@@ -3,23 +3,33 @@ package com.dbnt.faisp.main.faStatistics.crackdownsStatus.service;
 
 import com.dbnt.faisp.config.BaseService;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.mapper.CrackdownStatusMapper;
-import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.*;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatus;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatusVersion;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.FishingBoat;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.FishingBoatVersion;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.Violation;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.processResult.ProcessResult;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.sailor.Sailor;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.*;
+import com.fasterxml.jackson.databind.util.BeanUtil;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 @Service
 @RequiredArgsConstructor
 public class FishingBoatService extends BaseService {
 
   private final CrackdownStatusMapper crackdownStatusMapper;
   private final CrackdownStatusRepository crackdownStatusRepository;
+  private final CrackdownStatusVersionRepository crackdownStatusVersionRepository;
   private final FishingBoatRepository fishingBoatRepository;
+  private final FishingBoatVersionRepository fishingBoatVersionRepository;
   private final ViolationRepository violationRepository;
+  private final ViolationVersionRepository violationVersionRepository;
   private final ProcessResultRepository processResultRepository;
   private final SailorRepository sailorRepository;
 
@@ -43,9 +53,16 @@ public class FishingBoatService extends BaseService {
     if (crackdownStatus.getCdsKey()==null || crackdownStatus.getCdsKey().equals(0)){
       // 최초 등록시 단속현황, 처리현황, 선원정보를 같이 등록.
       cdsKey = crackdownStatusRepository.save(crackdownStatus).getCdsKey();
+      CrackdownStatusVersion crackdownStatusVersion = new CrackdownStatusVersion();
+      BeanUtils.copyProperties(crackdownStatus, crackdownStatusVersion);
+      crackdownStatusVersionRepository.save(crackdownStatusVersion);
       FishingBoat fishingBoat = crackdownStatus.getFishingBoat();
       fishingBoat.setCdsKey(cdsKey);
       fbKey = fishingBoatRepository.save(fishingBoat).getFbKey();
+      FishingBoatVersion fishingBoatVersion = new FishingBoatVersion();
+      BeanUtils.copyProperties(fishingBoat, fishingBoatVersion);
+      fishingBoatVersion.setVersionNo(1);
+      fishingBoatVersionRepository.save(fishingBoatVersion);
       List<Violation> violationList = crackdownStatus.getViolationList();
       int i = 1;
       for(Violation violation: violationList){
@@ -63,7 +80,9 @@ public class FishingBoatService extends BaseService {
     }else{
       // 업데이트시에는 어선정보만 수정.
       cdsKey = crackdownStatus.getCdsKey();
-      FishingBoat oldInfo = fishingBoatRepository.findById(crackdownStatus.getFishingBoat().getFbKey()).orElse(null);
+      FishingBoatVersion lastVersion = fishingBoatVersionRepository.findTop1ByFbKeyOrderByVersionNoDesc(crackdownStatus.getFishingBoat().getFbKey()).orElse(null);
+      int versionNo = lastVersion.getVersionNo();
+      FishingBoatVersion newInfo = new FishingBoatVersion();
 
       fbKey = fishingBoatRepository.save(crackdownStatus.getFishingBoat()).getFbKey();
     }

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

@@ -3,8 +3,9 @@ package com.dbnt.faisp.main.faStatistics.crackdownsStatus.service;
 
 import com.dbnt.faisp.config.BaseService;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.mapper.SailorMapper;
-import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.*;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatus;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.FishingBoat;
+import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.Violation;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.sailor.Sailor;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.sailor.SailorVersion;
 import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.*;