diff --git a/src/main/java/kr/xit/fims/biz/FimsConst.java b/src/main/java/kr/xit/fims/biz/FimsConst.java index c84a6099..e10fb60d 100644 --- a/src/main/java/kr/xit/fims/biz/FimsConst.java +++ b/src/main/java/kr/xit/fims/biz/FimsConst.java @@ -88,7 +88,7 @@ public class FimsConst { */ @Getter @AllArgsConstructor - public enum RegltSeCode { + public enum CrdnSeCd { CCTV_FIX("01", "고정형CCTV") ,CCTV_DRV("02", "주행형CCTV") ,BUS_ONLY("07", "버스장착형CCTV") diff --git a/src/main/java/kr/xit/fims/biz/cmm/FimsCrackdownDTO.java b/src/main/java/kr/xit/fims/biz/cmm/FimsCrackdownDTO.java index db08c9b9..8a785b76 100644 --- a/src/main/java/kr/xit/fims/biz/cmm/FimsCrackdownDTO.java +++ b/src/main/java/kr/xit/fims/biz/cmm/FimsCrackdownDTO.java @@ -116,7 +116,7 @@ public class FimsCrackdownDTO { /** * 단속구분코드 */ - private String regltSeCode; + private String crdnSeCd; /** * 파일업무구분코드 */ @@ -142,7 +142,7 @@ public class FimsCrackdownDTO { @Builder public static class AnsRequest { private String crdnId; - private String regltSeCode; + private String crdnSeCd; private String extrlRegltCntcId; // 민원심사 마스터 / 상세 key diff --git a/src/main/java/kr/xit/fims/biz/cmm/NtriDTO.java b/src/main/java/kr/xit/fims/biz/cmm/NtriDTO.java index fe773752..da28aa0e 100644 --- a/src/main/java/kr/xit/fims/biz/cmm/NtriDTO.java +++ b/src/main/java/kr/xit/fims/biz/cmm/NtriDTO.java @@ -40,7 +40,7 @@ public class NtriDTO { /** * 단속구분코드 */ - private String regltSeCode; + private String crdnSeCd; /** * 외부연계 ID */ @@ -80,7 +80,7 @@ public class NtriDTO { */ @NotEmpty @Size(min = 2, max = 2, message = "단속구분") - private String regltSeCode; + private String crdnSeCd; /** * 단속장비관리번호: 10 * 원천 시스템에서 관리하는 장비관리 번호 @@ -221,8 +221,8 @@ public class NtriDTO { this.vhrno = StringUtils.rightPad(nvl(vhrno), 30, " "); } - public void setRegltSeCode(String regltSeCode) { - this.regltSeCode = StringUtils.rightPad(nvl(regltSeCode), 2, ""); + public void setCrdnSeCd(String crdnSeCd) { + this.crdnSeCd = StringUtils.rightPad(nvl(crdnSeCd), 2, ""); } public void setRegltEqpmnManageNo(String regltEqpmnManageNo) { @@ -289,7 +289,7 @@ public class NtriDTO { final StringBuilder sb = new StringBuilder(); sb.append(crdnYmdTime).append('|'); sb.append(vhrno).append('|'); - sb.append(regltSeCode).append('|'); + sb.append(crdnSeCd).append('|'); sb.append(regltEqpmnManageNo).append('|'); sb.append(violtDtlsCode).append('|'); diff --git a/src/main/java/kr/xit/fims/biz/cmm/service/bean/CctvBusOnlyCrackDownServiceBean.java b/src/main/java/kr/xit/fims/biz/cmm/service/bean/CctvBusOnlyCrackDownServiceBean.java index 8aba1dc5..bdbd5bc3 100644 --- a/src/main/java/kr/xit/fims/biz/cmm/service/bean/CctvBusOnlyCrackDownServiceBean.java +++ b/src/main/java/kr/xit/fims/biz/cmm/service/bean/CctvBusOnlyCrackDownServiceBean.java @@ -69,9 +69,9 @@ public class CctvBusOnlyCrackDownServiceBean implements ExtrStrategyService { // extrRegltDTO.setSggCd(getUserInfo().getPstinstCode()); // // if(records.size() >= 3){ - // extrRegltDTO.setRegltSeCode(FimsConst.RegltSeCode.CCTV_DRV.getCode()); + // extrRegltDTO.setCrdnSeCd(FimsConst.CrdnSeCd.CCTV_DRV.getCode()); // }else{ - // extrRegltDTO.setRegltSeCode(FimsConst.RegltSeCode.CCTV_FIX.getCode()); + // extrRegltDTO.setCrdnSeCd(FimsConst.CrdnSeCd.CCTV_FIX.getCode()); // } // // 외부연계 데이타 생성 // //mapper.insertEcExtrlRegltCntc(extrRegltDTO); @@ -79,7 +79,7 @@ public class CctvBusOnlyCrackDownServiceBean implements ExtrStrategyService { // // CCTV image 저장 // List cpListMf = new ArrayList<>(mfList); // cpListMf.remove(0); - // cmmFileService.saveFiles(getFileMst(extrRegltDTO.getRegltSeCode(), extrRegltDTO.getExtrlRegltCntcId()), cpListMf); + // cmmFileService.saveFiles(getFileMst(extrRegltDTO.getCrdnSeCd(), extrRegltDTO.getExtrlRegltCntcId()), cpListMf); } } diff --git a/src/main/java/kr/xit/fims/biz/cmm/service/bean/FimsCrackdownMgtServiceBean.java b/src/main/java/kr/xit/fims/biz/cmm/service/bean/FimsCrackdownMgtServiceBean.java index 7f425510..4359e7b9 100644 --- a/src/main/java/kr/xit/fims/biz/cmm/service/bean/FimsCrackdownMgtServiceBean.java +++ b/src/main/java/kr/xit/fims/biz/cmm/service/bean/FimsCrackdownMgtServiceBean.java @@ -84,7 +84,7 @@ public class FimsCrackdownMgtServiceBean extends AbstractServiceBean implements if(Checks.isNotEmpty(infoDTO.getRtpyrId())){ rtpyrDTO = rtCrackdownMgtMapper.selectRtRtpyr(infoDTO.getRtpyrId()); } - if(Objects.equals(reqDTO.getRegltSeCode(), FimsConst.RegltSeCode.CITIZEN.getCode())){ + if(Objects.equals(reqDTO.getCrdnSeCd(), FimsConst.CrdnSeCd.CITIZEN.getCode())){ ctznDTO = mapper.selectCtznStmtInfo(reqDTO); } } @@ -135,7 +135,7 @@ public class FimsCrackdownMgtServiceBean extends AbstractServiceBean implements // 2. 외부연계정보 반영 : - if(!FimsConst.RegltSeCode.CITIZEN.getCode().equals(saveDTO.getRegltSeCode()) + if(!FimsConst.CrdnSeCd.CITIZEN.getCode().equals(saveDTO.getCrdnSeCd()) && Checks.isNotEmpty(saveDTO.getExtrlRegltCntcId())){ @@ -143,7 +143,7 @@ public class FimsCrackdownMgtServiceBean extends AbstractServiceBean implements } // 시민신고인 경우 - if(FimsConst.RegltSeCode.CITIZEN.getCode().equals(saveDTO.getRegltSeCode()) + if(FimsConst.CrdnSeCd.CITIZEN.getCode().equals(saveDTO.getCrdnSeCd()) && (Checks.isNotEmpty(saveDTO.getInterfaceSeqN()) && Checks.isNotEmpty(saveDTO.getCtznSttemntDetailSn()))) { ctznDTO.setVhrno(infoDTO.getVhrno()); ctznDTO.setMdfr(getUserInfo().getUniqId()); @@ -203,7 +203,7 @@ public class FimsCrackdownMgtServiceBean extends AbstractServiceBean implements } // 2. 외부연계정보 반영 : - if(!FimsConst.RegltSeCode.CITIZEN.getCode().equals(saveDTO.getRegltSeCode()) + if(!FimsConst.CrdnSeCd.CITIZEN.getCode().equals(saveDTO.getCrdnSeCd()) && Checks.isNotEmpty(saveDTO.getExtrlRegltCntcId())){ @@ -211,7 +211,7 @@ public class FimsCrackdownMgtServiceBean extends AbstractServiceBean implements } // 시민신고인 경우 - if(FimsConst.RegltSeCode.CITIZEN.getCode().equals(saveDTO.getRegltSeCode()) + if(FimsConst.CrdnSeCd.CITIZEN.getCode().equals(saveDTO.getCrdnSeCd()) && (Checks.isNotEmpty(saveDTO.getInterfaceSeqN()) && Checks.isNotEmpty(saveDTO.getCtznSttemntDetailSn()))) { ctznDTO.setVhrno(infoDTO.getVhrno()); @@ -264,7 +264,7 @@ public class FimsCrackdownMgtServiceBean extends AbstractServiceBean implements rtCrackdownMgtMapper.insertRtErpp(erppDTO); // 시민신고인 경우 - if(FimsConst.RegltSeCode.CITIZEN.getCode().equals(saveDTO.getRegltSeCode()) + if(FimsConst.CrdnSeCd.CITIZEN.getCode().equals(saveDTO.getCrdnSeCd()) && (Checks.isNotEmpty(saveDTO.getInterfaceSeqN()) && Checks.isNotEmpty(saveDTO.getCtznSttemntDetailSn()))) { ecCtznSttemntMapper.updateVhrnoOfEcCtznSttemntDetail( CtznStmtDTO.Dtl.builder() @@ -445,7 +445,7 @@ public class FimsCrackdownMgtServiceBean extends AbstractServiceBean implements List fileDtlList = cmmFileService.findFilesByJobSeCodeAndJobId( CmmFileDTO.FileMst.builder() - .jobSeCode(FimsBizUtils.getFileJobSeCode(param.getRegltSeCode())) + .jobSeCode(FimsBizUtils.getFileJobSeCode(param.getCrdnSeCd())) .fileJobId(param.getExtnlInterfaceId()) .build()); @@ -453,7 +453,7 @@ public class FimsCrackdownMgtServiceBean extends AbstractServiceBean implements param, layoutDto, fileDtlList, - FimsBizUtils.getSendNtriPhotoInterfaceFileName(param.getRegltSeCode()), + FimsBizUtils.getSendNtriPhotoInterfaceFileName(param.getCrdnSeCd()), uploadRootPath, sendFilePath, uploadTempPath diff --git a/src/main/java/kr/xit/fims/biz/cmm/web/FimsCrackDownMgtController.java b/src/main/java/kr/xit/fims/biz/cmm/web/FimsCrackDownMgtController.java index 43771a0d..950ba55d 100644 --- a/src/main/java/kr/xit/fims/biz/cmm/web/FimsCrackDownMgtController.java +++ b/src/main/java/kr/xit/fims/biz/cmm/web/FimsCrackDownMgtController.java @@ -64,14 +64,14 @@ public class FimsCrackDownMgtController extends AbstractController { }else if(Objects.equals(FimsConst.RegltProcessSttusCode.CRACKDOWN.getCode(), dto.getRegltProcessSttusCode())) { mav.addObject("pageTitle", "과태료 시스템 등록"); } - FimsConst.RegltSeCode regltSeCodeEnum = null; - for (FimsConst.RegltSeCode e : FimsConst.RegltSeCode.values()) { - if (e.getCode().equals(dto.getRegltSeCode())) { - regltSeCodeEnum = e; + FimsConst.CrdnSeCd crdnSeCdEnum = null; + for (FimsConst.CrdnSeCd e : FimsConst.CrdnSeCd.values()) { + if (e.getCode().equals(dto.getCrdnSeCd())) { + crdnSeCdEnum = e; break; } } - mav.addObject("txtTitle", Objects.requireNonNull(regltSeCodeEnum, "초기자료 편집").getDesc()); + mav.addObject("txtTitle", Objects.requireNonNull(crdnSeCdEnum, "초기자료 편집").getDesc()); mav.setViewName(FimsConst.FIMS_JSP_BASE_PATH + "cmm/cmmFimsCrackdownEditPopup.popup"); return mav; diff --git a/src/main/java/kr/xit/fims/biz/ec/CctvCrackdownDTO.java b/src/main/java/kr/xit/fims/biz/ec/CctvCrackdownDTO.java index e01f115e..58edf4dd 100644 --- a/src/main/java/kr/xit/fims/biz/ec/CctvCrackdownDTO.java +++ b/src/main/java/kr/xit/fims/biz/ec/CctvCrackdownDTO.java @@ -115,7 +115,7 @@ public class CctvCrackdownDTO { /** * 단속구분코드 : 01-고정형CCTV, 02-주행형CCTV, 07-버스장착형CCTV, 09-시민신고(국민신문고) */ - private String regltSeCode; + private String crdnSeCd; /** * 입력구분코드 */ @@ -247,7 +247,7 @@ public class CctvCrackdownDTO { private String crdnId; private String erppId; - private String regltSeCode; + private String crdnSeCd; private String crdnInptSeCd; private String crdnRegSeCd; diff --git a/src/main/java/kr/xit/fims/biz/ec/CtznStmtDTO.java b/src/main/java/kr/xit/fims/biz/ec/CtznStmtDTO.java index 2a8a62ae..d7f18ed0 100644 --- a/src/main/java/kr/xit/fims/biz/ec/CtznStmtDTO.java +++ b/src/main/java/kr/xit/fims/biz/ec/CtznStmtDTO.java @@ -340,7 +340,7 @@ public class CtznStmtDTO { //extends ExtlEsbDataType { //private String pkPrefix = FimsConst.PkPrefix.CTZ.getCode(); private String jobSeCode = FimsConst.FileJobSeCode.NATL_NEWS_PAPER_RCV.getCode(); private String crdnInptSeCd = FimsConst.CrdnInptSeCd.CITIZEN.getCode(); - private String regltSeCode; + private String crdnSeCd; private String regltProcessSttusCode; 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 9129bcb9..562f4f1e 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 @@ -130,9 +130,9 @@ public class EcCctvCrackdownServiceBean extends AbstractServiceBean implements E extrDTO.setSggCd(getUserInfo().getPstinstCode()); if(records.size() >= 3){ - extrDTO.setRegltSeCode(FimsConst.RegltSeCode.CCTV_DRV.getCode()); + extrDTO.setCrdnSeCd(FimsConst.CrdnSeCd.CCTV_DRV.getCode()); }else{ - extrDTO.setRegltSeCode(FimsConst.RegltSeCode.CCTV_FIX.getCode()); + extrDTO.setCrdnSeCd(FimsConst.CrdnSeCd.CCTV_FIX.getCode()); } // 외부연계 데이타 생성 mapper.insertEcExtrlRegltCntc(extrDTO); @@ -140,7 +140,7 @@ public class EcCctvCrackdownServiceBean extends AbstractServiceBean implements E // CCTV image 저장 List cpListMf = new ArrayList<>(mfList); cpListMf.remove(0); - cmmFileService.saveFiles(getFileMst(extrDTO.getRegltSeCode(), extrDTO.getExtrlRegltCntcId()), cpListMf); + cmmFileService.saveFiles(getFileMst(extrDTO.getCrdnSeCd(), extrDTO.getExtrlRegltCntcId()), cpListMf); // 단속 데이타 생성 - 단속이미지가 처리후(단속이미지 갯수 count) CctvCrackdownDTO.Request reqDTO = getRequestDTO(extrDTO); @@ -201,14 +201,14 @@ public class EcCctvCrackdownServiceBean extends AbstractServiceBean implements E .regltEqpmnManageNo(busOnlyDTO.getRegltEquip()) .rgtr(getUserInfo().getUniqId()) .build(); - extrDTO.setRegltSeCode(FimsConst.RegltSeCode.BUS_ONLY.getCode()); + extrDTO.setCrdnSeCd(FimsConst.CrdnSeCd.BUS_ONLY.getCode()); extrDTO.setExtrlRegltCntcProcessSttus(FimsConst.CtznStmtDtlStsCode.ACCEPTANCE.getCode()); // 외부연계 데이타 생성 mapper.insertEcExtrlRegltCntc(extrDTO); // CCTV 이미지 저장 CmmFileDTO.FileMst fileMstDTO = CmmFileDTO.FileMst.builder() - .jobSeCode(FimsBizUtils.getFileJobSeCode(extrDTO.getRegltSeCode())) + .jobSeCode(FimsBizUtils.getFileJobSeCode(extrDTO.getCrdnSeCd())) .fileJobId(extrDTO.getExtrlRegltCntcId()) .uploadeJobPath(uploadBusCctvPath) .fileDirPath(FimsConst.FileDirDepth.DAY.getCode()) @@ -261,7 +261,7 @@ public class EcCctvCrackdownServiceBean extends AbstractServiceBean implements E @Override @Transactional public void saveRtReglt(final CctvCrackdownDTO.Request dto) { - dto.setJobSeCode(FimsBizUtils.getFileJobSeCode(dto.getRegltSeCode())); + dto.setJobSeCode(FimsBizUtils.getFileJobSeCode(dto.getCrdnSeCd())); dto.setRegltProcessSttusCode(FimsConst.RegltProcessSttusCode.CRACKDOWN_INIT.getCode()); dto.setRgtr(getUserInfo().getUniqId()); mapper.insertRtRegltFromEcExtrRegltCntc(dto); @@ -278,7 +278,7 @@ public class EcCctvCrackdownServiceBean extends AbstractServiceBean implements E @Transactional public void saveRtErpp(final CctvCrackdownDTO.Request dto) { // 단속테이블 - dto.setJobSeCode(FimsBizUtils.getFileJobSeCode(dto.getRegltSeCode())); + dto.setJobSeCode(FimsBizUtils.getFileJobSeCode(dto.getCrdnSeCd())); dto.setRegltProcessSttusCode(FimsConst.RegltProcessSttusCode.DISALLOW.getCode()); dto.setRgtr(getUserInfo().getUniqId()); mapper.insertRtRegltFromEcExtrRegltCntc(dto); @@ -335,9 +335,9 @@ public class EcCctvCrackdownServiceBean extends AbstractServiceBean implements E .builder() .extrlRegltCntcId(extrDTO.getExtrlRegltCntcId()) .crdnId(extrDTO.getCrdnId()) - .regltSeCode(extrDTO.getRegltSeCode()) + .crdnSeCd(extrDTO.getCrdnSeCd()) .crdnInptSeCd(extrDTO.getCrdnInptSeCd()) - .jobSeCode(FimsBizUtils.getFileJobSeCode(extrDTO.getRegltSeCode())) + .jobSeCode(FimsBizUtils.getFileJobSeCode(extrDTO.getCrdnSeCd())) .crdnRegSeCd(FimsConst.CrdnRegSeCd.AUTO_REGIST.getCode()) .regltProcessSttusCode(FimsConst.RegltProcessSttusCode.CRACKDOWN_INIT.getCode()) .regltPlace(extrDTO.getRegltPlace()) @@ -349,14 +349,14 @@ public class EcCctvCrackdownServiceBean extends AbstractServiceBean implements E .build(); } - private CmmFileDTO.FileMst getFileMst(final String regltSeCode, final String fileJobId) { + private CmmFileDTO.FileMst getFileMst(final String crdnSeCd, final String fileJobId) { return CmmFileDTO.FileMst.builder() .jobSeCode( - Objects.equals(regltSeCode, FimsConst.RegltSeCode.CCTV_DRV.getCode())? + Objects.equals(crdnSeCd, FimsConst.CrdnSeCd.CCTV_DRV.getCode())? FimsConst.FileJobSeCode.CCTV_DRV.getCode() : FimsConst.FileJobSeCode.CCTV_FIX.getCode()) .fileJobId(fileJobId) - .uploadeJobPath(Objects.equals(regltSeCode, FimsConst.RegltSeCode.CCTV_DRV.getCode())? + .uploadeJobPath(Objects.equals(crdnSeCd, FimsConst.CrdnSeCd.CCTV_DRV.getCode())? uploadCctvDrvPath : uploadCctvFixPath) .fileDirPath(FimsConst.FileDirDepth.DAY.getCode()) diff --git a/src/main/java/kr/xit/fims/biz/ec/service/bean/EcCtznSttemntServiceBean.java b/src/main/java/kr/xit/fims/biz/ec/service/bean/EcCtznSttemntServiceBean.java index bd4b4263..775b4976 100644 --- a/src/main/java/kr/xit/fims/biz/ec/service/bean/EcCtznSttemntServiceBean.java +++ b/src/main/java/kr/xit/fims/biz/ec/service/bean/EcCtznSttemntServiceBean.java @@ -102,7 +102,7 @@ public class EcCtznSttemntServiceBean extends AbstractServiceBean implements EcC @Transactional public void saveRtReglt(final CtznStmtDTO.Request dto) { // 단속테이블 - dto.setRegltSeCode(FimsConst.RegltSeCode.CITIZEN.getCode()); + dto.setCrdnSeCd(FimsConst.CrdnSeCd.CITIZEN.getCode()); dto.setRegltProcessSttusCode(FimsConst.RegltProcessSttusCode.CRACKDOWN_INIT.getCode()); dto.setRgtr(getUserInfo().getUniqId()); mapper.insertRtRegltFromCtznStmt(dto); @@ -124,7 +124,7 @@ public class EcCtznSttemntServiceBean extends AbstractServiceBean implements EcC @Transactional public void saveRtErpp(final CtznStmtDTO.Request dto) { // 단속테이블 - dto.setRegltSeCode(FimsConst.RegltSeCode.CITIZEN.getCode()); + dto.setCrdnSeCd(FimsConst.CrdnSeCd.CITIZEN.getCode()); dto.setRgtr(getUserInfo().getUniqId()); dto.setRegltProcessSttusCode(FimsConst.RegltProcessSttusCode.DISALLOW.getCode()); mapper.insertRtRegltFromCtznStmt(dto); diff --git a/src/main/java/kr/xit/fims/biz/ec/service/bean/EcNatlNewspaperServiceBean.java b/src/main/java/kr/xit/fims/biz/ec/service/bean/EcNatlNewspaperServiceBean.java index 83d62e4c..c7239434 100644 --- a/src/main/java/kr/xit/fims/biz/ec/service/bean/EcNatlNewspaperServiceBean.java +++ b/src/main/java/kr/xit/fims/biz/ec/service/bean/EcNatlNewspaperServiceBean.java @@ -144,7 +144,7 @@ public class EcNatlNewspaperServiceBean extends AbstractServiceBean implements E CtznStmtDTO.Request reqDTO = CtznStmtDTO.Request .builder() .crdnInptSeCd(FimsConst.CrdnInptSeCd.CITIZEN.getCode()) - .regltSeCode(FimsConst.RegltSeCode.CITIZEN.getCode()) + .crdnSeCd(FimsConst.CrdnSeCd.CITIZEN.getCode()) .jobSeCode(FimsConst.FileJobSeCode.NATL_NEWS_PAPER_RCV.getCode()) .interfaceSeqN(dtl.getInterfaceSeqN()) .ctznSttemntDetailSn(dtl.getCtznSttemntDetailSn()) diff --git a/src/main/java/kr/xit/fims/biz/ec/web/EcCctvCrackdownController.java b/src/main/java/kr/xit/fims/biz/ec/web/EcCctvCrackdownController.java index 38f257bb..ef9fc1e6 100644 --- a/src/main/java/kr/xit/fims/biz/ec/web/EcCctvCrackdownController.java +++ b/src/main/java/kr/xit/fims/biz/ec/web/EcCctvCrackdownController.java @@ -61,7 +61,7 @@ public class EcCctvCrackdownController extends AbstractController { mav.addObject("extrDTO", service.findExtrlRegltCntc(dto.getExtrlRegltCntcId())); mav.addObject("attchFiles", fileService.findFilesByJobSeCodeAndJobId( CmmFileDTO.FileMst.builder() - .jobSeCode(FimsBizUtils.getFileJobSeCode(dto.getRegltSeCode())) + .jobSeCode(FimsBizUtils.getFileJobSeCode(dto.getCrdnSeCd())) .fileJobId(dto.getExtrlRegltCntcId()) .build())); return mav; @@ -78,7 +78,7 @@ public class EcCctvCrackdownController extends AbstractController { mav.addObject("extrDTO", service.findExtrlRegltCntc(dto)); mav.addObject("attchFiles", fileService.findFilesByJobSeCodeAndJobId( CmmFileDTO.FileMst.builder() - .jobSeCode(FimsBizUtils.getFileJobSeCode(dto.getRegltSeCode())) + .jobSeCode(FimsBizUtils.getFileJobSeCode(dto.getCrdnSeCd())) .fileJobId(dto.getExtrlRegltCntcId()) .build())); return mav; @@ -156,11 +156,11 @@ public class EcCctvCrackdownController extends AbstractController { } @RequestMapping(name = "", value = "/findExtrlRegltCntcAttchFiles") - public ModelAndView findExtrlRegltCntcAttchFiles(final String extrlRegltCntcId, final String regltSeCode) { + public ModelAndView findExtrlRegltCntcAttchFiles(final String extrlRegltCntcId, final String crdnSeCd) { return ResultResponse.of( fileService.findFilesByJobSeCodeAndJobId( CmmFileDTO.FileMst.builder() - .jobSeCode(FimsBizUtils.getFileJobSeCode(regltSeCode)) + .jobSeCode(FimsBizUtils.getFileJobSeCode(crdnSeCd)) .fileJobId(extrlRegltCntcId) .build()).stream() .filter(dtl -> !Objects.equals("png", dtl.getFileExtsn())) @@ -169,11 +169,11 @@ public class EcCctvCrackdownController extends AbstractController { } @RequestMapping(name = "", value = "/sendEcExtrlCrackdownRespons") - public ModelAndView sendEcExtrlCrackdownRespons(final String extrlRegltCntcId, final String regltSeCode) { + public ModelAndView sendEcExtrlCrackdownRespons(final String extrlRegltCntcId, final String crdnSeCd) { return ResultResponse.of( fileService.findFilesByJobSeCodeAndJobId( CmmFileDTO.FileMst.builder() - .jobSeCode(FimsBizUtils.getFileJobSeCode(regltSeCode)) + .jobSeCode(FimsBizUtils.getFileJobSeCode(crdnSeCd)) .fileJobId(extrlRegltCntcId) .build()).stream() .filter(dtl -> !Objects.equals("png", dtl.getFileExtsn())) diff --git a/src/main/java/kr/xit/fims/biz/rt/RtDTO.java b/src/main/java/kr/xit/fims/biz/rt/RtDTO.java index 287aad38..ac6074d1 100644 --- a/src/main/java/kr/xit/fims/biz/rt/RtDTO.java +++ b/src/main/java/kr/xit/fims/biz/rt/RtDTO.java @@ -38,7 +38,7 @@ public class RtDTO { /** * 단속 구분 코드 */ - private String regltSeCode; + private String crdnSeCd; /** * 입력 구분 코드 */ @@ -628,7 +628,7 @@ public class RtDTO { /** * 단속구분코드 */ - private String regltSeCode; + private String crdnSeCd; /** * 파일업무구분코드 */ diff --git a/src/main/java/kr/xit/fims/biz/rt/service/bean/RtCrackdownMgtServiceBean.java b/src/main/java/kr/xit/fims/biz/rt/service/bean/RtCrackdownMgtServiceBean.java index 99723bf2..c9057ed1 100644 --- a/src/main/java/kr/xit/fims/biz/rt/service/bean/RtCrackdownMgtServiceBean.java +++ b/src/main/java/kr/xit/fims/biz/rt/service/bean/RtCrackdownMgtServiceBean.java @@ -77,7 +77,7 @@ public class RtCrackdownMgtServiceBean extends AbstractServiceBean implements Rt @Override public List findRtRegltAttchFiles(final RtDTO.Request dto) { - dto.setJobSeCode(FimsBizUtils.getFileJobSeCode(dto.getRegltSeCode())); + dto.setJobSeCode(FimsBizUtils.getFileJobSeCode(dto.getCrdnSeCd())); return mapper.selectRtRegltAttchFiles(dto); } } 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 7209b74e..50f3d29c 100644 --- a/src/main/java/kr/xit/fims/biz/utils/FimsBizUtils.java +++ b/src/main/java/kr/xit/fims/biz/utils/FimsBizUtils.java @@ -21,25 +21,25 @@ public class FimsBizUtils { } - public static String getFileJobSeCode(String regltSeCode) { + public static String getFileJobSeCode(String crdnSeCd) { // 01 - 고정형CCTV - if(Objects.equals(regltSeCode, "01"))//FimsConst.FileJobSeCode.CCTV_FIX)) + if(Objects.equals(crdnSeCd, "01"))//FimsConst.FileJobSeCode.CCTV_FIX)) return FimsConst.FileJobSeCode.CCTV_FIX.getCode(); // 02 - 주행형CCTV - if(Objects.equals(regltSeCode, "02"))//FimsConst.FileJobSeCode.CCTV_DRV)) + if(Objects.equals(crdnSeCd, "02"))//FimsConst.FileJobSeCode.CCTV_DRV)) return FimsConst.FileJobSeCode.CCTV_DRV.getCode(); // 03 - 버스장착형CCTV - if(Objects.equals(regltSeCode, "07"))//FimsConst.FileJobSeCode.BUS_ONLY)) + if(Objects.equals(crdnSeCd, "07"))//FimsConst.FileJobSeCode.BUS_ONLY)) return FimsConst.FileJobSeCode.BUS_ONLY.getCode(); - if(Objects.equals(regltSeCode, "09"))//FimsConst.FileJobSeCode.BUS_ONLY)) + if(Objects.equals(crdnSeCd, "09"))//FimsConst.FileJobSeCode.BUS_ONLY)) return FimsConst.FileJobSeCode.NATL_NEWS_PAPER_RCV.getCode(); throw BizRuntimeException.create(MessageKey.CUSTOM_MSG, "데이타 오류[파일정보를 확인해 주세요"); } - public static String getSendNtriPhotoInterfaceFileName(String regltSeCode) { - switch (regltSeCode){ + public static String getSendNtriPhotoInterfaceFileName(String crdnSeCd) { + switch (crdnSeCd){ // 고정형CCTV case "01": // 이동형CCTV diff --git a/src/main/resources/sql/mapper/biz/cmm/cmm-fims-crackdown-mysql-mapper.xml b/src/main/resources/sql/mapper/biz/cmm/cmm-fims-crackdown-mysql-mapper.xml index c397af10..131ee276 100644 --- a/src/main/resources/sql/mapper/biz/cmm/cmm-fims-crackdown-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/biz/cmm/cmm-fims-crackdown-mysql-mapper.xml @@ -10,7 +10,7 @@ , trr.rtpyr_id -- 납부자ID , trr.sgg_cd -- 기관코드 , trr.sys_se_cd -- 시스템코드 - , trr.reglt_se_code -- 단속구분코드 + , trr.crdn_se_cd -- 단속구분코드 , trr.crdn_inpt_se_cd -- 입력구분코드 , trr.crdn_ymd , trr.reglt_begin_time -- 단속시작시간 @@ -62,7 +62,7 @@ , trp.adres , trp.detail_adres , trp.stdg_cd -- 법정동 코드 - , IF(trr.reglt_se_code = '09', tecsd.violt_dtls_nm, teerc.violt_dtls_nm) AS violtDtlsNm -- 위반내용 + , IF(trr.crdn_se_cd = '09', tecsd.violt_dtls_nm, teerc.violt_dtls_nm) AS violtDtlsNm -- 위반내용 , (SELECT COUNT(crdn_id) FROM tb_rt_reglt tgt WHERE tgt.vhrno = trr.vhrno @@ -126,14 +126,14 @@ AND trr.sys_se_cd = #{sysSeCd} - - AND trr.reglt_se_code = #{regltSeCode} + + AND trr.crdn_se_cd = #{crdnSeCd} AND trr.crdn_reg_se_cd = #{crdnRegSeCd} - ORDER BY trr.sys_se_cd, trr.reglt_se_code + ORDER BY trr.sys_se_cd, trr.crdn_se_cd , teerc.extrl_reglt_cntc_id , tecsd.interface_seq_n, tecsd.ctzn_sttemnt_detail_sn , trr.crdn_ymd, trr.vhrno, trr.reglt_begin_time @@ -189,7 +189,7 @@ /* cmm-fims-crackdown-mysql-mapper|updateRtReglt-단속 정보 초기 자료 반영|julim */ UPDATE tb_rt_reglt - SET reglt_se_code = IF(reglt_se_code = #{regltSeCode}, reglt_se_code, #{regltSeCode}) + SET crdn_se_cd = IF(crdn_se_cd = #{crdnSeCd}, crdn_se_cd, #{crdnSeCd}) , crdn_reg_se_cd = IF(crdn_reg_se_cd = #{crdnRegSeCd}, crdn_reg_se_cd, #{crdnRegSeCd}) , sys_se_cd = IF(sys_se_cd = #{sysSeCd}, sys_se_cd, #{sysSeCd}) , crdn_ymd = IF(crdn_ymd = REPLACE(#{crdnYmd}, '-', ''), crdn_ymd, REPLACE(#{crdnYmd}, '-', '')) @@ -458,7 +458,7 @@ /* cmm-fims-crackdown-mysql-mapper|selectCrackdownPhotoLayout-주정차/전용차로 단속사진전송 정보 레이아웃 조회|julim */ SELECT CONCAT(trr.crdn_ymd, trr.reglt_begin_time) AS crdnYmdTime -- 단속일시 , trr.vhrno -- 차량번호 - , trr.reglt_se_code -- 단속구분코드 + , trr.crdn_se_cd -- 단속구분코드 , teerc.reglt_eqpmn_manage_no -- 단속장비관리번호 , trr.violt_dtls_code -- 위반내역코드 , trr.violt_dtls_etc_cn -- 위반내역기타내용 diff --git a/src/main/resources/sql/mapper/biz/ec/ec-ctzn-sttemnt-mysql-mapper.xml b/src/main/resources/sql/mapper/biz/ec/ec-ctzn-sttemnt-mysql-mapper.xml index dfc3eae8..d0ce15f8 100644 --- a/src/main/resources/sql/mapper/biz/ec/ec-ctzn-sttemnt-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/biz/ec/ec-ctzn-sttemnt-mysql-mapper.xml @@ -209,7 +209,7 @@ crdn_id , sgg_cd , sys_se_cd - , reglt_se_code + , crdn_se_cd , crdn_inpt_se_cd , crdn_ymd , reglt_begin_time @@ -235,7 +235,7 @@ ) SELECT ecsd.crdn_id , ecsd.sgg_cd , ecsd.sys_se_cd - , #{regltSeCode} + , #{crdnSeCd} , #{crdnInptSeCd} -- 입력 구분 코드 , SUBSTR(ecsd.crdn_ymd_time, 1, 8) , SUBSTR(ecsd.crdn_ymd_time, 9) -- 단속 시작 시간 diff --git a/src/main/resources/sql/mapper/biz/ec/ec-extrl-reglt-cntc-mysql-mapper.xml b/src/main/resources/sql/mapper/biz/ec/ec-extrl-reglt-cntc-mysql-mapper.xml index e07f9a57..ff3e6701 100644 --- a/src/main/resources/sql/mapper/biz/ec/ec-extrl-reglt-cntc-mysql-mapper.xml +++ b/src/main/resources/sql/mapper/biz/ec/ec-extrl-reglt-cntc-mysql-mapper.xml @@ -11,7 +11,7 @@ , crdn_id , sgg_cd , sys_se_cd - , reglt_se_code + , crdn_se_cd , crdn_inpt_se_cd , vhrno , crdn_ymd @@ -49,8 +49,8 @@ AND sys_se_cd = #{sysSeCd} - - AND reglt_se_code = #{regltSeCode} + + AND crdn_se_cd = #{crdnSeCd} @@ -61,7 +61,7 @@ - ORDER BY sys_se_cd, reglt_se_code, crdn_ymd, crdn_id desc + ORDER BY sys_se_cd, crdn_se_cd, crdn_ymd, crdn_id desc -<%----%> +<%----%>