From b9e4d5b33f2768a3ee230fdd1c26027fd82f534f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Mon, 4 Sep 2023 14:56:42 +0900 Subject: [PATCH] =?UTF-8?q?=ED=86=B5=EA=B3=84=20=EB=B9=84=EA=B3=A0=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dbnt/faisp/config/SecurityConfig.java | 1 + .../UnlawfulFishingController.java | 6 ++++ .../model/ShipStatisticsEtc.java | 27 ++++++++++++++ .../model/sailor/SailorBaseEntity.java | 3 -- .../ShipStatisticsEtcRepository.java | 11 ++++++ .../service/UnlawfulFishingService.java | 7 ++++ .../mybatisMapper/UnlawfulFishingMapper.xml | 6 ++-- .../unlawfulFishing/statistics.js | 31 +++++++++++++++- .../statistics/statistics.html | 35 ++++++++++++++++--- 9 files changed, 115 insertions(+), 12 deletions(-) create mode 100644 src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/ShipStatisticsEtc.java create mode 100644 src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/ShipStatisticsEtcRepository.java diff --git a/src/main/java/com/dbnt/faisp/config/SecurityConfig.java b/src/main/java/com/dbnt/faisp/config/SecurityConfig.java index 3fa7bb89..5ca50521 100644 --- a/src/main/java/com/dbnt/faisp/config/SecurityConfig.java +++ b/src/main/java/com/dbnt/faisp/config/SecurityConfig.java @@ -147,6 +147,7 @@ public class SecurityConfig{ "/monitoring/**", "/intelligenceNetwork/**", "/budget/**", + "/faics/**", "/deadline/**", "/search/**" ).hasRole(Role.USER.name()) // USER 접근 허용 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 index 6d9087a5..f9e16ffd 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java @@ -2,6 +2,7 @@ package com.dbnt.faisp.main.faStatistics.unlawfulFishing; import com.dbnt.faisp.main.authMgt.model.AccessConfig; import com.dbnt.faisp.main.authMgt.service.AuthMgtService; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.ShipStatisticsEtc; import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.StatisticsModel; import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.UnlawfulFishingParam; import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.*; @@ -416,4 +417,9 @@ public class UnlawfulFishingController { return mav; } + @PostMapping("/statEtc") + public void saveStatEtc(ShipStatisticsEtc statEtc){ + unlawfulFishingService.saveStatEtc(statEtc); + } + } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/ShipStatisticsEtc.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/ShipStatisticsEtc.java new file mode 100644 index 00000000..dc8e6bd4 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/ShipStatisticsEtc.java @@ -0,0 +1,27 @@ +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.model; + +import com.dbnt.faisp.config.BaseModel; +import lombok.*; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.persistence.*; +import java.io.Serializable; +import java.time.LocalDateTime; + +@Getter +@Setter +@Entity +@NoArgsConstructor +@DynamicInsert +@DynamicUpdate +@Table(name="ship_statistics_etc") +public class ShipStatisticsEtc extends BaseModel { + @Id + @Column(name = "year") + private Integer year; + + @Column(name = "etc") + private String etc; +} diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/SailorBaseEntity.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/SailorBaseEntity.java index 3ed6408c..6a926812 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/SailorBaseEntity.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/sailor/SailorBaseEntity.java @@ -84,7 +84,4 @@ public class SailorBaseEntity extends BaseModel { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private LocalDateTime wrtDt; - @Column(name="detention_yn") - private String detentionYn; - } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/ShipStatisticsEtcRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/ShipStatisticsEtcRepository.java new file mode 100644 index 00000000..4369a0ad --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/ShipStatisticsEtcRepository.java @@ -0,0 +1,11 @@ +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository; + +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.ShipStatisticsEtc; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.asfCov.AsfCov; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; + +public interface ShipStatisticsEtcRepository extends JpaRepository { + +} 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 index c9b3a526..60e72fa3 100644 --- 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 @@ -1,5 +1,6 @@ package com.dbnt.faisp.main.faStatistics.unlawfulFishing.service; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.ShipStatisticsEtc; import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.StatisticsModel; import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.UnlawfulFishingParam; import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.*; @@ -40,6 +41,7 @@ public class UnlawfulFishingService { private final ShipProcessInfoHistoryRepository spihRepository; private final IllegalShipSailorRepository issRepository; private final IllegalShipSailorHistoryRepository isshRepository; + private final ShipStatisticsEtcRepository sseRepository; private final UnlawfulFishingMapper unlawfulFishingMapper; @Transactional @@ -331,4 +333,9 @@ public class UnlawfulFishingService { public List selectStatisticsListType3(StatisticsModel params) { return unlawfulFishingMapper.selectStatisticsListType3(params); } + + @Transactional + public void saveStatEtc(ShipStatisticsEtc statEtc){ + sseRepository.save(statEtc); + } } diff --git a/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml b/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml index 0e102262..78d89067 100644 --- a/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml +++ b/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml @@ -271,7 +271,7 @@ ci.case_num , iss.sailor_name_kr , iss.birthdate , - iss.detention_yn , + iss.is_restriction , iss.position , iss.career , iss.similar_criminal_history , @@ -425,8 +425,8 @@ sum(detention_not_cnt) as detention_not_cnt from ( select EXTRACT(YEAR FROM a.napo_dt) as year, - case when detention_yn = 'Y' then 1 else 0 end as detention_cnt, - case when detention_yn = 'N' then 1 else 0 end as detention_not_cnt + case when is_restriction = 'Y' then 1 else 0 end as detention_cnt, + case when is_restriction = 'N' then 1 else 0 end as detention_not_cnt from crackdown_info a inner join illegal_ship_info b on a.cds_key = b.cds_key and b.status <> 'DST008' inner join illegal_ship_sailor c on b.fb_key = c.fb_key and c.status <> 'DST008' diff --git a/src/main/resources/static/js/faStatistics/unlawfulFishing/statistics.js b/src/main/resources/static/js/faStatistics/unlawfulFishing/statistics.js index 567a4d33..d19b4be4 100644 --- a/src/main/resources/static/js/faStatistics/unlawfulFishing/statistics.js +++ b/src/main/resources/static/js/faStatistics/unlawfulFishing/statistics.js @@ -1,3 +1,32 @@ -$(document).on('click', '#statisticsTab', function (event){ +$(document).on('click', '.nav-item', function (event){ location.href = "/unlawfulFishing/statistics?type="+event.target.id.replace("Tab", ""); +}) + +$(document).on('click', '.type1Row', function (){ + $('#statYear').val($(this).attr('data-year')); + $('#statEtc').val($(this).find('.etc').text()) + $("#statEtcModal").modal('show'); +}) + +$(document).on('click', '#statEtcSubmitBtn', function (){ + if(confirm("저장하시겠습니까?")){ + const formData = new FormData($("#statEtcForm")[0]); + $.ajax({ + type : 'POST', + data : formData, + url : "/unlawfulFishing/statEtc", + processData: false, + contentType: false, + beforeSend: function (xhr){ + xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val()); + }, + success : function(data) { + alert("저장되었습니다."); + location.reload(); + }, + error : function(xhr) { + alert("저장에 실패하였습니다."); + } + }) + } }) \ No newline at end of file diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/statistics/statistics.html b/src/main/resources/templates/faStatistics/unlawfulFishing/statistics/statistics.html index c6757d85..7030a8d6 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/statistics/statistics.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/statistics/statistics.html @@ -25,7 +25,7 @@
-