diff --git a/WebContent/jsp/onl/admin/service/eaiMsgMan.jsp b/WebContent/jsp/onl/admin/service/eaiMsgMan.jsp
index 6a3a882..c86adce 100644
--- a/WebContent/jsp/onl/admin/service/eaiMsgMan.jsp
+++ b/WebContent/jsp/onl/admin/service/eaiMsgMan.jsp
@@ -47,9 +47,6 @@ function init(callback){
dataType:"json",
data:{cmd: 'LIST_INIT', codeGroupArr : 'SVC_SAME_TIME_TYPE,<%= tranTypeCode %>'},
success:function(json){
- new makeOptions("CODE","NAME").setObj($("select[name=searchSvcMotivUsedStcd]")).setNoValueInclude(true).setNoValue("", "<%=localeMessage.getString("combo.all")%>").setData(json.list[0].SVC_SAME_TIME_TYPE).rendering();
- new makeOptions("CODE","NAME").setObj($("select[name=searchPsvintfacdsticName]")).setNoValueInclude(true).setNoValue("", "<%=localeMessage.getString("combo.all")%>").setData(json.list[0].SVC_SAME_TIME_TYPE).rendering();
- new makeOptions("CODE","NAME").setObj($("select[name=searchFlowControl]")).setNoValueInclude(true).setNoValue("", "<%=localeMessage.getString("combo.all")%>").setData(json.listFlowControl).rendering();
new makeOptions("CODE","NAME").setObj($("select[name=searchTranType]")).setNoValueInclude(true).setNoValue("", "<%=localeMessage.getString("combo.all")%>").setData(json.list[0].<%= tranTypeCode %>).rendering();
svrInst = json.listInoutType;
putSelectFromParam();
@@ -89,8 +86,6 @@ $(document).ready(function() {
gridPostData["rmsMenuAuth"]= auth;
init(detail);
- gridPostData["searchSvcMotivUsedStcd"] = '${param.searchSvcMotivUsedStcd}';
- gridPostData["searchPsvintfacdsticName"] = '${param.searchPsvintfacdsticName}';
$('#grid').jqGrid({
datatype:"json",
@@ -100,10 +95,8 @@ $(document).ready(function() {
colNames:['<%= localeMessage.getString("eaiMsg.bizCode")%> ',
'<%= localeMessage.getString("eaiMessage.eaiSvcName")%> ',
'<%= localeMessage.getString("eaiMessage.eaiSvcDesc")%> ',
- '<%= localeMessage.getString("eaiMessage.svcMotivUsedStcd")%>',
- '<%= localeMessage.getString("eaiMessage.psvintfacdsticName")%>',
- '<%= localeMessage.getString("eaiMessage.queueName")%> ',
- '<%= localeMessage.getString("eaiMessage.flowCtrlRoutName")%> ',
+ '<%= localeMessage.getString("eaiMessage.gstatSysAdptr")%>',
+ '<%= localeMessage.getString("eaiMessage.psvSysAdptr")%>',
'<%= localeMessage.getString("eaiMessage.tranType")%> ',
'<%= localeMessage.getString("combo.useYn")%> ',
'<%= localeMessage.getString("eaiMessage.sevrDstCd")%>',
@@ -113,15 +106,13 @@ $(document).ready(function() {
{ name : 'EAIBZWKDSTCD' , align:'center' ,sortable:false, width:20 },
{ name : 'EAISVCNAME' , align:'left', width:50 },
{ name : 'EAISVCDESC' , align:'left' },
- { name : 'SVCMOTIVUSEDSTCD', align:'center', width:50 },
- { name : 'PSVINTFACDSTICNAME', align:'center', width:50 },
- { name : 'NONMOTIVROUTURINAME' , align:'left', width:90 },
- { name : 'FLOWCTRLROUTNAME' , align:'center', width:40 },
+ { name : 'GSTATSYSADPTRBZWKGROUPNAME', align:'left', width:80 },
+ { name : 'PSVSYSADPTRBZWKGROUPNAME', align:'left', width:80 },
{ name : 'TRANTYPE', align:'center', width:30 },
{ name : 'USEYN', align:'center', width:30,editoptions:{value:"0:<%= localeMessage.getString("combo.usen")%>;1:<%= localeMessage.getString("combo.usey")%>"}, formatter:"select"},
{ name : 'EAISEVRDSTCD', align:'center', width:30 , formatter:formatter, hidden:true},
{ name : 'VERINFO', align:'center', width:30 }
-
+
],
jsonReader: {
repeatitems:false
@@ -426,28 +417,25 @@ function deployInterfaces(ret) {
|
- <%= localeMessage.getString("eaiMessage.svcMotivUsedStcd")%> |
- |
- <%= localeMessage.getString("eaiMessage.tranType")%> |
- |
-
<%= localeMessage.getString("eaiMessage.eaiSvcDesc")%> |
|
-
+ <%= localeMessage.getString("eaiMessage.tranType")%> |
+ |
+
| <%= localeMessage.getString("eaiMessage.searchBzwkDstCd")%> |
|
- <%= localeMessage.getString("eaiMessage.psvintfacdsticName")%> |
- |
- <%= localeMessage.getString("eaiMessage.searchFlowControl")%> |
- |
- <%= localeMessage.getString("eaiMessage.queueName")%> |
+ <%= localeMessage.getString("eaiMessage.gstatSysAdptr")%> |
-
+
+ |
+ <%= localeMessage.getString("eaiMessage.psvSysAdptr")%> |
+
+
|
diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/eaimsg/EAIMessageService.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/eaimsg/EAIMessageService.java
index f6c1c45..28dcfa5 100644
--- a/src/main/java/com/eactive/eai/rms/data/entity/onl/eaimsg/EAIMessageService.java
+++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/eaimsg/EAIMessageService.java
@@ -115,6 +115,7 @@ public class EAIMessageService extends AbstractDataService map = new HashMap<>();
EAIMessageEntity eaiMessageEntity = tuple.get(QEAIMessageEntity.eAIMessageEntity);
- String nonMotivRoutUriName = tuple.get(QRouting.routing.nonmotivrouturiname);
- String psvIntfaCdSticName = tuple.get(QServiceMessageEntity.serviceMessageEntity.psvintfacdsticname);
+ String psvSysAdptrBzwkGroupName = tuple
+ .get(QServiceMessageEntity.serviceMessageEntity.psvsysadptrbzwkgroupname);
map.put("EAIBZWKDSTCD", eaiMessageEntity.getEaibzwkdstcd());
map.put("EAISVCNAME", eaiMessageEntity.getEaisvcname());
map.put("EAISVCDESC", eaiMessageEntity.getEaisvcdesc());
- map.put("SVCMOTIVUSEDSTCD", eaiMessageEntity.getSvcmotivusedstcd());
- map.put("PSVINTFACDSTICNAME", psvIntfaCdSticName);
- map.put("NONMOTIVROUTURINAME", nonMotivRoutUriName);
- map.put("FLOWCTRLROUTNAME", eaiMessageEntity.getFlowctrlroutname());
+ map.put("GSTATSYSADPTRBZWKGROUPNAME", eaiMessageEntity.getGstatsysadptrbzwkgroupname());
+ map.put("PSVSYSADPTRBZWKGROUPNAME", psvSysAdptrBzwkGroupName);
String eaisevrdstcd = codeService
.findCodeName("INOUT_TYPE", eaiMessageEntity.getEaisevrdstcd())
diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/serviceinfo/eaimsg/ui/EAIMessageUI.java b/src/main/java/com/eactive/eai/rms/onl/manage/serviceinfo/eaimsg/ui/EAIMessageUI.java
index cad2323..7dabb88 100644
--- a/src/main/java/com/eactive/eai/rms/onl/manage/serviceinfo/eaimsg/ui/EAIMessageUI.java
+++ b/src/main/java/com/eactive/eai/rms/onl/manage/serviceinfo/eaimsg/ui/EAIMessageUI.java
@@ -109,6 +109,9 @@ public class EAIMessageUI {
@JsonProperty("PSVINTFACDSTICNAME")
private String psvIntfaCdSticName;
+ @JsonProperty("PSVSYSADPTRBZWKGROUPNAME")
+ private String psvSysAdptrBzwkGroupName;
+
@JsonProperty("svcAll")
private List serviceMessages;
}
diff --git a/src/main/resources/message/LocaleMessage.properties b/src/main/resources/message/LocaleMessage.properties
index 5bf34ca..57c35ea 100644
--- a/src/main/resources/message/LocaleMessage.properties
+++ b/src/main/resources/message/LocaleMessage.properties
@@ -723,6 +723,7 @@ eaiMessage.failSts = Failover Status
eaiMessage.failoverWhether = Failover whether or not
eaiMessage.flowCtrlRoutName = FlowControl Routing Name
eaiMessage.gstaSysAdptBzwkGroupName = Activation interface type
+eaiMessage.gstatSysAdptr = Activation Adapter
eaiMessage.hdrConClaCd = Header Control Classification Code
eaiMessage.ifIdKeyVal = IF identification key value
eaiMessage.ifSvcMsgList = Interface Service Message List
@@ -739,6 +740,7 @@ eaiMessage.nextSvcPrcOrd = Next Service Process Order
eaiMessage.nextSvcSeq = Next service process sequence
eaiMessage.outRoutNm = Outbound Routing Name
eaiMessage.proOrder = Processing order
+eaiMessage.psvSysAdptr = Passive Adapter
eaiMessage.psvintfacdsticName = Passive Interface Type
eaiMessage.queueName = Queue Name
eaiMessage.refClsNm = Reference Class Name
diff --git a/src/main/resources/message/LocaleMessage_en.properties b/src/main/resources/message/LocaleMessage_en.properties
index 15d2fe5..946079b 100644
--- a/src/main/resources/message/LocaleMessage_en.properties
+++ b/src/main/resources/message/LocaleMessage_en.properties
@@ -852,6 +852,7 @@ eaiMessage.failSts = Failover ?
eaiMessage.failoverWhether = Failover ?
eaiMessage.flowCtrlRoutName = FlowControl Routing
eaiMessage.gstaSysAdptBzwkGroupName = 1st Adapter
+eaiMessage.gstatSysAdptr = 1st Adapter
eaiMessage.hdrConClaCd = Header Control Division
eaiMessage.ifIdKeyVal = IF Identification key value
eaiMessage.ifSvcMsgList = Interface Service Message List
diff --git a/src/main/resources/message/LocaleMessage_ko.properties b/src/main/resources/message/LocaleMessage_ko.properties
index 57a5ada..9262355 100644
--- a/src/main/resources/message/LocaleMessage_ko.properties
+++ b/src/main/resources/message/LocaleMessage_ko.properties
@@ -888,6 +888,7 @@ eaiMessage.failSts = FailOver\uC5EC\uBD80
eaiMessage.failoverWhether = failover\uC5EC\uBD80
eaiMessage.flowCtrlRoutName = FlowControl
eaiMessage.gstaSysAdptBzwkGroupName = \uAE30\uB3D9\uC778\uD130\uD398\uC774\uC2A4 \uC720\uD615
+eaiMessage.gstatSysAdptr = \uAE30\uB3D9\uC5B4\uB311\uD130
eaiMessage.hdrConClaCd = \uD5E4\uB354\uC81C\uC5B4\uAD6C\uBD84\uCF54\uB4DC
eaiMessage.ifIdKeyVal = EAI \uC2DD\uBCC4\uD0A4\uAC12
eaiMessage.ifSvcMsgList = OUTBOUND \uC11C\uBE44\uC2A4 \uBA54\uC2DC\uC9C0 \uBAA9\uB85D
@@ -904,6 +905,7 @@ eaiMessage.nextSvcPrcOrd = \uB2E4\uC74C\uC11C\uBE44\uC2A4\uCC98\uB9AC
eaiMessage.nextSvcSeq = \uB2E4\uC74C\uC11C\uBE44\uC2A4\uCC98\uB9AC\uC21C\uC11C
eaiMessage.outRoutNm = Outbound\uB77C\uC6B0\uD305\uBA85
eaiMessage.proOrder = \uCC98\uB9AC\uC21C\uC11C
+eaiMessage.psvSysAdptr = \uC218\uB3D9\uC5B4\uB311\uD130
eaiMessage.psvintfacdsticName = \uC218\uB3D9\uC778\uD130\uD398\uC774\uC2A4 \uC720\uD615
eaiMessage.queueName = \uD050\uBA85
eaiMessage.refClsNm = \uCC38\uACE0\uD074\uB798\uC2A4\uBA85