diff --git a/src/main/java/com/dbnt/faisp/config/BaseController.java b/src/main/java/com/dbnt/faisp/config/BaseController.java index 3265b4f3..441bb017 100644 --- a/src/main/java/com/dbnt/faisp/config/BaseController.java +++ b/src/main/java/com/dbnt/faisp/config/BaseController.java @@ -59,6 +59,14 @@ public class BaseController { return mav; } + @GetMapping("/selectBoxOptions") + public ModelAndView codeMgtPage(String categoryCd, String selectedCd) { + ModelAndView mav = new ModelAndView("common/selectBox/options"); + mav.addObject("codeList", codeMgtService.selectCodeMgtList(categoryCd)); + mav.addObject("selectedCd", selectedCd); + return mav; + } + public void setSession(@AuthenticationPrincipal UserInfo loginUser, HttpSession session){ loginUser.setDownOrganCdList(organConfigService.selectDownOrganListWhereUserOgCd(loginUser.getOgCd())); loginUser.setUpOrganCdList(organConfigService.selectUpOrganListWhereUserOgCd(loginUser.getOgCd())); diff --git a/src/main/java/com/dbnt/faisp/config/ModalController.java b/src/main/java/com/dbnt/faisp/config/ModalController.java index e9b33221..2c0dc8b8 100644 --- a/src/main/java/com/dbnt/faisp/config/ModalController.java +++ b/src/main/java/com/dbnt/faisp/config/ModalController.java @@ -24,7 +24,7 @@ public class ModalController { @GetMapping("/menuModal") public ModelAndView menuModalPage(@AuthenticationPrincipal UserInfo loginUser, MenuMgt menuMgt){ - ModelAndView mav = new ModelAndView("commonModal/menuModal"); + ModelAndView mav = new ModelAndView("common/modal/menuModal"); menuMgt.setUserSeq(loginUser.getUserSeq()); menuMgt.setQueryInfo(); mav.addObject("menuMgtList", menuMgtService.selectMenuMgtListToAccessAuth(menuMgt)); @@ -36,7 +36,7 @@ public class ModalController { @GetMapping("/userModal") public ModelAndView userMoadlPage(@AuthenticationPrincipal UserInfo loginUser, UserInfo userInfo){ - ModelAndView mav = new ModelAndView("commonModal/userModal"); + ModelAndView mav = new ModelAndView("common/modal/userModal"); userInfo.setQueryInfo(); if(userInfo.getUserStatus() == null || userInfo.getUserStatus().equals("")) { userInfo.setUserStatus("USC003"); diff --git a/src/main/java/com/dbnt/faisp/config/SecurityConfig.java b/src/main/java/com/dbnt/faisp/config/SecurityConfig.java index 7bc219bd..ebb09b1f 100644 --- a/src/main/java/com/dbnt/faisp/config/SecurityConfig.java +++ b/src/main/java/com/dbnt/faisp/config/SecurityConfig.java @@ -77,6 +77,7 @@ public class SecurityConfig{ "/dashboard", "/myInfo/**", "/modal/**", + "/selectBoxOptions", "/publicBoard/**", "/faRpt/**", "/ivsgt/**", diff --git a/src/main/java/com/dbnt/faisp/config/TomcatConfiguration.java b/src/main/java/com/dbnt/faisp/config/TomcatConfiguration.java index 504d1003..4db4f81b 100644 --- a/src/main/java/com/dbnt/faisp/config/TomcatConfiguration.java +++ b/src/main/java/com/dbnt/faisp/config/TomcatConfiguration.java @@ -1,7 +1,6 @@ package com.dbnt.faisp.config; import org.apache.catalina.connector.Connector; -import org.apache.coyote.ajp.AbstractAjpProtocol; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; import org.springframework.boot.web.servlet.server.ServletWebServerFactory; 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 46a1c429..f07acefe 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 @@ -47,8 +47,8 @@ public class CrackdownStatusController { for (CrackdownStatus cds:crackdownStatusList) { cds.setViolationList(violationRepository.findByFbKey(cds.getFbKey())); - cds.setProcessResult(processResultRepository.findByCdsKey(cds.getCdsKey())); - cds.setFishingBoat(fishingBoatRepository.findByCdsKey(cds.getCdsKey())); + cds.setProcessResult(processResultRepository.findByCdsKey(cds.getCdsKey()).orElse(null)); + cds.setFishingBoat(fishingBoatRepository.findByCdsKey(cds.getCdsKey()).orElse(null)); cds.setSailorList(sailorRepository.findByFbKey(cds.getFbKey())); } @@ -63,8 +63,8 @@ public class CrackdownStatusController { public ModelAndView crackdownStatusViewModal(@AuthenticationPrincipal UserInfo loginUser, CrackdownStatus crackdownStatus){ ModelAndView mav = new ModelAndView("faStatistics/crackdownStatus/crackdownStatusViewModal"); crackdownStatus = crackdownStatusService.selectCrackdownStatus(crackdownStatus.getCdsKey()); - crackdownStatus.setFishingBoat(fishingBoatRepository.findByCdsKey(crackdownStatus.getCdsKey())); - crackdownStatus.setProcessResult(processResultRepository.findByCdsKey(crackdownStatus.getCdsKey())); + crackdownStatus.setFishingBoat(fishingBoatRepository.findByCdsKey(crackdownStatus.getCdsKey()).orElse(null)); + crackdownStatus.setProcessResult(processResultRepository.findByCdsKey(crackdownStatus.getCdsKey()).orElse(null)); crackdownStatus.setViolationList(violationRepository.findByFbKey(crackdownStatus.getFishingBoat().getFbKey())); crackdownStatus.setSailorList(sailorRepository.findByFbKey(crackdownStatus.getFishingBoat().getFbKey())); @@ -80,8 +80,8 @@ public class CrackdownStatusController { ModelAndView mav = new ModelAndView("faStatistics/crackdownStatus/crackdownStatusEditModal"); if(crackdownStatus.getCdsKey()!=null){ crackdownStatus = crackdownStatusService.selectCrackdownStatus(crackdownStatus.getCdsKey()); - crackdownStatus.setFishingBoat(fishingBoatRepository.findByCdsKey(crackdownStatus.getCdsKey())); - crackdownStatus.setProcessResult(processResultRepository.findByCdsKey(crackdownStatus.getCdsKey())); + crackdownStatus.setFishingBoat(fishingBoatRepository.findByCdsKey(crackdownStatus.getCdsKey()).orElse(null)); + crackdownStatus.setProcessResult(processResultRepository.findByCdsKey(crackdownStatus.getCdsKey()).orElse(null)); crackdownStatus.setViolationList(violationRepository.findByFbKey(crackdownStatus.getFishingBoat().getFbKey())); crackdownStatus.setSailorList(sailorRepository.findByFbKey(crackdownStatus.getFishingBoat().getFbKey())); }else{ 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 1fa6e34c..c698263d 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 @@ -8,6 +8,7 @@ import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.ProcessResult; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.CrackdownStatusRepository; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.FishingBoatRepository; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.ViolationRepository; +import com.dbnt.faisp.main.faStatistics.crackdownsStatus.service.FishingBoatService; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.service.ProcessResultService; import com.dbnt.faisp.main.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; @@ -27,10 +28,7 @@ import java.util.List; public class FishingBoatController { private final AuthMgtService authMgtService; - private final ProcessResultService processResultService; - private final ViolationRepository violationRepository; - private final CrackdownStatusRepository crackdownStatusRepository; - private final FishingBoatRepository fishingBoatRepository; + private final FishingBoatService fishingBoatService; private final CodeMgtService codeMgtService; @RequestMapping("/fishingBoat") @@ -62,11 +60,11 @@ public class FishingBoatController { @GetMapping("/fishingBoatViewModal") public ModelAndView fishingBoatViewModal(@AuthenticationPrincipal UserInfo loginUser, ProcessResult processResult){ ModelAndView mav = new ModelAndView("faStatistics/processResult/processResultViewModal"); - 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 = 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())); mav.addObject("processResult", processResult); mav.addObject("userSeq",loginUser.getUserSeq()); @@ -76,21 +74,19 @@ public class FishingBoatController { } @GetMapping("/fishingBoatEditModal") - public ModelAndView fishingBoatEditModal(@AuthenticationPrincipal UserInfo loginUser, FishingBoat fishingBoat){ + public ModelAndView fishingBoatEditModal(@AuthenticationPrincipal UserInfo loginUser, CrackdownStatus crackdownStatus){ 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()));*/ + if(crackdownStatus.getCdsKey()!=null){ + crackdownStatus = fishingBoatService.selectCrackdownStatus(crackdownStatus.getCdsKey()); }else{ - fishingBoat.setWrtOrgan(loginUser.getOgCd()); - fishingBoat.setWrtPart(loginUser.getOfcCd()); - fishingBoat.setWrtUserSeq(loginUser.getUserSeq()); - fishingBoat.setWrtUserNm(loginUser.getUserNm()); - fishingBoat.setWrtUserGrd(loginUser.getTitleCd()); - fishingBoat.setWrtDt(LocalDateTime.now()); + crackdownStatus.setFishingBoat(new FishingBoat()); + crackdownStatus.setProcessResult(new ProcessResult()); + crackdownStatus.setWrtOrgan(loginUser.getOgCd()); + crackdownStatus.setWrtPart(loginUser.getOfcCd()); + crackdownStatus.setWrtUserSeq(loginUser.getUserSeq()); + crackdownStatus.setWrtUserNm(loginUser.getUserNm()); + crackdownStatus.setWrtUserGrd(loginUser.getTitleCd()); + crackdownStatus.setWrtDt(LocalDateTime.now()); } mav.addObject("ataList", codeMgtService.selectCodeMgtList("ATA")); mav.addObject("cpoList", codeMgtService.selectCodeMgtList("CPO")); @@ -99,7 +95,7 @@ public class FishingBoatController { mav.addObject("bmList", codeMgtService.selectCodeMgtList("BM")); mav.addObject("prList", codeMgtService.selectCodeMgtList("PR")); mav.addObject("bdtList", codeMgtService.selectCodeMgtList("BDT")); - mav.addObject("fishingBoat", fishingBoat); + mav.addObject("crackdownStatus", crackdownStatus); 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 fb77da68..8b7a24d1 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 @@ -34,6 +34,8 @@ public class FishingBoat extends BaseModel { private String permitNum; @Column(name = "nationality") private String nationality; + @Column(name = "sailor_cnt") + private Integer sailorCnt; @Column(name = "ton_cnt") private Integer tonCnt; @Column(name = "fishery_type") @@ -46,6 +48,8 @@ public class FishingBoat extends BaseModel { private String boatNnySi; @Column(name = "offense_type") private String offenseType; + @Column(name = "offense_weight") + private Double offenseWeight; @Column(name = "offense_quantity") private Integer offenseQuantity; @Column(name = "offense_amount") diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/processResultController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/processResultController.java index 7821218a..6b974ac6 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/processResultController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/processResultController.java @@ -44,8 +44,8 @@ public class processResultController { List processResultList = processResultService.selectProcessResultList(processResult); for (ProcessResult pr:processResultList) { - pr.setCrackdownStatus(crackdownStatusRepository.findByCdsKey(pr.getCdsKey())); - pr.setFishingBoat(fishingBoatRepository.findByCdsKey(pr.getCdsKey())); + pr.setCrackdownStatus(crackdownStatusRepository.findByCdsKey(pr.getCdsKey()).orElse(null)); + pr.setFishingBoat(fishingBoatRepository.findByCdsKey(pr.getCdsKey()).orElse(null)); pr.setViolationList(violationRepository.findByFbKey(pr.getFishingBoat().getFbKey())); } @@ -60,9 +60,9 @@ public class processResultController { public ModelAndView processResultViewModal(@AuthenticationPrincipal UserInfo loginUser, ProcessResult processResult){ ModelAndView mav = new ModelAndView("faStatistics/processResult/processResultViewModal"); 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.setCrackdownStatus(crackdownStatusRepository.findByCdsKey(processResult.getCdsKey()).orElse(null)); + processResult.setFbKey(fishingBoatRepository.findByCdsKey(processResult.getCdsKey()).orElse(null).getFbKey()); + processResult.setBoatNameKr(fishingBoatRepository.findByCdsKey(processResult.getCdsKey()).orElse(null).getBoatNameKr()); processResult.setViolationList(violationRepository.findByFbKey(processResult.getFbKey())); mav.addObject("processResult", processResult); @@ -77,9 +77,9 @@ public class processResultController { ModelAndView mav = new ModelAndView("faStatistics/processResult/processResultEditModal"); if(processResult.getPrKey()!=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.setCrackdownStatus(crackdownStatusRepository.findByCdsKey(processResult.getCdsKey()).orElse(null)); + processResult.setFbKey(fishingBoatRepository.findByCdsKey(processResult.getCdsKey()).orElse(null).getFbKey()); + processResult.setBoatNameKr(fishingBoatRepository.findByCdsKey(processResult.getCdsKey()).orElse(null).getBoatNameKr()); processResult.setViolationList(violationRepository.findByFbKey(processResult.getFbKey())); }else{ processResult.setWrtOrgan(loginUser.getOgCd()); diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/CrackdownStatusRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/CrackdownStatusRepository.java index 99d9b9ed..1a7efd80 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/CrackdownStatusRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/CrackdownStatusRepository.java @@ -3,6 +3,8 @@ package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.CrackdownStatus; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.Optional; + public interface CrackdownStatusRepository extends JpaRepository { - CrackdownStatus findByCdsKey(Integer cdsKey); + Optional findByCdsKey(Integer cdsKey); } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/FishingBoatRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/FishingBoatRepository.java index be867ae3..a80ac156 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/FishingBoatRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/FishingBoatRepository.java @@ -3,6 +3,8 @@ package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.FishingBoat; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.Optional; + public interface FishingBoatRepository extends JpaRepository { - FishingBoat findByCdsKey(Integer cdsKey); + Optional findByCdsKey(Integer cdsKey); } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ProcessResultRepository.java b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ProcessResultRepository.java index a8ee234c..36bacec9 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ProcessResultRepository.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/repository/ProcessResultRepository.java @@ -3,7 +3,9 @@ package com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.ProcessResult; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.Optional; + public interface ProcessResultRepository extends JpaRepository { - ProcessResult findByCdsKey(Integer cdsKey); - ProcessResult findByPrKey(Integer prKey); + Optional findByCdsKey(Integer cdsKey); + Optional findByPrKey(Integer prKey); } 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 new file mode 100644 index 00000000..b3fb5734 --- /dev/null +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/service/FishingBoatService.java @@ -0,0 +1,101 @@ +package com.dbnt.faisp.main.faStatistics.crackdownsStatus.service; + + +import com.dbnt.faisp.config.BaseService; +import com.dbnt.faisp.main.faStatistics.crackdownsStatus.mapper.CrackdownStatusMapper; +import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.*; +import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.*; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class FishingBoatService extends BaseService { + + private final CrackdownStatusMapper crackdownStatusMapper; + private final CrackdownStatusRepository crackdownStatusRepository; + private final FishingBoatRepository fishingBoatRepository; + private final ViolationRepository violationRepository; + private final ProcessResultRepository processResultRepository; + private final SailorRepository sailorRepository; + + public CrackdownStatus selectCrackdownStatus(Integer cdsKey) { + CrackdownStatus crackdownStatus = crackdownStatusRepository.findById(cdsKey).orElse(null); + crackdownStatus.setFishingBoat(fishingBoatRepository.findByCdsKey(cdsKey).orElse(new FishingBoat())); + crackdownStatus.setProcessResult(processResultRepository.findByCdsKey(cdsKey).orElse(new ProcessResult())); + if(crackdownStatus.getFishingBoat()!=null){ + crackdownStatus.setViolationList(violationRepository.findByFbKey(crackdownStatus.getFishingBoat().getFbKey())); + crackdownStatus.setSailorList(sailorRepository.findByFbKey(crackdownStatus.getFishingBoat().getFbKey())); + for(Sailor sailor: crackdownStatus.getSailorList()){ + //첨부파일 ...? + } + } + return crackdownStatus; + } + + @Transactional + public Integer saveCrackdownStatus(CrackdownStatus crackdownStatus) { + if (crackdownStatus.getViolationDeleteKeyList() != null) { + violationRepository.deleteAllByIdInQuery(crackdownStatus.getViolationDeleteKeyList()); + } + if (crackdownStatus.getSailorDeleteKeyList() != null) { + sailorRepository.deleteAllByIdInQuery(crackdownStatus.getSailorDeleteKeyList()); + } + + if (crackdownStatus.getCrackdownBoatEtc() != null) { + crackdownStatus.setCrackdownBoat(crackdownStatus.getCrackdownBoatEtc()); + } + if (crackdownStatus.getCrackdownPoliceEtc() != null) { + crackdownStatus.setCrackdownPolice(crackdownStatus.getCrackdownPoliceEtc()); + } + + Integer cdsKey = crackdownStatusRepository.save(crackdownStatus).getCdsKey(); + if (crackdownStatus.getFishingBoat() != null) { + if (crackdownStatus.getFishingBoat().getBoatMaterialEtc() != null) { + crackdownStatus.getFishingBoat().setBoatMaterial(crackdownStatus.getFishingBoat().getBoatMaterialEtc()); + } + if (crackdownStatus.getFishingBoat().getFisheryTypeEtc() != null) { + crackdownStatus.getFishingBoat().setFisheryType(crackdownStatus.getFishingBoat().getFisheryTypeEtc()); + } + + crackdownStatus.getFishingBoat().setCdsKey(cdsKey); + Integer fbKey = fishingBoatRepository.save(crackdownStatus.getFishingBoat()).getFbKey(); + crackdownStatus.getFishingBoat().setFbKey(fbKey); + } + + if (crackdownStatus.getProcessResult() != null) { + if (crackdownStatus.getProcessResult().getProcessStatusEtc() != null) { + crackdownStatus.getProcessResult().setProcessStatus(crackdownStatus.getProcessResult().getProcessStatusEtc()); + } + crackdownStatus.getProcessResult().setCdsKey(cdsKey); + Integer prKey = processResultRepository.save(crackdownStatus.getProcessResult()).getPrKey(); + crackdownStatus.getProcessResult().setPrKey(prKey); + } + + /*if (internationalCrimeArrest.getDeleteSpiKeyList() != null) { + suspectPersonInfoRepository.deleteAllByIdInQuery(internationalCrimeArrest.getDeleteSpiKeyList()); + }*/ + + if (crackdownStatus.getViolationList() != null) { + for(Violation violation: crackdownStatus.getViolationList()){ + if (violation.getViolationEtc() != null) { + violation.setViolation(violation.getViolationEtc()); + } + violation.setFbKey(crackdownStatus.getFishingBoat().getFbKey()); + } + violationRepository.saveAll(crackdownStatus.getViolationList()); + } + + if (crackdownStatus.getSailorList() != null) { + for(Sailor sailor: crackdownStatus.getSailorList()){ + sailor.setFbKey(crackdownStatus.getFishingBoat().getFbKey()); + } + sailorRepository.saveAll(crackdownStatus.getSailorList()); + } + + return cdsKey; + } +} 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 cc3555e1..7c613645 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 @@ -107,7 +107,7 @@ public class ProcessResultService extends BaseService { processResult.setExecutionDetail(processResult.getExecutionDetailEtc()); } - ProcessResult existingProcessResult = processResultRepository.findByPrKey(processResult.getPrKey()); + ProcessResult existingProcessResult = processResultRepository.findByPrKey(processResult.getPrKey()).orElse(null); Utils.copyNonNullProperties(processResult, existingProcessResult); Integer prKey = processResultRepository.save(existingProcessResult).getPrKey(); @@ -116,13 +116,13 @@ public class ProcessResultService extends BaseService { processResult.getCrackdownStatus().setCrackdownPolice(processResult.getCrackdownStatus().getCrackdownPoliceEtc()); } - CrackdownStatus existingCrackdownStatus = crackdownStatusRepository.findByCdsKey(processResult.getCdsKey()); + 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()); + FishingBoat existingFishingBoat = fishingBoatRepository.findByCdsKey(processResult.getCdsKey()).orElse(null); Utils.copyNonNullProperties(processResult, existingFishingBoat); fishingBoatRepository.save(existingFishingBoat); } diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties new file mode 100644 index 00000000..7cae2583 --- /dev/null +++ b/src/main/resources/application-prod.properties @@ -0,0 +1,38 @@ +tomcat.ajp.protocol=AJP/1.3 + +#file upload +spring.servlet.multipart.location=/uploadFiles +spring.servlet.multipart.max-file-size=200MB +spring.servlet.multipart.max-request-size=500MB + +#thymeleaf +spring.thymeleaf.prefix=classpath:templates/ +spring.thymeleaf.check-template-location=true +spring.thymeleaf.suffix=.html +spring.thymeleaf.mode=HTML + +#Datasource Configuration +spring.sql.init.encoding=utf-8 +#maximum-pool-size: CPU core count +spring.datasource.hikari.maximum-pool-size=4 +#postgresql +spring.datasource-main.driverClassName=org.postgresql.Driver +spring.datasource-main.url=jdbc:postgresql://118.219.150.34:50503/faisp +spring.datasource-main.username=dbnt0031 +spring.datasource-main.password=dbnt0928! +#oracle +spring.datasource-kwms.driverClassName=oracle.jdbc.driver.OracleDriver +spring.datasource-kwms.jdbcUrl=jdbc:oracle:thin:@118.219.150.34:51521:kwms +spring.datasource-kwms.username=kwms +spring.datasource-kwms.password=dbnt0928 + +#jpa +spring.jpa.show-sql=false +spring.jpa.generate-ddl=false +spring.jpa.hibernate.naming.physical-strategy = org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl + +# MyBatis +mybatis.mapper-locations: mybatisMapper/*.xml +mybatis.configuration.map-underscore-to-camel-case=true +mybatis.type-aliases-package=com.dbnt.faisp.main.**.model +logging.level.com.atoz_develop.mybatissample.repository=TRACE \ No newline at end of file diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties index 5c7e5b72..9687e5c5 100644 --- a/src/main/resources/application-test.properties +++ b/src/main/resources/application-test.properties @@ -17,7 +17,7 @@ spring.sql.init.encoding=utf-8 spring.datasource.hikari.maximum-pool-size=4 #postgresql spring.datasource-main.driverClassName=org.postgresql.Driver -spring.datasource-main.url=jdbc:postgresql://118.219.150.34:50503/faisp +spring.datasource-main.jdbcUrl=jdbc:postgresql://118.219.150.34:50503/faisp spring.datasource-main.username=dbnt0031 spring.datasource-main.password=dbnt0928! #oracle diff --git a/src/main/resources/static/js/faStatistics/fishingBoatMgt.js b/src/main/resources/static/js/faStatistics/fishingBoatMgt.js index 9743ac85..8564f39e 100644 --- a/src/main/resources/static/js/faStatistics/fishingBoatMgt.js +++ b/src/main/resources/static/js/faStatistics/fishingBoatMgt.js @@ -1,11 +1,48 @@ $(document).on('click', '#getFishingBoatEditModalBtn', function (){ getFishingBoatEditModal(null, null); }) +$(document).on('change', '#crackdownPolice', function (){ + getCrackdownBoatOption(this.value); +}) +$(document).on('change', '.boatNameKr', function (){ + $(".boatNameKr").val(this.value); +}) +$(document).on('change', '#equalCaptain', function (){ + if(this.checked){ + $.each($("#captainDiv :input"), function (idx, input){ + $("#shipOwnerDiv").find("[name='"+input.name+"']").val(input.value) + }) + }else{ + $("#shipOwnerDiv :input").val(""); + } +}) +$(document).on('change', '#captainDiv :input', function (){ + if($("#equalCaptain").prop("checked")){ + $("#shipOwnerDiv").find("[name='"+this.name+"']").val(this.value) + } +}) +$(document).on('click', '#sailorAddBtn', function (){ + $("#sailorRestrictionDiv").append( + '
\n' + + '
\n' + + ' \n' + + ' \n' + + ' \n' + + '
\n' + + '
' + ) +}) -function getFishingBoatEditModal(fbKey, cdsKey){ +function getFishingBoatEditModal(cdsKey){ $.ajax({ url: '/faStatistics/fishingBoatEditModal', - data: {fbKey: fbKey, cdsKey: cdsKey}, + data: {cdsKey: cdsKey}, type: 'GET', dataType:"html", success: function(html){ @@ -21,10 +58,31 @@ function getFishingBoatEditModal(fbKey, cdsKey){ lang:'kr', step:20 }); + const crackdownPolice = $("#crackdownPolice").val() + if(crackdownPolice){ + getCrackdownBoatOption(crackdownPolice) + } $("#fishingBoatEditModal").modal('show'); }, error:function(){ + } + }); +} + +function getCrackdownBoatOption(categoryCd){ + $.ajax({ + url: '/selectBoxOptions', + data: {categoryCd: categoryCd, selectedCd: $("#crackdownBoat").attr("data-boatcode")}, + type: 'GET', + dataType:"html", + success: function(html){ + const crackdownBoat = $("#crackdownBoat"); + crackdownBoat.empty().append(html); + crackdownBoat.removeAttr("disabled"); + }, + error:function(){ + } }); } \ No newline at end of file diff --git a/src/main/resources/templates/commonModal/menuModal.html b/src/main/resources/templates/common/modal/menuModal.html similarity index 100% rename from src/main/resources/templates/commonModal/menuModal.html rename to src/main/resources/templates/common/modal/menuModal.html diff --git a/src/main/resources/templates/commonModal/userModal.html b/src/main/resources/templates/common/modal/userModal.html similarity index 100% rename from src/main/resources/templates/commonModal/userModal.html rename to src/main/resources/templates/common/modal/userModal.html diff --git a/src/main/resources/templates/common/selectBox/options.html b/src/main/resources/templates/common/selectBox/options.html new file mode 100644 index 00000000..b67573f8 --- /dev/null +++ b/src/main/resources/templates/common/selectBox/options.html @@ -0,0 +1,7 @@ + + + + + + + \ 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 index 3f92aa4c..efcdb26c 100644 --- a/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html +++ b/src/main/resources/templates/faStatistics/fishingBoat/fishingBoatEditModal.html @@ -1,21 +1,20 @@
- +
- - - - - - - - + + + + + + +
- +
- +
- - + +
- +
- +
-
+
- +
- +
- +
- +
@@ -457,7 +456,7 @@
- +
@@ -485,15 +484,49 @@
- +
+
+ +
+
+
+ + + +
+
+
+
+
+
+ +
+ +
+ +
+ +
+ +
+
+
+ +
- - + + +