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 467ba49a..baf84f50 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 @@ -1,5 +1,6 @@ package kr.xit.fims.biz.cmm.web; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -9,21 +10,15 @@ import kr.xit.fims.biz.FimsConst; import kr.xit.fims.biz.cmm.fimsTotalPopup.model.FimsTotalPopupVO; import kr.xit.fims.biz.cmm.model.FimsCrackdownDTO; import kr.xit.fims.biz.cmm.service.IFimsCrackdownMgtService; +import kr.xit.fims.biz.utils.FimsBizUtils; import kr.xit.framework.core.constants.FrameworkConstants; +import kr.xit.framework.core.model.ResultResponse; import kr.xit.framework.support.util.AjaxMessageMapRenderer; import kr.xit.framework.support.util.constants.MessageKey; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; /** - * - * - * - * @author 최정민 * */ @Slf4j @@ -31,17 +26,15 @@ import lombok.extern.slf4j.Slf4j; @Controller @RequestMapping("/fims/biz/cmm") public class FimsCrackDownMgtController { + @Value("#{prop['file.rcv.root']}") + private String fileRcvRoot; + @Value("#{prop['file.rcv.busonly-cctv.path']}") + private String rcvBusonlyCctvPath; + @Value("#{prop['file.rcv.natl-newspaper.path']}") + private String rcvNatlNewspaperPath; private final IFimsCrackdownMgtService service; - - /** - * 
메소드 설명: 단건 자료 상세 조회
- * @param vo - * @return String 요청처리 후 응답객체 - * @author: 최정민 - * @date: 2022. 9. 20. - */ @RequestMapping(value = "/cmmFimsCrackdownMgtPopup") public ModelAndView cmmFimsCrackdownMgtPopup(final FimsCrackdownDTO.Request dto){ @@ -53,6 +46,21 @@ public class FimsCrackDownMgtController { return mav; } + @RequestMapping(value = "/cmmCrackdownRcvFilePopup") + public ModelAndView cmmCrackdownRcvFilePopup(){ + ModelAndView mav = new ModelAndView(FimsConst.FIMS_JSP_BASE_PATH +"cmm/cmmCrackdownRcvFilePopup.popup"); + mav.addObject("busOnlyDirPath", fileRcvRoot + rcvBusonlyCctvPath); + mav.addObject("ctznDirPath", fileRcvRoot + rcvNatlNewspaperPath); + return mav; + } + + + + @RequestMapping(value = "/findRcvPathFiles") + public ModelAndView findRcvPathFiles(final String dirPath){ + return ResultResponse.of(FimsBizUtils.getRcvPathFiles(dirPath)); + } + @PostMapping(value="/add") public ModelAndView add(FimsTotalPopupVO vo){ diff --git a/src/main/java/kr/xit/fims/biz/ec/service/EcCctvCrackdownService.java b/src/main/java/kr/xit/fims/biz/ec/service/EcCctvCrackdownService.java index 12dc73d8..c0541147 100644 --- a/src/main/java/kr/xit/fims/biz/ec/service/EcCctvCrackdownService.java +++ b/src/main/java/kr/xit/fims/biz/ec/service/EcCctvCrackdownService.java @@ -99,6 +99,7 @@ public class EcCctvCrackdownService implements IEcCctvCrackdownService { //Arrays.copyOfRange(sortedFileList.toArray(), 0, 4); + // 5개씩 잘라 배열 생성 List> listByMd = ListUtils.partition(sortedFileList, 5); for(int idx = 0; idx < listByMd.size(); idx++){ @@ -133,15 +134,7 @@ public class EcCctvCrackdownService implements IEcCctvCrackdownService { // 단속 데이타 생성 mapper.insertRtRegltFromEcExtrRegltCntc( - CctvCrackdownDTO.Request.builder() - .extrlRegltCntcId(extrDTO.getExtrlRegltCntcId()) - .regltId(extrDTO.getRegltId()) - .regltSeCode(extrDTO.getRegltSeCode()) - .inputSeCode(extrDTO.getInputSeCode()) - .jobSeCode(FimsBizUtils.getFileJobSeCode(extrDTO.getRegltSeCode())) - .regltProcessSttusCode(FimsConst.RegltProcessSttusCode.CRACKDOWN.getCode()) - .register(getUserInfo().getUniqId()) - .build() + getRequestDTO(extrDTO) ); // CCTV image 저장 @@ -202,15 +195,7 @@ public class EcCctvCrackdownService implements IEcCctvCrackdownService { // 단속 데이타 생성 mapper.insertRtRegltFromEcExtrRegltCntc( - CctvCrackdownDTO.Request.builder() - .extrlRegltCntcId(extrDTO.getExtrlRegltCntcId()) - .regltId(extrDTO.getRegltId()) - .regltSeCode(extrDTO.getRegltSeCode()) - .inputSeCode(extrDTO.getInputSeCode()) - .jobSeCode(FimsBizUtils.getFileJobSeCode(extrDTO.getRegltSeCode())) - .regltProcessSttusCode(FimsConst.RegltProcessSttusCode.CRACKDOWN.getCode()) - .register(getUserInfo().getUniqId()) - .build() + getRequestDTO(extrDTO) ); // CCTV 이미지 저장 @@ -320,6 +305,23 @@ public class EcCctvCrackdownService implements IEcCctvCrackdownService { .build(); } + + + //--------------------------------------------------------------------------- + // private method + //--------------------------------------------------------------------------- + private CctvCrackdownDTO.Request getRequestDTO(CctvCrackdownDTO.ExtrlRegltCntc extrDTO) { + return CctvCrackdownDTO.Request.builder() + .extrlRegltCntcId(extrDTO.getExtrlRegltCntcId()) + .regltId(extrDTO.getRegltId()) + .regltSeCode(extrDTO.getRegltSeCode()) + .inputSeCode(extrDTO.getInputSeCode()) + .jobSeCode(FimsBizUtils.getFileJobSeCode(extrDTO.getRegltSeCode())) + .regltProcessSttusCode(FimsConst.RegltProcessSttusCode.CRACKDOWN.getCode()) + .register(getUserInfo().getUniqId()) + .build(); + } + private CmmFileDTO.FileMst getFileMst(final String regltSeCode, final String fileJobId) { return CmmFileDTO.FileMst.builder() .jobSeCode( diff --git a/src/main/java/kr/xit/fims/biz/ec/service/EcNatlNewspaperService.java b/src/main/java/kr/xit/fims/biz/ec/service/EcNatlNewspaperService.java index 901f03ac..b65283b7 100644 --- a/src/main/java/kr/xit/fims/biz/ec/service/EcNatlNewspaperService.java +++ b/src/main/java/kr/xit/fims/biz/ec/service/EcNatlNewspaperService.java @@ -115,17 +115,38 @@ public class EcNatlNewspaperService implements IEcNatlNewspaperService { mapper.insertEcEsbInterface(xmlDto); //------------------------------------------------------------- - //시민 신고 테이블 save + //시민 신고 마스터 데이타 생성 //------------------------------------------------------------- CtznStmtDTO ctznStmtDTO = setCtznSttemntDTOFromRcvXml(xmlDto); ctznSttemntMapper.insertEcCtznSttemnt(ctznStmtDTO); + //------------------------------------------------------------- + //시민 신고 상세 / 단속 데이타 / 단속사진 데이타 / 단속사진 파일 생성 + //------------------------------------------------------------- index.set(0); CmmFileDTO.FileMst fstMstDTO = null; CmmFileDTO.FileDtl pngDtlDTO = null; for(CtznStmtDTO.CtznStmtDtl dtl : ctznStmtDTO.getStmtDtlDTOs()){ + // 시민 신고 상세 데이타 생성 + dtl.setCtznSttemntDetailProcessSttus(FimsConst.CtznStmtDtlStsCode.ACCEPTANCE.getCode()); ctznSttemntMapper.insertEcCtznSttemntDetail(dtl); + + // 단속 데이타 생성 + ctznSttemntMapper.insertRtRegltFromCtznStmt( + CtznStmtDTO.Request.builder() + //.inputSeCode(FimsConst.InputSeCode.CITIZEN.getCode()) + //.regltSeCode(FimsConst.RegltSeCode.CITIZEN.getCode()) + //.jobSeCode(FimsConst.FileJobSeCode.NATL_NEWS_PAPER_RCV.getCode()) + .interfaceSeqN(dtl.getInterfaceSeqN()) + .ctznSttemntDetailSn(dtl.getCtznSttemntDetailSn()) + .regltId(dtl.getRegltId()) + .regltProcessSttusCode(FimsConst.RegltProcessSttusCode.CRACKDOWN.getCode()) + .register(getUserInfo().getUniqId()) + .build() + ); + + // 신고사진 데이타 생성 // 단속건수가 1건인 경우 파일 전체 저장 if(ctznStmtDTO.isSingle()) { saveAllAppendFiles(xmlDto, appendFileDto, dtl, fileCnt); 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 12bc83c8..9ab0dcd1 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 @@ -22,8 +22,6 @@ import kr.xit.framework.biz.cmm.model.CmmFileDTO; import kr.xit.framework.biz.cmm.service.ICmmFileService; import kr.xit.framework.core.constants.FrameworkConstants; import kr.xit.framework.core.model.ResultResponse; -import kr.xit.framework.core.utils.fileExplorer.XitFileExplorerUtil; -import kr.xit.framework.core.utils.fileExplorer.function.DirectorySearch; import kr.xit.framework.support.mybatis.MybatisUtils; import kr.xit.framework.support.util.AjaxMessageMapRenderer; import kr.xit.framework.support.util.constants.MessageKey; @@ -40,6 +38,8 @@ public class EcCctvCrackdownController { @Value("#{prop['file.rcv.busonly-cctv.path']}") private String rcvBusonlyCctvPath; + @Value("#{prop['file.rcv.natl-newspaper.path']}") + private String rcvNatlNewspaperPath; private final IEcCctvCrackdownService service; private final ICmmFileService fileService; @@ -52,7 +52,8 @@ public class EcCctvCrackdownController { @RequestMapping(value = "/ecCctvCrackdownFileSelPopup") public ModelAndView ecCctvCrackdownFileSelPopup(){ ModelAndView mav = new ModelAndView(FimsConst.FIMS_JSP_BASE_PATH +"ec/ecCctvCrackdownFileSelPopup.popup"); - mav.addObject("dirPath", fileRcvRoot + rcvBusonlyCctvPath); + mav.addObject("busOnlyDirPath", fileRcvRoot + rcvBusonlyCctvPath); + mav.addObject("ctznDirPath", fileRcvRoot + rcvNatlNewspaperPath); return mav; } @@ -146,15 +147,15 @@ public class EcCctvCrackdownController { return mav; } + /** + * @see kr.xit.fims.biz.cmm.web.FimsCrackDownMgtController#findRcvPathFiles(String) + * @param dirPath + * @return + */ + @Deprecated @RequestMapping(value = "/findBusCctvCrackdownFiles") public ModelAndView findBusCctvCrackdownFiles(final String dirPath){ - - XitFileExplorerUtil explorer = new XitFileExplorerUtil(new DirectorySearch(dirPath)); - return ResultResponse.of( - explorer.getList().stream() - .filter(m->"Y".equals(m.get("isFile"))) - .collect(Collectors.toList()) - ); + return ResultResponse.of(FimsBizUtils.getRcvPathFiles(dirPath)); } @RequestMapping("/findExtrlRegltCntcAttchFiles") diff --git a/src/main/java/kr/xit/fims/biz/ec/web/EcNatlNewspaperController.java b/src/main/java/kr/xit/fims/biz/ec/web/EcNatlNewspaperController.java index 3dadb700..5e04e0ad 100644 --- a/src/main/java/kr/xit/fims/biz/ec/web/EcNatlNewspaperController.java +++ b/src/main/java/kr/xit/fims/biz/ec/web/EcNatlNewspaperController.java @@ -16,12 +16,11 @@ import org.springframework.web.servlet.ModelAndView; import kr.xit.fims.biz.FimsConst; import kr.xit.fims.biz.ec.model.FolderReqDTO; import kr.xit.fims.biz.ec.service.IEcNatlNewspaperService; +import kr.xit.fims.biz.utils.FimsBizUtils; import kr.xit.framework.biz.cmm.model.CmmFileDTO; import kr.xit.framework.biz.cmm.service.ICmmFileService; import kr.xit.framework.core.constants.FrameworkConstants; import kr.xit.framework.core.model.ResultResponse; -import kr.xit.framework.core.utils.fileExplorer.XitFileExplorerUtil; -import kr.xit.framework.core.utils.fileExplorer.function.DirectorySearch; import kr.xit.framework.support.mybatis.MybatisUtils; import kr.xit.framework.support.util.AjaxMessageMapRenderer; import kr.xit.framework.support.util.constants.MessageKey; @@ -67,15 +66,15 @@ public class EcNatlNewspaperController { return mav; } + /** + * @see kr.xit.fims.biz.cmm.web.FimsCrackDownMgtController#findRcvPathFiles(String) + * @param dirPath + * @return + */ + @Deprecated @RequestMapping(value = "/findNatlNewspaperFiles") public ModelAndView findDirFiles(final String dirPath){ - - XitFileExplorerUtil explorer = new XitFileExplorerUtil(new DirectorySearch(dirPath)); - return ResultResponse.of( - explorer.getList().stream() - .filter(m->"Y".equals(m.get("isFile")) && "xml".equals(m.get("fileType"))) - .collect(Collectors.toList()) - ); + return ResultResponse.of(FimsBizUtils.getRcvPathFiles(dirPath)); } @PostMapping(value = "/saveNatlNewspaers") diff --git a/src/main/java/kr/xit/fims/biz/rt/web/RtCrackdownMgtController.java b/src/main/java/kr/xit/fims/biz/rt/web/RtCrackdownMgtController.java index 6e4777fc..983ac0b3 100644 --- a/src/main/java/kr/xit/fims/biz/rt/web/RtCrackdownMgtController.java +++ b/src/main/java/kr/xit/fims/biz/rt/web/RtCrackdownMgtController.java @@ -47,8 +47,8 @@ public class RtCrackdownMgtController { public void rtRegltMgtForm(){ } - @RequestMapping(value = "/rtRegltMgtMainForm") - public void rtRegltMgtMainForm(final RtDTO.Request dto){ + @RequestMapping(value = "/rtCrackdownMgtMainForm") + public void rtCrackdownMgtMainForm(final RtDTO.Request dto){ // ModelAndView mav = new ModelAndView(); // if(Checks.isNotEmpty(dto) && Checks.isNotEmpty(dto.getRegltId())){ 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 a8a8f0c6..5e184a6d 100644 --- a/src/main/java/kr/xit/fims/biz/utils/FimsBizUtils.java +++ b/src/main/java/kr/xit/fims/biz/utils/FimsBizUtils.java @@ -1,13 +1,26 @@ package kr.xit.fims.biz.utils; +import java.util.List; +import java.util.Map; import java.util.Objects; +import java.util.stream.Collectors; import kr.xit.fims.biz.FimsConst; +import kr.xit.framework.core.utils.fileExplorer.XitFileExplorerUtil; +import kr.xit.framework.core.utils.fileExplorer.function.DirectorySearch; import kr.xit.framework.support.exception.BizRuntimeException; import kr.xit.framework.support.util.constants.MessageKey; public class FimsBizUtils { + public static List> getRcvPathFiles(String dirPath) { + XitFileExplorerUtil explorer = new XitFileExplorerUtil(new DirectorySearch(dirPath)); + return explorer.getList().stream() + .filter(m -> "Y".equals(m.get("isFile"))) + .collect(Collectors.toList()); + + } + public static String getFileJobSeCode(String regltSeCode) { // 01 - 고정형CCTV if(Objects.equals(regltSeCode, "01"))//FimsConst.FileJobSeCode.CCTV_FIX)) diff --git a/src/main/resources/sqlmapper/biz/ec/ec-ctzn-sttemnt-mysql-mapper.xml b/src/main/resources/sqlmapper/biz/ec/ec-ctzn-sttemnt-mysql-mapper.xml index 245f6cdd..c358dec4 100644 --- a/src/main/resources/sqlmapper/biz/ec/ec-ctzn-sttemnt-mysql-mapper.xml +++ b/src/main/resources/sqlmapper/biz/ec/ec-ctzn-sttemnt-mysql-mapper.xml @@ -142,8 +142,9 @@ /* ec-ctzn-sttemnt-mysql-mapper|insertEcCtznSttemntDetail-시민신고 상세 등록|julim */ - - SELECT LPAD(IFNULL(MAX(CAST(csd.ctzn_sttemnt_detail_sn AS UNSIGNED)) + 1, 1), 2, '0') + + SELECT LPAD(IFNULL(MAX(CAST(csd.ctzn_sttemnt_detail_sn AS UNSIGNED)) + 1, 1), 2, '0') AS ctznSttemntDetailSn + , LPAD(NEXTVAL(seq_rt_reglt), 16, '0') AS regltId FROM tb_ec_ctzn_sttemnt_detail csd WHERE interface_seq_n = #{interfaceSeqN} @@ -204,9 +205,6 @@ /* ec-ctzn-sttemnt-mysql-mapper|insertRtRegltFromCtznStmt-시민신고 단속 생성|julim */ - - SELECT LPAD(NEXTVAL(seq_rt_reglt), 16, '0') - INSERT INTO tb_rt_reglt ( reglt_id , instt_code @@ -232,7 +230,7 @@ , reglt_process_sttus_code , regist_dt , register - ) SELECT #{regltId} + ) SELECT ecsd.reglt_id , ecsd.instt_code , ecsd.sys_code , #{regltSeCode} diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmCrackdownRcvFilePopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmCrackdownRcvFilePopup.jsp new file mode 100644 index 00000000..67800421 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmCrackdownRcvFilePopup.jsp @@ -0,0 +1,330 @@ +<%-- +================================================================================ +File : /fims/biz/cmm/cmmCrackdownRcvFilePopup.jsp +Name : 외부연계파일 처리 - 단속관리>단속현황관리>외부자료연계탭>연계파일처리 +Auth : lim.jong.uk +Date : 2022-01-20 +Desc : 외부연계파일 처리 +================================================================================ +Date Author Description +================================================================================ +================================================================================ +--%> +<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ include file="/WEB-INF/jsp/framework/taglibs.jsp" %> + +
+
+

CCTV 단속 자료 선택

+
+
+ + + + + + + + + + + + + + + + + +
검색조건
+ + + + + + 동일한 데이타 선택시 중복 처리될수 있습니다. +
+
+
+
+ +
전체 ㅣ 0
+ +
+
+
+ + 파일 처리 + 닫기 + +
+ +
+
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownMgtPopup.jsp new file mode 100644 index 00000000..8f976d77 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/cmm/cmmFimsCrackdownMgtPopup.jsp @@ -0,0 +1,667 @@ +<%-- +================================================================================ +File : /fims/biz/cmm/cmmCrackdownMgtPopup.jsp +Name : 단속 처리 메인 팝업 - 단속관리>단속현황관리 +Auth : lim.jong.uk +Date : 2022-01-20 +Desc : 단속자료 처리를 위한 메인 팝업 +================================================================================ +Date Author Description +================================================================================ +================================================================================ +--%> +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ include file="/WEB-INF/jsp/framework/taglibs.jsp"%> + + + +<%--2022.10.05 박소영 웹폰트 링크 추가--%> + + +
+ "> + +
+ +

개별총정보

+
+ +
+
+ + +
+
+

위반정보

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
등록구분"> + 자료출처
단속일 + + + 차량번호
단속구분 + + 위반내역 + +
단속장소
등록일시 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
위반횟수 + + 시군구 + + 법정동 + +
사전통지금액 + + 부과금액 + +
감액금액 + + 총수납액 + + 잔액 + +
특이사항 + +
처리상태 + +
+ <%--

소유주 정보

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
소유주aaa등록구분
주민번호aaaa우편번호
주소
상세주소
차대번호도로코드
--%> +
+
+
    > +
  • + <%@include file="/WEB-INF/jsp/framework/biz-popup-btn.jsp" %> +
    • +
+
+
+
+
+

진술내역

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
등록구분진술일
성명 + 주민등록번호
주소
번지
우편번호연락처
차주와의 관계이메일 주소
회신방법
진술요지
진술 내용
+
+
+

판정

+ + + + + + + + + + + + + + + + + + + + + + + +
처리일시
처리결과 +
담당자 의견
+
+
+
+
+ <%--
+
+

처리상태 변동이력

+
+ <%–삭제조심–%> +
+
--%> +
+

감경처리

+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
처리일 +
감경사유 +
감경금액
처리자 +
특이사항
+
+
+

서손처리

+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
처리일 +
감경사유 +
감경금액
처리자 +
특이사항
+
+
+ <%--box_01--%> +
+

처리상태 변동이력

+
+
+
+
+
+

주소 변동이력

+
+
+
+
+
+

발송 이력

+
+
+
+
+ +
+
    +
  • + <%@include file="/WEB-INF/jsp/framework/biz-popup-btn.jsp" %> +
    • +
+
+ +
+
+
+
+

민원내역

+
+
+
+
+
+

민원내용

+
+ <%--
--%> +
+
+
<%--box--%> +
+
    +
  • + <%@include file="/WEB-INF/jsp/framework/biz-popup-btn.jsp" %> +
    • +
+
+
+
+
+ +
+ diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownFileSelPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownFileSelPopup.jsp index 95b8c889..670388a4 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownFileSelPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownFileSelPopup.jsp @@ -146,7 +146,8 @@ } ,onComboChange: () => { $('#totCnt span').text(0); - if($('#regltSeCode').val() === '07'){ + + if($('#regltSeCode').val() === '07') { $('#folder') .css('display', 'none') .attr('disabled', true); @@ -269,7 +270,7 @@ api: { readData: { <%--url: '' --%> - url: fimsApiUrl.FIND_BUS_ONLY_EC_EXTRL_REGLT_CNTC_ATTCH_FILES + url: fimsApiUrl.FIND_RCV_PATH_FILES ,serializer: (params) => getPageParam({dirPath: $('#dirPath').val()}, params) } } diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperFileSelPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperFileSelPopup.jsp index 13cef925..1d418e72 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperFileSelPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperFileSelPopup.jsp @@ -182,7 +182,7 @@ api: { readData: { <%--url: '' --%> - url: fimsApiUrl.FIND_EC_NATL_NEWS_PAPER_ATTCH_FILES + url: fimsApiUrl.FIND_RCV_PATH_FILES ,serializer: (params) => getPageParam({dirPath: $('#dirPath').val()}, params) } } diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtExtrInterfaceMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownExtrInterfaceMgtForm.jsp similarity index 91% rename from src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtExtrInterfaceMgtForm.jsp rename to src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownExtrInterfaceMgtForm.jsp index 9f7870f5..928127c1 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtExtrInterfaceMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownExtrInterfaceMgtForm.jsp @@ -1,3 +1,15 @@ +<%-- +================================================================================ +File : /fims/biz/rt/rtCrackdownExtrInterfaceMgtForm.jsp +Name : 외부자료연계 - 단속관리>단속현황관리 +Auth : lim.jong.uk +Date : 2022-01-26 +Desc : 단속현황관리 외부자료 연계탭 +================================================================================ +Date Author Description +================================================================================ +================================================================================ +--%> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@ include file="/WEB-INF/jsp/framework/taglibs.jsp" %> @@ -76,7 +88,7 @@ popTitle = "개별총정보"; break; case "file": - url = fimsApiUrl.POPUP_CCTV_EC_EXTRL_REGLT_CNTC_DATA_SEL; + url = fimsApiUrl.POPUP_RT_EXTR_INTERFACE_FILE_SEL; popOption = {width: 900, height:750}; popTitle = "외부연계 데이타 선택"; break; diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtRegltMgtMainForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownMgtMainForm.jsp similarity index 77% rename from src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtRegltMgtMainForm.jsp rename to src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownMgtMainForm.jsp index aae17ba3..168cb8ef 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtRegltMgtMainForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/rt/rtCrackdownMgtMainForm.jsp @@ -1,3 +1,15 @@ +<%-- +================================================================================ +File : /fims/biz/rt/rtRegltMgtForm.jsp +Name : 단속현황관리 - 단속관리>단속현황관리 +Auth : lim.jong.uk +Date : 2022-01-20 +Desc : 단속현황관리 메인 +================================================================================ +Date Author Description +================================================================================ +================================================================================ +--%> <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ include file="/WEB-INF/jsp/framework/taglibs.jsp"%> @@ -13,8 +25,8 @@
- <%@include file="/WEB-INF/jsp/fims/biz/rt/rtExtrInterfaceMgtForm.jsp" %> -<%-- --%> + <%@include file="/WEB-INF/jsp/fims/biz/rt/rtCrackdownExtrInterfaceMgtForm.jsp" %> +<%-- --%>
diff --git a/src/main/webapp/resources/biz/common/js/fimsApiURL.js b/src/main/webapp/resources/biz/common/js/fimsApiURL.js index e34a7c42..5cc17e46 100644 --- a/src/main/webapp/resources/biz/common/js/fimsApiURL.js +++ b/src/main/webapp/resources/biz/common/js/fimsApiURL.js @@ -3,14 +3,14 @@ const fimsApiUrl = { /** * fims 공통 API URL */ - - - + FIND_RCV_PATH_FILES: '/fims/biz/cmm/findRcvPathFiles.do' //연계파일 경로 파일 목록 조회 + ,POPUP_RT_REGLT_TOTAL: '/fims/biz/cmm/cmmFimsCrackdownMgtPopup.do' //단속정보 상세 팝업 + ,POPUP_RT_EXTR_INTERFACE_FILE_SEL: '/fims/biz/cmm/cmmCrackdownRcvFilePopup.do' //CCTV 외부연계 데이타 선택 /** * fims API URL */ //외부연계처리 - 시민신고(국민신문고) 데이타 관리 - POPUP_EC_NATL_NEWS_PAPER_DATA_SEL: '/fims/biz/ec/ecNatlNewspaperFileSelPopup.do' //국민신문고 데이타 선택 + ,POPUP_EC_NATL_NEWS_PAPER_DATA_SEL: '/fims/biz/ec/ecNatlNewspaperFileSelPopup.do' //국민신문고 데이타 선택 ,POPUP_EC_NATL_NEWS_PAPER_INFO: '/fims/biz/ec/ecNatlNewspaperPopup.do' //국민신문고 데이타 상세 ,SAVE_EC_NATL_NEWS_PAPER: '/fims/biz/ec/saveNatlNewspaers.do' //국민신문고 데이타 등록 ,FIND_EC_NATL_NEWS_PAPERS: '/fims/biz/ec/findNatlNewspaers.do' //국민신문고 목록 조회 @@ -45,7 +45,7 @@ const fimsApiUrl = { //단속관리 - 단속현황관리 ,POPUP_RT_REGLT_MAIN: '/fims/biz/rt/rtRegltMgtMainPopup.do' //단속 관리 메인 팝업 ,POPUP_RT_REGLT_INFO: '/fims/biz/rt/rtRegltMgtPopup.do' //단속정보 상세 팝업 - ,POPUP_RT_REGLT_TOTAL: '/fims/biz/cmm/cmmFimsCrackdownMgtPopup.do' //단속정보 상세 팝업 + ,FIND_RT_REGLTS: '/fims/biz/rt/findRtReglts.do' //단속 목록 조회 ,FIND_RT_REGLT_INFO_AND_ATTCH_FILES: '/fims/biz/rt/findRtRegltAndAttchFiles.do' //단속 정보 및 첨부파일 목록 조회 ,ADD_RT_REGLT: '/fims/biz/rt/addRtReglt.do' //단속 데이타 저장