From ff359aaad737421f22c21b313e706ca6b0c12226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EA=B0=95=EC=84=9D?= Date: Wed, 24 May 2023 18:18:53 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B6=88=EB=B2=95=EC=A1=B0=EC=97=85=EC=99=B8?= =?UTF-8?q?=EA=B5=AD=EC=96=B4=EC=84=A0=20=EC=9E=91=EC=97=85=EC=A4=91.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UnlawfulFishingController.java | 38 +-- .../model/crackdownStatus/CrackdownInfo.java | 224 ++++++++++++++++++ .../crackdownStatus/CrackdownInfoHistory.java | 36 +++ .../CrackdownInfoHistoryRepository.java | 12 + .../repository/CrackdownInfoRepository.java | 11 + .../service/UnlawfulFishingService.java | 9 +- .../{crackdownStatus.js => crackdownInfo.js} | 2 +- .../crackdownStatus/crackdownStatus.html | 2 +- .../crackdownInfo/cdiEditModal.html | 112 +++++++++ .../cdiViewModal.html} | 0 .../crackdownInfoPage.html} | 8 +- .../crackdownStatus/csEditModal.html | 223 ----------------- 12 files changed, 426 insertions(+), 251 deletions(-) create mode 100644 src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/crackdownStatus/CrackdownInfo.java create mode 100644 src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/crackdownStatus/CrackdownInfoHistory.java create mode 100644 src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/CrackdownInfoHistoryRepository.java create mode 100644 src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/CrackdownInfoRepository.java rename src/main/resources/static/js/faStatistics/unlawfulFishing/{crackdownStatus.js => crackdownInfo.js} (92%) create mode 100644 src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiEditModal.html rename src/main/resources/templates/faStatistics/unlawfulFishing/{crackdownStatus/csViewModal.html => crackdownInfo/cdiViewModal.html} (100%) rename src/main/resources/templates/faStatistics/unlawfulFishing/{crackdownStatus/crackdownStatusPage.html => crackdownInfo/crackdownInfoPage.html} (99%) delete mode 100644 src/main/resources/templates/faStatistics/unlawfulFishing/crackdownStatus/csEditModal.html 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 1a53647a..138917fe 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 @@ -1,5 +1,6 @@ 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.UnlawfulFishingParam; import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.*; @@ -26,12 +27,13 @@ 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"); + @GetMapping("/crackdownInfo") + public ModelAndView crackdownInfoPage(@AuthenticationPrincipal UserInfo loginUser, UnlawfulFishingParam params){ + ModelAndView mav = new ModelAndView("faStatistics/unlawfulFishing/crackdownInfo/crackdownInfoPage"); //메뉴권한 확인 - String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/unlawfulFishing/crackdownStatus").get(0).getAccessAuth(); - mav.addObject("accessAuth", accessAuth); + AccessConfig accessConfig = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/unlawfulFishing/crackdownInfo").get(0); + mav.addObject("menuKey", accessConfig.getMenuKey()); + mav.addObject("accessAuth", accessConfig.getAccessAuth()); if(params.getYear()==null){ params.setYear(LocalDateTime.now().getYear()); @@ -44,26 +46,26 @@ public class UnlawfulFishingController { CSStatistics statistics = new CSStatistics(); mav.addObject("statistics", statistics); - mav.addObject("crackdownStatusList", csDTOList); + mav.addObject("crackdownInfoList", 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()); + @GetMapping("/cdiEditModal") + public ModelAndView crackdownInfoEditModal(@AuthenticationPrincipal UserInfo loginUser, CrackdownInfo crackdownInfo){ + ModelAndView mav = new ModelAndView("faStatistics/unlawfulFishing/crackdownInfo/cdiEditModal"); + if(crackdownInfo.getCdsKey()!=null){ + crackdownInfo = unlawfulFishingService.selectCrackdownInfo(crackdownInfo.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()); + crackdownInfo.setWrtOrgan(loginUser.getOgCd()); + crackdownInfo.setWrtPart(loginUser.getOfcCd()); + crackdownInfo.setWrtUserSeq(loginUser.getUserSeq()); + crackdownInfo.setWrtUserGrd(loginUser.getTitleCd()); + crackdownInfo.setWrtUserNm(loginUser.getUserNm()); + crackdownInfo.setWrtDt(LocalDateTime.now()); } - mav.addObject("crackdownStatus", crackdownStatus); + mav.addObject("crackdownInfo", crackdownInfo); return mav; } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/crackdownStatus/CrackdownInfo.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/crackdownStatus/CrackdownInfo.java new file mode 100644 index 00000000..4649284d --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/crackdownStatus/CrackdownInfo.java @@ -0,0 +1,224 @@ +package 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.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; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.web.multipart.MultipartFile; + +import javax.persistence.*; +import java.time.LocalDate; +import java.util.List; + +@Getter +@Setter +@Entity +@NoArgsConstructor +@DynamicInsert +@DynamicUpdate +@Table(name = "crackdown_info") +public class CrackdownInfo extends CrackdownStatusBaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "cds_key") + private Integer cdsKey; + + @Column(name="status") + private String status; + + @Transient + private List crackdownStatusVersionList; + + @Transient + private List violationList; + @Transient + private FishingBoat fishingBoat; + @Transient + private ProcessResult processResult; + @Transient + private List sailorList; + @Transient + private List sailorFileList; + + @Transient + private String crackdownPoliceEtc; + @Transient + private String crackdownBoatEtc; + + @Transient + private Integer fbKey; + @Transient + private String boatNameKr; + @Transient + private String fisheryType; + @Transient + private String boatNnySung; + @Transient + private String boatMaterial; + @Transient + private String boatNnySi; + @Transient + private Double tonCnt; + @Transient + private String boat_material; + @Transient + private String violationStr; + + + @Transient + private String sailorNameKr; + + @Transient + private String processStatus; + + @Transient + private Integer restrictionCaptin; + @Transient + private Integer notRestrictionCaptin; + @Transient + private Integer restrictionMate; + @Transient + private Integer notRestrictionMate; + @Transient + private Integer restrictionWarden; + @Transient + private Integer notRestrictionWarden; + @Transient + private Integer restrictionSailor; + @Transient + private Integer notRestrictionSailor; + @Transient + private Integer restrictionTotal; + @Transient + private Integer notRestrictionTotal; + @Transient + private Integer unlicensedOperationTotal; + @Transient + private Integer specificImpossibilityTotal; + @Transient + private Integer eezTotal; + @Transient + private Integer invasionTerritorialWatersTotal; + @Transient + private List violationDeleteKeyList; + @Transient + private List sailorDeleteKeyList; + + @Transient + private String year; + @Transient + private String month; + @Transient + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate napoDate; + @Transient + private String violation; + @Transient + private Integer tonStartCnt; + @Transient + private Integer tonEndCnt; + @Transient + private String catchFishSpecies; + @Transient + private String catchCnt; + @Transient + private String offenseFishSpecies; + @Transient + private String offenseCatchCnt; + @Transient + private String offenseIllegalWasteQuantity; + @Transient + private String offenseQuantity; + @Transient + private String offenseAmount; + @Transient + private String damboPayment; + @Transient + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate paymentPaymentDate; + @Transient + private Integer damboUnpaidAmount; + @Transient + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate consignmentStartDate; + @Transient + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate consignmentEndDate; + /*@Transient + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate evictionDt;*/ + @Transient + private String isEvictionDt; + /*@Transient + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate returnDt;*/ + @Transient + private String isReturnDt; + /*@Transient + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate confiscationDt;*/ + @Transient + private String isConfiscationDt; + @Transient + private String isConsignmentStartDt; + @Transient + private String isDamboUnpaidAmount; + @Transient + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate boatDisposalDate; + @Transient + private String boatDisposalType; + @Transient + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate directHandoverDate; + @Transient + private String isDirectHandoverDt; + @Transient + private String handoverSeaPointLat; + @Transient + private String handoverSeaPointLon; + @Transient + private String handoverSeaPointDetail; + @Transient + private String handoverBoat; + @Transient + private String middleTakeoverBoat; + @Transient + private String captin; + @Transient + private String mate; + @Transient + private String warden; + @Transient + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate fieldIvsgtNapoDate; + @Transient + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate fieldIvsgtReleaseDate; + @Transient + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate pressurizedStartDate; + @Transient + @DateTimeFormat(pattern = "yyyy-MM-dd") + private LocalDate pressurizedEndDate; + @Transient + private String distance; + @Transient + private String confiscationFrame; + @Transient + private String confiscationWidth; + @Transient + private String confiscationJo; + @Transient + private String confiscationGae; + @Transient + private String confiscationEtc; + +} diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/crackdownStatus/CrackdownInfoHistory.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/crackdownStatus/CrackdownInfoHistory.java new file mode 100644 index 00000000..9a0d8c9b --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/crackdownStatus/CrackdownInfoHistory.java @@ -0,0 +1,36 @@ +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus; + +import lombok.*; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; +import java.io.Serializable; + +@Getter +@Setter +@Entity +@NoArgsConstructor +@DynamicInsert +@DynamicUpdate +@Table(name = "crackdown_info_history") +@IdClass(CrackdownInfoHistory.CrackdownInfoHistoryId.class) +public class CrackdownInfoHistory extends CrackdownStatusBaseEntity { + + @Id + @Column(name = "cds_key") + private Integer cdsKey; + + @Id + @Column(name = "version_no") + private Integer versionNo; + + @Embeddable + @Data + @NoArgsConstructor + @AllArgsConstructor + public static class CrackdownInfoHistoryId implements Serializable { + private Integer cdsKey; + private Integer versionNo; + } +} diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/CrackdownInfoHistoryRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/CrackdownInfoHistoryRepository.java new file mode 100644 index 00000000..201ec104 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/CrackdownInfoHistoryRepository.java @@ -0,0 +1,12 @@ +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository; + +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.CrackdownInfoHistory; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; +import java.util.Optional; + +public interface CrackdownInfoHistoryRepository extends JpaRepository { + Optional findTopByCdsKeyOrderByVersionNoDesc(Integer cdsKey); + List findByCdsKey(Integer cdsKey); +} diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/CrackdownInfoRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/CrackdownInfoRepository.java new file mode 100644 index 00000000..41164a49 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/repository/CrackdownInfoRepository.java @@ -0,0 +1,11 @@ +package com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository; + +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.CrackdownInfo; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; + +public interface CrackdownInfoRepository extends JpaRepository { + Optional findByCdsKey(Integer cdsKey); + Optional findTop1ByCaseNum(String caseNum); +} 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 6e47b248..3dfb02b7 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,11 +1,12 @@ package com.dbnt.faisp.main.faStatistics.unlawfulFishing.service; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.CrackdownInfo; 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 com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository.CrackdownInfoRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -21,7 +22,7 @@ public class UnlawfulFishingService { private final ProcessResultService processResultService; private final SailorService sailorService; - private final CrackdownStatusRepository csRepository; + private final CrackdownInfoRepository cdiRepository; private final UnlawfulFishingMapper unlawfulFishingMapper; @Transactional @@ -86,7 +87,7 @@ public class UnlawfulFishingService { return unlawfulFishingMapper.selectFishingBoatYearParam(); } - public CrackdownStatus selectCrackdownStatus(Integer cdsKey) { - return csRepository.findById(cdsKey).orElse(new CrackdownStatus()); + public CrackdownInfo selectCrackdownInfo(Integer cdsKey) { + return cdiRepository.findByCdsKey(cdsKey).orElse(new CrackdownInfo()); } } diff --git a/src/main/resources/static/js/faStatistics/unlawfulFishing/crackdownStatus.js b/src/main/resources/static/js/faStatistics/unlawfulFishing/crackdownInfo.js similarity index 92% rename from src/main/resources/static/js/faStatistics/unlawfulFishing/crackdownStatus.js rename to src/main/resources/static/js/faStatistics/unlawfulFishing/crackdownInfo.js index d0248e5a..fccd6364 100644 --- a/src/main/resources/static/js/faStatistics/unlawfulFishing/crackdownStatus.js +++ b/src/main/resources/static/js/faStatistics/unlawfulFishing/crackdownInfo.js @@ -5,7 +5,7 @@ $(document).on('click', '#addCrackdownStatusBtn', function (){ function getCsEditModal(cdsKey){ $.ajax({ - url: '/unlawfulFishing/csEditModal', + url: '/unlawfulFishing/cdiEditModal', data: {cdsKey: cdsKey}, type: 'GET', dataType:"html", diff --git a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html index 1fbb0173..59d84cc2 100644 --- a/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html +++ b/src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html @@ -7,7 +7,7 @@ const crackdownStatus = [[${crackdownStatus}]]; const commonCode = [[${session.commonCode}]]; - + diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiEditModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiEditModal.html new file mode 100644 index 00000000..942c229b --- /dev/null +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiEditModal.html @@ -0,0 +1,112 @@ + + +
+
+ +
+
+
+ + + + + + + + +
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+
+ + +
+
+ +
+
+ + + +
+
+
+
+
+
+ + +
\ No newline at end of file diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownStatus/csViewModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiViewModal.html similarity index 100% rename from src/main/resources/templates/faStatistics/unlawfulFishing/crackdownStatus/csViewModal.html rename to src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiViewModal.html diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownStatus/crackdownStatusPage.html b/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/crackdownInfoPage.html similarity index 99% rename from src/main/resources/templates/faStatistics/unlawfulFishing/crackdownStatus/crackdownStatusPage.html rename to src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/crackdownInfoPage.html index f7f18daa..d9559323 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownStatus/crackdownStatusPage.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/crackdownInfoPage.html @@ -3,7 +3,7 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout/layout}"> - +