diff --git a/WebContent/WEB-INF/sqlmap-config/oracle/sqlMapConfigOfBap.xml b/WebContent/WEB-INF/sqlmap-config/oracle/sqlMapConfigOfBap.xml index 4b55925..89b0448 100644 --- a/WebContent/WEB-INF/sqlmap-config/oracle/sqlMapConfigOfBap.xml +++ b/WebContent/WEB-INF/sqlmap-config/oracle/sqlMapConfigOfBap.xml @@ -115,7 +115,7 @@ resource="com/eactive/eai/rms/bap/manage/message/MessageMetaMan-oracle.xml" /> + resource="com/eactive/eai/rms/bap/manage/common/Combo-oracle.xml" />
- " id="btn_excel" level="R"/> + <%-- " id="btn_excel" level="R"/> --%> " alt="" id="btn_search" level="R" />
연결된 세션정보
diff --git a/WebContent/jsp/bap/adapter/socket/instStatus.jsp b/WebContent/jsp/bap/adapter/socket/instStatus.jsp index 2b246b9..63aee4f 100644 --- a/WebContent/jsp/bap/adapter/socket/instStatus.jsp +++ b/WebContent/jsp/bap/adapter/socket/instStatus.jsp @@ -21,7 +21,8 @@ $(document).ready(function() { mtype: 'POST', url: '', postData : { cmd : 'LIST' }, - colNames:['업무구분', + colNames:[ + '업무구분', '대외기관', 'IP', 'PORT', @@ -53,7 +54,7 @@ $(document).ready(function() { } } }, - { name : 'serverCheck' , align:'center' , + { name : 'serverCheck' , align:'center' , hidden: true, formatter: function (cellValue, options, rowObject) { var ip = rowObject.LNKGIPINFONAME; var port = rowObject.LNKGPORTINFONAME; @@ -67,8 +68,9 @@ $(document).ready(function() { return be; } }, - { name : 'serverConnected', align: 'center' } + { name : 'serverConnected', align: 'center', hidden: true } ], + autowidth: true, autoheight: true, height: $("#container").height(), //height: "500", @@ -151,8 +153,8 @@ function serverCheck(rowId) {
- " id="btn_operate" level="R"/> - " id="btn_excel" level="R"/> + <%-- " id="btn_operate" level="R"/> --%> + <%-- " id="btn_excel" level="R"/> --%> " alt="" id="btn_search" level="R" />
비연결유지형 클라이언트 소켓 상태정보
diff --git a/WebContent/jsp/bap/adapter/socket/serverStatus.jsp b/WebContent/jsp/bap/adapter/socket/serverStatus.jsp index d4d5cb8..416c9fd 100644 --- a/WebContent/jsp/bap/adapter/socket/serverStatus.jsp +++ b/WebContent/jsp/bap/adapter/socket/serverStatus.jsp @@ -93,6 +93,7 @@ $(document).ready(function() { { name : 'status2' , align:'center', width:70}, { name : 'startStop' , align:'center'} ], + autowidth: true, autoheight: true, height: $("#container").height(), //height: "500", @@ -166,7 +167,7 @@ $(document).ready(function() {
- " id="btn_excel" level="R"/> + <%-- " id="btn_excel" level="R"/> --%> " alt="" id="btn_search" level="R" />
연결유지형 소켓 상태정보
diff --git a/WebContent/jsp/bap/admin/adapter/adapterMan.jsp b/WebContent/jsp/bap/admin/adapter/adapterMan.jsp index 66e8da7..87c3915 100644 --- a/WebContent/jsp/bap/admin/adapter/adapterMan.jsp +++ b/WebContent/jsp/bap/admin/adapter/adapterMan.jsp @@ -25,17 +25,17 @@ var svrType = ''; $(document).ready(function() { - var url = ''; + var url = ''; var url_view = ''; var gridPostData = getSearchForJqgrid("cmd","LIST"); //jqgrid에서는 object 로 - - if(devSvr) { + + /* if(devSvr) { svrType = "stg"; } else if (stgSvr){ svrType = "prod"; } else if (!prdSvr){ svrType = "dev"; - } + }*/ $('#grid').jqGrid({ datatype:"json", @@ -68,8 +68,8 @@ $(document).ready(function() { height: $("#container").height(), autowidth: true, viewrecords: true, - multiselect: true, - multiboxonly: false, + /* multiselect: true, + multiboxonly: false, */ rowList : eval('[${rmsDefaultRowList}]'), gridComplete:function (d){ var colModel = $(this).getGridParam("colModel"); @@ -117,197 +117,8 @@ $(document).ready(function() { $("#btn_search").click(); } }); - $("#btn_delete").click(function() { - - var id = "grid"; - var data = new Array(); - var ids = $("#grid").jqGrid('getDataIDs'); - var chkcnt = 0; - - for(var i=0;i @@ -325,7 +136,7 @@ $(document).ready(function() { " alt="" id="btn_new" level="W" /> - " alt="" id="btn_delete" level="W" /> + <%-- " alt="" id="btn_delete" level="W" /> --%> " alt="" id="btn_search" level="R" />
어댑터 관리일괄전송에서 사용하는 어댑터 목록(Server/Non-permanent Client)
diff --git a/WebContent/jsp/bap/admin/adapter/adapterManDetail.jsp b/WebContent/jsp/bap/admin/adapter/adapterManDetail.jsp index 734ed08..41f8302 100644 --- a/WebContent/jsp/bap/admin/adapter/adapterManDetail.jsp +++ b/WebContent/jsp/bap/admin/adapter/adapterManDetail.jsp @@ -486,7 +486,7 @@ /* 231102 김기영 이전기능 관련 숨김 처리 */ setBtnHide(roleString, " ", "btn_clone_stg"); setBtnHide(roleString, " ", "btn_clone_prod"); - setBtnHide(roleString, " ", "btn_clone_dev"); + setBtnHide(roleString, " ", "btn_clone_dev"); }); @@ -500,9 +500,9 @@
- " alt="" id="btn_clone_stg" level="W" status="DETAIL"/> + <%-- " alt="" id="btn_clone_stg" level="W" status="DETAIL"/> " alt="" id="btn_clone_prod" level="W" status="DETAIL"/> - " alt="" id="btn_clone_dev" level="W" status="DETAIL"/> + " alt="" id="btn_clone_dev" level="W" status="DETAIL"/> --%> " alt="" id="btn_modify" level="W" status="DETAIL,NEW" /> " alt="" id="btn_delete" level="W" status="DETAIL"/> " alt="" id="btn_previous" level="R" status="DETAIL,NEW"/> @@ -533,6 +533,15 @@ 어댑터 사용 구분 + +
+ +
+ + 복제 어댑터 그룹명 diff --git a/WebContent/jsp/bap/admin/common/comErrMessageMan.jsp b/WebContent/jsp/bap/admin/common/comErrMessageMan.jsp index 730ef4b..c2137a1 100644 --- a/WebContent/jsp/bap/admin/common/comErrMessageMan.jsp +++ b/WebContent/jsp/bap/admin/common/comErrMessageMan.jsp @@ -129,10 +129,10 @@ $(document).ready(function() {
오류메시지 관리표준화된 IF시스템 에러 응답코드를 조회합니다. 메시지 키 및 내용으로 그에 해당하는 오류메시지를 조회할 수 있습니다.
- + + -->
diff --git a/WebContent/jsp/bap/admin/common/comErrMessageManDetail.jsp b/WebContent/jsp/bap/admin/common/comErrMessageManDetail.jsp index b6e522f..702596d 100644 --- a/WebContent/jsp/bap/admin/common/comErrMessageManDetail.jsp +++ b/WebContent/jsp/bap/admin/common/comErrMessageManDetail.jsp @@ -133,10 +133,10 @@ $(document).ready(function() {
- + diff --git a/WebContent/jsp/bap/admin/common/comLifecycleMan.jsp b/WebContent/jsp/bap/admin/common/comLifecycleMan.jsp index e44525c..7c9dfb8 100644 --- a/WebContent/jsp/bap/admin/common/comLifecycleMan.jsp +++ b/WebContent/jsp/bap/admin/common/comLifecycleMan.jsp @@ -127,10 +127,10 @@ $(document).ready(function() {
라이프사이클 관리시스템 기동 시 로딩 되는 라이프사이클 클래스를 조회합니다.
- + + -->
오류메시지 코드 *
diff --git a/WebContent/jsp/bap/admin/common/comLifecycleManDetail.jsp b/WebContent/jsp/bap/admin/common/comLifecycleManDetail.jsp index 9575281..b33a2e6 100644 --- a/WebContent/jsp/bap/admin/common/comLifecycleManDetail.jsp +++ b/WebContent/jsp/bap/admin/common/comLifecycleManDetail.jsp @@ -135,10 +135,10 @@ $(document).ready(function() { - + diff --git a/WebContent/jsp/bap/admin/common/comPropertyMan.jsp b/WebContent/jsp/bap/admin/common/comPropertyMan.jsp index a92f85b..f3281bb 100644 --- a/WebContent/jsp/bap/admin/common/comPropertyMan.jsp +++ b/WebContent/jsp/bap/admin/common/comPropertyMan.jsp @@ -132,10 +132,10 @@ $(document).ready(function() {
프로퍼티 관리각 Layer에서 필요한 프라퍼티 Key, Value를 하나의 그룹으로 등록하기 위한 그룹명
- + + -->
라이프사이클 클래스명 *
diff --git a/WebContent/jsp/bap/admin/common/comPropertyManDetail.jsp b/WebContent/jsp/bap/admin/common/comPropertyManDetail.jsp index 290b136..b47c550 100644 --- a/WebContent/jsp/bap/admin/common/comPropertyManDetail.jsp +++ b/WebContent/jsp/bap/admin/common/comPropertyManDetail.jsp @@ -435,14 +435,14 @@
- + diff --git a/WebContent/jsp/bap/admin/common/serverManDetail.jsp b/WebContent/jsp/bap/admin/common/serverManDetail.jsp index bb8eb42..7379911 100644 --- a/WebContent/jsp/bap/admin/common/serverManDetail.jsp +++ b/WebContent/jsp/bap/admin/common/serverManDetail.jsp @@ -179,7 +179,7 @@ $(document).ready(function() { - + diff --git a/WebContent/jsp/bap/admin/message/classInfoMan.jsp b/WebContent/jsp/bap/admin/message/classInfoMan.jsp index 6d826fa..4c7598a 100644 --- a/WebContent/jsp/bap/admin/message/classInfoMan.jsp +++ b/WebContent/jsp/bap/admin/message/classInfoMan.jsp @@ -95,8 +95,8 @@ function getGridData() { height: $("#container").height(), autowidth: true, viewrecords: true, - multiselect: true, - multiboxonly: false, +/* multiselect: true, + multiboxonly: false, */ rowList : eval('[${rmsDefaultRowList}]'), gridComplete:function (d){ var colModel = $(this).getGridParam("colModel"); @@ -136,7 +136,7 @@ function getGridData() { var url = ''; url = url + '?cmd=DETAIL'; url = url + '&page='+$("#grid").getGridParam("page"); - url = url + '&returnUrl='+getSearchUrlForReturn(); + url = url + '&returnUrl='+getReturnUrl(); url = url + '&menuId='+'${param.menuId}'; //검색값 url = url + '&'+getSearchUrl(); @@ -385,7 +385,7 @@ function getGridData() { " alt="" id="btn_new" level="W" /> - " alt="" id="btn_delete" level="W" /> + " alt="" id="btn_search" level="R" />
클래스정보 관리클래스정보를 등록/관리합니다
@@ -395,16 +395,23 @@ function getGridData() { - - - + <%-- + --%> + diff --git a/WebContent/jsp/bap/admin/message/classMapMan.jsp b/WebContent/jsp/bap/admin/message/classMapMan.jsp index 277d121..489a566 100644 --- a/WebContent/jsp/bap/admin/message/classMapMan.jsp +++ b/WebContent/jsp/bap/admin/message/classMapMan.jsp @@ -101,8 +101,8 @@ function getGridData() { height: $("#container").height(), autowidth: true, viewrecords: true, - multiselect: true, - multiboxonly: false, + /* multiselect: true, + multiboxonly: false, */ rowList : eval('[${rmsDefaultRowList}]'), gridComplete:function (d){ var colModel = $(this).getGridParam("colModel"); @@ -406,7 +406,7 @@ function getGridData() { " alt="" id="btn_new" level="W" /> - " alt="" id="btn_delete" level="W" /> + <%-- " alt="" id="btn_delete" level="W" /> --%> " alt="" id="btn_search" level="R" />
클래스맵핑 관리클래스정보를 등록/관리합니다
@@ -418,7 +418,7 @@ function getGridData() { - + diff --git a/WebContent/jsp/bap/admin/message/flowRuleManDetail.jsp b/WebContent/jsp/bap/admin/message/flowRuleManDetail.jsp index e0aaa73..0b7df99 100644 --- a/WebContent/jsp/bap/admin/message/flowRuleManDetail.jsp +++ b/WebContent/jsp/bap/admin/message/flowRuleManDetail.jsp @@ -155,7 +155,7 @@ { name : 'MOVEUP' , align : 'center', sortable:false, width : '80', unformat : imgUpunformatter, formatter : imgUpformatter}, { name : 'MOVEDOWN' , align : 'center', sortable:false, width : '80', unformat : imgDownunformatter, formatter : imgDownformatter}, { name : 'DELETEYN' , align : 'center', sortable:false, width : '80', unformat : unformatterFunction, formatter : formatterFunction}, - { name : 'CLONE' , align : 'center', sortable:false, width : '80', unformat : cloneunformatter, formatter : cloneformatter} + { name : 'CLONE' , align : 'center', sortable:false, width : '80', unformat : cloneunformatter, formatter : cloneformatter, hidden: true} ], jsonReader : { repeatitems : false @@ -676,10 +676,10 @@
- " alt="" id="btn_clone_stg" level="W" status="DETAIL"/> + <%-- " alt="" id="btn_clone_stg" level="W" status="DETAIL"/> " alt="" id="btn_clone_prod" level="W" status="DETAIL"/> " alt="" id="btn_clone_dev" level="W" status="DETAIL"/> - " alt="" id="btn_excel" level="W" status="DETAIL"/> + " alt="" id="btn_excel" level="W" status="DETAIL"/> --%> " alt="" id="btn_modify" level="W" status="DETAIL,NEW" /> " alt="" id="btn_delete" level="W" status="DETAIL"/> " alt="" id="btn_previous" level="R" status="DETAIL,NEW"/> diff --git a/WebContent/jsp/bap/admin/message/flowStepMan.jsp b/WebContent/jsp/bap/admin/message/flowStepMan.jsp index 73e96f3..bf9f6e2 100644 --- a/WebContent/jsp/bap/admin/message/flowStepMan.jsp +++ b/WebContent/jsp/bap/admin/message/flowStepMan.jsp @@ -116,8 +116,8 @@ function cloneformatter(cellvalue, options, rowObject) { { name : 'BJOBFLOWCMPONAME' , align:'left' ,width:40 }, { name : 'TELGMCLSID' , align:'left' ,width:40 }, { name : 'UNITTELGMLEN' , align:'left' ,width:40 }, - { name : 'BJOBNODEDESC' , align:'left' ,width:40, hidden : false }, - { name : 'CLONE' , align:'center',width:10, unformat:cloneunformatter, formatter:cloneformatter} + { name : 'BJOBNODEDESC' , align:'left' ,width:40, hidden : true }, + { name : 'CLONE' , align:'center',width:10, unformat:cloneunformatter, formatter:cloneformatter, hidden: true } ], jsonReader: { repeatitems:false @@ -129,8 +129,8 @@ function cloneformatter(cellvalue, options, rowObject) { height: $("#container").height(), autowidth: true, viewrecords: true, - multiselect: true, - multiboxonly: false, + /* multiselect: true, + multiboxonly: false, */ rowList : eval('[${rmsDefaultRowList}]'), loadComplete : function(rowId) { $("img[name^=img_clone]").click(function() { @@ -478,7 +478,7 @@ function cloneformatter(cellvalue, options, rowObject) { " alt="" id="btn_new" level="W" /> - " alt="" id="btn_delete" level="W" /> + <%-- " alt="" id="btn_delete" level="W" /> --%> " alt="" id="btn_search" level="R" />
흐름단계 리스트흐름단계 리스트를 관리합니다
@@ -490,9 +490,9 @@ function cloneformatter(cellvalue, options, rowObject) {
-<%-- - --%> - + + + <%-- + --%> diff --git a/WebContent/jsp/bap/admin/message/messageItemMan.jsp b/WebContent/jsp/bap/admin/message/messageItemMan.jsp index 7898fb6..f80a743 100644 --- a/WebContent/jsp/bap/admin/message/messageItemMan.jsp +++ b/WebContent/jsp/bap/admin/message/messageItemMan.jsp @@ -57,13 +57,13 @@ { name : 'MSGCLMNVAL' , align:'center' , width:40 }, { name : 'THISMSGCLMNUSEYN' , align:'center' , width:40 , formatter: function (cellvalue) { - if ( !cellvalue ) { - return '사용안함'; - } else if ( cellvalue ) { - return '사용함'; - } else { - return cellvalue; - } + if ( cellvalue == '0' ) { + return '사용안함'; + } else if ( cellvalue == '1' ) { + return '사용'; + } else { + return cellvalue; + } } } ], @@ -77,8 +77,8 @@ height: $("#container").height(), autowidth: true, viewrecords: true, - multiselect: true, - multiboxonly: false, + /* multiselect: true, + multiboxonly: false, */ rowList : eval('[${rmsDefaultRowList}]'), gridComplete:function (d){ var colModel = $(this).getGridParam("colModel"); @@ -396,7 +396,7 @@ " alt="" id="btn_new" level="W" /> - " alt="" id="btn_delete" level="W" /> + <%-- " alt="" id="btn_delete" level="W" /> --%> " alt="" id="btn_search" level="R" /> @@ -406,12 +406,12 @@ - - + + - + <%-- + " level="W" status="LIST" class="btn_img"/> --%>
프라퍼티 그룹명 * - " class="btn_img" level="W" status="DETAIL"/> + <%-- " class="btn_img" level="W" status="DETAIL"/> --%>
IF서버인스턴스명
마스터여부
장애극복서버명
IF서버IP
전문클래스명 전문클래스 설명복제 사용여부전문클래스 설명
메시지항목 구분명메시지 컬럼명메시지 컬럼명 복제 메시지항목 구분명복제 메시지항목 구분명 - " level="W" status="LIST" class="btn_img"/>
diff --git a/WebContent/jsp/bap/admin/message/messageMetaMan.jsp b/WebContent/jsp/bap/admin/message/messageMetaMan.jsp index ff66f1a..e6248df 100644 --- a/WebContent/jsp/bap/admin/message/messageMetaMan.jsp +++ b/WebContent/jsp/bap/admin/message/messageMetaMan.jsp @@ -109,8 +109,8 @@ function getGridData() { height: $("#container").height(), autowidth: true, viewrecords: true, - multiselect: true, - multiboxonly: false, +/* multiselect: true, + multiboxonly: false, */ rowList : eval('[${rmsDefaultRowList}]'), gridComplete:function (d){ var colModel = $(this).getGridParam("colModel"); @@ -402,7 +402,7 @@ function getGridData() { " alt="" id="btn_new" level="W" /> - " alt="" id="btn_delete" level="W" /> + <%-- " alt="" id="btn_delete" level="W" /> --%> " alt="" id="btn_search" level="R" />
메시지메타 관리메시지메타 정보를 등록 관리합니다
@@ -415,14 +415,14 @@ function getGridData() { 메시지 설명 - 복제 사용여부 + 복제 메시지메타 구분코드 diff --git a/WebContent/jsp/bap/admin/message/messageMetaManPopup.jsp b/WebContent/jsp/bap/admin/message/messageMetaManPopup.jsp index fae898a..b6308aa 100644 --- a/WebContent/jsp/bap/admin/message/messageMetaManPopup.jsp +++ b/WebContent/jsp/bap/admin/message/messageMetaManPopup.jsp @@ -71,9 +71,9 @@ function getGridData() { colModel:[ { name : 'MSGITEMDSTICNAME' , align:'left' ,width:40 ,sortable:false }, { name : 'MSGCLMNNAME' , align:'center' ,width:40 }, - { name : 'MSGCLMNATTRIPTRNCD' , align:'center' ,width:30 }, - { name : 'MSGCLMNVAL' , align:'center' ,width:30 }, - { name : 'THISMSGCLMNUSEYN' , align:'center' ,width:30 , + { name : 'MSGCLMNATTRIPTRNCD' , align:'center' ,width:40 }, + { name : 'MSGCLMNVAL' , align:'center' ,width:40 }, + { name : 'THISMSGCLMNUSEYN' , align:'center' ,width:40 , formatter: function (cellvalue) { if ( !cellvalue ) { return '사용안함'; @@ -84,9 +84,9 @@ function getGridData() { } } }, - { name : 'MSGITEMCLONENAME', align:'left', sortable:false, width:40, unformat:unformatterFunction, formatter:gridCloneName}, - { name : 'MSGITEMCLONE' , align:'center', sortable:false, width:20, unformat:unformatterFunction, formatter:gridCloneFunction}, - { name : 'DELETEYN' , align:'center', sortable:false, width:20, unformat:unformatterFunction, formatter:formatterFunction} + { name : 'MSGITEMCLONENAME', align:'left', sortable:false, width:40, unformat:unformatterFunction, formatter:gridCloneName, hidden:true }, + { name : 'MSGITEMCLONE' , align:'center', sortable:false, width:20, unformat:unformatterFunction, formatter:gridCloneFunction, hidden:true }, + { name : 'DELETEYN' , align:'center', sortable:false, width:20, unformat:unformatterFunction, formatter:formatterFunction, hidden:true } ], jsonReader: { repeatitems:false @@ -98,8 +98,8 @@ function getGridData() { height: $("#container").height(), autowidth: true, viewrecords: true, - multiselect: true, - multiboxonly: false, + /* multiselect: true, + multiboxonly: false, */ rowList : eval('[${rmsDefaultRowList}]'), gridComplete:function (d){ var colModel = $(this).getGridParam("colModel"); @@ -224,8 +224,8 @@ function getGridData() {
- " alt="" id="btn_input" level="R" /> - " alt="" id="btn_new" level="W" /> + <%-- " alt="" id="btn_input" level="R" /> + " alt="" id="btn_new" level="W" /> --%> " alt="" id="btn_search" level="R" /> " alt="" id="btn_close" level="R" />
diff --git a/WebContent/jsp/bap/admin/work/bizGbnMan.jsp b/WebContent/jsp/bap/admin/work/bizGbnMan.jsp index 7cd6f76..38475b2 100644 --- a/WebContent/jsp/bap/admin/work/bizGbnMan.jsp +++ b/WebContent/jsp/bap/admin/work/bizGbnMan.jsp @@ -13,261 +13,127 @@ - -
-
- -
-
- "> -
- - - - " id="btn_excel" level="R" /> - " alt="" id="btn_upload" level="W" /> - " alt="" id="btn_download" level="R" /> - " alt="" id="btn_new" level="W" /> - " alt="" id="btn_search" level="R" /> -
- -
배치 대외 기관 관리배치 대외 기관 코드를 관리 하는 화면입니다
- - - - - - - - - - -
배치 대외 기관배치 대외 기관명
-
-
-
-
- - - + +
+
+ +
+
+
+ " alt="" id="btn_new" level="W" /> + " alt="" id="btn_search" level="R" /> +
+
업무구분 관리일괄 전송 파일을 송수신 업무 구분 코드를 관리 하는 화면입니다
+ + + + + + + + + + +
업무구분코드업무구분명
+
+
+ + +
+
+ + \ No newline at end of file diff --git a/WebContent/jsp/bap/admin/work/bizGbnManDetail.jsp b/WebContent/jsp/bap/admin/work/bizGbnManDetail.jsp index 4f8c054..541fba3 100644 --- a/WebContent/jsp/bap/admin/work/bizGbnManDetail.jsp +++ b/WebContent/jsp/bap/admin/work/bizGbnManDetail.jsp @@ -324,24 +324,24 @@ $(document).ready(function() { " alt="" id="btn_modify" level="W" status="DETAIL,NEW" /> " alt="" id="btn_previous" level="R" status="DETAIL,NEW"/>
-
배치 대외 기관 코드
+
업무구분코드
- + <%--
-
" class="btn_img"/>
+ --%> - + - + diff --git a/WebContent/jsp/bap/admin/work/messageProcMan.jsp b/WebContent/jsp/bap/admin/work/messageProcMan.jsp index 01f3139..aba6598 100644 --- a/WebContent/jsp/bap/admin/work/messageProcMan.jsp +++ b/WebContent/jsp/bap/admin/work/messageProcMan.jsp @@ -9,342 +9,215 @@ - - - - + + +
+
+ +
+ +
+
+ " alt="" id="btn_new" + level="W" /> " alt="" + id="btn_search" level="R" /> +
+
+ 송수신 파일 관리일괄 전송에서 사용하는 송수신 파일을 관리 하는 화면입니다 +
-function init() { - $.ajax({ - type: "POST", - url: url, - dataType: "json", - data: { cmd: 'LIST_INIT_COMBO' }, - success: function(json) { - new makeOptions("CODE","NAME").setObj($("select[name=searchBjobBzwkDstcd]")).setNoValueInclude(true).setNoValue('', '전체').setData(json.bjobBzwkDstcd).rendering(); // 업무구분코드 - list(); - }, - error: function(e) { - alert(e.responseText); - } - }); - setSearchable(selectName); // 콤보에 searchable 설정 -} +
배치 대외 기관 코드업무구분코드
배치 대외 기관명업무구분명
당메시지 사용여부 *
+ + + + + + + + + + + + + + +
업무구분명 + + 송수신파일명 + + 송수신파일설명 + +
-$(document).ready(function() { - - resizeJqGridWidth('grid', 'title', '1000'); - init(); - - $("#btn_search").click(function() { - var postData = getSearchForJqgrid("cmd","LIST"); //jqgrid에서는 object 로 - $("#grid").setGridParam({url:url, postData: postData,page:"1" }).trigger("reloadGrid"); - }); - - $("#btn_new").click(function() { - var url = ''; - url += '?cmd=DETAIL'; - url += '&page=' + $("#grid").getGridParam("page"); - url += '&returnUrl=' + getReturnUrl(); - url += '&menuId=' + '${param.menuId}'; - //검색값 - url += '&'+getSearchUrl(); - - goNav(url); - }); - - $("input[name^=search]").keydown(function(key) { - if (key.keyCode == 13) { - $("#btn_search").click(); - } - }); - - $("input[name^=like]").keydown(function(key) { - if (key.keyCode == 13) { - $("#btn_search").click(); - } - }); - - $("#btn_excel").click(function(event) { - event.stopPropagation(); // Do not propagate the event. - // Create an object that will manage to download the file. - var merge = new Array(); - gridToExcelSubmit(url_excel, "LIST_GRID_TO_EXCEL", $("#grid"), $("#ajaxForm"), "송수신 파일 관리", merge); - return false; - }); - - $("#btn_download").click(function() { - let selectedVal = ""; - const rowIds = $("#grid").getGridParam("selarrrow"); - - rowIds.forEach(rowId => { - selectedVal += "," + $("#grid").getRowData(rowId).BJOBMSGDSTCD; - }); - - if(selectedVal != "") selectedVal = selectedVal.substring(1); - - var url =''; - url += '?cmd=messageProcMan'; - url += '&control=download'; - url += '&serviceType=' + sessionStorage["serviceType"]; - url += '&fileName=messageProcMan'; - url += '&selectedVal=' + selectedVal; - url += '&' + getSearchUrl(); - - goNav(url); - }); - - $("#multiform").on('submit', fileupload); - $('#btn_upload').click(function() { - if( confirm( "동일한 이름의 경우 기존내용을 수정합니다.\n\n업로드 하시겠습니까?" ) != true ) return; - - if(window.FormData !== undefined) { - $("input[name=file]").click(); - } else { - if($("input[name=file]").val() == "") return; - $("#multiform").submit(); - } - }); - - if(window.FormData !== undefined) { - $("input[name=file]").change(function(ev) { - var filename = $(this).val().split('\\').pop(); - - if (!filename.startsWith('messageProcMan')) { - alert("송수신 파일관리 JSON 파일을 선택하십시오.\n\n[파일명 : messageProcMan.json]") - return false; - } - - if(filename == "") return; - else $("#multiform").submit(); - }); - } - - if(window.FormData !== undefined) { - $("input[name=file]").hide(); - } else { - $("input[name=file]").show(); - } - - buttonControl(); -}); - - - - -
-
- -
-
- "> -
- - - - " id="btn_excel" level="R" /> - " alt="" id="btn_upload" level="W" /> - " alt="" id="btn_download" level="R" /> - " alt="" id="btn_new" level="W" /> - " alt="" id="btn_search" level="R" /> -
- -
송수신 파일 관리일괄 전송에서 사용하는 송수신 파일을 관리 하는 화면입니다
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
인터페이스ID업무구분코드 -
- -
- 		세부기관코드
송수신파일설명인터페이스설명사용여부 -
- -
-
- -
-
- -
-
- +
+
+ + + + + diff --git a/WebContent/jsp/bap/admin/work/messageProcManDetail.jsp b/WebContent/jsp/bap/admin/work/messageProcManDetail.jsp index 1ce2662..1bc6419 100644 --- a/WebContent/jsp/bap/admin/work/messageProcManDetail.jsp +++ b/WebContent/jsp/bap/admin/work/messageProcManDetail.jsp @@ -16,529 +16,387 @@
+
  • ${rmsMenuPath}
    • +
    " alt="" id="btn_delete" level="W" status="DETAIL"/> - " alt="" id="btn_modify" level="W" status="DETAIL,NEW" /> - " alt="" id="btn_previous" level="R" status="DETAIL,NEW"/> - " alt="" id="btn_close" level="R" style="display:none;" /> + " alt="" id="btn_modify" level="W" status="DETAIL,NEW" /> + " alt="" id="btn_previous" level="R" status="DETAIL,NEW"/>
    -
    송수신 파일
    +
    송수신 파일
    - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
    인터페이스ID *업무구분코드
    +
    BATCH작업메시지구분코드
    BATCH작업메시지구분명
    BATCH작업전문헤더크기
    BATCH작업전문데이터크기
    BATCH작업전문트레일러크기
    파일송신사용여부
    +
    파일수신사용여부
    +
    작업처리 우선순위
    연계시스템 CODE(송신)
    +
    연계시스템 CODE(수신)
    +
    APPLICATION CODE + + +
    파일담당자
    수신시 알림여부 +
    +
    당메시지 사용여부 * -
    - - -
    +
    BATCH작업메시지구분코드 *BATCH작업메시지구분명 *jFlow Job ID
    BATCH작업전문헤더크기 *BATCH작업전문데이터크기 *
    BATCH작업전문트레일러크기BATCH작업주기구분
    파일 송/수신 구분 -
    - -
    -     		수신시 알림여부 -
    - -
    -
    APPLICATION CODE *
    		EAI 인터페이스ID
    데이터검증여부 -
    - -
    -     		" class="btn_img" />작업처리 우선순위
    처리여부 -
    - -
    -     		중복횟수
    종결여부 -
    - -
    -     		종결횟수
    파일담당자
    -
    프라퍼티 정보
    + +
    프라퍼티 정보
    -
    + \ No newline at end of file diff --git a/WebContent/jsp/bap/admin/work/systemInstMan.jsp b/WebContent/jsp/bap/admin/work/systemInstMan.jsp index 44ecd4b..19d04b8 100644 --- a/WebContent/jsp/bap/admin/work/systemInstMan.jsp +++ b/WebContent/jsp/bap/admin/work/systemInstMan.jsp @@ -13,296 +13,170 @@ - -
    -
    - -
    -
    -
    "> -
    - - - - " id="btn_excel" level="R"/> - " alt="" id="btn_upload" level="W" /> - " alt="" id="btn_download" level="R" /> - " alt="" id="btn_new" level="W" /> - " alt="" id="btn_search" level="R" /> -
    -
    -
    배치 세부 기관 관리일괄 전송에서 사용하는 배치 세부 기관 코드를 관리 하는 화면입니다
    - - - - - - - - - - - - -
    배치 세부 기관 명배치 세부 기관 코드배치 기관명
    -
    -
    -
    -
    - + +
    +
    + +
    +
    +
    + " alt="" id="btn_new" level="W" /> + " alt="" id="btn_search" level="R" /> +
    +
    시스템 대외기관 관리일괄 전송에서 사용하는 대외 기관구분 코드를 관리 하는 화면입니다
    + + + + + + + + + + + + + + + + + + + + + + + +
    대외기관명대외기관코드업무구분명
    업무구분코드송신처리규칙코드수신처리규칙코드
    +
    +
    + +
    +
    + - diff --git a/WebContent/jsp/bap/admin/work/systemInstManDetail.jsp b/WebContent/jsp/bap/admin/work/systemInstManDetail.jsp index 39ec69d..8c83647 100644 --- a/WebContent/jsp/bap/admin/work/systemInstManDetail.jsp +++ b/WebContent/jsp/bap/admin/work/systemInstManDetail.jsp @@ -116,7 +116,7 @@ function init(key1, key2) { getBjobBzwkDstcd(key1, key2); getBjobBzwkPrcssDstcd(key1, key2); getAdaptorGroup(key1, key2); - setSearchable(selectName); // 콤보에 searchable 설정 + //setSearchable(selectName); // 콤보에 searchable 설정 } function getBjobBzwkDstcd(key1, key2) { @@ -178,7 +178,7 @@ function getAdaptorGroup(key1, key2) { } }, error: function(e) { - alert(e.responseText); + //alert(e.responseText); } }); } @@ -224,7 +224,7 @@ function detail(key1,key2) { $("#grid")[0].addJSONData(data); }, error: function(e) { - alert(e.responseText); + //alert(e.responseText); } }); } @@ -245,7 +245,7 @@ function setRqstRspnsDstcd() { $("select[name=adptrBzwkName]").val(sysLnkgList["ADPTRBZWKNAME"]); }, error: function(e) { - alert(e.responseText); + //alert(e.responseText); } }); } diff --git a/WebContent/jsp/bap/transaction/procWorkMan.jsp b/WebContent/jsp/bap/transaction/procWorkMan.jsp index 4b6d0e0..881a85b 100644 --- a/WebContent/jsp/bap/transaction/procWorkMan.jsp +++ b/WebContent/jsp/bap/transaction/procWorkMan.jsp @@ -214,7 +214,7 @@ $(document).ready(function() {
    - " id="btn_excel" level="R"/> + <%-- " id="btn_excel" level="R"/> --%> " alt="" id="btn_search" level="R" />
    진행작업 관리
    diff --git a/WebContent/jsp/bap/transaction/transactionStatusMan.jsp b/WebContent/jsp/bap/transaction/transactionStatusMan.jsp index 54f8aca..5640bcd 100644 --- a/WebContent/jsp/bap/transaction/transactionStatusMan.jsp +++ b/WebContent/jsp/bap/transaction/transactionStatusMan.jsp @@ -12,772 +12,611 @@ - - +
    +
  • ${rmsMenuPath}
    • +
    - " id="btn_excel" level="R"/> - " alt="" id="btn_search" level="R" /> + " alt="" id="btn_search" level="R" />
    일괄전송 현황 조회
    @@ -789,8 +628,8 @@ $(document).ready(function() {
    -
    - +
    + 작업유형
    @@ -806,8 +645,8 @@ $(document).ready(function() {
    - - - + + + 대외기관명
    -
    @@ -839,46 +678,50 @@ $(document).ready(function() {
    -
    +
    - +
      +
    • 비정상:지연+에러
      • +
    • 미도래
    • 큐대기
      • -
    • 진행중
    • 전송현황
      • -
    • 미완료
    +
    +
    +
    +
    +
    -
    -
    +
    +
    - - + + \ No newline at end of file diff --git a/WebContent/jsp/bap/transaction/transactionTraceMan.jsp b/WebContent/jsp/bap/transaction/transactionTraceMan.jsp index 6198356..6625437 100644 --- a/WebContent/jsp/bap/transaction/transactionTraceMan.jsp +++ b/WebContent/jsp/bap/transaction/transactionTraceMan.jsp @@ -13,97 +13,96 @@ - -
    -
    - -
    -
    -
    - " id="btn_excel" level="R"/> - " alt="" id="btn_search" level="R" /> -
    -
    거래 추적
    - - - - - - - - - - - - - - - - - - - - - - -
    프레임웍구분 -
    - -
    -     		업무구분명 -
    - -
    -     		송수신구분 -
    - -
    -     		상태 -
    - -
    -
    파일명 - - 기관명 - - 거래기간 - - ~ - - - - -
    -
    -
    -
    -
    - + +
    +
    + +
    +
    +
    + " alt="" id="btn_search" level="R" /> +
    +
    거래 추적
    + + + + + + + + + + + + + + + + + + + + + + +
    프레임웍구분 +
    + +
    +     		업무구분명 +
    + +
    +     		송수신구분 +
    + +
    +     		상태 +
    + +
    +
    파일명 + + 기관명 + + 거래기간 + + ~ + + + + +
    + +
    +
    +
    +
    + + \ No newline at end of file diff --git a/WebContent/jsp/bap/transaction/transactionWaitMan.jsp b/WebContent/jsp/bap/transaction/transactionWaitMan.jsp index 4362ebe..b95e837 100644 --- a/WebContent/jsp/bap/transaction/transactionWaitMan.jsp +++ b/WebContent/jsp/bap/transaction/transactionWaitMan.jsp @@ -144,7 +144,7 @@ $(document).ready(function() { autowidth: true, viewrecords: true, gridview: true, - multiselect: true, + /* multiselect: true, */ rowList: eval('[${rmsDefaultRowList}]'), gridComplete: function (d) { var colModel = $(this).getGridParam("colModel"); @@ -250,8 +250,8 @@ $(document).ready(function() {
    - " id="btn_excel" level="R"/> - " alt="" id="btn_delete" level="W" status="DETAIL"/> + <%-- " id="btn_excel" level="R"/> + " alt="" id="btn_delete" level="W" status="DETAIL"/> --%> " alt="" id="btn_search" level="R" />
    작업대기 관리
    diff --git a/src/main/java/com/eactive/eai/rms/bap/adaptor/socket/BapConnSessionController.java b/src/main/java/com/eactive/eai/rms/bap/adaptor/socket/BapConnSessionController.java index 39082a8..c93f1d1 100644 --- a/src/main/java/com/eactive/eai/rms/bap/adaptor/socket/BapConnSessionController.java +++ b/src/main/java/com/eactive/eai/rms/bap/adaptor/socket/BapConnSessionController.java @@ -53,7 +53,7 @@ public class BapConnSessionController extends BapBaseAnnotationController { } - @RequestMapping(value= "/bap/adapter/socket/connStatus.json", params = "cmd=TRANSACTION") + @RequestMapping(value= "/bap/adapter/socket/connStatus.json", params = "cmd=CONTROL") public ModelAndView control(HttpServletRequest request, String startStop, String uuid) throws Exception { String[] args = new String[4]; diff --git a/src/main/java/com/eactive/eai/rms/bap/manage/comm/property/BapTelePropertyController.java b/src/main/java/com/eactive/eai/rms/bap/manage/comm/property/BapTelePropertyController.java index d94e65e..20f3553 100644 --- a/src/main/java/com/eactive/eai/rms/bap/manage/comm/property/BapTelePropertyController.java +++ b/src/main/java/com/eactive/eai/rms/bap/manage/comm/property/BapTelePropertyController.java @@ -80,7 +80,7 @@ public class BapTelePropertyController extends BapBaseAnnotationController { HashMap[] list = gson.fromJson(gridData, HashMap[].class); service.insert(map,list); - CommonCommand command = new CommonCommand("com.eactive.eai.agent.teleproperty.UpdatePropertyCommand",(String)map.get("prptyGroupName")); + CommonCommand command = new CommonCommand("com.eactive.eai.agent.property.UpdatePropertyCommand",(String)map.get("prptyGroupName")); agentUtilService.broadcast(command); return null; @@ -94,7 +94,7 @@ public class BapTelePropertyController extends BapBaseAnnotationController { HashMap[] list = gson.fromJson(gridData, HashMap[].class); service.update(map,list); - CommonCommand command = new CommonCommand("com.eactive.eai.agent.teleproperty.UpdatePropertyCommand",(String)map.get("prptyGroupName")); + CommonCommand command = new CommonCommand("com.eactive.eai.agent.property.UpdatePropertyCommand",(String)map.get("prptyGroupName")); agentUtilService.broadcast(command); return null; @@ -107,7 +107,7 @@ public class BapTelePropertyController extends BapBaseAnnotationController { paramMap.put("prptyGroupName", prptyGroupName); service.delete(paramMap); - CommonCommand command = new CommonCommand("com.eactive.eai.agent.teleproperty.RemovePropertyCommand",prptyGroupName); + CommonCommand command = new CommonCommand("com.eactive.eai.agent.property.RemovePropertyCommand",prptyGroupName); agentUtilService.broadcast(command); return null; diff --git a/src/main/java/com/eactive/eai/rms/bap/manage/comm/server/BapServerController.java b/src/main/java/com/eactive/eai/rms/bap/manage/comm/server/BapServerController.java index 1796bb7..f3257f6 100644 --- a/src/main/java/com/eactive/eai/rms/bap/manage/comm/server/BapServerController.java +++ b/src/main/java/com/eactive/eai/rms/bap/manage/comm/server/BapServerController.java @@ -101,7 +101,7 @@ public class BapServerController extends BapBaseAnnotationController { public ModelAndView initCombo( HttpServletRequest request, HttpServletResponse response,String eaiSvcName) throws Exception { - List> listServer = ibatisComboService.selectListComboForTable("TSEAICM20", "code", "codename","codegroup = 'YN' "); + List> listServer = ibatisComboService.selectListComboForTable("TSEAIBP03","EAISEVRINSTNCNAME","EAISEVRINSTNCNAME"); Map resultMap = new HashMap(); resultMap.put("serverRows" , listServer); diff --git a/src/main/java/com/eactive/eai/rms/bap/manage/message/classmap/BapClassMapController.java b/src/main/java/com/eactive/eai/rms/bap/manage/message/classmap/BapClassMapController.java index 9278801..43bbb9d 100644 --- a/src/main/java/com/eactive/eai/rms/bap/manage/message/classmap/BapClassMapController.java +++ b/src/main/java/com/eactive/eai/rms/bap/manage/message/classmap/BapClassMapController.java @@ -88,7 +88,7 @@ public class BapClassMapController extends BapBaseAnnotationController { HttpServletResponse response,@RequestParam HashMap map ) throws Exception { // 전문클래스ID 공백 제거 - map.replace("telgmClsID",map.get("telgmClsID").toString().trim()); +// map.replace("telgmClsID",map.get("telgmClsID").toString().trim()); service.insert(map); CommonCommand command = new CommonCommand("com.eactive.eai.agent.rule.telegraminfo.UpdateTelegramInfoCommand", map.get("telgmClsID")); diff --git a/src/main/java/com/eactive/eai/rms/bap/manage/message/messageMeta/BapMessageMetaController.java b/src/main/java/com/eactive/eai/rms/bap/manage/message/messageMeta/BapMessageMetaController.java index 2dcb309..67842e4 100644 --- a/src/main/java/com/eactive/eai/rms/bap/manage/message/messageMeta/BapMessageMetaController.java +++ b/src/main/java/com/eactive/eai/rms/bap/manage/message/messageMeta/BapMessageMetaController.java @@ -1,8 +1,6 @@ package com.eactive.eai.rms.bap.manage.message.messageMeta; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletRequest; @@ -122,88 +120,5 @@ public class BapMessageMetaController extends BapBaseAnnotationController { return null; } - @RequestMapping(value= "/bap/admin/message/messageMetaMan.json",params = "cmd=LIST_DELETE") - public String deleteList(HttpServletRequest request, - HttpServletResponse response, @RequestParam HashMap paramMap ) throws Exception { - for (String msgMetaDstcd : paramMap.get("msgMetaDstcdList").toString().split(",")) { - HashMap paramDetail = new HashMap(); - paramDetail.put("msgMetaDstcd", msgMetaDstcd); - service.delete(paramDetail); - } - return null; - - } - @SuppressWarnings("unchecked") - @RequestMapping(value= "/bap/admin/message/messageMetaMan.json",params = "cmd=CLONE") - public ModelAndView clone(HttpServletRequest request, - HttpServletResponse response,@RequestParam HashMap map) throws Exception { - - String msgMetaDstcd = map.get("msgMetaDstcd").toString(); - HashMap detailMap = service.selectDetail(msgMetaDstcd); - HashMap detail = (HashMap)detailMap.get("detail"); - List> list = (List>)detailMap.get("list"); - - // detail insert 데이터키 치환 (insert_bm03) - String newMsgMetaDstcd = map.get("newMsgMetaDstcd").toString(); - detail.put("msgMetaDstcd", newMsgMetaDstcd); - detail.put("msgDesc" , map.get("newMsgDesc") != null ? map.get("newMsgDesc") : detail.get("MSGDESC")); - detail.put("thisMsgUseYn", detail.get("THISMSGUSEYN")); - - String searchMsgMetaDstcd = map.get("searchMsgMetaDstcd").toString(); - String cloneMsgMetaDstcd = map.get("cloneMsgMetaDstcd").toString(); - - // gridList insert 데이터키 치환 (insert_bm02) - HashMap[] gridList = list.toArray(new HashMap[list.size()]); - for (int i=0; i listMap = (Map)list.get(i); - gridList[i].put("msgMetaDstcd" , ((String)listMap.get("MSGMETADSTCD")).replace(searchMsgMetaDstcd,cloneMsgMetaDstcd)); - gridList[i].put("thisMsgUseYn" , listMap.get("THISMSGCLMNUSEYN")); - // 메시지항목명을 치환하면 메시지항목 테이블(BM01)에 항목이 없으므로 메타 Item 리스트에 보이지 않음 --> 치환 안함으로 변경 -// gridList[i].replace("MSGITEMDSTICNAME" , ((String)listMap.get("MSGITEMDSTICNAME")).replace(searchMsgMetaDstcd,cloneMsgMetaDstcd)); - gridList[i].replace("MSGITEMDSTICNAME" , listMap.get("MSGITEMDSTICNAME")); - gridList[i].replace("MSGCLMNSEQ" , listMap.get("MSGCLMNSEQ")); - } - String userid = com.eactive.eai.rms.common.login.SessionManager.getUserId(request); - detail.put("userid", userid ); - - service.insert(detail,gridList); - - CommonCommand command = new CommonCommand("com.eactive.eai.agent.telegram.UpdateTelegramCommand",map.get("newMsgMetaDstcd")); - agentUtilService.broadcast(command); - - HashMap result = new HashMap(); - result.put("detail",detail); - result.put("list",gridList); - ModelAndView modelAndView = new ModelAndView("jsonView", result); - - return modelAndView; - } - - @SuppressWarnings("unchecked") - @RequestMapping(value= "/bap/admin/message/messageMetaMan.json",params = "cmd=LIST_DOWNLOAD_SQL") - public ModelAndView downloadSql(HttpServletRequest request, - HttpServletResponse response,@RequestParam HashMap map) throws Exception { - - List> msgMetaList = new ArrayList>(); - for (String searchMsgMetaDstcd : map.get("searchMsgMetaDstcdList").toString().split(",")) { - HashMap msgMeta = service.selectDetail(searchMsgMetaDstcd); - msgMetaList.add((Map)msgMeta.get("detail")); - } - - HashMap messageMeta = new HashMap(); - messageMeta.put("list", msgMetaList); - messageMeta.put("userid",com.eactive.eai.rms.common.login.SessionManager.getUserId(request)); - messageMeta.put("fileName", map.get("fileName")); - messageMeta.put("svrType", map.get("svrType")); - - ModelAndView modelAndView = new ModelAndView("jsonView",service.mkInserSqlForMsgMeta(messageMeta)); - - return modelAndView; - } - @RequestMapping(value= "/bap/admin/message/messageMetaMan.view",params = "cmd=LIST_FILE_DOWNLOAD") - public String fileDownload(HttpServletRequest request) throws Exception { - - return "/bap/admin/common/filedownload"; - } -} \ No newline at end of file +} diff --git a/src/main/java/com/eactive/eai/rms/bap/manage/message/messageMeta/BapMessageMetaService.java b/src/main/java/com/eactive/eai/rms/bap/manage/message/messageMeta/BapMessageMetaService.java index dd0ae97..91c9289 100644 --- a/src/main/java/com/eactive/eai/rms/bap/manage/message/messageMeta/BapMessageMetaService.java +++ b/src/main/java/com/eactive/eai/rms/bap/manage/message/messageMeta/BapMessageMetaService.java @@ -1,9 +1,5 @@ package com.eactive.eai.rms.bap.manage.message.messageMeta; -import java.io.FileOutputStream; -import java.io.OutputStream; -import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -13,8 +9,6 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import com.eactive.eai.rms.bap.common.base.BapBaseService; -import com.eactive.eai.rms.bap.manage.comm.property.BapPropertyDao; -import com.eactive.eai.rms.common.util.SqlUtil; @Service("bapMessageMetaService") public class BapMessageMetaService extends BapBaseService { @@ -23,17 +17,13 @@ public class BapMessageMetaService extends BapBaseService { @Qualifier("bapMessageMetaDao") private BapMessageMetaDao dao; - @Autowired - @Qualifier("bapPropertyDao") - private BapPropertyDao propDao; - public HashMap selectList(int startNum,int endNum, HashMap paramMap) throws Exception { - // 전체 목록수 얻기 + // 전체 목록 수 얻기 int totalCount = dao.selectListCount(paramMap); - paramMap.put("startNum" , startNum);// 시작 record - paramMap.put("endNum" , endNum);// 끝 record + paramMap.put("startNum" , startNum);// record + paramMap.put("endNum" , endNum);// record List> list = dao.selectList(paramMap); HashMap map = new HashMap(); @@ -44,11 +34,6 @@ public class BapMessageMetaService extends BapBaseService { return map; } - public int selectTotalCount(HashMap paramMap) throws Exception { - - return dao.selectListCount(paramMap); // 전체 목록수 얻기 - } - public HashMap selectDetail(String msgMetaDstcd) throws Exception { HashMap detail = dao.selectDetail(msgMetaDstcd); @@ -94,162 +79,4 @@ public class BapMessageMetaService extends BapBaseService { dao.deleteList(paramMap); } - @SuppressWarnings("unchecked") - public HashMap mkInserSqlForMsgMeta(HashMap msgMetaMap) throws Exception { - - StringBuffer msgMetaInsertSql = new StringBuffer(); - String[] columnUserId = {"THISMSGREGSNTID","THISMSGAMNDRID","THISMSGCLMNREGSNTID","THISMSGCLMNAMNDRID"}; // userID 입력컬럼 구분 - String[] columnDateTime = {"THISMSGREGIHMS","THISMSGAMNDHMS","THISMSGCLMNREGIHMS","THISMSGCLMNAMNDHMS"}; // DateTime 입력컬럼 구분 - List> msgMetaList = (List>)msgMetaMap.get("list"); - String userid = msgMetaMap.containsKey("userid") ? msgMetaMap.get("userid").toString() : ""; - - for (Map meta : msgMetaList) { - // MESSAGE META LIST into BM03 - List columnArr = new ArrayList(); - String[] columnList = {"MSGMETADSTCD","MSGDESC","THISMSGUSEYN","THISMSGREGSNTID","THISMSGREGIHMS","THISMSGAMNDRID","THISMSGAMNDHMS"}; - columnArr = Arrays.asList(columnList); - msgMetaInsertSql.append("INSERT INTO EAIPKG.TSEAIBM03 ("); - - // 필드명 입력 - for (String column : columnArr) { - msgMetaInsertSql.append((column.equals(columnArr.get(columnArr.size()-1))) ? column : column+","); - } - msgMetaInsertSql.append(") VALUES ("); - // 필드값 입력 - for (String column : columnArr) { - if (column.equals(columnArr.get(columnArr.size()-1))) { - if (Arrays.asList(columnUserId).contains(column)) { - msgMetaInsertSql.append("'"+userid+"');\n"); - } else if (Arrays.asList(columnDateTime).contains(column)) { - msgMetaInsertSql.append("TO_CHAR(LOCALTIMESTAMP, 'YYYYMMDDHH24MISSFF3'));\n"); - } else { - msgMetaInsertSql.append("'"+(meta.containsKey(column) ? meta.get(column) : "")+"');\n"); - } - } else { - if (Arrays.asList(columnUserId).contains(column)) { - msgMetaInsertSql.append("'"+userid+"',"); - } else if (Arrays.asList(columnDateTime).contains(column)) { - msgMetaInsertSql.append("TO_CHAR(LOCALTIMESTAMP, 'YYYYMMDDHH24MISSFF3'),"); - } else { - msgMetaInsertSql.append("'"+(meta.containsKey(column) ? meta.get(column) : "")+"',"); - } - } - } - - HashMap metaMap = selectDetail(meta.get("MSGMETADSTCD").toString()); - List> metaItemList = (List>)metaMap.get("list"); - - // MESSAGE META LIST into BM02 - for (Map metaItem : metaItemList) { - List columnItemArr = new ArrayList(); - String[] columnItemList = {"MSGMETADSTCD","MSGCLMNSEQ","MSGITEMDSTICNAME","THISMSGCLMNUSEYN","THISMSGREGSNTID","THISMSGREGIHMS","THISMSGAMNDRID","THISMSGAMNDHMS"}; - columnItemArr = Arrays.asList(columnItemList); - msgMetaInsertSql.append("INSERT INTO EAIPKG.TSEAIBM02 (MSGGROUPDSTCD,"); - - // 필드명 입력 - for (String columnItem : columnItemArr) { - if (columnItem.equals("MSGMETADSTCD")) continue; - msgMetaInsertSql.append((columnItem.equals(columnItemArr.get(columnItemArr.size()-1))) ? columnItem : columnItem+","); - } - msgMetaInsertSql.append(") VALUES ("); - // 필드값 입력 - for (String column : columnItemArr) { - if (column.equals(columnItemArr.get(columnItemArr.size()-1))) { - if (Arrays.asList(columnUserId).contains(column)) { - msgMetaInsertSql.append("'"+userid+"');\n"); - } else if (Arrays.asList(columnDateTime).contains(column)) { - msgMetaInsertSql.append("TO_CHAR(LOCALTIMESTAMP, 'YYYYMMDDHH24MISSFF3'));\n"); - } else { - msgMetaInsertSql.append("'"+(metaItem.containsKey(column) ? metaItem.get(column) : "")+"');\n"); - } - } else { - if (Arrays.asList(columnUserId).contains(column)) { - msgMetaInsertSql.append("'"+userid+"',"); - } else if (Arrays.asList(columnDateTime).contains(column)) { - msgMetaInsertSql.append("TO_CHAR(LOCALTIMESTAMP, 'YYYYMMDDHH24MISSFF3'),"); - } else { - msgMetaInsertSql.append("'"+(metaItem.containsKey(column) ? metaItem.get(column) : "")+"',"); - } - } - } - } - - // MESSAGE META LIST into BM01 - for (Map metaItem : metaItemList) { - List columnClmArr = new ArrayList(); - String[] columnClmList = {"MSGITEMDSTICNAME","THISMSGCLMNUSEYN","MSGCLMNNAME","MSGCLMNATTRIPTRNCD","MSGCLMNVAL","THISMSGCLMNREGSNTID","THISMSGCLMNREGIHMS","THISMSGCLMNAMNDRID","THISMSGCLMNAMNDHMS"}; - columnClmArr = Arrays.asList(columnClmList); - - msgMetaInsertSql.append("MERGE INTO EAIPKG.TSEAIBM01 r USING (VALUES("); - // 필드값 입력 - for (String column : columnClmArr) { - if (column.equals(columnClmArr.get(columnClmArr.size()-1))) { - if (Arrays.asList(columnUserId).contains(column)) { - msgMetaInsertSql.append("'"+userid+"')) "); - } else if (Arrays.asList(columnDateTime).contains(column)) { - msgMetaInsertSql.append("TO_CHAR(LOCALTIMESTAMP, 'YYYYMMDDHH24MISSFF3'))) "); - } else { - msgMetaInsertSql.append("'"+(metaItem.containsKey(column) ? metaItem.get(column) : "")+"')) "); - } - } else { - if (Arrays.asList(columnUserId).contains(column)) { - msgMetaInsertSql.append("'"+userid+"',"); - } else if (Arrays.asList(columnDateTime).contains(column)) { - msgMetaInsertSql.append("TO_CHAR(LOCALTIMESTAMP, 'YYYYMMDDHH24MISSFF3'),"); - } else { - msgMetaInsertSql.append("'"+(metaItem.containsKey(column) ? metaItem.get(column) : "")+"',"); - } - } - } - // 필드명 입력 - msgMetaInsertSql.append("AS s("); - for (String columnClm : columnClmArr) { - msgMetaInsertSql.append((columnClm.equals(columnClmArr.get(columnClmArr.size()-1))) ? columnClm+")\n" : columnClm+","); - } - msgMetaInsertSql.append("ON r.MSGITEMDSTICNAME = s.MSGITEMDSTICNAME WHEN NOT MATCHED THEN\n"); - msgMetaInsertSql.append("INSERT ("); - for (String columnClm : columnClmArr) { - msgMetaInsertSql.append((columnClm.equals(columnClmArr.get(columnClmArr.size()-1))) ? "r."+columnClm : "r."+columnClm+","); - } - msgMetaInsertSql.append(") VALUES ("); - for (String columnClm : columnClmArr) { - msgMetaInsertSql.append((columnClm.equals(columnClmArr.get(columnClmArr.size()-1))) ? "s."+columnClm+");\n" : "s."+columnClm+","); - } - } - } - - HashMap retMap = new HashMap(); - if (msgMetaMap.get("fileName") != null) { - OutputStream output = null; - try { - String sqlDownloadPath = getProperties("SQL_DOWNLOAD", "DOWNLOAD_PATH"); - String sqlDownloadFile = sqlDownloadPath+msgMetaMap.get("fileName"); - output = new FileOutputStream(sqlDownloadFile); - if (sqlDownloadPath != null) { - byte[] bt = msgMetaInsertSql.toString().getBytes(); - output.write(bt); - output.close(); - } - retMap.put("path", sqlDownloadPath); - } catch (Exception e) { - logger.error( e.getMessage(), e); - } finally { - if(output != null) try { output.close(); } catch(Exception ee) {logger.error( ee.getMessage(), ee);} - } - } else { - retMap = SqlUtil.executeSql(msgMetaInsertSql.toString(), "BAP_"+msgMetaMap.get("svrType").toString().toUpperCase()); - } - - return retMap; - } - - private String getProperties(String propGroup, String propName) throws Exception { - HashMap params = new HashMap(); - params.put("prptyGroupName", propGroup); - params.put("prptyName", propName); - - HashMap props = propDao.getProperties(params); - - return props.get("PRPTY2VAL").toString(); - } -} \ No newline at end of file +} diff --git a/src/main/java/com/eactive/eai/rms/bap/manage/work/message/BapMessageProcController.java b/src/main/java/com/eactive/eai/rms/bap/manage/work/message/BapMessageProcController.java index f674a8d..47c7bee 100644 --- a/src/main/java/com/eactive/eai/rms/bap/manage/work/message/BapMessageProcController.java +++ b/src/main/java/com/eactive/eai/rms/bap/manage/work/message/BapMessageProcController.java @@ -137,20 +137,20 @@ public class BapMessageProcController extends BapBaseAnnotationController { List> bjobBzwkDstcd = comboService.selectListComboForTableWithCode("TSEAIBJ02", "BJOBBZWKDSTCD", "BJOBBZWKNAME"); List> bjobInstiDstcd = comboService.selectListComboForTableWithCode("TSEAIBJ06", "OSIDINSTIDSTCD", "OSIDINSTINAME"); // -// List> sysCd = comboService.selectListComboForTableWithCode("TSEAIBJ11", "SYSCD", "SYSNAME"); - List> uapplCd = //comboService.selectListComboForTableWithCode("TSEAICM01", "TRIM(EAIBZWKDSTCD)", "BZWKDSTICNAME"); - comboService.selectListComboForTable("TSEAICM01", "TRIM(EAIBZWKDSTCD)", "BZWKDSTICNAME","systeminoutdstcd = 'I' "); - List> bJobCycleGb = //comboService.selectListCombo("BAP_CYCLE_GB"); // BATCH작업주기구분 - comboService.selectListComboForTable("TSEAICM20", "code", "codename","codegroup = 'BAP_CYCLE_GB' "); + List> sysCd = comboService.selectListComboForTableWithCode("TSEAIBJ11", "SYSCD", "SYSNAME"); +// List> uapplCd = //comboService.selectListComboForTableWithCode("TSEAICM01", "TRIM(EAIBZWKDSTCD)", "BZWKDSTICNAME"); +// comboService.selectListComboForTable("TSEAICM01", "TRIM(EAIBZWKDSTCD)", "BZWKDSTICNAME","systeminoutdstcd = 'I' "); +// List> bJobCycleGb = //comboService.selectListCombo("BAP_CYCLE_GB"); // BATCH작업주기구분 +// comboService.selectListComboForTable("TSEAICM20", "code", "codename","codegroup = 'BAP_CYCLE_GB' "); Map resultMap = new HashMap(); resultMap.put("bjobBzwkDstcd" , bjobBzwkDstcd); resultMap.put("bjobInstiDstcd", bjobInstiDstcd); // resultMap.put("groupCoCd" , groupCoCd); -// resultMap.put("sysCd" , sysCd); - resultMap.put("uapplCd" , uapplCd); - resultMap.put("bJobCycleGb" , bJobCycleGb); + resultMap.put("sysCd" , sysCd); +// resultMap.put("uapplCd" , uapplCd); +// resultMap.put("bJobCycleGb" , bJobCycleGb); ModelAndView modelAndView = new ModelAndView("jsonView",resultMap); return modelAndView; @@ -159,20 +159,23 @@ public class BapMessageProcController extends BapBaseAnnotationController { @RequestMapping(value= "/bap/admin/work/messageProcMan.json",params = "cmd=LIST_PROP") public ModelAndView getProps( HttpServletRequest request, HttpServletResponse response, - @RequestParam String bjobBzwkDstcd, - @RequestParam String bjobMsgDstcd + @RequestParam String bjobBzwkDstcd ) throws Exception { Map resultMap = new HashMap(); +// if(!StringUtils.isEmpty(bjobBzwkDstcd)) { +// HashMap propMap = service.getProps(bjobBzwkDstcd); // 프로퍼티 정보 +// HashMap InstMap = service.selectOsidInstiDstcd(bjobBzwkDstcd); +// +// resultMap.put("propMap", propMap); +// resultMap.put("InstMap", InstMap); +// } + if(!StringUtils.isEmpty(bjobBzwkDstcd)) { - HashMap propMap = service.getProps(bjobBzwkDstcd, bjobMsgDstcd); // 프로퍼티 정보 - HashMap InstMap = service.selectOsidInstiDstcd(bjobBzwkDstcd); - - resultMap.put("propMap", propMap); - resultMap.put("InstMap", InstMap); + HashMap map = service.getProps(bjobBzwkDstcd); } - + ModelAndView modelAndView = new ModelAndView("jsonView", resultMap); return modelAndView; } diff --git a/src/main/java/com/eactive/eai/rms/bap/manage/work/message/BapMessageProcDao.java b/src/main/java/com/eactive/eai/rms/bap/manage/work/message/BapMessageProcDao.java index e10de38..e7c56dc 100644 --- a/src/main/java/com/eactive/eai/rms/bap/manage/work/message/BapMessageProcDao.java +++ b/src/main/java/com/eactive/eai/rms/bap/manage/work/message/BapMessageProcDao.java @@ -87,4 +87,9 @@ public class BapMessageProcDao extends SqlMapClientTemplateDao { public void deleteVerifyInfo(HashMap param) throws Exception{ this.template.delete("BapMessageProc.deleteVerifyInfo", param); } + + public void deleteBS01(HashMap param) throws Exception{ + this.template.delete("BapMessageProc.deleteBS01", param); + } + } \ No newline at end of file diff --git a/src/main/java/com/eactive/eai/rms/bap/manage/work/message/BapMessageProcService.java b/src/main/java/com/eactive/eai/rms/bap/manage/work/message/BapMessageProcService.java index d0e3441..180f2ac 100644 --- a/src/main/java/com/eactive/eai/rms/bap/manage/work/message/BapMessageProcService.java +++ b/src/main/java/com/eactive/eai/rms/bap/manage/work/message/BapMessageProcService.java @@ -75,9 +75,8 @@ public class BapMessageProcService extends BapBaseService { } } - public void insert(HashMap paramMap, HashMap[] list, HashMap connList) throws Exception { - -// paramMap.put( "bjobMsgDstcd", dao.generatePK(paramMap)); + public void insert(HashMap paramMap, HashMap[] list, HashMap connList) throws Exception { + paramMap.put( "bjobMsgDstcd", dao.generatePK(paramMap)); dao.insert(paramMap); telePropDao.delete(paramMap); telePropDao.deleteProperty(paramMap); @@ -99,7 +98,8 @@ public class BapMessageProcService extends BapBaseService { public void delete(HashMap paramMap) throws Exception { dao.delete(paramMap); - dao.deleteVerifyInfo(paramMap); +// dao.deleteVerifyInfo(paramMap); + dao.deleteBS01(paramMap); telePropDao.delete(paramMap); telePropDao.deleteProperty(paramMap); } @@ -114,6 +114,18 @@ public class BapMessageProcService extends BapBaseService { map.put("rows", list); return map; } + + public HashMap getProps(String bjobBzwkDstcd) throws Exception { + + HashMap param = new HashMap(); + param.put("bjobBzwkDstcd", bjobBzwkDstcd); + List> list = dao.getProps(param); + HashMap map = new HashMap(); + + map.put("rows", list); + + return map; + } public HashMap selectOsidInstiDstcd(String bjobBzwkDstcd) throws Exception { diff --git a/src/main/java/com/eactive/eai/rms/bap/tansaction/procWork/BapProcWorkController.java b/src/main/java/com/eactive/eai/rms/bap/tansaction/procWork/BapProcWorkController.java index d7e4b55..b185650 100644 --- a/src/main/java/com/eactive/eai/rms/bap/tansaction/procWork/BapProcWorkController.java +++ b/src/main/java/com/eactive/eai/rms/bap/tansaction/procWork/BapProcWorkController.java @@ -92,14 +92,14 @@ public class BapProcWorkController extends BapBaseAnnotationController { List> bjobBzwkDstcd = comboService.selectListComboForTableWithCode("TSEAIBJ02", "BJOBBZWKDSTCD", "BJOBBZWKNAME"); List> osidInstiDstcd = statusService.selectOsidInstiDstcd(""); - List> svcPrcssNo = comboService.selectListComboForTable("TSEAICM20", "code", "codename","codegroup = 'SVC_PRCSS_NO' "); +// List> svcPrcssNo = comboService.selectListComboForTable("TSEAICM20", "code", "codename","codegroup = 'SVC_PRCSS_NO' "); //comboService.selectListCombo("SVC_PRCSS_NO"); Map resultMap = new HashMap(); resultMap.put("bjobBzwkDstcd" , bjobBzwkDstcd); resultMap.put("osidInstiDstcd" , osidInstiDstcd); - resultMap.put("svcPrcssNo" , svcPrcssNo); +// resultMap.put("svcPrcssNo" , svcPrcssNo); ModelAndView modelAndView = new ModelAndView("jsonView",resultMap); return modelAndView; diff --git a/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionStatus/BapTransactionStatusController.java b/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionStatus/BapTransactionStatusController.java index 6f0f4c1..a211a1a 100644 --- a/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionStatus/BapTransactionStatusController.java +++ b/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionStatus/BapTransactionStatusController.java @@ -50,43 +50,63 @@ public class BapTransactionStatusController extends BapBaseAnnotationController * @throws Exception */ @RequestMapping(value= "/bap/transaction/transactionStatusMan.json", params = "cmd=LIST") - public ModelAndView selectList(HttpServletRequest request, + public ModelAndView selectList(HttpServletRequest request, JsonPageVo pageVo, @RequestParam HashMap paramMap) throws Exception { -// String date = (String)paramMap.get("searchStartYYYYMMDD"); -// CommonCommand command = new CommonCommand("com.eactive.eai.agent.schedule.GetScheduleBasisListCommand",date); + String date = (String)paramMap.get("searchStartYYYYMMDD"); + CommonCommand command = new CommonCommand("com.eactive.eai.agent.schedule.GetScheduleBasisListCommand",date); + + Map returnMap = agentUtilService.broadcast(command); + Iterator iter = returnMap.keySet().iterator(); + String svrName = iter.next(); + String[] basis = null; + + if(returnMap.get(svrName) instanceof String[]) { + basis = (String[])returnMap.get(svrName); + } -// String[] basis = null; - - Map returnMap = null; - Iterator iter = null; - String svrName = ""; -// try { -// returnMap = agentUtilService.broadcast(command); -// iter = returnMap.keySet().iterator(); -// svrName = iter.next(); -// basis = (String[])returnMap.get(svrName); -// } catch (Exception e) { -// basis = new String[1]; -// basis[0] = "D"; -// } - -// paramMap.put("basis", basis); + if ( basis == null ){ + basis = new String[1]; + basis[0] = "D"; + } + paramMap.put("basis", basis); String activeTab = (String)paramMap.get("activeTab"); if ( activeTab.equals("tabS") ){ - CommonCommand command = new CommonCommand("com.eactive.eai.agent.transaction.ProcessingFileTransferCommand",""); + command = new CommonCommand("com.eactive.eai.agent.transaction.ProcessingFileTransferCommand",""); returnMap = agentUtilService.broadcast(command); iter = returnMap.keySet().iterator(); svrName = iter.next(); - @SuppressWarnings("unchecked") - List> list = (List>)returnMap.get(svrName); - paramMap.put("procList", list); + + Object value = returnMap.get(svrName); + + + if(value instanceof List) { + @SuppressWarnings("unchecked") + List> list = (List>)value; + paramMap.put("procList", list); + }else { + paramMap.put("procList", null); + } + } - Map resultMap = service.selectList( paramMap); + //Map resultMap = service.selectList( paramMap); - ModelAndView modelAndView = new ModelAndView("jsonView",resultMap); + //ModelAndView modelAndView = new ModelAndView("jsonView",resultMap); + + Map listMap = service.selectList(pageVo.getStartNum(), pageVo.getEndNum(), paramMap); + + pageVo.setTotalCount((Integer)listMap.get("totalCount")); + + Map resultMap = new HashMap(); + resultMap.put("total" , pageVo.getTotal()); //전체 페이지수 + resultMap.put("page" , pageVo.getPage()); //현재 페이지수 + resultMap.put("records", pageVo.getTotalCount()); //전체 레코드건수 + resultMap.put("rows" , listMap.get("rows")); + + ModelAndView modelAndView = new ModelAndView("jsonView",resultMap); + return modelAndView; } @@ -135,22 +155,19 @@ public class BapTransactionStatusController extends BapBaseAnnotationController public ModelAndView initCombo( HttpServletRequest request, HttpServletResponse response) throws Exception { - List> groupCoCd = comboService.selectListComboForTable("TSEAICM20", "code", "codename","codegroup = 'EAIGROUPCOCD' "); - //comboService.selectListCombo("EAIGROUPCOCD"); - List> bjobBzwkDstcd = comboService.selectListComboForTableWithCode("TSEAIBJ02", "BJOBBZWKDSTCD", "BJOBBZWKNAME"); - List> osidInstiDstcd = service.selectOsidInstiDstcd(""); - List> uapplCd = comboService.selectListComboForTableWithCode("TSEAICM01", "TRIM(EAIBZWKDSTCD)", "BZWKDSTICNAME"); + List> bjobBzwkDstcd = comboService.selectListComboForTableWithCode("TSEAIBJ02", "BJOBBZWKDSTCD", "BJOBBZWKNAME"); + List> osidInstiDstcd = service.selectOsidInstiDstcd(""); +// List> uapplCd = comboService.selectListComboForTableWithCode("TSEAICM01", "TRIM(EAIBZWKDSTCD)", "BZWKDSTICNAME"); Map resultMap = new HashMap(); resultMap.put("bjobBzwkDstcd" , bjobBzwkDstcd); resultMap.put("osidInstiDstcd" , osidInstiDstcd); - resultMap.put("groupCoCd" , groupCoCd); - resultMap.put("uapplCd" , uapplCd); +// resultMap.put("uapplCd" , uapplCd); - ModelAndView modelAndView = new ModelAndView("jsonView",resultMap); - return modelAndView; - } + ModelAndView modelAndView = new ModelAndView("jsonView",resultMap); + return modelAndView; + } @RequestMapping(value= "/bap/transaction/transactionStatusMan.json",params = "cmd=LIST_ORGN_COMBO") public ModelAndView initOrgnCombo( HttpServletRequest request, diff --git a/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionStatus/BapTransactionStatusDao.java b/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionStatus/BapTransactionStatusDao.java index d38f2ee..bce6585 100644 --- a/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionStatus/BapTransactionStatusDao.java +++ b/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionStatus/BapTransactionStatusDao.java @@ -15,18 +15,31 @@ public class BapTransactionStatusDao extends SqlMapClientTemplateDao { public List> findStatusList(HashMap param) throws Exception { return (List>)template.queryForList("BapTranStatus.list_normal", param); } + public int findStatusListCount(HashMap param) throws Exception { + return (Integer)template.queryForObject("BapTranStatus.list_normal_count", param); + } public List> findErrorList(HashMap param) throws Exception { return (List>)template.queryForList("BapTranStatus.list_e", param); } + public int findErrorListCount(HashMap param) throws Exception { + return (Integer)template.queryForObject("BapTranStatus.list_e_count", param); + } public List> findFutureList(HashMap param) throws Exception { return (List>)template.queryForList("BapTranStatus.list_f", param); } + public int findFutureListCount(HashMap param) throws Exception { + return (Integer)template.queryForObject("BapTranStatus.list_f_count", param); + } public List> findDelayList(HashMap param) throws Exception { return (List>)template.queryForList("BapTranStatus.list_l", param); } public List> findSpecList(HashMap param) throws Exception { return (List>)template.queryForList("BapTranStatus.speclist", param); - } + } + public int findSpecListCount(HashMap param) throws Exception { + return (Integer)template.queryForObject("BapTranStatus.speclist_count", param); + } + public HashMap selectDetail(HashMap param) throws Exception { return (HashMap)template.queryForObject("BapTranStatus.masterlog", param); @@ -41,11 +54,11 @@ public class BapTransactionStatusDao extends SqlMapClientTemplateDao { } public int getFileLogCount(HashMap param) throws Exception { - return (Integer)template.queryForObject("BapTranStatus.getFileLogCount", param); + return (Integer)template.queryForObject("BapTranStatus.filelogcount", param); } public int getStageLogCount(HashMap param) throws Exception { - return (Integer)template.queryForObject("BapTranStatus.getStageLogCount", param); + return (Integer)template.queryForObject("BapTranStatus.stagelogcount", param); } public List> selectOsidInstiDstcd(HashMap param) throws Exception { diff --git a/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionStatus/BapTransactionStatusService.java b/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionStatus/BapTransactionStatusService.java index eb11183..a716cb6 100644 --- a/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionStatus/BapTransactionStatusService.java +++ b/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionStatus/BapTransactionStatusService.java @@ -20,46 +20,51 @@ public class BapTransactionStatusService extends BapBaseService { @Qualifier("bapTransactionStatusDao") private BapTransactionStatusDao dao; - public HashMap selectList(HashMap paramMap) throws Exception { - + public HashMap selectList(int startNum,int endNum, HashMap paramMap) throws Exception { + String activeTab = (String)paramMap.get("activeTab"); ArrayList tranPrcssDstcds = new ArrayList(); - ArrayList tranPrcssDstcds2 = new ArrayList(); - + paramMap.put("startNum" , startNum); + paramMap.put("endNum" , endNum); + HashMap map = new HashMap(); - + if ( activeTab.equals("tabE")){ tranPrcssDstcds.add("T"); - //tranPrcssDstcds.add("R"); + tranPrcssDstcds.add("R"); paramMap.put("tranPrcssDstcds", tranPrcssDstcds); - paramMap.put("tranPrcssDstcds2", tranPrcssDstcds2); List> listNomal = dao.findStatusList(paramMap); List> listError = dao.findErrorList(paramMap); map.put("rows", processErrorList(listNomal, listError)); - + map.put("totalCount", dao.findErrorListCount(paramMap)); }else if ( activeTab.equals("tabF")){ List> listF = dao.findFutureList(paramMap); map.put("rows", listF); + map.put("totalCount", dao.findFutureListCount(paramMap)); }else if ( activeTab.equals("tabQ")){ tranPrcssDstcds.add("Q"); paramMap.put("tranPrcssDstcds", tranPrcssDstcds); List> waitlist = dao.findStatusList(paramMap); map.put("rows", waitlist); - + map.put("totalCount", dao.findStatusListCount(paramMap)); }else if ( activeTab.equals("tabS")){ - tranPrcssDstcds2.add("S"); + tranPrcssDstcds.add("S"); paramMap.put("tranPrcssDstcds", tranPrcssDstcds); - paramMap.put("tranPrcssDstcds2", tranPrcssDstcds2); List> sendlist = dao.findStatusList(paramMap); @SuppressWarnings("unchecked") List> memList = (List>)paramMap.get("procList"); - processMemList(sendlist, memList); + + if(memList != null) { + processMemList(sendlist, memList); + } map.put("rows", sendlist); + map.put("totalCount", dao.findStatusListCount(paramMap)); }else if ( activeTab.equals("tabA")){ List> listA = dao.findSpecList(paramMap); map.put("rows", listA); + map.put("totalCount", dao.findSpecListCount(paramMap)); } return map; diff --git a/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionTrace/BapTransactionTraceController.java b/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionTrace/BapTransactionTraceController.java index 2978d11..1610347 100644 --- a/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionTrace/BapTransactionTraceController.java +++ b/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionTrace/BapTransactionTraceController.java @@ -17,7 +17,6 @@ import org.springframework.web.servlet.ModelAndView; import com.eactive.eai.agent.command.CommonCommand; import com.eactive.eai.rms.common.base.BapBaseAnnotationController; -import com.eactive.eai.rms.common.combo.ComboService; import com.eactive.eai.rms.common.combo.IbatisComboService; import com.eactive.eai.rms.common.login.SessionManager; import com.eactive.eai.rms.common.util.CamelCaseUtil; @@ -72,15 +71,15 @@ public class BapTransactionTraceController extends BapBaseAnnotationController public ModelAndView initCombo( HttpServletRequest request, HttpServletResponse response) throws Exception { - List> groupCoCd = comboService.selectListComboForTable("TSEAICM20", "code", "codename","codegroup = 'EAIGROUPCOCD' "); +// List> groupCoCd = comboService.selectListComboForTable("TSEAICM20", "code", "codename","codegroup = 'EAIGROUPCOCD' "); List> bjobBzwkDstcd = comboService.selectListComboForTableWithCode("TSEAIBJ02", "BJOBBZWKDSTCD", "BJOBBZWKNAME"); - List> uapplCd = comboService.selectListComboForTableWithCode("TSEAICM01", "TRIM(EAIBZWKDSTCD)", "BZWKDSTICNAME"); +// List> uapplCd = comboService.selectListComboForTableWithCode("TSEAICM01", "TRIM(EAIBZWKDSTCD)", "BZWKDSTICNAME"); Map resultMap = new HashMap(); resultMap.put("bjobBzwkDstcd" , bjobBzwkDstcd); - resultMap.put("groupCoCd" , groupCoCd); - resultMap.put("uapplCd" , uapplCd); +// resultMap.put("groupCoCd" , groupCoCd); +// resultMap.put("uapplCd" , uapplCd); ModelAndView modelAndView = new ModelAndView("jsonView",resultMap); return modelAndView; diff --git a/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionTrace/BapTransactionTraceDao.java b/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionTrace/BapTransactionTraceDao.java index 474bb38..c34bca0 100644 --- a/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionTrace/BapTransactionTraceDao.java +++ b/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionTrace/BapTransactionTraceDao.java @@ -19,4 +19,8 @@ public class BapTransactionTraceDao extends SqlMapClientTemplateDao { public List> selectList(HashMap param) throws Exception { return (List>)template.queryForList("BapTransactionTrace.selectList", param); } + + public List> selectOsidInstiDstcd(HashMap param) throws Exception { + return (List>)template.queryForList("BapTranStatus.selectOsidInstiDstcd", param); + } } \ No newline at end of file diff --git a/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionTrace/BapTransactionTraceService.java b/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionTrace/BapTransactionTraceService.java index 79cf1e7..93e5906 100644 --- a/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionTrace/BapTransactionTraceService.java +++ b/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionTrace/BapTransactionTraceService.java @@ -34,6 +34,14 @@ public class BapTransactionTraceService extends BapBaseService { return map; - } + } + + public List> selectOsidInstiDstcd(String bjobBzwkDstcd) throws Exception { + + HashMap param = new HashMap(); + param.put("bjobBzwkDstcd", bjobBzwkDstcd); + + return dao.selectOsidInstiDstcd(param); + } } \ No newline at end of file diff --git a/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionWait/BapTransactionWaitController.java b/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionWait/BapTransactionWaitController.java index 73b097c..bab492b 100644 --- a/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionWait/BapTransactionWaitController.java +++ b/src/main/java/com/eactive/eai/rms/bap/tansaction/transactionWait/BapTransactionWaitController.java @@ -86,14 +86,14 @@ public class BapTransactionWaitController extends BapBaseAnnotationController { List> bjobBzwkDstcd = comboService.selectListComboForTableWithCode("TSEAIBJ02", "BJOBBZWKDSTCD", "BJOBBZWKNAME"); List> osidInstiDstcd = statusService.selectOsidInstiDstcd(""); - List> svcPrcssNo = comboService.selectListComboForTable("TSEAICM20", "code", "codename","codegroup = 'SVC_PRCSS_NO' "); +// List> svcPrcssNo = comboService.selectListComboForTable("TSEAICM20", "code", "codename","codegroup = 'SVC_PRCSS_NO' "); //comboService.selectListCombo("SVC_PRCSS_NO"); Map resultMap = new HashMap(); resultMap.put("bjobBzwkDstcd" , bjobBzwkDstcd); resultMap.put("osidInstiDstcd" , osidInstiDstcd); - resultMap.put("svcPrcssNo" , svcPrcssNo); +// resultMap.put("svcPrcssNo" , svcPrcssNo); ModelAndView modelAndView = new ModelAndView("jsonView",resultMap); return modelAndView; diff --git a/src/main/resources/com/eactive/eai/rms/bap/manage/adapter/Adapter-oracle.xml b/src/main/resources/com/eactive/eai/rms/bap/manage/adapter/Adapter-oracle.xml index a7918ae..5386651 100644 --- a/src/main/resources/com/eactive/eai/rms/bap/manage/adapter/Adapter-oracle.xml +++ b/src/main/resources/com/eactive/eai/rms/bap/manage/adapter/Adapter-oracle.xml @@ -18,7 +18,7 @@ A.PRPTYGROUPNAME, A.ADPTRDESC, B.PRPTYGROUPDESC - FROM $schemaId$.TSEAIBA02 A LEFT OUTER JOIN $schemaId$.TSEAIBA03 B + FROM $schemaId$.TSEAIBA02 A LEFT OUTER JOIN $schemaId$.TSEAIBP01 B ON A.PrptyGroupName = B.PrptyGroupName WHERE AdptrBzwkGroupName=#adptrBzwkGroupName# @@ -27,7 +27,7 @@ SELECT B.PRPTYNAME, B.PRPTY2VAL - FROM $schemaId$.TSEAIBA02 A LEFT OUTER JOIN $schemaId$.TSEAIBA04 B + FROM $schemaId$.TSEAIBA02 A LEFT OUTER JOIN $schemaId$.TSEAIBP02 B ON A.PrptyGroupName = B.PrptyGroupName WHERE A.AdptrBzwkGroupName=#adptrBzwkGroupName# @@ -47,6 +47,9 @@ UPPER(AdptrBzwkGroupName) LIKE '%' || #searchAdptrBzwkGroupName# || '%' + + UPPER(AdptrBzwkGroupDesc) LIKE '%' || #searchAdptrBzwkGroupDesc# || '%' + ) TMP ) T WHERE ROWNO BETWEEN #startNum# AND #endNum# diff --git a/src/main/resources/com/eactive/eai/rms/bap/manage/common/AdapterPropertyMan-oracle.xml b/src/main/resources/com/eactive/eai/rms/bap/manage/common/AdapterPropertyMan-oracle.xml index abf8517..0f5dbf7 100644 --- a/src/main/resources/com/eactive/eai/rms/bap/manage/common/AdapterPropertyMan-oracle.xml +++ b/src/main/resources/com/eactive/eai/rms/bap/manage/common/AdapterPropertyMan-oracle.xml @@ -6,7 +6,7 @@ FROM ( SELECT ROW_NUMBER() OVER(ORDER BY BA03.PrptyGroupName) ROWNO, BA03.PrptyGroupName, BA03.PrptyGroupDesc - FROM $schemaId$.TSEAIBA03 BA03 LEFT OUTER JOIN $schemaId$.TSEAIBA04 BA04 + FROM $schemaId$.TSEAIBP01 BA03 LEFT OUTER JOIN $schemaId$.TSEAIBP02 BA04 ON BA03.PRPTYGROUPNAME = BA04.PRPTYGROUPNAME @@ -30,7 +30,7 @@ SELECT COUNT(*) AS TOTALCOUNT FROM ( SELECT BA03.PRPTYGROUPNAME - FROM $schemaId$.TSEAIBA03 BA03 LEFT OUTER JOIN $schemaId$.TSEAIBA04 BA04 + FROM $schemaId$.TSEAIBP01 BA03 LEFT OUTER JOIN $schemaId$.TSEAIBP02 BA04 ON BA03.PRPTYGROUPNAME = BA04.PRPTYGROUPNAME diff --git a/src/main/resources/com/eactive/eai/rms/bap/manage/common/AdapterPropertyMan.xml b/src/main/resources/com/eactive/eai/rms/bap/manage/common/AdapterPropertyMan.xml index 4d6dbe6..e280b9f 100644 --- a/src/main/resources/com/eactive/eai/rms/bap/manage/common/AdapterPropertyMan.xml +++ b/src/main/resources/com/eactive/eai/rms/bap/manage/common/AdapterPropertyMan.xml @@ -3,40 +3,40 @@ SELECT PRPTYGROUPNAME AS "PRPTYGROUPNAME", PRPTYGROUPDESC AS "PRPTYGROUPDESC" - FROM $schemaId$.TSEAIBA03 + FROM $schemaId$.TSEAIBP01 WHERE PrptyGroupName = #prptyGroupName# SELECT PRPTYNAME AS "PRPTYNAME", PRPTY2VAL AS "PRPTY2VAL" - FROM $schemaId$.TSEAIBA04 + FROM $schemaId$.TSEAIBP02 WHERE PrptyGroupName = #prptyGroupName# - UPDATE $schemaId$.TSEAIBA03 + UPDATE $schemaId$.TSEAIBP01 SET PrptyGroupDesc = #prptyGroupDesc# WHERE PrptyGroupName = #prptyGroupName# - INSERT INTO $schemaId$.TSEAIBA03( + INSERT INTO $schemaId$.TSEAIBP01( PrptyGroupName, PrptyGroupDesc) VALUES(#prptyGroupName#, #prptyGroupDesc#) - INSERT INTO $schemaId$.TSEAIBA04( + INSERT INTO $schemaId$.TSEAIBP02( PrptyGroupName, PrptyName, Prpty2Val) VALUES(#prptyGroupName#, #prptyName#, #prpty2Val#) - DELETE FROM $schemaId$.TSEAIBA03 WHERE PrptyGroupName = #prptyGroupName# + DELETE FROM $schemaId$.TSEAIBP01 WHERE PrptyGroupName = #prptyGroupName# - DELETE FROM $schemaId$.TSEAIBA04 WHERE PrptyGroupName = #prptyGroupName# + DELETE FROM $schemaId$.TSEAIBP02 WHERE PrptyGroupName = #prptyGroupName# diff --git a/src/main/resources/com/eactive/eai/rms/bap/manage/common/Combo-oracle.xml b/src/main/resources/com/eactive/eai/rms/bap/manage/common/Combo-oracle.xml index d36e0a6..ba9ccf1 100644 --- a/src/main/resources/com/eactive/eai/rms/bap/manage/common/Combo-oracle.xml +++ b/src/main/resources/com/eactive/eai/rms/bap/manage/common/Combo-oracle.xml @@ -17,7 +17,7 @@ - SELECT $codeColumn$ CODE, CONCAT( '[' , $codeColumn$ , ']' , $nameColumn$ ) NAME + SELECT distinct $codeColumn$ CODE, '[' || $codeColumn$ || ']' || $nameColumn$ NAME FROM $schemaId$.$tableName$ $where$ diff --git a/src/main/resources/com/eactive/eai/rms/bap/manage/common/TelePropertyMan-oracle.xml b/src/main/resources/com/eactive/eai/rms/bap/manage/common/TelePropertyMan-oracle.xml index 3bf12f3..2fcf03c 100644 --- a/src/main/resources/com/eactive/eai/rms/bap/manage/common/TelePropertyMan-oracle.xml +++ b/src/main/resources/com/eactive/eai/rms/bap/manage/common/TelePropertyMan-oracle.xml @@ -6,7 +6,7 @@ FROM ( SELECT ROW_NUMBER() OVER(ORDER BY BA05.PrptyGroupName) ROWNO, BA05.PrptyGroupName, BA05.PrptyGroupDesc - FROM $schemaId$.TSEAIBA05 BA05 LEFT OUTER JOIN $schemaId$.TSEAIBA06 BA06 + FROM $schemaId$.TSEAIBP01 BA05 LEFT OUTER JOIN $schemaId$.TSEAIBP02 BA06 ON BA05.PRPTYGROUPNAME = BA06.PRPTYGROUPNAME @@ -30,7 +30,7 @@ SELECT COUNT(*) AS TOTALCOUNT FROM ( SELECT BA05.PRPTYGROUPNAME - FROM $schemaId$.TSEAIBA05 BA05 LEFT OUTER JOIN $schemaId$.TSEAIBA06 BA06 + FROM $schemaId$.TSEAIBP01 BA05 LEFT OUTER JOIN $schemaId$.TSEAIBP02 BA06 ON BA05.PRPTYGROUPNAME = BA06.PRPTYGROUPNAME @@ -47,5 +47,5 @@ GROUP BY BA05.PRPTYGROUPNAME, BA05.PRPTYGROUPDESC ) - + diff --git a/src/main/resources/com/eactive/eai/rms/bap/manage/common/TelePropertyMan.xml b/src/main/resources/com/eactive/eai/rms/bap/manage/common/TelePropertyMan.xml index f579d4d..0012c5c 100644 --- a/src/main/resources/com/eactive/eai/rms/bap/manage/common/TelePropertyMan.xml +++ b/src/main/resources/com/eactive/eai/rms/bap/manage/common/TelePropertyMan.xml @@ -3,45 +3,45 @@ SELECT PRPTYGROUPNAME AS "PRPTYGROUPNAME", PRPTYGROUPDESC AS "PRPTYGROUPDESC" - FROM $schemaId$.TSEAIBA05 + FROM $schemaId$.TSEAIBP01 WHERE PrptyGroupName = #prptyGroupName# SELECT PRPTYNAME AS "PRPTYNAME", PRPTY2VAL AS "PRPTY2VAL" - FROM $schemaId$.TSEAIBA06 + FROM $schemaId$.TSEAIBP02 WHERE PrptyGroupName = #prptyGroupName# - UPDATE $schemaId$.TSEAIBA05 + UPDATE $schemaId$.TSEAIBP01 SET PrptyGroupDesc = #prptyGroupDesc# WHERE PrptyGroupName = #prptyGroupName# - INSERT INTO $schemaId$.TSEAIBA05( + INSERT INTO $schemaId$.TSEAIBP01( PrptyGroupName, PrptyGroupDesc) VALUES(#prptyGroupName#, #prptyGroupDesc#) - INSERT INTO $schemaId$.TSEAIBA06( + INSERT INTO $schemaId$.TSEAIBP02( PrptyGroupName, PrptyName, Prpty2Val) VALUES(#prptyGroupName#, #prptyName#, #prpty2Val#) - DELETE FROM $schemaId$.TSEAIBA05 WHERE PrptyGroupName = #prptyGroupName# + DELETE FROM $schemaId$.TSEAIBP01 WHERE PrptyGroupName = #prptyGroupName# - DELETE FROM $schemaId$.TSEAIBA06 WHERE PrptyGroupName = #prptyGroupName# + DELETE FROM $schemaId$.TSEAIBP02 WHERE PrptyGroupName = #prptyGroupName# SELECT PRPTYNAME AS "CODE", PRPTY2VAL AS "NAME" - FROM $schemaId$.TSEAIBA06 + FROM $schemaId$.TSEAIBP02 WHERE PrptyGroupName = #key1#||'{'||#key2#||'}' diff --git a/src/main/resources/com/eactive/eai/rms/bap/manage/message/FlowRuleMan.xml b/src/main/resources/com/eactive/eai/rms/bap/manage/message/FlowRuleMan.xml index f8a14f0..e6724d2 100644 --- a/src/main/resources/com/eactive/eai/rms/bap/manage/message/FlowRuleMan.xml +++ b/src/main/resources/com/eactive/eai/rms/bap/manage/message/FlowRuleMan.xml @@ -66,8 +66,8 @@ #telgmPtrnDstcd# , #telgmDtalsOperCd# , #bjobCmnTelgmTranCd# , - #toutVal#::NUMERIC , - #bjobIterNotms#::NUMERIC , + #toutVal# , + #bjobIterNotms# , #telgmClsID# , #cndnItemDcsnCtnt# , #cndnTelgmPtrnCd# , @@ -75,7 +75,7 @@ #cndnTranClsfiCd# , #cndnRspnsCd# , #bjobStgeFlxblCndnDesc# , - #tranPrcssPrity#::NUMERIC ) + #tranPrcssPrity# ) diff --git a/src/main/resources/com/eactive/eai/rms/bap/manage/message/MessageMetaMan-oracle.xml b/src/main/resources/com/eactive/eai/rms/bap/manage/message/MessageMetaMan-oracle.xml index d0437c6..bb1e6a8 100644 --- a/src/main/resources/com/eactive/eai/rms/bap/manage/message/MessageMetaMan-oracle.xml +++ b/src/main/resources/com/eactive/eai/rms/bap/manage/message/MessageMetaMan-oracle.xml @@ -78,8 +78,8 @@ ThisMsgRegsntID, ThisMsgRegiHMS, ThisMsgAmndrID, - ThisMsgAmndHMS ) - + ThisMsgAmndHMS, + MSGMETADSTCD ) VALUES ( #msgMetaDstcd# , #msgClmnSeq# , @@ -88,10 +88,10 @@ #userid# , TO_CHAR(SYSTIMESTAMP, 'YYYYMMDDHH24MISSFF3'), #userid# , - TO_CHAR(SYSTIMESTAMP, 'YYYYMMDDHH24MISSFF3') - + TO_CHAR(SYSTIMESTAMP, 'YYYYMMDDHH24MISSFF3'), + #msgMetaDstcd# ) - + \ No newline at end of file diff --git a/src/main/resources/com/eactive/eai/rms/bap/manage/work/MessageProcMan-oracle.xml b/src/main/resources/com/eactive/eai/rms/bap/manage/work/MessageProcMan-oracle.xml index 23fc868..9d14d71 100644 --- a/src/main/resources/com/eactive/eai/rms/bap/manage/work/MessageProcMan-oracle.xml +++ b/src/main/resources/com/eactive/eai/rms/bap/manage/work/MessageProcMan-oracle.xml @@ -76,7 +76,7 @@ FULL OUTER JOIN ( SELECT PrptyName, Prpty2Val - FROM $schemaId$.TSEAIBA06 + FROM $schemaId$.TSEAIBP02 WHERE PrptyGroupName = #propGroupName# ) B ON A.PrptyName = B.PrptyName ORDER BY A.PrptyName @@ -101,7 +101,7 @@ MsgPrcssPrity , BjobTelgmRecSize , SysCd , - SysCd2 , + UapplCd , SndrcvFileName , ThisMsgChrgIDs , @@ -125,7 +125,7 @@ #msgPrcssPrity# , #bjobTelgmRecSize# , NVL(#sysCd#, ' ' ) , - NVL(#sysCd2#, ' ' ) , + NVL(#uapplCd#, ' ' ) , #sndrcvFileName# , #thisMsgChrgIDs# , @@ -149,7 +149,7 @@ MsgPrcssPrity = #msgPrcssPrity# , BjobTelgmRecSize = #bjobTelgmRecSize# , SysCd = NVL(#sysCd#, ' ' ) , - SysCd2 = NVL(#sysCd2#, ' ' ) , + UapplCd = #uapplCd# , SndrcvFileName = #sndrcvFileName# , ThisMsgChrgIDs = #thisMsgChrgIDs# , diff --git a/src/main/resources/com/eactive/eai/rms/bap/manage/work/MessageProcMan.xml b/src/main/resources/com/eactive/eai/rms/bap/manage/work/MessageProcMan.xml index 73e5fc3..d1fe75f 100644 --- a/src/main/resources/com/eactive/eai/rms/bap/manage/work/MessageProcMan.xml +++ b/src/main/resources/com/eactive/eai/rms/bap/manage/work/MessageProcMan.xml @@ -7,23 +7,12 @@ SELECT COUNT(*) AS "TotalCount" FROM $schemaId$.TSEAIBJ01 A, $schemaId$.TSEAIBJ02 B WHERE A.BjobBzwkDstcd = B.BjobBzwkDstcd - AND A.BjobMsgDstcd Like #likeBjobMsgDstcd# - AND A.BjobMsgDsticName Like #likeBjobMsgDsticName# - AND A.BjobTranDstcdName Like #likeBjobTranDstcdName# - AND A.UapplCd Like #likeUapplCd# - AND A.ThisMsgChrgIDs LIKE #likeThisMsgChrgIDs# - AND A.BjobInstiDstcd LIKE #likeBjobInstiDstcd# - - A.ThisMsgUseYn = '1' - - - A.ThisMsgUseYn != '1' - - - B.BjobBzwkDstcd = #searchBjobBzwkDstcd# - + AND B.BjobBzwkName Like #likeBjobBzwkName# + AND A.BjobMsgDsticName Like #likeBjobMsgDsticName# + AND A.BjobTranDstcdName Like #likeBjobTranDstcdName# + AND A.ThisMsgChrgIDs LIKE #likeThisMsgChrgIDs# - A.GroupCoCd = #searchGroupCoCd# + A.GroupCoCd = #searchGroupCoCd# @@ -40,7 +29,8 @@ MSGPRCSSPRITY AS "MSGPRCSSPRITY" , BJOBTELGMRECSIZE AS "BJOBTELGMRECSIZE", SYSCD AS "SYSCD", - trim(UAPPLCD) AS "UAPPLCD" , + + UAPPLCD AS "UAPPLCD", GROUPCOCD AS "GROUPCOCD" , SNDRCVFILENAME AS "SNDRCVFILENAME" , INTFID AS "INTFID" , @@ -50,15 +40,9 @@ THISMSGREGSNTID AS "THISMSGREGSNTID" , THISMSGREGIHMS AS "THISMSGREGIHMS" , THISMSGAMNDRID AS "THISMSGAMNDRID" , - THISMSGAMNDHMS AS "THISMSGAMNDHMS" , - BJOBINSTIDSTCD AS "BJOBINSTIDSTCD" , - DATAVRFYYN AS "DATAVRFYYN" , - BJOBCYCLEGB AS "BJOBCYCLEGB" , - PROCYN AS "PROCYN" , - DUPCNT "DUPCNT" , - ENDYN AS "ENDYN" , - ENDCNT AS "ENDCNT" , - SNDSCRIPTNAME AS "SNDSCRIPTNAME" + THISMSGAMNDHMS AS "THISMSGAMNDHMS" + + FROM $schemaId$.TSEAIBJ01 WHERE BjobMsgDstcd = #bjobMsgDstcd# @@ -67,4 +51,8 @@ DELETE FROM $schemaId$.TSEAIBJ01 WHERE BjobMsgDstcd = #bjobMsgDstcd# + + DELETE FROM $schemaId$.TSEAIBS01 + WHERE BjobMsgDstcd = #bjobMsgDstcd# + \ No newline at end of file diff --git a/src/main/resources/com/eactive/eai/rms/bap/manage/work/SystemInstMan-oracle.xml b/src/main/resources/com/eactive/eai/rms/bap/manage/work/SystemInstMan-oracle.xml index 4b56a34..c647ca5 100644 --- a/src/main/resources/com/eactive/eai/rms/bap/manage/work/SystemInstMan-oracle.xml +++ b/src/main/resources/com/eactive/eai/rms/bap/manage/work/SystemInstMan-oracle.xml @@ -31,6 +31,9 @@ AND A.OsidInstiName LIKE '%' || #searchOsidInstiName# || '%' AND A.OsidInstiDstcd LIKE '%' || #searchOsidInstiDstcd# || '%' AND B.BjobBzwkName LIKE '%' || #searchBjobBzwkName# || '%' + AND A.BjobBzwkDstcd LIKE '%' || #searchBjobBzwkDstcd# || '%' + AND A.SendPrcssRuleCd LIKE '%' || #searchSendPrcssRulecd# || '%' + AND A.RecvPrcssRuleCd LIKE '%' || #searchRecvPrcssRulecd# || '%' ) TMP WHERE ROWNO BETWEEN #startNum# AND #endNum# @@ -43,6 +46,9 @@ AND A.OsidInstiName LIKE '%' || #searchOsidInstiName# || '%' AND A.OsidInstiDstcd LIKE '%' || #searchOsidInstiDstcd# || '%' AND B.BjobBzwkName LIKE '%' || #searchBjobBzwkName# || '%' + AND A.BjobBzwkDstcd LIKE '%' || #searchBjobBzwkDstcd# || '%' + AND A.SendPrcssRuleCd LIKE '%' || #searchSendPrcssRulecd# || '%' + AND A.RecvPrcssRuleCd LIKE '%' || #searchRecvPrcssRulecd# || '%' @@ -261,7 +267,7 @@ FULL OUTER JOIN ( SELECT PrptyName, Prpty2Val - FROM $schemaId$.TSEAIBA06 + FROM $schemaId$.TSEAIBP02 WHERE PrptyGroupName = #prptyGroupName# ) B ON A.PrptyName = B.PrptyName ORDER BY A.PrptyName diff --git a/src/main/resources/com/eactive/eai/rms/bap/transaction/TransactionStatusMan-oracle.xml b/src/main/resources/com/eactive/eai/rms/bap/transaction/TransactionStatusMan-oracle.xml index 9c3e372..8c68bb6 100644 --- a/src/main/resources/com/eactive/eai/rms/bap/transaction/TransactionStatusMan-oracle.xml +++ b/src/main/resources/com/eactive/eai/rms/bap/transaction/TransactionStatusMan-oracle.xml @@ -1239,7 +1239,7 @@ WHERE A.BjobDmndMsgID = #bjobDmndMsgID# AND A.BjobDmndSubMsgID = #bjobDmndSubMsgID# - + SELECT B.BjobDmndMsgID , B.BjobDmndSubMsgID , @@ -1311,8 +1311,35 @@ ORDER BY B.BjobDmndMsgID, B.BjobDmndSubMsgID, B.ThisStgeStartHMS, TO_NUMBER(B.BjobNodeCasNo) + + SELECT COUNT(BJOBDMNDMSGID) AS "stageTotalCount" + FROM( SELECT B.BjobDmndMsgID AS "BJOBDMNDMSGID", + B.BjobDmndSubMsgID AS "BJOBDMNDSUBMSGID", + E.BjobMsgDstcd AS "BJOBMSGDSTCD", + E.BjobMsgDsticName AS "BJOBMSGDSTICNAME", + B.BjobTranDstcdName AS "BJOBTRANDSTCDNAME", + B.RqstRecvFileStorgDirName AS "RQSTRECVFILESTORGDIRNAME", + B.SndrcvFileName AS "SNDRCVFILENAME", + B.BkupSndrcvFileName AS "BKUPSNDRCVFILENAME", + B.SndrcvRecCnt AS "SNDRCVRECCNT", + B.SndrcvFileSize AS "SNDRCVFILESIZE", + B.FileTrsmtStartHMS AS "FileTrsmtStartHMS", + B.FileTrsmtEndHMS AS "FILETRSMTENDHMS", + B.ThisStgePrcssRsultCd AS "THISSTGEPRCSSRSULTCD", + B.EAIObstclOccurCausCtnt AS "EAIOBSTCLOCCURCAUSCTNT", + B.BjobFileHdrCtnt AS "BJOBFILEHDRCTNT", + B.BjobFileTrailCtnt AS "BJOBFILETRAILCTNT", + E.UapplCd AS "UAPPLCD", + E.ThisMsgChrgIDs AS "THISMSGCHRGIDS", + B.HdrInfoName AS "THISMSGCHRGIDS" + FROM $schemaId$.TSEAIBJ08 B LEFT OUTER JOIN $schemaId$.TSEAIBJ01 E ON B.BjobBzwkDstcd = E.BjobBzwkDstcd AND B.BjobTranDstcdName = E.BjobTranDstcdName + WHERE B.BjobDmndMsgID = #bjobDmndMsgID# + AND B.BjobDmndSubMsgID = #bjobDmndSubMsgID# + ORDER BY B.BjobDmndMsgID, B.BjobDmndSubMsgID, B.FileTrsmtStartHMS) + + - SELECT COUNT(BJOBDMNDMSGID) AS "TOTALCOUNT" + SELECT COUNT(BJOBDMNDMSGID) AS "stageTotalCount" FROM (SELECT B.BjobDmndMsgID AS "BJOBDMNDMSGID", B.BjobDmndSubMsgID AS "BJOBDMNDSUBMSGID", B.BjobStgeID AS "BJOBSTGEID",