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..cbd2c67a --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java @@ -0,0 +1,52 @@ +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.CrackdownStatus; +import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatusDTO; +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 UnlawfulFishingService unlawfulFishingService; + 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 = 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; + } + +} 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 new file mode 100644 index 00000000..6055fb7c --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/mapper/UnlawfulFishingMapper.java @@ -0,0 +1,13 @@ +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; + +@Mapper +public interface UnlawfulFishingMapper { + + List selectFishingBoatYearParam(); +} diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/UnlawfulFishingService.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/UnlawfulFishingService.java new file mode 100644 index 00000000..a427ef56 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/UnlawfulFishingService.java @@ -0,0 +1,19 @@ +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 UnlawfulFishingService { + + private final UnlawfulFishingMapper unlawfulFishingMapper; + + public List selectFishingBoatYearParam() { + return unlawfulFishingMapper.selectFishingBoatYearParam(); + } +} diff --git a/src/main/resources/mybatisMapper/CrackdownStatusMapper.xml b/src/main/resources/mybatisMapper/CrackdownStatusMapper.xml index bed5d913..b5c3d9ff 100644 --- a/src/main/resources/mybatisMapper/CrackdownStatusMapper.xml +++ b/src/main/resources/mybatisMapper/CrackdownStatusMapper.xml @@ -617,11 +617,13 @@ ) e on b.fb_key = e.fb_key + + + select distinct extract(year from napo_dt) as year + from crackdown_status + where napo_dt is not null + + + \ 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 new file mode 100644 index 00000000..1fbb0173 --- /dev/null +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownStatus/crackdownStatusPage.html @@ -0,0 +1,690 @@ + + + + + + + + + + +
+
+ + + +
+
+
+
불법조업 외국어선 단속현황
+
+

외사통계 > 불법조업외국어선 > 불법조업 외국어선 단속현황

+
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+
+
+
+
+
+ +
+ +
+ + +
+ +
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ + + +
+
+
+ + + + +
+
+ + +
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
순번나포일시위반내용위반장소침범유형NLL특수공무집행방해사건담당경찰서검거기관MMSI.NO(AIS)선박제원선장(출생년도)선종어획물 축소기재범칙물처리현황담보금납부(만원)담보금미납(만원)선박처리직접인계구속불구속현장조사압송영장청구 소요시간압수어구
무허가 조업 +
특정금지
+
(무허가, 정선명령위반)
+ 		+
EEZ
+
제한조건
+ 		영해침범발생건수인적피해물적피해구분선명톤수(톤)선원(명)선질선적어종어획량(kg)폐기량(kg)위판량(kg)위판금액(원)조사중완료척수납부액납부일시미납미납금액위탁관리위탁시작일위탁종료일퇴거직접인계공매폐선침몰환부일시해점인계함정중측인수함정계선장항해장기관장선원구속척수(몰수판결)계선장항해장기관장선원불구속척수틀(타망)폭(유망)조(형망)개(통발)기타
피해인원피해액(만원)상세내용발생건수피해액(만원)상세내용단순폐선폐선조건부공매
단속경찰서단속함정성시이름출생년도어종수량나포일시석방일시소요시간소요시간거리(해리)
+
+
+
+ 		+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+
+ +
+
+ \ No newline at end of file