From 3a16f2e686eec9e6b09bd1b96754f4121414d022 Mon Sep 17 00:00:00 2001 From: minuk926 Date: Tue, 10 Jan 2023 20:33:58 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20fims=20API=20URL=20=EB=B3=84=EB=8F=84?= =?UTF-8?q?=EC=9D=98=20js=ED=8C=8C=EC=9D=BC=EB=A1=9C=20=EB=B6=84=EB=A6=AC(?= =?UTF-8?q?fimsApiUrl,=20frwkApiUrl)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/ec/web/EcCctvCrackdownController.java | 4 +- .../biz/ec/ecCctvCrackdownFileSelPopup.jsp | 10 +++-- .../fims/biz/ec/ecCctvCrackdownMgtForm.jsp | 9 ++-- .../jsp/fims/biz/ec/ecCctvCrackdownPopup.jsp | 18 +++++--- .../fims/biz/ec/ecCtznSttemntAnsMgtPopup.jsp | 42 +++--------------- .../jsp/fims/biz/ec/ecCtznSttemntMgtForm.jsp | 23 +++++++--- .../jsp/fims/biz/ec/ecCtznSttemntMgtPopup.jsp | 21 ++++++--- .../biz/ec/ecNatlNewspaperFileSelPopup.jsp | 13 +++--- .../fims/biz/ec/ecNatlNewspaperMgtForm.jsp | 9 ++-- .../jsp/fims/biz/ec/ecNatlNewspaperPopup.jsp | 6 ++- .../layouts/tiles/biz/cmmn/BizIncludeBase.jsp | 9 ++++ .../resources/biz/common/js/codeComboData.js | 6 +++ .../resources/biz/common/js/fimsApiURL.js | 44 +++++++++++++++++++ .../resources/framework/js/cmm/frwkApiURL.js | 17 +++++++ 14 files changed, 153 insertions(+), 78 deletions(-) create mode 100644 src/main/webapp/resources/biz/common/js/fimsApiURL.js create mode 100644 src/main/webapp/resources/framework/js/cmm/frwkApiURL.js 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 02790567..a3fae0de 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 @@ -70,8 +70,8 @@ public class EcCctvCrackdownController { .build())); return mav; } - @RequestMapping(value = "/findCctvCrackdownFiles") - public ModelAndView findCctvCrackdownFiles(final String dirPath){ + @RequestMapping(value = "/findBusCctvCrackdownFiles") + public ModelAndView findBusCctvCrackdownFiles(final String dirPath){ XitFileExplorerUtil explorer = new XitFileExplorerUtil(new DirectorySearch(dirPath)); return ResultResponse.of( 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 e1a4dcc8..95b8c889 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 @@ -109,7 +109,8 @@ $.ajax({ type: 'post' , enctype: "multipart/form-data" - , url: '' + <%--, url: ''--%> + , url: fimsApiUrl.SAVE_CCTV_EC_EXTRL_REGLT_CNTCS , data: formData , processData: false , contentType: false @@ -132,7 +133,8 @@ }) } cmmAjax({ - url: '' + <%--url: ''--%> + url: fimsApiUrl.SAVE_BUS_ONLY_EC_EXTRL_REGLT_CNTC , data: JSON.stringify(data) , contentType: 'application/json; charset=utf-8' , success: () => { @@ -266,8 +268,8 @@ initialRequest: false, api: { readData: { - url: '' - //,initParams: {dirPath: $('#dirPath').val()} + <%--url: '' --%> + url: fimsApiUrl.FIND_BUS_ONLY_EC_EXTRL_REGLT_CNTC_ATTCH_FILES ,serializer: (params) => getPageParam({dirPath: $('#dirPath').val()}, params) } } diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownMgtForm.jsp index 2f3580a6..ffc91432 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownMgtForm.jsp @@ -66,12 +66,14 @@ let popOption; switch (flag) { case "detail": - url = ''; + <%--url = ''; --%> + url = fimsApiUrl.POPUP_CCTV_EC_EXTRL_REGLT_CNTC_INFO; popOption = {width: 900, height:800}; popTitle = "외부연계 데이타 상세"; break; case "file": - url = ''; + <%--url = '';--%> + url = fimsApiUrl.POPUP_CCTV_EC_EXTRL_REGLT_CNTC_DATA_SEL; popOption = {width: 900, height:750}; popTitle = "외부연계 데이타 선택"; break; @@ -201,7 +203,8 @@ initialRequest: true, // 화면 load시 조회 안함 - default api: { readData: { - url: '' + <%--url: ''--%> + url: fimsApiUrl.FIND_CCTV_EC_EXTRL_REGLT_CNTCS ,serializer: (params) => fnAddPageInfo(document.frmSearch, params) } } diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownPopup.jsp index 69061877..631d4bc0 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCctvCrackdownPopup.jsp @@ -192,7 +192,8 @@ cmmAjax({ showSuccessMsg: false - ,url: '' + <%--,url: '' --%> + ,url: fimsApiUrl.FIND_EC_EXTRL_REGLT_CNTC_ATTCH_FILES ,data: {extrlRegltCntcId: '${extrlRegltCntcDTO.extrlRegltCntcId}', regltSeCode: '${extrlRegltCntcDTO.regltSeCode}'} ,success: (res) => { cmmImgDownload('#imgList', res.data?.contents, true); @@ -207,12 +208,14 @@ // FIXME: 이미지에디터 팝업 width, height는 952, 800으로 fix // paintweb config의 imageWidth, imageHeight, viewportWidth, viewPortHeight 와 같이 연관 case "imageEditor": - url = ''; + <%--url = '';--%> + url = frwkApiUrl.POPUP_PAINTWEB_IMG_EDITOR popOption = {width: 952, height: 800, resizable:false,scrollbars:'no'}; popTitle = "이미지 에디터"; break; case "imageView": - url = ''; + <%--url = '';--%> + url = frwkApiUrl.POPUP_IMG_VIEW popOption = {width: 950, height: 750, resizable:false, scrollbars:'no'}; popTitle = "이미지 보기"; break; @@ -224,7 +227,8 @@ } ,save: (extrlRegltCntcId) => { cmmBizAjax('modify', { - url: '' + <%--url: ''--%> + url: fimsApiUrl.MODIFY_EC_EXTRL_REGLT_CNTC ,data: $('form').serialize() }) } @@ -248,7 +252,8 @@ if(!confirm('단속자료를 생성 하시겠습니까?')) return false; cmmAjax({ - url: '' + <%--url: ''--%> + url: fimsApiUrl.SAVE_EC_EXTRL_REGLT_CNTC_RT_REGLT ,data: $.param(data) }) } @@ -258,7 +263,8 @@ } if(!confirm('서손 처리 하시겠습니까?')) return false; cmmAjax({ - url: '' + <%--url: ''--%> + url: fimsApiUrl.SAVE_EC_EXTRL_REGLT_CNTC_RT_ERPP ,data: $.param(data) }) } diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntAnsMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntAnsMgtPopup.jsp index 48fb819f..4603afcb 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntAnsMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntAnsMgtPopup.jsp @@ -127,33 +127,11 @@ **************************************************************************/ let orgData; - /* ******************************* * Biz function ******************************* */ const fnBiz = { - pagePopup: function(flag, params) { - let url; - let popTitle; - let popOption; - switch (flag) { - case "imageEditor": - url = ''; - popOption = {width: 950, height: 750, resizable:false,scrollbars:'no'}; - popTitle = "이미지 에디터"; - break; - case "imageView": - url = ''; - popOption = {width: 950, height: 750, resizable:false,scrollbars:'no'}; - popTitle = "이미지 보기"; - break; - default: - break; - } - window.opener.popup = CmmPopup.open(url, params, popOption, popTitle); - //var w = window.open("/imageEditor.do", "", "width=800,height=650,top=0px,left=200px,status=,resizable=false,scrollbars=no"); - } - ,save: () => { + save: () => { let confirmMsg = '답변 처리 하시겠습니까?'; const fileName = $('input[name=interfaceSeqN]').val()+'.xml'; @@ -164,12 +142,14 @@ if(!confirm(confirmMsg)) return false; cmmAjax({ showSuccessMsg: false - ,url: '' + <%--,url: ''--%> + ,url: fimsApiUrl.SAVE_EC_CTZN_STMT_ANSWER ,data: $('#frmStmt').serialize() ,success: (res) => { const data = {fileFullPath: res.data?.contents, fileName}; - fetch('' + <%--fetch(''--%> + fetch(frwkApiUrl.DOWNLOAD_BY_FILE_PATH ,{ method: 'post' ,body: JSON.stringify(data) @@ -187,18 +167,6 @@ } }) } - ,remove: (ctznSttemntDetailSn) => { - const data = { - interfaceSeqN: '${ansDTO.interfaceSeqN}' - ,ctznSttemntDetailSn: ctznSttemntDetailSn - } - if(confirm('첨부파일도 함께 삭제 하시겠습까?')) data.removeImageData = true; - - cmmBizAjax('remove', { - url: '' - ,data: $.param(data) - }) - } ,validate: () => { if(orgData === $('form').serialize()){ alert('변경된 내용이 없습니다.'); diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtForm.jsp index 36fe4849..046b39b7 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtForm.jsp @@ -80,17 +80,20 @@ let popOption; switch (flag) { case "detail": - url = ''; + <%--url = ''; --%> + url = fimsApiUrl.POPUP_EC_CTZN_STMT; popOption = {width: 900, height:800}; popTitle = "주민 신고 데이타 상세"; break; case "file": - url = ''; + <%--url = ''; --%> + url = fimsApiUrl.POPUP_EC_NATL_NEWS_PAPER_DATA_SEL; popOption = {width: 900, height:750}; popTitle = "주민 신고 데이타 선택"; break; case "answer": - url = ''; + <%--url = ''; --%> + url = fimsApiUrl.POPUP_EC_CTZN_STMT_ANS; popOption = {width: 900, height:780}; popTitle = "주민 신고 데이타 답변"; break; @@ -330,7 +333,15 @@ name: 'insttCode', minWidth: 200, sortable: false, - align: 'center' + align: 'center', + formatter: 'listItemText', + disabled: true, + editor: { + type: "select", + options: { + listItems: ComboCodeData.insttCode + } + }, }, { header: '시스템코드', @@ -391,8 +402,8 @@ initialRequest: true, // 화면 load시 조회 안함 - default api: { readData: { - <%--url: ''--%> - url: '' + <%--url: ''--%> + url: fimsApiUrl.FIND_EC_CTZN_STMT_DTLS ,serializer: (params) => fnAddPageInfo(document.frmSearch, params) } } diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtPopup.jsp index 44c6206a..fc6bbe79 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecCtznSttemntMgtPopup.jsp @@ -270,7 +270,8 @@ cmmAjax({ showSuccessMsg: false - ,url: '' + <%--,url: '' --%> + ,url: fimsApiUrl.FIND_EC_NATL_NEWS_PAPER_ATTCH_FILES ,data: {interfaceSeqN: '${reqDTO.interfaceSeqN}'} ,success: (res) => { cmmImgDownload('#imgList', res.data?.contents, true); @@ -285,12 +286,14 @@ //FIXME: 이미지에디터 팝업 width, height는 952, 800으로 fix // paintweb config의 imageWidth, imageHeight, viewportWidth, viewPortHeight 와 같이 연관 case "imageEditor": - url = ''; + <%--url = ''; --%> + url = frwkApiUrl.POPUP_PAINTWEB_IMG_EDITOR; popOption = {width: 952, height: 800, resizable:false,scrollbars:'no'}; popTitle = "이미지 에디터"; break; case "imageView": - url = ''; + <%--url = '';--%> + url = frwkApiUrl.POPUP_IMG_VIEW; popOption = {width: 950, height: 750, resizable:false,scrollbars:'no'}; popTitle = "이미지 보기"; break; @@ -313,7 +316,8 @@ ,vhcleNo: frm.find('input[name=vhcleNo]').val().trim() } cmmBizAjax('modify', { - url: '' + <%--url: ''--%> + url: fimsApiUrl.MODIFY_EC_CTZN_STMT_DTL ,data: $.param(data) }) } @@ -325,7 +329,8 @@ if(confirm('첨부파일도 함께 삭제 하시겠습까?')) data.removeImageData = true; cmmBizAjax('remove', { - url: '' + <%--url: ''--%> + url: fimsApiUrl.REMOVE_EC_CTZN_STMT_DTL ,data: $.param(data) }) } @@ -345,7 +350,8 @@ if(!confirm('단속자료를 생성 하시겠습니까?')) return false; cmmAjax({ - url: '' + <%--url: '' --%> + url: fimsApiUrl.SAVE_EC_CTZN_STMT_RT_REGLT ,data: $.param(data) }) } @@ -356,7 +362,8 @@ } if(!confirm('서손 처리 하시겠습니까?')) return false; cmmAjax({ - url: '' + <%--url: ''--%> + url: fimsApiUrl.SAVE_EC_CTZN_STMT_RT_ERPP ,data: $.param(data) }) } 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 91962ced..13cef925 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 @@ -59,11 +59,7 @@ ******************************* */ const fnBiz = { search: () => { - GRID.reloadData(); - //FIXME : onGridUpdated - GRID.on('onGridUpdated', (ev) => { - console.log('%%%%%%%%%%%%%>>>>>>>',ev) - }) // 그리드 레이아웃 새로고침 (로드가 다 되지 않는 경우 그리드가 흰색 화면으로 출력될 때가 있다.)) + GRID.reloadData();// 그리드 레이아웃 새로고침 (로드가 다 되지 않는 경우 그리드가 흰색 화면으로 출력될 때가 있다.)) } ,add: () => { const arrChecks = GRID.getCheckedRows(); @@ -82,7 +78,8 @@ if(confirm("등록 하시겠습니까?")) { cmmAjax({ - url: '' + <%--url: '' --%> + url: fimsApiUrl.SAVE_EC_NATL_NEWS_PAPER ,data: JSON.stringify(data) ,contentType: 'application/json; charset=utf-8' ,success: () => { @@ -184,8 +181,8 @@ initialRequest: true, api: { readData: { - url: '' - //,initParams: {dirPath: $('#dirPath').val()} + <%--url: '' --%> + url: fimsApiUrl.FIND_EC_NATL_NEWS_PAPER_ATTCH_FILES ,serializer: (params) => getPageParam({dirPath: $('#dirPath').val()}, params) } } diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperMgtForm.jsp index 88bab078..4a6c3a07 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperMgtForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperMgtForm.jsp @@ -66,12 +66,14 @@ let popOption; switch (flag) { case "detail": - url = ''; + <%--url = '';--%> + url = fimsApiUrl.POPUP_EC_NATL_NEWS_PAPER_INFO; popOption = {width: 1000, height:800}; popTitle = "주민 신고 데이타 상세"; break; case "file": - url = ''; + <%--url = '';--%> + url = fimsApiUrl.POPUP_EC_NATL_NEWS_PAPER_DATA_SEL popOption = {width: 900, height:750}; popTitle = "주민 신고 데이타 선택"; break; @@ -184,7 +186,8 @@ initialRequest: true, // 화면 load시 조회 안함 - default api: { readData: { - url: '' + <%--url: '' --%> + url: fimsApiUrl.FIND_EC_NATL_NEWS_PAPERS ,serializer: (params) => fnAddPageInfo(document.frmSearch, params) } } diff --git a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperPopup.jsp b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperPopup.jsp index f499e4e3..c2d4ffd7 100644 --- a/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/fims/biz/ec/ecNatlNewspaperPopup.jsp @@ -229,7 +229,8 @@ cmmAjax({ showSuccessMsg: false - ,url: '' + <%--,url: '' --%> + ,url: fimsApiUrl.FIND_EC_NATL_NEWS_PAPER_ATTCH_FILES ,data: {interfaceSeqN: '${interfaceSeqN}'} ,success: (res) => { cmmImgDownload('#imgList', res.data?.contents); @@ -242,7 +243,8 @@ let popOption; switch (flag) { case "imageView": - url = ''; + <%--url = '';--%> + url = frwkApiUrl.POPUP_IMG_VIEW; popOption = {width: 950, height: 750, resizable:false, scrollbars:'no'}; popTitle = "이미지 보기"; break; diff --git a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/cmmn/BizIncludeBase.jsp b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/cmmn/BizIncludeBase.jsp index e5450a01..76f54439 100644 --- a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/cmmn/BizIncludeBase.jsp +++ b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/cmmn/BizIncludeBase.jsp @@ -50,6 +50,8 @@ + + @@ -89,6 +91,13 @@