diff --git a/src/main/java/com/dbnt/faisp/config/FileController.java b/src/main/java/com/dbnt/faisp/config/FileController.java index 96ebdf55..3b868af8 100644 --- a/src/main/java/com/dbnt/faisp/config/FileController.java +++ b/src/main/java/com/dbnt/faisp/config/FileController.java @@ -2,8 +2,8 @@ package com.dbnt.faisp.config; import com.dbnt.faisp.main.counterIntelligence.service.CounterIntelligenceService; import com.dbnt.faisp.main.faRpt.service.FaRptService; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.service.FishingBoatService; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.service.SailorService; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.service.FishingBoatService; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.service.SailorService; import com.dbnt.faisp.main.fpiMgt.affair.service.AffairService; import com.dbnt.faisp.main.fpiMgt.affairPlan.service.PlanService; import com.dbnt.faisp.main.fpiMgt.affairResult.service.ResultService; @@ -26,7 +26,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.*; -import java.net.URLEncoder; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/src/main/java/com/dbnt/faisp/config/ModalController.java b/src/main/java/com/dbnt/faisp/config/ModalController.java index 756521b3..401aae81 100644 --- a/src/main/java/com/dbnt/faisp/config/ModalController.java +++ b/src/main/java/com/dbnt/faisp/config/ModalController.java @@ -1,16 +1,10 @@ package com.dbnt.faisp.config; import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.UnlawfulFishingParam; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CSStatistics; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatus; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatusDTO; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.FishingBoatRepository; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.ProcessResultRepository; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.SailorRepository; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.ViolationRepository; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.service.CrackdownStatusService; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.service.FishingBoatService; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.UnlawfulFishingParam; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.CSStatistics; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.CrackdownStatusDTO; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.service.FishingBoatService; import com.dbnt.faisp.main.menuMgt.model.MenuMgt; import com.dbnt.faisp.main.menuMgt.service.MenuMgtService; import com.dbnt.faisp.main.userInfo.model.UserInfo; diff --git a/src/main/java/com/dbnt/faisp/config/SecurityConfig.java b/src/main/java/com/dbnt/faisp/config/SecurityConfig.java index 37585705..7d61c6da 100644 --- a/src/main/java/com/dbnt/faisp/config/SecurityConfig.java +++ b/src/main/java/com/dbnt/faisp/config/SecurityConfig.java @@ -139,6 +139,7 @@ public class SecurityConfig{ "/affairStatistics/**", "/affairResult/**", "/faStatistics/**", + "/unlawfulFishing/**", "/translator/**", "/police/**", "/sri/**", diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/UnlawfulFishingController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/UnlawfulFishingController.java deleted file mode 100644 index 4abff8b0..00000000 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/UnlawfulFishingController.java +++ /dev/null @@ -1,41 +0,0 @@ -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.crackdownStatus.CrackdownStatusVersion; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.UnlawfulFishingVersion; -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.repository.FishingBoatRepository; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.ProcessResultRepository; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.SailorRepository; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.ViolationRepository; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.service.CrackdownStatusService; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.service.UnlawfulFishingService; -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; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.servlet.ModelAndView; - -import java.time.LocalDateTime; -import java.util.List; - -@RestController -@RequiredArgsConstructor -@RequestMapping("/faStatistics") -public class UnlawfulFishingController { - - private final UnlawfulFishingService unlawfulFishingService; - - @GetMapping("/crackdownStatusVersionInfo") - public ModelAndView selectUnlawfulFishingVersionInfo(Integer cdsKey, Integer versionNo){ - ModelAndView mav = new ModelAndView("faStatistics/unlawfulFishing/versionInfo"); - mav.addObject("infos", unlawfulFishingService.selectUnlawfulFishingVersionInfo(cdsKey, versionNo)); - return mav; - } - -} diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/mapper/CrackdownStatusMapper.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/mapper/CrackdownStatusMapper.java deleted file mode 100644 index d773c019..00000000 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/mapper/CrackdownStatusMapper.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.mapper; - -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.UnlawfulFishingParam; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatus; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatusDTO; -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.processResult.ProcessResultVersion; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface CrackdownStatusMapper { - List selectCrackdownStatusList(UnlawfulFishingParam params); - Integer selectCrackdownStatusListCnt(UnlawfulFishingParam params); - - List selectFishingBoatList(UnlawfulFishingParam params); - Integer selectFishingBoatListCnt(UnlawfulFishingParam params); - List selectFishingBoatYearParam(UnlawfulFishingParam params); - - List selectCrackdownStatusVersionList(Integer cdsKey); - List selectFishingBoatVersionList(Integer fbKey); - List selectProcessResultVersionList(Integer prKey); - -} diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/AsfCovController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/AsfCovController.java similarity index 84% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/AsfCovController.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/AsfCovController.java index 8704907d..74ec2b83 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/AsfCovController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/AsfCovController.java @@ -1,26 +1,18 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing; import com.dbnt.faisp.main.authMgt.service.AuthMgtService; import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.asfCov.AsfCov; -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.processResult.ProcessResult; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.service.AsfCovService; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.asfCov.AsfCov; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.service.AsfCovService; import com.dbnt.faisp.main.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; -import oracle.jdbc.proxy.annotation.Post; import org.springframework.security.core.annotation.AuthenticationPrincipal; -import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; import java.time.LocalDateTime; -import java.util.List; @RestController diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/CrackdownStatusController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/CrackdownStatusController.java similarity index 89% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/CrackdownStatusController.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/CrackdownStatusController.java index bc507c69..6f67df9d 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/CrackdownStatusController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/CrackdownStatusController.java @@ -1,13 +1,12 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing; 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.crackdownStatus.CrackdownStatusDTO; -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.repository.*; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.service.CrackdownStatusService; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.CrackdownStatus; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.FishingBoat; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.CrackdownStatusVersion; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.processResult.ProcessResult; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository.*; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.service.CrackdownStatusService; import com.dbnt.faisp.main.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/FishingBoatController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/FishingBoatController.java similarity index 90% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/FishingBoatController.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/FishingBoatController.java index e0396e86..94856064 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/FishingBoatController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/FishingBoatController.java @@ -1,16 +1,16 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing; import com.dbnt.faisp.main.authMgt.service.AuthMgtService; import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.UnlawfulFishingParam; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CSStatistics; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatus; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatusDTO; -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.processResult.ProcessResult; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.service.FishingBoatService; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.service.UnlawfulFishingService; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.UnlawfulFishingParam; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.CSStatistics; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.CrackdownStatus; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.CrackdownStatusDTO; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.FishingBoat; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.FishingBoatVersion; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.processResult.ProcessResult; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.service.FishingBoatService; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.service.UnlawfulFishingService; import com.dbnt.faisp.main.menuMgt.service.MenuMgtService; import com.dbnt.faisp.main.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/ProcessResultController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/ProcessResultController.java similarity index 91% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/ProcessResultController.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/ProcessResultController.java index 3f99c900..bd327704 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/ProcessResultController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/ProcessResultController.java @@ -1,12 +1,12 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing; 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.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.repository.*; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.service.ProcessResultService; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.CrackdownStatus; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.FishingBoat; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.processResult.ProcessResult; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.processResult.ProcessResultVersion; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository.*; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.service.ProcessResultService; import com.dbnt.faisp.main.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/SailorController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/SailorController.java similarity index 91% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/SailorController.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/SailorController.java index cd26eec5..27762701 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/SailorController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/SailorController.java @@ -1,12 +1,12 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing; 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.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.*; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.service.SailorService; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.CrackdownStatus; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.FishingBoat; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.sailor.Sailor; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.sailor.SailorVersion; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository.*; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.service.SailorService; import com.dbnt.faisp.main.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishing2Controller.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishing2Controller.java deleted file mode 100644 index 7436a80e..00000000 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishing2Controller.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.dbnt.faisp.main.faStatistics.unlawfulFishing; - -import com.dbnt.faisp.main.authMgt.service.AuthMgtService; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.UnlawfulFishingParam; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CSStatistics; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatusDTO; -import com.dbnt.faisp.main.faStatistics.unlawfulFishing.service.UnlawfulFishing2Service; -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; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.servlet.ModelAndView; - -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; - -@RestController -@RequiredArgsConstructor -@RequestMapping("/unlawfulFishing") -public class UnlawfulFishing2Controller { - private final UnlawfulFishing2Service unlawfulFishing2Service; - private final AuthMgtService authMgtService; - - @GetMapping("/crackdownStatus") - public ModelAndView crackdownStatusPage(@AuthenticationPrincipal UserInfo loginUser, UnlawfulFishingParam params){ - ModelAndView mav = new ModelAndView("faStatistics/unlawfulFishing/crackdownStatus/crackdownStatusPage"); - //메뉴권한 확인 - String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faStatistics/crackdownStatus").get(0).getAccessAuth(); - mav.addObject("accessAuth", accessAuth); - - if(params.getYear()==null){ - params.setYear(LocalDateTime.now().getYear()); - } - List yearList = unlawfulFishing2Service.selectFishingBoatYearParam(); - if(!yearList.contains(params.getYear())){ - yearList.add(params.getYear()); - } - List csDTOList = new ArrayList(); - CSStatistics statistics = new CSStatistics(); - - mav.addObject("statistics", statistics); - mav.addObject("crackdownStatusList", csDTOList); - mav.addObject("yearList", yearList); - mav.addObject("searchParams", params); - return mav; - } - -} diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java new file mode 100644 index 00000000..1a53647a --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java @@ -0,0 +1,77 @@ +package com.dbnt.faisp.main.faStatistics.unlawfulFishing; + +import com.dbnt.faisp.main.authMgt.service.AuthMgtService; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.UnlawfulFishingParam; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.*; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.FishingBoat; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.processResult.ProcessResult; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.service.UnlawfulFishingService; +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; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.ModelAndView; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/unlawfulFishing") +public class UnlawfulFishingController { + + private final AuthMgtService authMgtService; + private final UnlawfulFishingService unlawfulFishingService; + + @GetMapping("/crackdownStatus") + public ModelAndView crackdownStatusPage(@AuthenticationPrincipal UserInfo loginUser, UnlawfulFishingParam params){ + ModelAndView mav = new ModelAndView("faStatistics/unlawfulFishing/crackdownStatus/crackdownStatusPage"); + //메뉴권한 확인 + String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/unlawfulFishing/crackdownStatus").get(0).getAccessAuth(); + mav.addObject("accessAuth", accessAuth); + + if(params.getYear()==null){ + params.setYear(LocalDateTime.now().getYear()); + } + List yearList = unlawfulFishingService.selectFishingBoatYearParam(); + if(!yearList.contains(params.getYear())){ + yearList.add(params.getYear()); + } + List csDTOList = new ArrayList<>(); + CSStatistics statistics = new CSStatistics(); + + mav.addObject("statistics", statistics); + mav.addObject("crackdownStatusList", csDTOList); + mav.addObject("yearList", yearList); + mav.addObject("searchParams", params); + return mav; + } + + @GetMapping("/csEditModal") + public ModelAndView crackdownStatusEditModal(@AuthenticationPrincipal UserInfo loginUser, CrackdownStatus crackdownStatus){ + ModelAndView mav = new ModelAndView("faStatistics/unlawfulFishing/crackdownStatus/csEditModal"); + if(crackdownStatus.getCdsKey()!=null){ + crackdownStatus = unlawfulFishingService.selectCrackdownStatus(crackdownStatus.getCdsKey()); + }else{ + crackdownStatus.setWrtOrgan(loginUser.getOgCd()); + crackdownStatus.setWrtPart(loginUser.getOfcCd()); + crackdownStatus.setWrtUserGrd(loginUser.getGroupCd()); + crackdownStatus.setWrtOrgan(loginUser.getOgCd()); + crackdownStatus.setWrtUserNm(loginUser.getUserNm()); + crackdownStatus.setWrtDt(LocalDateTime.now()); + } + mav.addObject("crackdownStatus", crackdownStatus); + return mav; + } + + @GetMapping("/crackdownStatusVersionInfo") + public ModelAndView selectUnlawfulFishingVersionInfo(Integer cdsKey, Integer versionNo){ + ModelAndView mav = new ModelAndView("faStatistics/unlawfulFishing/versionInfo"); + mav.addObject("infos", unlawfulFishingService.selectUnlawfulFishingVersionInfo(cdsKey, versionNo)); + return mav; + } + +} diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/mapper/AsfCovMapper.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/mapper/AsfCovMapper.java similarity index 72% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/mapper/AsfCovMapper.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/mapper/AsfCovMapper.java index 2e48ba7c..f834ad70 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/mapper/AsfCovMapper.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/mapper/AsfCovMapper.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.mapper; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.mapper; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.asfCov.AsfCov; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.asfCov.AsfCov; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/mapper/CrackdownStatusMapper.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/mapper/CrackdownStatusMapper.java new file mode 100644 index 00000000..5b7bd2de --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/mapper/CrackdownStatusMapper.java @@ -0,0 +1,26 @@ +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.mapper; + +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.UnlawfulFishingParam; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.CrackdownStatus; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.CrackdownStatusDTO; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.CrackdownStatusVersion; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.FishingBoatVersion; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.processResult.ProcessResultVersion; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface CrackdownStatusMapper { + List selectCrackdownStatusList(UnlawfulFishingParam params); + Integer selectCrackdownStatusListCnt(UnlawfulFishingParam params); + + List selectFishingBoatList(UnlawfulFishingParam params); + Integer selectFishingBoatListCnt(UnlawfulFishingParam params); + List selectFishingBoatYearParam(UnlawfulFishingParam params); + + List selectCrackdownStatusVersionList(Integer cdsKey); + List selectFishingBoatVersionList(Integer fbKey); + List selectProcessResultVersionList(Integer prKey); + +} diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/mapper/ProcessResultMapper.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/mapper/ProcessResultMapper.java similarity index 68% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/mapper/ProcessResultMapper.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/mapper/ProcessResultMapper.java index eb3fce0d..faac1211 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/mapper/ProcessResultMapper.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/mapper/ProcessResultMapper.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.mapper; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.mapper; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.processResult.ProcessResult; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.processResult.ProcessResult; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/mapper/SailorMapper.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/mapper/SailorMapper.java similarity index 53% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/mapper/SailorMapper.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/mapper/SailorMapper.java index 8703e66c..9ea274a4 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/mapper/SailorMapper.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/mapper/SailorMapper.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.mapper; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.mapper; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.sailor.Sailor; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.sailor.Sailor; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/mapper/UnlawfulFishingMapper.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/mapper/UnlawfulFishingMapper.java index 6055fb7c..ed9af34f 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/mapper/UnlawfulFishingMapper.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/mapper/UnlawfulFishingMapper.java @@ -1,7 +1,5 @@ package com.dbnt.faisp.main.faStatistics.unlawfulFishing.mapper; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.UnlawfulFishingParam; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.asfCov.AsfCov; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/UnlawfulFishingParam.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/UnlawfulFishingParam.java similarity index 97% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/UnlawfulFishingParam.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/UnlawfulFishingParam.java index 78e7ff43..eda753bd 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/UnlawfulFishingParam.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/UnlawfulFishingParam.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.model; import com.dbnt.faisp.config.BaseModel; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/asfCov/AsfCov.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/asfCov/AsfCov.java similarity index 82% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/asfCov/AsfCov.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/asfCov/AsfCov.java index 39525535..1e44922d 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/asfCov/AsfCov.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/asfCov/AsfCov.java @@ -1,11 +1,6 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.asfCov; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.asfCov; import com.dbnt.faisp.config.BaseModel; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatus; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatusBaseEntity; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.FishingBoat; -import com.dbnt.faisp.main.ivsgtMgt.majorStatus.model.MajorFile; -import io.micrometer.core.annotation.Counted; import lombok.*; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CSStatistics.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/crackdownStatus/CSStatistics.java similarity index 90% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CSStatistics.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/crackdownStatus/CSStatistics.java index f52f5ca9..1008e029 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CSStatistics.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/crackdownStatus/CSStatistics.java @@ -1,13 +1,9 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus; import com.dbnt.faisp.config.BaseModel; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.springframework.format.annotation.DateTimeFormat; - -import java.time.LocalDate; -import java.time.LocalDateTime; @Getter @Setter diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatus.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/crackdownStatus/CrackdownStatus.java similarity index 90% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatus.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/crackdownStatus/CrackdownStatus.java index 147aec17..4b98acee 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatus.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/crackdownStatus/CrackdownStatus.java @@ -1,10 +1,9 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus; -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.unlawfulFishing.model.fishingBoat.FishingBoat; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.Violation; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.processResult.ProcessResult; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.sailor.Sailor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @@ -15,7 +14,6 @@ import org.springframework.web.multipart.MultipartFile; import javax.persistence.*; import java.time.LocalDate; -import java.time.LocalDateTime; import java.util.List; @Getter diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatusBaseEntity.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/crackdownStatus/CrackdownStatusBaseEntity.java similarity index 97% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatusBaseEntity.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/crackdownStatus/CrackdownStatusBaseEntity.java index 8601909f..90c8f9a7 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatusBaseEntity.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/crackdownStatus/CrackdownStatusBaseEntity.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus; import com.dbnt.faisp.config.BaseModel; import lombok.Getter; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatusDTO.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/crackdownStatus/CrackdownStatusDTO.java similarity index 96% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatusDTO.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/crackdownStatus/CrackdownStatusDTO.java index 859ae77c..6de8c165 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatusDTO.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/crackdownStatus/CrackdownStatusDTO.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus; import com.dbnt.faisp.config.BaseModel; import lombok.Getter; @@ -6,8 +6,6 @@ import lombok.NoArgsConstructor; import lombok.Setter; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.MappedSuperclass; import java.time.LocalDate; import java.time.LocalDateTime; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatusVersion.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/crackdownStatus/CrackdownStatusVersion.java similarity index 90% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatusVersion.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/crackdownStatus/CrackdownStatusVersion.java index aa57d3ca..4af07403 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatusVersion.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/crackdownStatus/CrackdownStatusVersion.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus; import lombok.*; import org.hibernate.annotations.DynamicInsert; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/UnlawfulFishingVersion.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/crackdownStatus/UnlawfulFishingVersion.java similarity index 53% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/UnlawfulFishingVersion.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/crackdownStatus/UnlawfulFishingVersion.java index 54d57b37..34a78878 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/UnlawfulFishingVersion.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/crackdownStatus/UnlawfulFishingVersion.java @@ -1,7 +1,7 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.FishingBoatVersion; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.processResult.ProcessResultVersion; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.FishingBoatVersion; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.processResult.ProcessResultVersion; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/FishingBoat.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/fishingBoat/FishingBoat.java similarity index 86% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/FishingBoat.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/fishingBoat/FishingBoat.java index a082edc2..cf7a82ae 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/FishingBoat.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/fishingBoat/FishingBoat.java @@ -1,14 +1,12 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.springframework.web.multipart.MultipartFile; import javax.persistence.*; -import java.util.List; @Getter @Setter diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/FishingBoatBaseEntity.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/fishingBoat/FishingBoatBaseEntity.java similarity index 97% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/FishingBoatBaseEntity.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/fishingBoat/FishingBoatBaseEntity.java index c74a678f..21236b25 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/FishingBoatBaseEntity.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/fishingBoat/FishingBoatBaseEntity.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat; import com.dbnt.faisp.config.BaseModel; import lombok.Getter; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/FishingBoatVersion.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/fishingBoat/FishingBoatVersion.java similarity index 91% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/FishingBoatVersion.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/fishingBoat/FishingBoatVersion.java index e3a11867..89bcef49 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/FishingBoatVersion.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/fishingBoat/FishingBoatVersion.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat; import lombok.*; import org.hibernate.annotations.DynamicInsert; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/Violation.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/fishingBoat/Violation.java similarity index 91% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/Violation.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/fishingBoat/Violation.java index 9f3f64e3..8c6b518b 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/Violation.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/fishingBoat/Violation.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat; import com.dbnt.faisp.config.BaseModel; import lombok.*; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/ViolationVersion.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/fishingBoat/ViolationVersion.java similarity index 92% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/ViolationVersion.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/fishingBoat/ViolationVersion.java index ca66bbf3..b9575e43 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/fishingBoat/ViolationVersion.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/fishingBoat/ViolationVersion.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat; import com.dbnt.faisp.config.BaseModel; import lombok.*; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/processResult/ProcessResult.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/processResult/ProcessResult.java similarity index 80% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/processResult/ProcessResult.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/processResult/ProcessResult.java index d53923d0..670d8e1f 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/processResult/ProcessResult.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/processResult/ProcessResult.java @@ -1,8 +1,8 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.processResult; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.processResult; -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.unlawfulFishing.model.crackdownStatus.CrackdownStatus; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.FishingBoat; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.Violation; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/processResult/ProcessResultBaseEntity.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/processResult/ProcessResultBaseEntity.java similarity index 97% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/processResult/ProcessResultBaseEntity.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/processResult/ProcessResultBaseEntity.java index a3d3524e..16d7566c 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/processResult/ProcessResultBaseEntity.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/processResult/ProcessResultBaseEntity.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.processResult; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.processResult; import com.dbnt.faisp.config.BaseModel; import lombok.Getter; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/processResult/ProcessResultVersion.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/processResult/ProcessResultVersion.java similarity index 75% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/processResult/ProcessResultVersion.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/processResult/ProcessResultVersion.java index c26fc9b0..b5264fa4 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/processResult/ProcessResultVersion.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/processResult/ProcessResultVersion.java @@ -1,8 +1,8 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.processResult; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.processResult; -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.crackdownStatus.CrackdownStatus; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.FishingBoat; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.Violation; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.CrackdownStatus; import lombok.*; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/sailor/Sailor.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/Sailor.java similarity index 79% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/sailor/Sailor.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/Sailor.java index eef5aaa8..72c7e58f 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/sailor/Sailor.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/Sailor.java @@ -1,8 +1,8 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.sailor; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.sailor; -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.unlawfulFishing.model.crackdownStatus.CrackdownStatus; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.FishingBoat; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.Violation; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/sailor/SailorBaseEntity.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/SailorBaseEntity.java similarity index 96% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/sailor/SailorBaseEntity.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/SailorBaseEntity.java index 1ec13c5c..6a926812 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/sailor/SailorBaseEntity.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/SailorBaseEntity.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.sailor; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.sailor; import com.dbnt.faisp.config.BaseModel; import lombok.Getter; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/sailor/SailorFile.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/SailorFile.java similarity index 93% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/sailor/SailorFile.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/SailorFile.java index 840d0d10..a3764dd7 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/sailor/SailorFile.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/SailorFile.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.sailor; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.sailor; import com.dbnt.faisp.config.FileInfo; import lombok.*; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/sailor/SailorFileVersion.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/SailorFileVersion.java similarity index 94% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/sailor/SailorFileVersion.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/SailorFileVersion.java index 68eaf9aa..0ed386b6 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/sailor/SailorFileVersion.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/SailorFileVersion.java @@ -1,4 +1,4 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.sailor; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.sailor; import com.dbnt.faisp.config.FileInfo; import lombok.*; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/sailor/SailorVersion.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/SailorVersion.java similarity index 82% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/sailor/SailorVersion.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/SailorVersion.java index c5e6b9cd..2453e58f 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/sailor/SailorVersion.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/SailorVersion.java @@ -1,7 +1,7 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.sailor; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.sailor; -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.unlawfulFishing.model.crackdownStatus.CrackdownStatus; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.FishingBoat; import lombok.*; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/AsfCovRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/AsfCovRepository.java similarity index 59% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/AsfCovRepository.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/AsfCovRepository.java index f19e8601..7a58baf5 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/AsfCovRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/AsfCovRepository.java @@ -1,12 +1,9 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.asfCov.AsfCov; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.asfCov.AsfCov; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatus; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatusVersion; import org.springframework.data.jpa.repository.JpaRepository; -import java.util.List; import java.util.Optional; public interface AsfCovRepository extends JpaRepository { diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/CrackdownStatusRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/CrackdownStatusRepository.java similarity index 64% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/CrackdownStatusRepository.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/CrackdownStatusRepository.java index e9ea3f57..b92b5119 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/CrackdownStatusRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/CrackdownStatusRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatus; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.CrackdownStatus; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/CrackdownStatusVersionRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/CrackdownStatusVersionRepository.java similarity index 70% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/CrackdownStatusVersionRepository.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/CrackdownStatusVersionRepository.java index a3b8b86d..5ba509ae 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/CrackdownStatusVersionRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/CrackdownStatusVersionRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatusVersion; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.CrackdownStatusVersion; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/FishingBoatRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/FishingBoatRepository.java similarity index 78% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/FishingBoatRepository.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/FishingBoatRepository.java index 15ecd7cb..c33c2102 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/FishingBoatRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/FishingBoatRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.FishingBoat; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.FishingBoat; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/FishingBoatVersionRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/FishingBoatVersionRepository.java similarity index 54% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/FishingBoatVersionRepository.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/FishingBoatVersionRepository.java index e0cb893d..7ce5d61e 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/FishingBoatVersionRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/FishingBoatVersionRepository.java @@ -1,7 +1,6 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository; -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.unlawfulFishing.model.fishingBoat.FishingBoatVersion; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ProcessResultRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/ProcessResultRepository.java similarity index 64% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ProcessResultRepository.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/ProcessResultRepository.java index 59684819..dda35afd 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ProcessResultRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/ProcessResultRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.processResult.ProcessResult; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.processResult.ProcessResult; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ProcessResultVersionRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/ProcessResultVersionRepository.java similarity index 70% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ProcessResultVersionRepository.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/ProcessResultVersionRepository.java index d04abcd1..7c2ce831 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ProcessResultVersionRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/ProcessResultVersionRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.processResult.ProcessResultVersion; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.processResult.ProcessResultVersion; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/SailorFileRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/SailorFileRepository.java similarity index 63% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/SailorFileRepository.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/SailorFileRepository.java index 4eefd190..8297eb14 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/SailorFileRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/SailorFileRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.sailor.SailorFile; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.sailor.SailorFile; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/SailorFileVersionRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/SailorFileVersionRepository.java similarity index 54% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/SailorFileVersionRepository.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/SailorFileVersionRepository.java index b68b20a5..d6683474 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/SailorFileVersionRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/SailorFileVersionRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.sailor.SailorFileVersion; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.sailor.SailorFileVersion; import org.springframework.data.jpa.repository.JpaRepository; public interface SailorFileVersionRepository extends JpaRepository { diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/SailorRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/SailorRepository.java similarity index 81% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/SailorRepository.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/SailorRepository.java index b07d7520..8ba29bf5 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/SailorRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/SailorRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.sailor.Sailor; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.sailor.Sailor; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/SailorVersionRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/SailorVersionRepository.java similarity index 74% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/SailorVersionRepository.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/SailorVersionRepository.java index 99ea0880..b3a102cd 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/SailorVersionRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/SailorVersionRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.sailor.SailorVersion; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.sailor.SailorVersion; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ViolationRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/ViolationRepository.java similarity index 83% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ViolationRepository.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/ViolationRepository.java index 9523bcbc..b5076768 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ViolationRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/ViolationRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.Violation; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.Violation; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ViolationVersionRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/ViolationVersionRepository.java similarity index 72% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ViolationVersionRepository.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/ViolationVersionRepository.java index 2b352c46..d1c54269 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ViolationVersionRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/ViolationVersionRepository.java @@ -1,6 +1,6 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.ViolationVersion; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.ViolationVersion; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/AsfCovService.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/AsfCovService.java similarity index 77% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/AsfCovService.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/AsfCovService.java index 62099b65..d021331b 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/AsfCovService.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/AsfCovService.java @@ -1,15 +1,14 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.service; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.service; import com.dbnt.faisp.config.BaseService; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.mapper.AsfCovMapper; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.asfCov.AsfCov; -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.repository.AsfCovRepository; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.mapper.AsfCovMapper; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.asfCov.AsfCov; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.CrackdownStatus; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.FishingBoat; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository.AsfCovRepository; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.CrackdownStatusRepository; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.FishingBoatRepository; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository.CrackdownStatusRepository; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository.FishingBoatRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/CrackdownStatusService.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/CrackdownStatusService.java similarity index 88% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/CrackdownStatusService.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/CrackdownStatusService.java index 3923139d..678162c0 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/CrackdownStatusService.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/CrackdownStatusService.java @@ -1,15 +1,13 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.service; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.service; 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.CrackdownStatusDTO; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatusVersion; -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.fishingBoat.Violation; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.*; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.mapper.CrackdownStatusMapper; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.CrackdownStatus; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.CrackdownStatusVersion; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.sailor.Sailor; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.Violation; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository.*; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/FishingBoatService.java similarity index 94% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/FishingBoatService.java index e4f06f35..ac196346 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/FishingBoatService.java @@ -1,19 +1,19 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.service; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.service; import com.dbnt.faisp.config.BaseService; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.mapper.CrackdownStatusMapper; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.UnlawfulFishingParam; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CSStatistics; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatus; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatusDTO; -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.fishingBoat.ViolationVersion; -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.dbnt.faisp.main.faStatistics.unlawfulFishing.mapper.CrackdownStatusMapper; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.UnlawfulFishingParam; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.CSStatistics; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.CrackdownStatus; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.CrackdownStatusDTO; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.FishingBoat; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.FishingBoatVersion; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.Violation; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.ViolationVersion; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.processResult.ProcessResult; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.sailor.Sailor; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository.*; import com.dbnt.faisp.util.Utils; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/ProcessResultService.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/ProcessResultService.java similarity index 85% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/ProcessResultService.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/ProcessResultService.java index bb29a26c..81ce54c9 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/ProcessResultService.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/ProcessResultService.java @@ -1,15 +1,11 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.service; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.service; import com.dbnt.faisp.config.BaseService; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.mapper.ProcessResultMapper; -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.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.sailor.SailorVersion; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.*; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.mapper.ProcessResultMapper; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.processResult.ProcessResult; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.processResult.ProcessResultVersion; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository.*; import com.dbnt.faisp.util.Utils; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/SailorService.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/SailorService.java similarity index 88% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/SailorService.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/SailorService.java index 50df5a54..113525d0 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/SailorService.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/SailorService.java @@ -1,17 +1,17 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.service; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.service; import com.dbnt.faisp.config.BaseService; import com.dbnt.faisp.config.FileInfo; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.mapper.SailorMapper; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.sailor.SailorFile; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.sailor.SailorFileVersion; -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.*; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.mapper.SailorMapper; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.sailor.SailorFile; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.sailor.SailorFileVersion; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.CrackdownStatus; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.FishingBoat; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.Violation; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.sailor.Sailor; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.sailor.SailorVersion; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository.*; import com.dbnt.faisp.util.Utils; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/UnlawfulFishing2Service.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/UnlawfulFishing2Service.java deleted file mode 100644 index e68d2b2b..00000000 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/UnlawfulFishing2Service.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.dbnt.faisp.main.faStatistics.unlawfulFishing.service; - -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.UnlawfulFishingParam; -import com.dbnt.faisp.main.faStatistics.unlawfulFishing.mapper.UnlawfulFishingMapper; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -@RequiredArgsConstructor -public class UnlawfulFishing2Service { - - private final UnlawfulFishingMapper unlawfulFishingMapper; - - public List selectFishingBoatYearParam() { - return unlawfulFishingMapper.selectFishingBoatYearParam(); - } -} diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/UnlawfulFishingService.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/UnlawfulFishingService.java similarity index 77% rename from src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/UnlawfulFishingService.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/UnlawfulFishingService.java index 44eb3137..6e47b248 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/UnlawfulFishingService.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/UnlawfulFishingService.java @@ -1,14 +1,17 @@ -package com.dbnt.faisp.main.faStatistics.crackdownsStatus.service; +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.service; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatus; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.UnlawfulFishingVersion; -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.unlawfulFishing.model.crackdownStatus.CrackdownStatus; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.UnlawfulFishingVersion; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.FishingBoat; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.sailor.Sailor; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.mapper.UnlawfulFishingMapper; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository.CrackdownStatusRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; +import java.util.List; @Service @RequiredArgsConstructor @@ -18,6 +21,9 @@ public class UnlawfulFishingService { private final ProcessResultService processResultService; private final SailorService sailorService; + private final CrackdownStatusRepository csRepository; + private final UnlawfulFishingMapper unlawfulFishingMapper; + @Transactional public Integer saveUnlawfulFishing(CrackdownStatus crackdownStatus){ crackdownStatus = setWriteInfo(crackdownStatus); @@ -76,4 +82,11 @@ public class UnlawfulFishingService { } return crackdownStatus; } + public List selectFishingBoatYearParam() { + return unlawfulFishingMapper.selectFishingBoatYearParam(); + } + + public CrackdownStatus selectCrackdownStatus(Integer cdsKey) { + return csRepository.findById(cdsKey).orElse(new CrackdownStatus()); + } } diff --git a/src/main/resources/mybatisMapper/AsfCovMapper.xml b/src/main/resources/mybatisMapper/AsfCovMapper.xml index 1c602dad..b9e7c248 100644 --- a/src/main/resources/mybatisMapper/AsfCovMapper.xml +++ b/src/main/resources/mybatisMapper/AsfCovMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/src/main/resources/mybatisMapper/CrackdownStatusMapper.xml b/src/main/resources/mybatisMapper/CrackdownStatusMapper.xml index b5c3d9ff..88ee5695 100644 --- a/src/main/resources/mybatisMapper/CrackdownStatusMapper.xml +++ b/src/main/resources/mybatisMapper/CrackdownStatusMapper.xml @@ -3,7 +3,7 @@ - + c.status <> 'DST008' diff --git a/src/main/resources/mybatisMapper/ProcessResultMapper.xml b/src/main/resources/mybatisMapper/ProcessResultMapper.xml index 8b70750a..2acf8231 100644 --- a/src/main/resources/mybatisMapper/ProcessResultMapper.xml +++ b/src/main/resources/mybatisMapper/ProcessResultMapper.xml @@ -3,7 +3,7 @@ - + fb.status <> 'DST008' diff --git a/src/main/resources/mybatisMapper/SailorMapper.xml b/src/main/resources/mybatisMapper/SailorMapper.xml index c0e869a0..394b8618 100644 --- a/src/main/resources/mybatisMapper/SailorMapper.xml +++ b/src/main/resources/mybatisMapper/SailorMapper.xml @@ -3,7 +3,7 @@ - + diff --git a/src/main/resources/static/js/faStatistics/fishingBoatMgt.js b/src/main/resources/static/js/faStatistics/fishingBoatMgt.js index 414c7161..1ee7443e 100644 --- a/src/main/resources/static/js/faStatistics/fishingBoatMgt.js +++ b/src/main/resources/static/js/faStatistics/fishingBoatMgt.js @@ -163,7 +163,7 @@ $(document).on('click', '.versionInfoTr', function (){ $(".versionInfoChkbox").prop("checked", false); $(this).find(".versionInfoChkbox")[0].checked = true $.ajax({ - url: '/faStatistics/crackdownStatusVersionInfo', + url: '/unlawfulFishing/crackdownStatusVersionInfo', data: { cdsKey: $(this).find(".cdsKey").val(), versionNo: $(this).find(".versionNo").val() diff --git a/src/main/resources/static/js/faStatistics/unlawfulFishing/crackdownStatus.js b/src/main/resources/static/js/faStatistics/unlawfulFishing/crackdownStatus.js new file mode 100644 index 00000000..d0248e5a --- /dev/null +++ b/src/main/resources/static/js/faStatistics/unlawfulFishing/crackdownStatus.js @@ -0,0 +1,26 @@ + +$(document).on('click', '#addCrackdownStatusBtn', function (){ + getCsEditModal(null); +}) + +function getCsEditModal(cdsKey){ + $.ajax({ + url: '/unlawfulFishing/csEditModal', + data: {cdsKey: cdsKey}, + type: 'GET', + dataType:"html", + success: function(html){ + const contentDiv = $("#csEditModalContent"); + contentDiv.empty().append(html) + $(".dateSelector").datepicker({ + format: "yyyy-mm-dd", + language: "ko", + autoclose: true + }); + $("#csEditModal").modal('show'); + }, + error:function(e){ + ajaxErrorAction(e); + } + }); +} \ No newline at end of file diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownStatus/crackdownStatusPage.html b/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownStatus/crackdownStatusPage.html index 1fbb0173..f7f18daa 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownStatus/crackdownStatusPage.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownStatus/crackdownStatusPage.html @@ -3,12 +3,7 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout/layout}"> - - - +