diff --git a/src/main/java/com/nis/domain/log/NtcStreamMediaLog.java b/src/main/java/com/nis/domain/log/NtcStreamMediaLog.java new file mode 100644 index 000000000..ad74410e7 --- /dev/null +++ b/src/main/java/com/nis/domain/log/NtcStreamMediaLog.java @@ -0,0 +1,27 @@ +package com.nis.domain.log; + +/** + * @ClassName:NtcStreamMediaLog + * @Description:TODO(这里用一句话描述这个类的作用) + * @author (wx) + * @date 2018年7月16日 下午3:11:42 + * @version V1.0 + */ +public class NtcStreamMediaLog extends BaseLogEntity { + + private static final long serialVersionUID = 1446933545638550170L; + protected String url; + protected String protocol; + public String getUrl() { + return url; + } + public void setUrl(String url) { + this.url = url; + } + public String getProtocol() { + return protocol; + } + public void setProtocol(String protocol) { + this.protocol = protocol; + } +} diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java b/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java index 80f30463d..b0b8fa217 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java @@ -20,7 +20,7 @@ import com.google.gson.reflect.TypeToken; import com.nis.domain.FunctionServiceDict; import com.nis.domain.Page; import com.nis.domain.PageLog; -import com.nis.domain.log.MmAvUrlLog; +import com.nis.domain.log.NtcStreamMediaLog; import com.nis.domain.maat.LogRecvData; import com.nis.util.Constants; import com.nis.util.DictUtils; @@ -42,11 +42,11 @@ public class MmAvUrlLogController extends BaseController{ * @throws IOException */ @RequestMapping(value={"list",""}) - public String list(Model model,@ModelAttribute("log")MmAvUrlLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException { + public String list(Model model,@ModelAttribute("log")NtcStreamMediaLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException { try { - PageLog page = new PageLog(request, response); + PageLog page = new PageLog(request, response); Map params=new HashMap<>(); params.put("pageSize", page.getPageSize()); params.put("pageNo", page.getPageNo()); @@ -62,13 +62,13 @@ public class MmAvUrlLogController extends BaseController{ Gson gson = new GsonBuilder().create(); //gson泛型支持 - LogRecvData fromJson = gson.fromJson(jsonString, new TypeToken>(){}.getType()); + LogRecvData fromJson = gson.fromJson(jsonString, new TypeToken>(){}.getType()); if (fromJson.getStatus().intValue() == 200) { - Page data = fromJson.getData(); + Page data = fromJson.getData(); page.setList(data.getList()); - List list = page.getList(); - for (MmAvUrlLog l : list) { + List list = page.getList(); + for (NtcStreamMediaLog l : list) { l.setFunctionId(entry.getFunctionId()); setLogAction(l,serviceList); } @@ -79,7 +79,7 @@ public class MmAvUrlLogController extends BaseController{ logger.error("查询音视频url日志失败", e); addMessageLog(model, e.getMessage()); } - return "/log/ntc/mmAvUrlList"; + return "/log/ntc/ntcStreamMedia"; } } diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 932c8a8bb..bc702fc82 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1200,4 +1200,7 @@ dnat_policy=DNAT Reuse Policy report_total=Total message_type=Message Type as=AS -route=Route \ No newline at end of file +route=Route +transport_layer_protocol=TLS Protocol +av_voip_monit=VoIP Monit +av_voip_reject=VoIP Reject \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index eeba48c6b..6b4603bc9 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1202,4 +1202,7 @@ dnat_policy=DNAT Reuse Policy report_total=Total message_type=\u6D88\u606F\u7C7B\u578B as=\u81EA\u6CBB\u7CFB\u7EDF\u53F7 -route=\u8DEF\u7531\u4FE1\u606F \ No newline at end of file +route=\u8DEF\u7531\u4FE1\u606F +transport_layer_protocol=TLS Protocol +av_voip_monit=VoIP\u76D1\u6D4B +av_voip_reject=VoIP\u7BA1\u63A7 \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index bed04829f..461a88a3d 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1194,4 +1194,7 @@ dnat_policy=DNAT\u590D\u7528\u7B56\u7565 report_total=\u5408\u8BA1 message_type=\u6D88\u606F\u7C7B\u578B as=\u81EA\u6CBB\u7CFB\u7EDF\u53F7 -route=\u8DEF\u7531\u4FE1\u606F \ No newline at end of file +route=\u8DEF\u7531\u4FE1\u606F +transport_layer_protocol=\u4F20\u8F93\u5C42\u534F\u8BAE +av_voip_monit=VoIP\u76D1\u6D4B +av_voip_reject=VoIP\u7BA1\u63A7 \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp index 443517053..cd8d985d2 100644 --- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp +++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp @@ -111,7 +111,7 @@ $(document).ready(function(){
- + @@ -194,7 +194,7 @@ $(document).ready(function(){ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp index c33373d1f..9798b5603 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp @@ -102,7 +102,7 @@ $(document).ready(function(){
- + @@ -174,7 +174,7 @@ $(document).ready(function(){ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp index 9836888c7..87018298a 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp @@ -97,7 +97,7 @@
- + @@ -172,7 +172,7 @@ - + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp index 125594b0f..a4185893f 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp @@ -89,7 +89,7 @@ $(document).ready(function(){