diff --git a/src/main/java/com/nis/domain/log/MmSampleAudioLog.java b/src/main/java/com/nis/domain/log/MmSampleAudioLog.java new file mode 100644 index 000000000..4a0ec40a2 --- /dev/null +++ b/src/main/java/com/nis/domain/log/MmSampleAudioLog.java @@ -0,0 +1,62 @@ +package com.nis.domain.log; + +public class MmSampleAudioLog extends BaseLogEntity{ + + private static final long serialVersionUID = -9107324545841909071L; + + private String pid;// 节目ID + private String url;// 节目访问地址 + private String logUri;// fd现场片段路径 + private String refer;// 入口页面 + private Integer level;// 有害级别 + private Integer fdType;// fd类型 + private String protocol;// 传输协议 + + public String getPid() { + return pid; + } + public void setPid(String pid) { + this.pid = pid; + } + public String getUrl() { + return url; + } + public void setUrl(String url) { + this.url = url; + } + public String getLogUri() { + return logUri; + } + public void setLogUri(String logUri) { + this.logUri = logUri; + } + public String getRefer() { + return refer; + } + public void setRefer(String refer) { + this.refer = refer; + } + public Integer getLevel() { + return level; + } + public void setLevel(Integer level) { + this.level = level; + } + public Integer getFdType() { + return fdType; + } + public void setFdType(Integer fdType) { + this.fdType = fdType; + } + public String getProtocol() { + return protocol; + } + public void setProtocol(String protocol) { + this.protocol = protocol; + } + @Override + public String toString() { + return "MmSampleAudioLog [pid=" + pid + ", url=" + url + ", logUri=" + logUri + ", refer=" + refer + ", level=" + + level + ", fdType=" + fdType + ", protocol=" + protocol + "]"; + } +} diff --git a/src/main/java/com/nis/domain/log/MmSamplePicLog.java b/src/main/java/com/nis/domain/log/MmSamplePicLog.java new file mode 100644 index 000000000..c7034b300 --- /dev/null +++ b/src/main/java/com/nis/domain/log/MmSamplePicLog.java @@ -0,0 +1,62 @@ +package com.nis.domain.log; + +public class MmSamplePicLog extends BaseLogEntity{ + + private static final long serialVersionUID = -8851111472033278357L; + + private String pid;// 节目ID + private String url;// 节目访问地址 + private String logUri;// fd现场片段路径 + private String refer;// 入口页面 + private Integer level;// 有害级别 + private Integer fdType;// fd类型 + private String protocol;// 传输协议 + public String getPid() { + return pid; + } + public void setPid(String pid) { + this.pid = pid; + } + public String getUrl() { + return url; + } + public void setUrl(String url) { + this.url = url; + } + public String getLogUri() { + return logUri; + } + public void setLogUri(String logUri) { + this.logUri = logUri; + } + public String getRefer() { + return refer; + } + public void setRefer(String refer) { + this.refer = refer; + } + public Integer getLevel() { + return level; + } + public void setLevel(Integer level) { + this.level = level; + } + public Integer getFdType() { + return fdType; + } + public void setFdType(Integer fdType) { + this.fdType = fdType; + } + public String getProtocol() { + return protocol; + } + public void setProtocol(String protocol) { + this.protocol = protocol; + } + @Override + public String toString() { + return "MmSamplePicLog [pid=" + pid + ", url=" + url + ", logUri=" + logUri + ", refer=" + refer + ", level=" + + level + ", fdType=" + fdType + ", protocol=" + protocol + "]"; + } + +} diff --git a/src/main/java/com/nis/domain/log/MmSampleVideoLog.java b/src/main/java/com/nis/domain/log/MmSampleVideoLog.java new file mode 100644 index 000000000..5146bd6d8 --- /dev/null +++ b/src/main/java/com/nis/domain/log/MmSampleVideoLog.java @@ -0,0 +1,62 @@ +package com.nis.domain.log; + +public class MmSampleVideoLog extends BaseLogEntity{ + + private static final long serialVersionUID = -1160853324359310439L; + + private String pid;// 节目ID + private String url;// 节目访问地址 + private String logUri;// fd现场片段路径 + private String refer;// 入口页面 + private Integer level;// 有害级别 + private Integer fdType;// fd类型 + private String protocol;// 传输协议 + public String getPid() { + return pid; + } + public void setPid(String pid) { + this.pid = pid; + } + public String getUrl() { + return url; + } + public void setUrl(String url) { + this.url = url; + } + public String getLogUri() { + return logUri; + } + public void setLogUri(String logUri) { + this.logUri = logUri; + } + public String getRefer() { + return refer; + } + public void setRefer(String refer) { + this.refer = refer; + } + public Integer getLevel() { + return level; + } + public void setLevel(Integer level) { + this.level = level; + } + public Integer getFdType() { + return fdType; + } + public void setFdType(Integer fdType) { + this.fdType = fdType; + } + public String getProtocol() { + return protocol; + } + public void setProtocol(String protocol) { + this.protocol = protocol; + } + @Override + public String toString() { + return "MmSampleVideoLog [pid=" + pid + ", url=" + url + ", logUri=" + logUri + ", refer=" + refer + ", level=" + + level + ", fdType=" + fdType + ", protocol=" + protocol + "]"; + } + +} diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSampleAudioController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSampleAudioController.java new file mode 100644 index 000000000..4851a72e5 --- /dev/null +++ b/src/main/java/com/nis/web/controller/log/ntc/MmSampleAudioController.java @@ -0,0 +1,65 @@ +package com.nis.web.controller.log.ntc; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.reflect.TypeToken; +import com.nis.domain.Page; +import com.nis.domain.PageLog; +import com.nis.domain.log.MmSampleAudioLog; +import com.nis.domain.maat.LogRecvData; +import com.nis.util.Constants; +import com.nis.util.httpclient.HttpClientUtil; +import com.nis.web.controller.BaseController; + +@Controller +@RequestMapping(value = "${adminPath}/log/ntc/mmSampleAudioLogs") +public class MmSampleAudioController extends BaseController{ + + @RequestMapping(value = {"/list",""}) + public String list(HttpServletRequest request, HttpServletResponse response, Model model, @ModelAttribute("log")MmSampleAudioLog sampleAudioLog) { + + PageLog page = new PageLog(request,response); + Map params = new HashMap(); + params.put("pageSize", page.getPageSize()); + params.put("pageNo", page.getPageNo()); + + // 请求参数判断 + initLogSearchValue(sampleAudioLog, params); + + try { + // 请求接口 + String url = Constants.LOG_BASE_URL + Constants.NTC_MMSAMPLEAUDIO_LOG; + String resJson = HttpClientUtil.getMsg(url, params, request); + Gson gson = new GsonBuilder().create(); + LogRecvData fromJson = gson.fromJson(resJson, new TypeToken>() {}.getType()); + if(fromJson.getStatus().intValue() == 200) { + Page fromPage = fromJson.getData(); + page.setList(fromPage.getList()); + List list = fromPage.getList(); + for (MmSampleAudioLog log : list) { + log.setFunctionId(sampleAudioLog.getFunctionId()); + setLogAction(log); + } + model.addAttribute("page", page); + logger.info("音频样例日志查询成功！"); + } + } catch (Exception e) { + logger.info("音频样例日志查询失败！", e); + addMessage(model, e.getMessage()); + } + + return "/log/ntc/mmSampleAudioList"; + } +} diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSamplePicController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSamplePicController.java new file mode 100644 index 000000000..de0ef49b9 --- /dev/null +++ b/src/main/java/com/nis/web/controller/log/ntc/MmSamplePicController.java @@ -0,0 +1,65 @@ +package com.nis.web.controller.log.ntc; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.reflect.TypeToken; +import com.nis.domain.Page; +import com.nis.domain.PageLog; +import com.nis.domain.log.MmSamplePicLog; +import com.nis.domain.maat.LogRecvData; +import com.nis.util.Constants; +import com.nis.util.httpclient.HttpClientUtil; +import com.nis.web.controller.BaseController; + +@Controller +@RequestMapping(value = "${adminPath}/log/ntc/mmSamplePicLogs") +public class MmSamplePicController extends BaseController{ + + @RequestMapping(value = {"/list",""}) + public String list(HttpServletRequest request, HttpServletResponse response, Model model, @ModelAttribute("log")MmSamplePicLog samplePicLog) { + + PageLog page = new PageLog(request,response); + Map params = new HashMap(); + params.put("pageSize", page.getPageSize()); + params.put("pageNo", page.getPageNo()); + + // 请求参数判断 + initLogSearchValue(samplePicLog, params); + + try { + // 请求接口 + String url = Constants.LOG_BASE_URL + Constants.NTC_MMSAMPLEPIC_LOG; + String resJson = HttpClientUtil.getMsg(url, params, request); + Gson gson = new GsonBuilder().create(); + LogRecvData fromJson = gson.fromJson(resJson, new TypeToken>() {}.getType()); + if(fromJson.getStatus().intValue() == 200) { + Page fromPage = fromJson.getData(); + page.setList(fromPage.getList()); + List list = fromPage.getList(); + for (MmSamplePicLog log : list) { + log.setFunctionId(samplePicLog.getFunctionId()); + setLogAction(log); + } + model.addAttribute("page", page); + logger.info("图片样例日志查询成功！"); + } + } catch (Exception e) { + logger.info("图片样例日志查询失败！", e); + addMessage(model, e.getMessage()); + } + + return "/log/ntc/mmSamplePicList"; + } +} diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSampleVideoController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSampleVideoController.java new file mode 100644 index 000000000..f7c929ca1 --- /dev/null +++ b/src/main/java/com/nis/web/controller/log/ntc/MmSampleVideoController.java @@ -0,0 +1,65 @@ +package com.nis.web.controller.log.ntc; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.reflect.TypeToken; +import com.nis.domain.Page; +import com.nis.domain.PageLog; +import com.nis.domain.log.MmSampleVideoLog; +import com.nis.domain.maat.LogRecvData; +import com.nis.util.Constants; +import com.nis.util.httpclient.HttpClientUtil; +import com.nis.web.controller.BaseController; + +@Controller +@RequestMapping(value = "${adminPath}/log/ntc/mmSampleVideoLogs") +public class MmSampleVideoController extends BaseController{ + + @RequestMapping(value = {"/list",""}) + public String list(HttpServletRequest request, HttpServletResponse response, Model model, @ModelAttribute("log")MmSampleVideoLog sampleVideoLog) { + + PageLog page = new PageLog(request,response); + Map params = new HashMap(); + params.put("pageSize", page.getPageSize()); + params.put("pageNo", page.getPageNo()); + + // 请求参数判断 + initLogSearchValue(sampleVideoLog, params); + + try { + // 请求接口 + String url = Constants.LOG_BASE_URL + Constants.NTC_MMSAMPLEVIDEO_LOG; + String resJson = HttpClientUtil.getMsg(url, params, request); + Gson gson = new GsonBuilder().create(); + LogRecvData fromJson = gson.fromJson(resJson, new TypeToken>() {}.getType()); + if(fromJson.getStatus().intValue() == 200) { + Page fromPage = fromJson.getData(); + page.setList(fromPage.getList()); + List list = fromPage.getList(); + for (MmSampleVideoLog log : list) { + log.setFunctionId(sampleVideoLog.getFunctionId()); + setLogAction(log); + } + model.addAttribute("page", page); + logger.info("视频样例日志查询成功！"); + } + } catch (Exception e) { + logger.info("视频样例日志查询失败！", e); + addMessage(model, e.getMessage()); + } + + return "/log/ntc/mmSampleVideoList"; + } +} diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 96058f1df..8bd41de51 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -627,6 +627,8 @@ direct=direction stream_type=stream type clj_ip=processor ip nest_addr_list=nest addr list +server_locate=server locate +client_locate=client locate user_region=user region version=version encrypt_mode=encrypt mode diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp index cb435de50..580af051b 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp @@ -215,7 +215,11 @@ $(document).ready(function(){ ${log.logUri} ${log.refer} ${log.level} - ${log.fdType} + + + + + ${log.protocol} ${log.foundTime} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp index aaa8f894c..b22f42005 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp @@ -170,7 +170,6 @@ $(document).ready(function(){ - @@ -178,7 +177,6 @@ $(document).ready(function(){ - @@ -209,15 +207,17 @@ $(document).ready(function(){ - ${log.pid} ${log.url} ${log.logUri} ${log.refer} ${log.level} - ${log.fdType} + + + + + ${log.protocol} - ${log.foundTime} ${log.recvTime} ${log.transProto} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp new file mode 100644 index 000000000..cac282d84 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp @@ -0,0 +1,254 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + + + + +
+

+ + +

+ +
+
+
+
+
+
+ + + + + + + + + + +
+
+ + + + + +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+ +
+ + + +
+ +
+ href="javascript:;"> + + +
+
+ + +
+
+
+
+ + + + + + + + +
+
+ +
+
+ + + + + + + +
+
+
+
+ + + + + + + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
${log.cfgId}${log.entranceId} + + + + + + + ${log.pid}${log.url}${log.logUri}${log.refer}${log.level} + + + + ${log.protocol}${log.foundTime}${log.recvTime}${log.transProto} + + + + ${log.dIp}${log.sIp}${log.dPort}${log.sPort}${log.deviceId} + + + + ${log.capIp}${log.addrList}${log.userRegion}
+
${page}
+
+
+
+
+
+
+ + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp new file mode 100644 index 000000000..1bc575f01 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp @@ -0,0 +1,254 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + + + + +
+

+ + +

+ +
+
+
+
+
+
+ + + + + + + + + + +
+
+ + + + + +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+ +
+ + + +
+ +
+ href="javascript:;"> + + +
+
+ + +
+
+
+
+ + + + + + + + +
+
+ +
+
+ + + + + + + +
+
+
+
+ + + + + + + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
${log.cfgId}${log.entranceId} + + + + + + + ${log.pid}${log.url}${log.logUri}${log.refer}${log.level} + + + + ${log.protocol}${log.foundTime}${log.recvTime}${log.transProto} + + + + ${log.dIp}${log.sIp}${log.dPort}${log.sPort}${log.deviceId} + + + + ${log.capIp}${log.addrList}${log.userRegion}
+
${page}
+
+
+
+
+
+
+ + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp new file mode 100644 index 000000000..ab315eccf --- /dev/null +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp @@ -0,0 +1,255 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + + + + +
+

+ + +

+ +
+
+
+
+
+
+ + + + + + + + + + +
+
+ + + + + +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+ +
+ + + +
+ +
+ href="javascript:;"> + + +
+
+ + +
+
+
+
+ + + + + + + + +
+
+ +
+
+ + + + + + + +
+
+
+
+ + + + + + + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
${log.cfgId}${log.entranceId} + + + + + + + ${log.pid}${log.url}${log.logUri}${log.refer}${log.level} + + + + ${log.protocol}${log.foundTime}${log.recvTime}${log.transProto} + + + + ${log.dIp}${log.sIp}${log.dPort}${log.sPort}${log.deviceId} + + + + ${log.capIp}${log.addrList}${log.userRegion}
+
${page}
+
+
+
+
+
+
+ +