From 2c07e183eb3dd6f2e64c1979d2f5fe477a1d7b39 Mon Sep 17 00:00:00 2001 From: dongxiaoyan Date: Sat, 22 Dec 2018 16:34:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E5=8F=96=E6=9F=A5=E8=AF=A2=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E8=8C=83=E5=9B=B4=E5=88=B0=E9=A1=B5=E9=9D=A2=E6=8E=A7?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dynamicpage/DynamicIndexController.java | 17 +++++++++++------ .../WEB-INF/views/dynamicpage/dynamicIndex.jsp | 6 +++--- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/nis/web/controller/dynamicpage/DynamicIndexController.java b/src/main/java/com/nis/web/controller/dynamicpage/DynamicIndexController.java index d8fabfdcf..6c39d5fa0 100644 --- a/src/main/java/com/nis/web/controller/dynamicpage/DynamicIndexController.java +++ b/src/main/java/com/nis/web/controller/dynamicpage/DynamicIndexController.java @@ -42,9 +42,14 @@ public class DynamicIndexController extends BaseController { public String dynamicIndex(HttpServletRequest request){ String serviceIds = request.getParameter("sid"); String baseNum = request.getParameter("baseNum"); - Object trafficAreaStat = trafficAreaStat(null, Integer.parseInt(baseNum)); - Object dropStat = dropStat(null, Integer.parseInt(baseNum)); - Object logStat = logStat(null, serviceIds, Integer.parseInt(baseNum)); + String hourStr = request.getParameter("hour"); + Integer hour = null; + if(hourStr!=null &&!"".equals(hourStr)){ + hour = Integer.parseInt(hourStr); + } + Object trafficAreaStat = trafficAreaStat(hour, Integer.parseInt(baseNum)); + Object dropStat = dropStat(hour, Integer.parseInt(baseNum)); + Object logStat = logStat(hour, serviceIds, Integer.parseInt(baseNum)); Gson gson = new GsonBuilder().create(); String trafficJson = gson.toJson(trafficAreaStat); String dropJson = gson.toJson(dropStat); @@ -93,12 +98,12 @@ public class DynamicIndexController extends BaseController { List results = new ArrayList<>(); if (hour == null || hour <= 0) { - hour = 24; + hour = 1; } Date now = new Date(); - Date start = new Date(now.getTime()-(hour*60*60*1000)); - + Date start = new Date(now.getTime()-(hour*60*60*1000)-(5*60*1000)); + now = new Date(now.getTime()-5*60*1000); String nowString = DateUtils.formatDate(now, "yyyy-MM-dd HH:mm:ss"); String startString = DateUtils.formatDate(start, "yyyy-MM-dd HH:mm:ss"); /*nowString = "2018-12-05 00:00:00"; diff --git a/src/main/webapp/WEB-INF/views/dynamicpage/dynamicIndex.jsp b/src/main/webapp/WEB-INF/views/dynamicpage/dynamicIndex.jsp index d4d223fa1..f5543bfd5 100644 --- a/src/main/webapp/WEB-INF/views/dynamicpage/dynamicIndex.jsp +++ b/src/main/webapp/WEB-INF/views/dynamicpage/dynamicIndex.jsp @@ -1136,7 +1136,7 @@ $.ajax({ type:'get', dataType: 'json', - url:"${pageContext.request.contextPath}/nis/dynamicpage/indexTraffic?baseNum=" + top.baseNum, + url:"${pageContext.request.contextPath}/nis/dynamicpage/indexTraffic?hour=2&baseNum=" + top.baseNum, success:function(res){//处理返回结果 if(res) { data = res; @@ -1189,7 +1189,7 @@ $.ajax({ type:'get', dataType: 'json', - url:'${pageContext.request.contextPath}/nis/dynamicpage/indexLog?sid=' + top.indexLogServiceId + "&baseNum=" + top.baseNum, + url:'${pageContext.request.contextPath}/nis/dynamicpage/indexLog?hour=24&sid=' + top.indexLogServiceId + "&baseNum=" + top.baseNum, success:function(res){//处理返回结果 logData = res; _logData = logData.shift(); @@ -1241,7 +1241,7 @@ $.ajax({ type:'get', dataType: 'json', - url:'${pageContext.request.contextPath}/nis/dynamicpage/indexDrop' + "?baseNum=" + top.dropBaseNum, + url:'${pageContext.request.contextPath}/nis/dynamicpage/indexDrop?hour=24' + "&baseNum=" + top.dropBaseNum, success:function(res){//处理返回结果 if(res) { dropData = res;