From 4bd99aca72a4b83c950d7f05cd73ef2204124a9f Mon Sep 17 00:00:00 2001 From: leijun Date: Mon, 7 Jan 2019 19:40:46 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=81=94=E6=97=A5=E5=BF=97=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E8=B0=83=E6=95=B4=E3=80=81=E6=A3=80=E7=B4=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=B7=BB=E5=8A=A0=E5=8F=8A=E5=9F=9F=E5=90=8D?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=AF=B9=E5=BA=94=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../log/ntc/NtcConnRecordLogController.java | 36 +++++++++++++++++-- .../resources/messages/message_en.properties | 6 ++-- .../resources/messages/message_ru.properties | 4 +-- .../views/log/ntc/connRecordLogList.jsp | 23 +++++++++--- 4 files changed, 56 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java b/src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java index 4bf4a08d6..79f176539 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/NtcConnRecordLogController.java @@ -22,6 +22,7 @@ import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.PageLog; import com.nis.domain.SysUser; +import com.nis.domain.configuration.WebsiteDomainTopic; import com.nis.domain.log.NtcConnRecordLog; import com.nis.domain.maat.LogRecvData; import com.nis.exceptions.MaatConvertException; @@ -71,11 +72,19 @@ public class NtcConnRecordLogController extends BaseController { params.put("searchClientLocate", log.getClientLocate()); } + if (StringUtils.isNotBlank(log.getsSubscribeId())) { + params.put("searchSSubscribeId", log.getsSubscribeId()); + } + if (StringUtils.isNotBlank(log.getdSubscribeId())) { + params.put("searchDSubscribeId", log.getdSubscribeId()); + } + List serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId()); model.addAttribute("serviceList", serviceList); List appList = CodeDicUtils.getCodeList("appCode"); List protocolList = CodeDicUtils.getCodeList("protocolCode"); - List webList = CodeDicUtils.getCodeList("webCode"); + //查询domainId + List webList = appCfgService.getDomainDict(new WebsiteDomainTopic()); model.addAttribute("appList", appList); model.addAttribute("protocolList", protocolList); @@ -184,11 +193,21 @@ public class NtcConnRecordLogController extends BaseController { if (StringUtils.isNotBlank(log.getClientLocate())) { params.put("searchClientLocate", log.getClientLocate()); } + if (StringUtils.isNotBlank(log.getsSubscribeId())) { + params.put("searchSSubscribeId", log.getsSubscribeId()); + } + if (StringUtils.isNotBlank(log.getdSubscribeId())) { + params.put("searchDSubscribeId", log.getdSubscribeId()); + } + List serviceList = DictUtils.getFunctionServiceDictList(log.getFunctionId()); model.addAttribute("serviceList", serviceList); List appList = CodeDicUtils.getCodeList("appCode"); List protocolList = CodeDicUtils.getCodeList("protocolCode"); - List webList = CodeDicUtils.getCodeList("webCode"); + //List webList = CodeDicUtils.getCodeList("webCode"); + //查询domainId + List webList = appCfgService.getDomainDict(new WebsiteDomainTopic()); + model.addAttribute("appList", appList); model.addAttribute("protocolList", protocolList); model.addAttribute("webList", webList); @@ -214,7 +233,7 @@ public class NtcConnRecordLogController extends BaseController { l.setProtoId(getName(l.getProtoId(),protocolList,msgProp)); } if (StringUtils.isNotBlank(l.getWebId())) { - l.setWebId(getName(l.getWebId(),webList,msgProp)); + l.setWebId(getWebName(l.getWebId(),webList,msgProp)); } if (StringUtils.isNotBlank(l.getC2sPktNum()) && StringUtils.isNotBlank(l.getS2cPktNum()) ) { l.setTotalPkt(String.valueOf(Integer.valueOf(l.getC2sPktNum())+Integer.valueOf(l.getS2cPktNum()))); @@ -260,5 +279,16 @@ public class NtcConnRecordLogController extends BaseController { } return name; } + + public String getWebName(String id,List list,Properties msgProp){ + String name=String.valueOf(id); + for (int i = 0; i < list.size(); i++) { + if(String.valueOf(id).equals(list.get(i).getId())){ + name=msgProp.getProperty(list.get(i).getDomain(),list.get(i).getDomain()); + break; + } + } + return name; + } } diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 9721fec49..98d15c5b0 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1132,7 +1132,7 @@ report_total=Total message_type=Message Type as=AS route=Route -transport_layer_protocol=Protocol +transport_layer_protocol=Trans Protocol av_voip_monit=VoIP Monitor av_voip_reject=VoIP Block label_proto_source=Protocol Source @@ -1361,7 +1361,7 @@ nas_ip=NAS IP Address framed_ip=Framed IP Address log_user_name=User Name av_tips=The system does not support the index information of audio and video coding in the tail of the audio and video files. The system does not support video with resolution greater than 1080P. -asn_ip_group_delete=\uff08IP configuration under this ASN group will also be deleted.) +asn_ip_group_delete=\uFF08IP configuration under this ASN group will also be deleted.) keyword_log_tips=Deduplicate http body keywords log,for the control status of http body keywords is not ideal, configure the http url of the hit keyword as URL control configuration. conn_record=Connection Records bps=Gbps @@ -1457,4 +1457,4 @@ country_code=Country Code asn_name=ASN Name details=Details NTC_ASN_NUMBER=ASN -application_layer_protocol=AppProto \ No newline at end of file +application_layer_protocol=Protocol diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index e9f05d3c7..279f912aa 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1132,7 +1132,7 @@ report_total=\u0412\u0441\u0435\u0433\u043e message_type=\u0422\u0438\u043f \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f as=\u041a\u0410\u041a route=\u041c\u0430\u0440\u0448\u0440\u0443\u0442 -transport_layer_protocol=\u041f\u0440\u043e\u0442\u043e\u043a\u043e\u043b +transport_layer_protocol=\u041F\u0440\u043E\u0442\u043E\u043A\u043E\u043B \u0422\u0440\u0430\u043D\u0441\u043F\u043E\u0440\u0442\u043D\u043E\u0433\u043E \u0423\u0440\u043E\u0432\u043D\u044F av_voip_monit=\u041c\u043e\u043d\u0438\u0442\u043e\u0440\u0438\u043d\u0433 VoIP av_voip_reject=VoIP \u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 label_proto_source=\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a \u043f\u0440\u043e\u0442\u043e\u043a\u043e\u043b\u0430 @@ -1461,4 +1461,4 @@ country_code=Country Code asn_name=ASN Name details=Details NTC_ASN_NUMBER=ASN -application_layer_protocol=\u041f\u0440\u043e\u0442\u043e\u043a\u043e\u043b \u041f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0439 +application_layer_protocol=\u041f\u0440\u043e\u0442\u043e\u043a\u043e\u043b diff --git a/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp index b7c94520f..f00a16ce2 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp @@ -128,8 +128,7 @@ - +
<%--
@@ -288,7 +287,7 @@
@@ -323,6 +322,20 @@
+ +
+
+ + +
+
+ +
+
+ + +
+
@@ -424,8 +437,8 @@ ${log.webId } - - ${dict.item} + + ${dict.domain}