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 new file mode 100644 index 00000000..506a00d4 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/UnlawfulFishingController.java @@ -0,0 +1,41 @@ +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 index 4b39acd3..5a360891 100644 --- 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 @@ -1,18 +1,23 @@ package com.dbnt.faisp.main.faStatistics.crackdownsStatus.mapper; 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.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(CrackdownStatus crackdownStatus); - Integer selectCrackdownStatusListCnt(CrackdownStatus crackdownStatus); + List selectCrackdownStatusList(CrackdownStatus crackdownStatus); + Integer selectCrackdownStatusListCnt(CrackdownStatus crackdownStatus); - List selectFishingBoatList(CrackdownStatus crackdownStatus); - Integer selectFishingBoatListCnt(CrackdownStatus crackdownStatus); - List selectFishingBoatVersionList(Integer fbKey); + List selectFishingBoatList(CrackdownStatus crackdownStatus); + Integer selectFishingBoatListCnt(CrackdownStatus crackdownStatus); + + List selectCrackdownStatusVersionList(Integer cdsKey); + List selectFishingBoatVersionList(Integer fbKey); + List selectProcessResultVersionList(Integer prKey); } 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/crackdownsStatus/model/crackdownStatus/CrackdownStatus.java index a5ce14bb..147aec17 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatus.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatus.java @@ -35,13 +35,14 @@ public class CrackdownStatus extends CrackdownStatusBaseEntity { @Column(name="status") private String status; + @Transient + private List crackdownStatusVersionList; + @Transient private List violationList; @Transient private FishingBoat fishingBoat; @Transient - private List fishingBoatVersionList; - @Transient private ProcessResult processResult; @Transient private List sailorList; 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/crackdownsStatus/model/crackdownStatus/UnlawfulFishingVersion.java new file mode 100644 index 00000000..54d57b37 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/UnlawfulFishingVersion.java @@ -0,0 +1,16 @@ +package com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus; + +import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.fishingBoat.FishingBoatVersion; +import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.processResult.ProcessResultVersion; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +public class UnlawfulFishingVersion { + private CrackdownStatusVersion crackdownStatusVersion; + private FishingBoatVersion fishingBoatVersion; + private ProcessResultVersion processResultVersion; +} diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/CrackdownStatusVersionRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/CrackdownStatusVersionRepository.java index fca654d1..a3b8b86d 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/CrackdownStatusVersionRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/CrackdownStatusVersionRepository.java @@ -9,6 +9,4 @@ import java.util.Optional; public interface CrackdownStatusVersionRepository extends JpaRepository { Optional findTopByCdsKeyOrderByVersionNoDesc(Integer cdsKey); List findByCdsKey(Integer cdsKey); - - CrackdownStatusVersion findByVersionNoAndCdsKey(Integer versionNo, Integer cdsKey); } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ProcessResultVersionRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ProcessResultVersionRepository.java index ff6be265..d04abcd1 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ProcessResultVersionRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ProcessResultVersionRepository.java @@ -7,8 +7,7 @@ import java.util.List; import java.util.Optional; public interface ProcessResultVersionRepository extends JpaRepository { - Optional findTopByPrKeyOrderByVersionNoDesc(Integer prKey); - List findByPrKey(Integer prKey); + Optional findTopByPrKeyOrderByVersionNoDesc(Integer prKey); + List findByPrKey(Integer prKey); - ProcessResultVersion findByVersionNoAndPrKey(Integer versionNo, Integer prKey); } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/CrackdownStatusService.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/CrackdownStatusService.java index 379f1f85..2a7de610 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/CrackdownStatusService.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/CrackdownStatusService.java @@ -48,8 +48,8 @@ public class CrackdownStatusService extends BaseService { return crackdownStatusVersionRepository.findByCdsKey(cdsKey); } - public CrackdownStatusVersion selectCrackdownStatusVersion(Integer versionNo, Integer cdsKey) { - return crackdownStatusVersionRepository.findByVersionNoAndCdsKey(versionNo, cdsKey); + public CrackdownStatusVersion selectCrackdownStatusVersion(Integer cdsKey, Integer versionNo) { + return crackdownStatusVersionRepository.findById(new CrackdownStatusVersion.CrackdownStatusVersionId(cdsKey, versionNo)).orElse(new CrackdownStatusVersion()); } @Transactional diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java index 9ff087c0..de90b50e 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java @@ -52,8 +52,8 @@ public class FishingBoatService extends BaseService { } public CrackdownStatus selectCrackdownStatus(Integer cdsKey) { CrackdownStatus crackdownStatus = crackdownStatusRepository.findById(cdsKey).orElse(null); + crackdownStatus.setCrackdownStatusVersionList(crackdownStatusMapper.selectCrackdownStatusVersionList(crackdownStatus.getCdsKey())); crackdownStatus.setFishingBoat(fishingBoatRepository.findByCdsKey(cdsKey).orElse(new FishingBoat())); - crackdownStatus.setFishingBoatVersionList(crackdownStatusMapper.selectFishingBoatVersionList(crackdownStatus.getFishingBoat().getFbKey())); crackdownStatus.setProcessResult(processResultRepository.findByCdsKey(cdsKey).orElse(new ProcessResult())); if(crackdownStatus.getFishingBoat()!=null){ crackdownStatus.setViolationList(violationRepository.findByFbKey(crackdownStatus.getFishingBoat().getFbKey())); @@ -194,10 +194,14 @@ public class FishingBoatService extends BaseService { return crackdownStatusRepository.findTop1ByCaseNum(caseNum).orElse(null)==null?0:1; } - public FishingBoatVersion selectFishingBoatVersion(Integer fbKey, Integer versionNo) { - FishingBoatVersion fishingBoat = fishingBoatVersionRepository.findById(new FishingBoatVersion.FishingBoatVersionId(fbKey, versionNo)).orElse(null); - fishingBoat.setViolationList(violationVersionRepository.findByFbKeyAndVersionNoOrderByViolationKeyAsc(fbKey, versionNo)); - return fishingBoat; + public FishingBoatVersion selectFishingBoatVersion(Integer cdsKey, Integer versionNo) { + FishingBoat fishingBoat = fishingBoatRepository.findByCdsKey(cdsKey).orElse(null); + if(fishingBoat==null){ + return null; + } + FishingBoatVersion fishingBoatVersion = fishingBoatVersionRepository.findById(new FishingBoatVersion.FishingBoatVersionId(fishingBoat.getFbKey(), versionNo)).orElse(new FishingBoatVersion()); + fishingBoatVersion.setViolationList(violationVersionRepository.findByFbKeyAndVersionNoOrderByViolationKeyAsc(fishingBoat.getFbKey(), versionNo)); + return fishingBoatVersion; } public int saveFishingBoatOnly(int cdsKey, FishingBoat fishingBoat, List violationList) { diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/ProcessResultService.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/ProcessResultService.java index fee02111..a52cf558 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/ProcessResultService.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/ProcessResultService.java @@ -23,8 +23,6 @@ import java.util.List; public class ProcessResultService extends BaseService { private final ProcessResultMapper processResultMapper; - private final CrackdownStatusRepository crackdownStatusRepository; - private final FishingBoatRepository fishingBoatRepository; private final ViolationRepository violationRepository; private final ProcessResultRepository processResultRepository; private final ProcessResultVersionRepository processResultVersionRepository; @@ -45,8 +43,13 @@ public class ProcessResultService extends BaseService { return processResultVersionRepository.findByPrKey(prKey); } - public ProcessResultVersion selectProcessResultVersion(Integer versionNo, Integer prKey) { - return processResultVersionRepository.findByVersionNoAndPrKey(versionNo, prKey); + public ProcessResultVersion selectProcessResultVersion(Integer cdsKey, Integer versionNo) { + ProcessResult processResult = processResultRepository.findByCdsKey(cdsKey).orElse(null); + if (processResult == null){ + return null; + }else{ + return processResultVersionRepository.findById(new ProcessResultVersion.ProcessResultVersionId(processResult.getPrKey(), versionNo)).orElse(new ProcessResultVersion()); + } } @Transactional @@ -74,39 +77,6 @@ public class ProcessResultService extends BaseService { saveProcessResultVersion(processResult); } - /*if (processResult.getCrackdownStatus() != null) { - if (processResult.getCrackdownStatus().getCrackdownPoliceEtc() != null) { - processResult.getCrackdownStatus().setCrackdownPolice(processResult.getCrackdownStatus().getCrackdownPoliceEtc()); - } - - CrackdownStatus existingCrackdownStatus = crackdownStatusRepository.findByCdsKey(processResult.getCdsKey()).orElse(null); - Utils.copyNonNullProperties(processResult, existingCrackdownStatus); - processResult.setCrackdownStatus(crackdownStatusRepository.save(existingCrackdownStatus)); - }*/ - - /*if (processResult.getFishingBoat() != null) { - FishingBoat existingFishingBoat = fishingBoatRepository.findByCdsKey(processResult.getCdsKey()).orElse(null); - Utils.copyNonNullProperties(processResult, existingFishingBoat); - fishingBoatRepository.save(existingFishingBoat); - }*/ - - /*if (processResult.getViolationList().get(0).getViolation() != null) { - Violation lastViolation = violationRepository.findTopByFbKeyOrderByViolationKeyDesc(processResult.getCrackdownStatus().getFbKey()).orElse(null); - int violationKey = lastViolation==null?1:(lastViolation.getViolationKey()+1); - - for(Violation violation: processResult.getViolationList()){ - if (violation.getViolationEtc() != null) { - violation.setViolation(violation.getViolationEtc()); - } - violation.setFbKey(processResult.getFishingBoat().getFbKey()); - if (violation.getViolationKey() == null) { - violation.setViolationKey(violationKey); - violationKey++; - } - } - violationRepository.saveAll(processResult.getViolationList()); - }*/ - return prKey; } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/UnlawfulFishingService.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/UnlawfulFishingService.java index 784ba5da..44eb3137 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/UnlawfulFishingService.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/UnlawfulFishingService.java @@ -1,6 +1,7 @@ package com.dbnt.faisp.main.faStatistics.crackdownsStatus.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 lombok.RequiredArgsConstructor; @@ -35,6 +36,14 @@ public class UnlawfulFishingService { return cdsKey; } + public UnlawfulFishingVersion selectUnlawfulFishingVersionInfo(Integer cdsKey, Integer versionNo) { + UnlawfulFishingVersion ufv = new UnlawfulFishingVersion(); + ufv.setCrackdownStatusVersion(crackdownStatusService.selectCrackdownStatusVersion(cdsKey, versionNo)); + ufv.setFishingBoatVersion(fishingBoatService.selectFishingBoatVersion(cdsKey, versionNo)); + ufv.setProcessResultVersion(processResultService.selectProcessResultVersion(cdsKey, versionNo)); + return ufv; + } + private CrackdownStatus setWriteInfo(CrackdownStatus crackdownStatus){ FishingBoat fishingBoat = crackdownStatus.getFishingBoat(); fishingBoat.setWrtDt(LocalDateTime.now()); diff --git a/src/main/resources/mybatisMapper/CrackdownStatustMapper.xml b/src/main/resources/mybatisMapper/CrackdownStatusMapper.xml similarity index 98% rename from src/main/resources/mybatisMapper/CrackdownStatustMapper.xml rename to src/main/resources/mybatisMapper/CrackdownStatusMapper.xml index 5c3a2ec0..98b9dc96 100644 --- a/src/main/resources/mybatisMapper/CrackdownStatustMapper.xml +++ b/src/main/resources/mybatisMapper/CrackdownStatusMapper.xml @@ -429,16 +429,16 @@ on b.fb_key = d.fb_key and d.position = 'POS001' - + select cds_key, version_no, wrt_organ, wrt_part, wrt_user_grd, wrt_user_nm, wrt_dt - from fishing_boat_version - where fb_key = #{fb_key} + from crackdown_status_version + where cds_key = #{cds_key} order by version_no desc \ 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 index 6da92dde..ef876c38 100644 --- a/src/main/resources/static/js/faStatistics/fishingBoatMgt.js +++ b/src/main/resources/static/js/faStatistics/fishingBoatMgt.js @@ -121,15 +121,15 @@ $(document).on('click', '.versionInfoTr', function (){ $(".versionInfoChkbox").prop("checked", false); $(this).find(".versionInfoChkbox")[0].checked = true $.ajax({ - url: '/faStatistics/fishingBoatVersionInfo', + url: '/faStatistics/crackdownStatusVersionInfo', data: { - fbKey: $(this).find(".fbKey").val(), + cdsKey: $(this).find(".cdsKey").val(), versionNo: $(this).find(".versionNo").val() }, type: 'GET', dataType:"html", success: function(html){ - $("#fishingBoardVersionInfoDiv").empty().append(html); + $("#versionInfoDiv").empty().append(html); }, error:function(e){ ajaxErrorAction(e); diff --git a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatViewModal.html b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatViewModal.html index bcde01ce..c888eac1 100644 --- a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatViewModal.html +++ b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatViewModal.html @@ -9,19 +9,35 @@ -
-
-
-
-
-
■ 단속정보
+
+
+
+ +
+
+
+
■ 단속정보
+
+ + + + + (수정 이력 없음) + + + + +
+
+
@@ -534,27 +550,6 @@
-
@@ -568,26 +563,26 @@ - - - + + + - +
- + - + - +
-
+
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/versionInfo.html b/src/main/resources/templates/faStatistics/unlawfulFishing/versionInfo.html new file mode 100644 index 00000000..2c5c2df1 --- /dev/null +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/versionInfo.html @@ -0,0 +1,484 @@ + + +
+
+ + +
+
+
+ +
+ +
+ +
+ +
+ +
+
+ + +
+ +
+
+
+
+
+
+
+ +
+ + + +
+ +
+ +
+ +
+ + + +
+ +
+ + + + + +
+
+
+ +
+ +
+ +
+ + + +
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+
+ + +
+ +
+
+ +
+
+ + + + + + +
+
+ +
+
+
+
+
+
+ +
+
+ + + + +
+
+ +
+
+
+
+
+
+
+
+
+ + +
+ +
+
+ + + + +
+
+
+
+
+
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+ + + +
+ +
+ + + +
+ +
+
+ + +
+
+
+
+ + + + + + + + +
+
+ + + + + +
+ +
+
+
+ + +
+
+
+
+ +
+ + + +
+ +
+ +
+ + + + +
+
+ +
+ +
+ + + +
+ +
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+
+ + +
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+ +
+ + + +
+
+
+ +
+ +
+ +
+ +
+
+
+
+
+
+
+ + \ No newline at end of file