From 639c13fc05583691a7780c84f54bccec3bd44d68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Wed, 2 Nov 2022 15:08:07 +0900 Subject: [PATCH] =?UTF-8?q?=EC=96=B4=EC=84=A0=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=EC=9E=91=EC=97=85=EC=A4=91.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dbnt/faisp/config/SecurityConfig.java | 10 +- .../CrackdownStatusController.java | 2 +- .../FishingBoatController.java | 21 +- .../crackdownsStatus/model/FishingBoat.java | 41 +- .../crackdownsStatus/model/Violation.java | 35 +- .../repository/ViolationRepository.java | 2 +- src/main/resources/static/css/common.css | 7 + .../static/js/faStatistics/fishingBoatMgt.js | 19 + .../fishingBoat/fishingBoatEditModal.html | 379 ++++++++++++++++++ .../fishingBoat/fishingBoatMgt.html | 20 +- 10 files changed, 468 insertions(+), 68 deletions(-) create mode 100644 src/main/resources/static/js/faStatistics/fishingBoatMgt.js create mode 100644 src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html diff --git a/src/main/java/com/dbnt/faisp/config/SecurityConfig.java b/src/main/java/com/dbnt/faisp/config/SecurityConfig.java index ecf2867b..7bc219bd 100644 --- a/src/main/java/com/dbnt/faisp/config/SecurityConfig.java +++ b/src/main/java/com/dbnt/faisp/config/SecurityConfig.java @@ -79,20 +79,22 @@ public class SecurityConfig{ "/modal/**", "/publicBoard/**", "/faRpt/**", + "/ivsgt/**", + "/target/**", + "/equip/**", "/affairPlan/**", "/affair/**", "/affairResult/**", - "/equip/**", - "/target/**", + "/faStatistics/**", "/translator/**" ).hasRole(Role.USER.name()) // USER 접근 허용 .antMatchers( "/authMgt/**", - "/userMgt/**", - "/organMgt/**" + "/userMgt/**" ).hasRole(Role.SUB_ADMIN.name()) // SUB_ADMIN 접근 허용 .antMatchers( "/codeMgt/**", + "/organMgt/**", "/menuMgt/**" ).hasRole(Role.ADMIN.name()) // ADMIN 접근 허용 .antMatchers( diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/CrackdownStatusController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/CrackdownStatusController.java index 99d1fb93..6fc31d52 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/CrackdownStatusController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/CrackdownStatusController.java @@ -90,7 +90,7 @@ public class CrackdownStatusController { crackdownStatus.setWrtDt(LocalDateTime.now()); crackdownStatus.setFishingBoat(new FishingBoat()); crackdownStatus.getFishingBoat().setWrtOrgan(loginUser.getOgCd()); - crackdownStatus.getFishingBoat().setWrtNm(loginUser.getUserNm()); + crackdownStatus.getFishingBoat().setWrtUserNm(loginUser.getUserNm()); crackdownStatus.getFishingBoat().setWrtDt(LocalDateTime.now()); crackdownStatus.setProcessResult(new ProcessResult()); crackdownStatus.getProcessResult().setWrtOrgan(loginUser.getOgCd()); diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/FishingBoatController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/FishingBoatController.java index 75ca508b..67cb7f10 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/FishingBoatController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/FishingBoatController.java @@ -74,20 +74,23 @@ public class FishingBoatController { } @GetMapping("/fishingBoatEditModal") - public ModelAndView crackdownStatusEditModal(@AuthenticationPrincipal UserInfo loginUser, ProcessResult processResult){ - ModelAndView mav = new ModelAndView("faStatistics/processResult/processResultEditModal"); - if(processResult.getPrKey()!=null){ - processResult = processResultService.selectProcessResult(processResult.getPrKey()); + public ModelAndView fishingBoatEditModal(@AuthenticationPrincipal UserInfo loginUser, FishingBoat fishingBoat){ + ModelAndView mav = new ModelAndView("faStatistics/fishingBoat/fishingBoatEditModal"); + if(fishingBoat.getFbKey()!=null && fishingBoat.getCdsKey()!=null){ + /*processResult = processResultService.selectProcessResult(processResult.getPrKey()); processResult.setCrackdownStatus(crackdownStatusRepository.findByCdsKey(processResult.getCdsKey())); processResult.setFbKey(fishingBoatRepository.findByCdsKey(processResult.getCdsKey()).getFbKey()); processResult.setBoatNameKr(fishingBoatRepository.findByCdsKey(processResult.getCdsKey()).getBoatNameKr()); - processResult.setViolationList(violationRepository.findByFbKey(processResult.getFbKey())); + processResult.setViolationList(violationRepository.findByFbKey(processResult.getFbKey()));*/ }else{ - processResult.setWrtOrgan(loginUser.getOgCd()); - processResult.setWrtNm(loginUser.getUserNm()); - processResult.setWrtDt(LocalDateTime.now()); + fishingBoat.setWrtOrgan(loginUser.getOgCd()); + fishingBoat.setWrtPart(loginUser.getOfcCd()); + fishingBoat.setWrtUserSeq(loginUser.getUserSeq()); + fishingBoat.setWrtUserNm(loginUser.getUserNm()); + fishingBoat.setWrtUserGrd(loginUser.getTitleCd()); + fishingBoat.setWrtDt(LocalDateTime.now()); } - mav.addObject("processResult", processResult); + mav.addObject("fishingBoat", fishingBoat); return mav; } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/FishingBoat.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/FishingBoat.java index 1c5cfc6d..fb77da68 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/FishingBoat.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/FishingBoat.java @@ -24,102 +24,77 @@ public class FishingBoat extends BaseModel { @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "fb_key") private Integer fbKey; - @Column(name = "cds_key") private Integer cdsKey; - @Column(name = "boat_name_kr") private String boatNameKr; - @Column(name = "boat_name_cn") private String boatNameCn; - @Column(name = "permit_num") private String permitNum; - @Column(name = "nationality") private String nationality; - @Column(name = "ton_cnt") private Integer tonCnt; - @Column(name = "fishery_type") private String fisheryType; - @Column(name = "boat_material") private String boatMaterial; - @Column(name = "boat_nny_sung") private String boatNnySung; - @Column(name = "boat_nny_si") private String boatNnySi; - @Column(name = "offense_type") private String offenseType; - @Column(name = "offense_quantity") private Integer offenseQuantity; - @Column(name = "offense_amount") private Integer offenseAmount; - @Column(name = "offense_illegal_waste_quantity") private Integer offenseIllegalWasteQuantity; - @Column(name = "dambo_unpaid_amount") private Integer damboUnpaidAmount; - @Column(name = "dambo_payment") private Integer damboPayment; - @Column(name = "payment_payment_dt") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private LocalDateTime paymentPaymentDt; - @Column(name = "confiscation_frame") private String confiscationFrame; - @Column(name = "confiscation_width") private String confiscationWidth; - @Column(name = "confiscation_jo") private String confiscationJo; - @Column(name = "confiscation_gae") private String confiscationGae; - @Column(name = "confiscation_etc") private String confiscationEtc; - @Column(name = "catch_fish_species") private String catchFishSpecies; - @Column(name = "catch_cnt") private Integer catchCnt; - @Column(name = "offense_fish_species") private String offenseFishSpecies; - @Column(name = "offense_catch_cnt") private Integer offenseCatchCnt; - @Column(name = "save_yn") private String saveYn; - @Column(name = "wrt_organ") private String wrtOrgan; - + @Column(name = "wrt_part") + private String wrtPart; @Column(name = "wrt_user_seq") private Integer wrtUserSeq; - - @Column(name = "wrt_nm") - private String wrtNm; - + @Column(name = "wrt_user_nm") + private String wrtUserNm; + @Column(name = "wrt_user_grd") + private String wrtUserGrd; @Column(name = "wrt_dt") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private LocalDateTime wrtDt; + @Transient + private String year; @Transient private String caseAgency; @Transient diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/Violation.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/Violation.java index 932513a7..f6fe0abd 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/Violation.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/Violation.java @@ -1,13 +1,12 @@ package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model; import com.dbnt.faisp.config.BaseModel; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; +import lombok.*; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; @Getter @Setter @@ -16,16 +15,26 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @Table(name = "violation") +@IdClass(Violation.ViolationId.class) public class Violation extends BaseModel { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "violation_key") - private Integer violationKey; - @Column(name = "fb_key") - private Integer fbKey; - @Column(name = "violation") - private String violation; + @Id + @Column(name = "violation_key") + private Integer violationKey; + @Id + @Column(name = "fb_key") + private Integer fbKey; + @Column(name = "violation") + private String violation; - @Transient - private String violationEtc; + @Transient + private String violationEtc; + + @Embeddable + @Data + @NoArgsConstructor + @AllArgsConstructor + public static class ViolationId implements Serializable{ + private Integer violationKey; + private Integer fbKey; + } } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ViolationRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ViolationRepository.java index f48b3769..6b7a2b84 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ViolationRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ViolationRepository.java @@ -5,6 +5,6 @@ import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; -public interface ViolationRepository extends JpaRepository { +public interface ViolationRepository extends JpaRepository { List findByFbKey(Integer fbKey); } diff --git a/src/main/resources/static/css/common.css b/src/main/resources/static/css/common.css index fb06e4d0..7e59d498 100644 --- a/src/main/resources/static/css/common.css +++ b/src/main/resources/static/css/common.css @@ -69,4 +69,11 @@ content: url("/img/bootstrap-icons-1.9.1/caret-down-fill.svg"); /*왜 안돌까?*/ /*transform: rotate(90deg);*/ +} + +.fs-13{ + font-size: 13px; +} +.fs-11{ + font-size: 11px; } \ No newline at end of file diff --git a/src/main/resources/static/js/faStatistics/fishingBoatMgt.js b/src/main/resources/static/js/faStatistics/fishingBoatMgt.js new file mode 100644 index 00000000..09af841b --- /dev/null +++ b/src/main/resources/static/js/faStatistics/fishingBoatMgt.js @@ -0,0 +1,19 @@ +$(document).on('click', '#getFishingBoatEditModalBtn', function (){ + getFishingBoatEditModal(null, null); +}) + +function getFishingBoatEditModal(fbKey, cdsKey){ + $.ajax({ + url: '/faStatistics/fishingBoatEditModal', + data: {fbKey: fbKey, cdsKey: cdsKey}, + type: 'GET', + dataType:"html", + success: function(html){ + $("#fishingBoatEditModalContent").empty().append(html) + $("#fishingBoatEditModal").modal('show'); + }, + error:function(){ + + } + }); +} \ No newline at end of file diff --git a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html new file mode 100644 index 00000000..a865ecf3 --- /dev/null +++ b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html @@ -0,0 +1,379 @@ + + +
+ + +
+
+
+ + + + + + + + + + + +
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+
+
+
+
+ +
+
+ +
+ + + +
+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+ + +
+
+
+ +
+ + + +
+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+ +
+ + +
+
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+ +
+ + +
+
+
+ +
+ + +
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+ + + + + +
+
+
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+ + +
+
+
+
+
+
+
+ + + +
\ No newline at end of file diff --git a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html index 847e3f71..5d5d7941 100644 --- a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html +++ b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatMgt.html @@ -4,8 +4,7 @@ xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorate="~{layout/layout}"> - - +
@@ -66,7 +65,14 @@
- + +
+
+
@@ -194,9 +200,9 @@ -