From d269800cf5fdf6ff3fc2ac867ad79ad620d03934 Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Wed, 31 May 2023 11:05:08 +0900 Subject: [PATCH] =?UTF-8?q?FIX=20:=20=ED=8C=8C=EC=9D=BC=20=EC=97=85?= =?UTF-8?q?=EB=AC=B4=20=EA=B5=AC=EB=B6=84=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/kr/xit/fims/biz/FimsConst.java | 8 +++----- .../service/bean/EcCctvCrackdownServiceBean.java | 5 +---- .../java/kr/xit/fims/biz/utils/FimsBizUtils.java | 16 +++++----------- 3 files changed, 9 insertions(+), 20 deletions(-) diff --git a/src/main/java/kr/xit/fims/biz/FimsConst.java b/src/main/java/kr/xit/fims/biz/FimsConst.java index 6dddcc5d..1577953a 100644 --- a/src/main/java/kr/xit/fims/biz/FimsConst.java +++ b/src/main/java/kr/xit/fims/biz/FimsConst.java @@ -20,11 +20,9 @@ public class FimsConst { @Getter @AllArgsConstructor public enum FileJobSeCode { - NATL_NEWS_PAPER_RCV("NATL_NEWS_PAPER_RCV", "민원심사-국민신문고") - ,BUS_INSTALL("BUS_INSTALL", "버스장착형CCTV") - ,CCTV_FIX("CCTV_FIX", "cctv-고정형") - ,CCTV_DRV("CCTV_DRV", "cctv-주행형") - ,CMM_BOARD("CMM_BOARD", "게시판-첨부파일") + NATL_NEWS_PAPER_RCV("EIF", "민원심사-국민신문고"), + CRDN_FILE_LINK("CFL","cctv단속연계파일"), + CMM_BOARD("BBS", "게시판-첨부파일") ; private final String code; diff --git a/src/main/java/kr/xit/fims/biz/ec/service/bean/EcCctvCrackdownServiceBean.java b/src/main/java/kr/xit/fims/biz/ec/service/bean/EcCctvCrackdownServiceBean.java index 0033d681..44646261 100644 --- a/src/main/java/kr/xit/fims/biz/ec/service/bean/EcCctvCrackdownServiceBean.java +++ b/src/main/java/kr/xit/fims/biz/ec/service/bean/EcCctvCrackdownServiceBean.java @@ -370,10 +370,7 @@ public class EcCctvCrackdownServiceBean extends AbstractServiceBean implements E private CmmFileDTO.FileMst getFileMst(final String crdnSeCd, final String fileJobId) { return CmmFileDTO.FileMst.builder() - .jobSeCode( - Objects.equals(crdnSeCd, FimsConst.CrdnSeCd.CCTV_DRV.getCode())? - FimsConst.FileJobSeCode.CCTV_DRV.getCode() - : FimsConst.FileJobSeCode.CCTV_FIX.getCode()) + .jobSeCode(FimsConst.FileJobSeCode.CRDN_FILE_LINK.getCode()) .fileJobId(fileJobId) .uploadeJobPath(Objects.equals(crdnSeCd, FimsConst.CrdnSeCd.CCTV_DRV.getCode())? uploadCctvDrvPath diff --git a/src/main/java/kr/xit/fims/biz/utils/FimsBizUtils.java b/src/main/java/kr/xit/fims/biz/utils/FimsBizUtils.java index a474d602..4dc15b40 100644 --- a/src/main/java/kr/xit/fims/biz/utils/FimsBizUtils.java +++ b/src/main/java/kr/xit/fims/biz/utils/FimsBizUtils.java @@ -22,17 +22,11 @@ public class FimsBizUtils { } public static String getFileJobSeCode(String crdnSeCd) { - // 01 - 고정형CCTV - if(Objects.equals(crdnSeCd, "01"))//FimsConst.FileJobSeCode.CCTV_FIX)) - return FimsConst.FileJobSeCode.CCTV_FIX.getCode(); - // 02 - 주행형CCTV - if(Objects.equals(crdnSeCd, "02"))//FimsConst.FileJobSeCode.CCTV_DRV)) - return FimsConst.FileJobSeCode.CCTV_DRV.getCode(); - // 03 - 버스장착형CCTV - if(Objects.equals(crdnSeCd, "07"))//FimsConst.FileJobSeCode.BUS_INSTALL)) - return FimsConst.FileJobSeCode.BUS_INSTALL.getCode(); - - if(Objects.equals(crdnSeCd, "09"))//FimsConst.FileJobSeCode.BUS_INSTALL)) + // 01 - CCTV + if(Objects.equals(crdnSeCd, "01") || Objects.equals(crdnSeCd, "02") || Objects.equals(crdnSeCd, "07")) + return FimsConst.FileJobSeCode.CRDN_FILE_LINK.getCode(); + + if(Objects.equals(crdnSeCd, "09")) return FimsConst.FileJobSeCode.NATL_NEWS_PAPER_RCV.getCode(); throw BizRuntimeException.create(MessageKey.CUSTOM_MSG, "데이타 오류[파일정보를 확인해 주세요");