diff --git a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/CrackdownStatusController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/CrackdownStatusController.java similarity index 84% rename from src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/CrackdownStatusController.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/CrackdownStatusController.java index d8753954..8e263dc3 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/CrackdownStatusController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/CrackdownStatusController.java @@ -1,12 +1,11 @@ -package com.dbnt.faisp.faStatistics.crackdownStatus; +package com.dbnt.faisp.main.faStatistics.crackdownsStatus; -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.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; 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/main/faStatistics/crackdownsStatus/mapper/CrackdownStatusMapper.java similarity index 68% rename from src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/mapper/CrackdownStatusMapper.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/mapper/CrackdownStatusMapper.java index bb25e07a..9b30837f 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/mapper/CrackdownStatusMapper.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/mapper/CrackdownStatusMapper.java @@ -1,8 +1,7 @@ -package com.dbnt.faisp.faStatistics.crackdownStatus.mapper; +package com.dbnt.faisp.main.faStatistics.crackdownsStatus.mapper; -import com.dbnt.faisp.faStatistics.crackdownStatus.model.CrackdownStatus; +import com.dbnt.faisp.main.faStatistics.crackdownsStatus.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/CaptinPhotoFile.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/CaptinPhotoFile.java similarity index 94% rename from src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/CaptinPhotoFile.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/CaptinPhotoFile.java index 93412e0b..b2b2d0c8 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/CaptinPhotoFile.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/CaptinPhotoFile.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.faStatistics.crackdownStatus.model; +package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model; import com.dbnt.faisp.config.FileInfo; import lombok.*; diff --git a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/CrackdownStatus.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/CrackdownStatus.java similarity index 98% rename from src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/CrackdownStatus.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/CrackdownStatus.java index 418b1166..17088e80 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/CrackdownStatus.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/CrackdownStatus.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.faStatistics.crackdownStatus.model; +package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model; import com.dbnt.faisp.config.BaseModel; import lombok.Getter; diff --git a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/FishingBoat.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/FishingBoat.java similarity index 97% rename from src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/FishingBoat.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/FishingBoat.java index 9d65557b..b51f56f7 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/FishingBoat.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/FishingBoat.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.faStatistics.crackdownStatus.model; +package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model; import com.dbnt.faisp.config.BaseModel; import lombok.*; diff --git a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/ProcessResult.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/ProcessResult.java similarity index 98% rename from src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/ProcessResult.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/ProcessResult.java index 7112f9ab..31ae7296 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/ProcessResult.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/ProcessResult.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.faStatistics.crackdownStatus.model; +package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model; import com.dbnt.faisp.config.BaseModel; import lombok.*; diff --git a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/Sailor.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/Sailor.java similarity index 97% rename from src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/Sailor.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/Sailor.java index 8816f377..aba3c2e5 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/Sailor.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/Sailor.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.faStatistics.crackdownStatus.model; +package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model; import com.dbnt.faisp.config.BaseModel; import lombok.*; diff --git a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/Violation.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/Violation.java similarity index 91% rename from src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/Violation.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/Violation.java index 86be3085..932513a7 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/model/Violation.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/Violation.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.faStatistics.crackdownStatus.model; +package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model; import com.dbnt.faisp.config.BaseModel; import lombok.Getter; diff --git a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/CaptionPhotoFileRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/CaptionPhotoFileRepository.java similarity index 55% rename from src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/CaptionPhotoFileRepository.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/CaptionPhotoFileRepository.java index fdabd9a9..75e28ba5 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/CaptionPhotoFileRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/CaptionPhotoFileRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.faStatistics.crackdownStatus.repository; +package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository; -import com.dbnt.faisp.faStatistics.crackdownStatus.model.CaptinPhotoFile; +import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.CaptinPhotoFile; import org.springframework.data.jpa.repository.JpaRepository; public interface CaptionPhotoFileRepository extends JpaRepository { diff --git a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/CrackdownStatusRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/CrackdownStatusRepository.java similarity index 51% rename from src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/CrackdownStatusRepository.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/CrackdownStatusRepository.java index 2333669d..0215f8ce 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/CrackdownStatusRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/CrackdownStatusRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.faStatistics.crackdownStatus.repository; +package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository; -import com.dbnt.faisp.faStatistics.crackdownStatus.model.CrackdownStatus; +import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.CrackdownStatus; import org.springframework.data.jpa.repository.JpaRepository; public interface CrackdownStatusRepository extends JpaRepository { diff --git a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/FishingBoatRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/FishingBoatRepository.java similarity index 53% rename from src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/FishingBoatRepository.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/FishingBoatRepository.java index 2d547182..da9f7af9 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/FishingBoatRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/FishingBoatRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.faStatistics.crackdownStatus.repository; +package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository; -import com.dbnt.faisp.faStatistics.crackdownStatus.model.FishingBoat; +import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.FishingBoat; import org.springframework.data.jpa.repository.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/main/faStatistics/crackdownsStatus/repository/ProcessResultRepository.java similarity index 54% rename from src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/ProcessResultRepository.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ProcessResultRepository.java index abd1c8d5..1bd15932 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/ProcessResultRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ProcessResultRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.faStatistics.crackdownStatus.repository; +package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository; -import com.dbnt.faisp.faStatistics.crackdownStatus.model.ProcessResult; +import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.ProcessResult; import org.springframework.data.jpa.repository.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/main/faStatistics/crackdownsStatus/repository/SailorRepository.java similarity index 51% rename from src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/SailorRepository.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/SailorRepository.java index d63c9ad1..23d56701 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/SailorRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/SailorRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.faStatistics.crackdownStatus.repository; +package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository; -import com.dbnt.faisp.faStatistics.crackdownStatus.model.Sailor; +import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.Sailor; import org.springframework.data.jpa.repository.JpaRepository; public interface SailorRepository extends JpaRepository { diff --git a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/ViolationRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ViolationRepository.java similarity index 50% rename from src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/ViolationRepository.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ViolationRepository.java index 4b4c57b1..65d0c538 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/repository/ViolationRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ViolationRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.faStatistics.crackdownStatus.repository; +package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository; -import com.dbnt.faisp.faStatistics.crackdownStatus.model.Violation; +import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.Violation; import org.springframework.data.jpa.repository.JpaRepository; public interface ViolationRepository extends JpaRepository { diff --git a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/service/CrackdownStatusService.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/CrackdownStatusService.java similarity index 89% rename from src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/service/CrackdownStatusService.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/CrackdownStatusService.java index a5c93d00..f423c06e 100644 --- a/src/main/java/com/dbnt/faisp/faStatistics/crackdownStatus/service/CrackdownStatusService.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/CrackdownStatusService.java @@ -1,13 +1,12 @@ -package com.dbnt.faisp.faStatistics.crackdownStatus.service; +package com.dbnt.faisp.main.faStatistics.crackdownsStatus.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.main.faStatistics.crackdownsStatus.mapper.CrackdownStatusMapper; +import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.CrackdownStatus; +import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.Sailor; +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 lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java b/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java index 80bf6a60..99c86ad0 100644 --- a/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/FipTargetController.java @@ -1,7 +1,7 @@ package com.dbnt.faisp.main.fipTarget; -import com.dbnt.faisp.fipTarget.model.ShipInfo; +import com.dbnt.faisp.main.fipTarget.model.ShipInfo; import com.dbnt.faisp.main.authMgt.service.AuthMgtService; import com.dbnt.faisp.main.fipTarget.model.PartInfo; import com.dbnt.faisp.main.fipTarget.model.PartInfoFile; diff --git a/src/main/java/com/dbnt/faisp/fipTarget/model/ShipInfo.java b/src/main/java/com/dbnt/faisp/main/fipTarget/model/ShipInfo.java similarity index 94% rename from src/main/java/com/dbnt/faisp/fipTarget/model/ShipInfo.java rename to src/main/java/com/dbnt/faisp/main/fipTarget/model/ShipInfo.java index 79470223..807a8079 100644 --- a/src/main/java/com/dbnt/faisp/fipTarget/model/ShipInfo.java +++ b/src/main/java/com/dbnt/faisp/main/fipTarget/model/ShipInfo.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.fipTarget.model; +package com.dbnt.faisp.main.fipTarget.model; import com.dbnt.faisp.config.BaseModel; @@ -10,15 +10,11 @@ import lombok.Setter; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; -import org.springframework.web.multipart.MultipartFile; import javax.persistence.*; import java.io.Serializable; -import java.time.LocalDate; import java.time.LocalDateTime; -import java.util.Date; -import java.util.List; @Getter diff --git a/src/main/resources/mybatisMapper/CrackdownStatustMapper.xml b/src/main/resources/mybatisMapper/CrackdownStatustMapper.xml index 29e4bf2d..ca49f5c2 100644 --- a/src/main/resources/mybatisMapper/CrackdownStatustMapper.xml +++ b/src/main/resources/mybatisMapper/CrackdownStatustMapper.xml @@ -3,7 +3,7 @@ - +