diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index d64c914b2..007494b07 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -427,6 +427,9 @@ public final class Constants { public static final String NTC_MMPORNAUDIOLEVEL_LOG = Configurations.getStringProperty("mmPornAudioLevelLog", ""); public static final String NTC_MMPORNVIDEOLEVEL_LOG = Configurations.getStringProperty("mmPornVideoLevelLog", ""); public static final String NTC_MMSAMPLEPIC_LOG = Configurations.getStringProperty("mmSamplePicLog", ""); + public static final String NTC_MMSAMPLESPEAKER_LOG = Configurations.getStringProperty("mmSampleSpeakerLog", ""); + public static final String NTC_MMSAMPLELOGO_LOG = Configurations.getStringProperty("mmSampleLogoLog", ""); + public static final String NTC_MMSAMPLEFACE_LOG = Configurations.getStringProperty("mmSampleFaceLog", ""); public static final String NTC_MMSAMPLEVOIP_LOG = Configurations.getStringProperty("mmSampleVoipLog", ""); public static final String PXY_HTTP_LOG = Configurations.getStringProperty("pxyHttpLog", ""); diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSampleFaceController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSampleFaceController.java new file mode 100644 index 000000000..32eef1f3c --- /dev/null +++ b/src/main/java/com/nis/web/controller/log/ntc/MmSampleFaceController.java @@ -0,0 +1,70 @@ +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.FunctionServiceDict; +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.DictUtils; +import com.nis.util.httpclient.HttpClientUtil; +import com.nis.web.controller.BaseController; + +@Controller +@RequestMapping(value = "${adminPath}/log/ntc/mmSampleFaceLogs") +public class MmSampleFaceController 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); + + List serviceList = DictUtils.getFunctionServiceDictList(samplePicLog.getFunctionId()); + model.addAttribute("serviceList", serviceList); + + try { + // 请求接口 + String url = Constants.LOG_BASE_URL + Constants.NTC_MMSAMPLEFACE_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,serviceList); + } + model.addAttribute("page", page); + logger.info("人脸识别日志查询成功！"); + } + } catch (Exception e) { + logger.info("人脸识别日志查询失败！", e); + addMessageLog(model, e.getMessage()); + } + + return "/log/ntc/mmSampleFaceList"; + } +} diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSampleLogoController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSampleLogoController.java new file mode 100644 index 000000000..9bb03bf25 --- /dev/null +++ b/src/main/java/com/nis/web/controller/log/ntc/MmSampleLogoController.java @@ -0,0 +1,70 @@ +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.FunctionServiceDict; +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.DictUtils; +import com.nis.util.httpclient.HttpClientUtil; +import com.nis.web.controller.BaseController; + +@Controller +@RequestMapping(value = "${adminPath}/log/ntc/mmSampleLogoLogs") +public class MmSampleLogoController 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); + + List serviceList = DictUtils.getFunctionServiceDictList(samplePicLog.getFunctionId()); + model.addAttribute("serviceList", serviceList); + + try { + // 请求接口 + String url = Constants.LOG_BASE_URL + Constants.NTC_MMSAMPLELOGO_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,serviceList); + } + model.addAttribute("page", page); + logger.info("台标识别日志查询成功！"); + } + } catch (Exception e) { + logger.info("台标识别日志查询失败！", e); + addMessageLog(model, e.getMessage()); + } + + return "/log/ntc/mmSampleLogoList"; + } +} diff --git a/src/main/java/com/nis/web/controller/log/ntc/MmSampleSpeakerController.java b/src/main/java/com/nis/web/controller/log/ntc/MmSampleSpeakerController.java new file mode 100644 index 000000000..c9f70189a --- /dev/null +++ b/src/main/java/com/nis/web/controller/log/ntc/MmSampleSpeakerController.java @@ -0,0 +1,70 @@ +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.FunctionServiceDict; +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.DictUtils; +import com.nis.util.httpclient.HttpClientUtil; +import com.nis.web.controller.BaseController; + +@Controller +@RequestMapping(value = "${adminPath}/log/ntc/mmSampleSpeakerLogs") +public class MmSampleSpeakerController 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); + + List serviceList = DictUtils.getFunctionServiceDictList(samplePicLog.getFunctionId()); + model.addAttribute("serviceList", serviceList); + + try { + // 请求接口 + String url = Constants.LOG_BASE_URL + Constants.NTC_MMSAMPLESPEAKER_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,serviceList); + } + model.addAttribute("page", page); + logger.info("说话人识别日志查询成功！"); + } + } catch (Exception e) { + logger.info("说话人识别日志查询失败！", e); + addMessageLog(model, e.getMessage()); + } + + return "/log/ntc/mmSampleSpeakerList"; + } +} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp new file mode 100644 index 000000000..d0981e401 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp @@ -0,0 +1,308 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + + + + +
+ +

+ +

+ +
+
+
+
+
+
+ + + + + + + + + + + +
+
+ + + + + + + + + + +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+ +
+ + + +
+ +
+ href="javascript:;"> + + +
+
+ + +
+
+
+
+ + + + + + + + +
+
+ + <%--
+
+ + + + + + + +
+
--%> +
+
+ + + + + + + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+ +
+ + + + + + + + + + + + + + + + <%-- --%> + + + + + + + + + <%-- + --%> + + <%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + <%-- --%> + + + + + + + + + <%-- + --%> + + <%-- --%> + + + + + + + + + + +
${log.cfgId} + + + + + + + + ${log.foundTime} + + + + + + ${log.pid} + + ${fn:substring(log.url,7,-1)} + + + ${log.url} + + + + + ${fn:substring(log.logUri,0,20) } + + + + + + http://${fn:substring(log.logUri,0,20) } + + + ${log.referer }${log.level } + + + + ${log.protocol}${fns:abbr(log.capIp, 42)}${log.transProto} + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort}${log.sPort} + + + + + + + + + + + + + + ${log.addrList }${log.serverLocate }${log.clientLocate }${log.sAsn}${log.dAsn}${log.sSubscribeId}${log.dSubscribeId}${log.sceneFile}
+
${page}
+
+
+
+
+
+
+ + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp new file mode 100644 index 000000000..d16070da4 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp @@ -0,0 +1,308 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + + + + +
+ +

+ +

+ +
+
+
+
+
+
+ + + + + + + + + + + +
+
+ + + + + + + + + + +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+ +
+ + + +
+ +
+ href="javascript:;"> + + +
+
+ + +
+
+
+
+ + + + + + + + +
+
+ + <%--
+
+ + + + + + + +
+
--%> +
+
+ + + + + + + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+ +
+ + + + + + + + + + + + + + + + <%-- --%> + + + + + + + + + <%-- + --%> + + <%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + <%-- --%> + + + + + + + + + <%-- + --%> + + <%-- --%> + + + + + + + + + + +
${log.cfgId} + + + + + + + + ${log.foundTime} + + + + + + ${log.pid} + + ${fn:substring(log.url,7,-1)} + + + ${log.url} + + + + + ${fn:substring(log.logUri,0,20) } + + + + + + http://${fn:substring(log.logUri,0,20) } + + + ${log.referer }${log.level } + + + + ${log.protocol}${fns:abbr(log.capIp, 42)}${log.transProto} + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort}${log.sPort} + + + + + + + + + + + + + + ${log.addrList }${log.serverLocate }${log.clientLocate }${log.sAsn}${log.dAsn}${log.sSubscribeId}${log.dSubscribeId}${log.sceneFile}
+
${page}
+
+
+
+
+
+
+ + diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp new file mode 100644 index 000000000..043a2ded5 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp @@ -0,0 +1,308 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + + + + +
+ +

+ +

+ +
+
+
+
+
+
+ + + + + + + + + + + +
+
+ + + + + + + + + + +
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+ +
+ + + +
+ +
+ href="javascript:;"> + + +
+
+ + +
+
+
+
+ + + + + + + + +
+
+ + <%--
+
+ + + + + + + +
+
--%> +
+
+ + + + + + + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+ + +
+
+
+ + +
+ +
+ + + + + + + + + + + + + + + + <%-- --%> + + + + + + + + + <%-- + --%> + + <%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + <%-- --%> + + + + + + + + + <%-- + --%> + + <%-- --%> + + + + + + + + + + +
${log.cfgId} + + + + + + + + ${log.foundTime} + + + + + + ${log.pid} + + ${fn:substring(log.url,7,-1)} + + + ${log.url} + + + + + ${fn:substring(log.logUri,0,20) } + + + + + + http://${fn:substring(log.logUri,0,20) } + + + ${log.referer }${log.level } + + + + ${log.protocol}${fns:abbr(log.capIp, 42)}${log.transProto} + + + + ${fns:abbr(log.dIp, 42)}${fns:abbr(log.sIp, 42)}${log.dPort}${log.sPort} + + + + + + + + + + + + + + ${log.addrList }${log.serverLocate }${log.clientLocate }${log.sAsn}${log.dAsn}${log.sSubscribeId}${log.dSubscribeId}${log.sceneFile}
+
${page}
+
+
+
+
+
+
+ + diff --git a/src/main/webapp/static/global/scripts/jeesite.js b/src/main/webapp/static/global/scripts/jeesite.js index a965c0439..79016f42d 100644 --- a/src/main/webapp/static/global/scripts/jeesite.js +++ b/src/main/webapp/static/global/scripts/jeesite.js @@ -320,6 +320,15 @@ function filterActionInit() { $("#isFilterAction").val("true"); fiterPanleShow(); } + //调整滚动条div的高度 + var he=document.getElementsByClassName("filter-action-select-panle")[0].offsetHeight; + var height=document.documentElement.clientHeight; + if(he>0){ + he+=5; + } + if($('.table-responsive')){ + $('.table-responsive').css({'height':height-105-he+'px'}); + } }); }