diff --git a/src/main/java/com/nis/web/controller/restful/DashboardServiceController.java b/src/main/java/com/nis/web/controller/restful/DashboardServiceController.java index 1dd1f29..b504dfe 100644 --- a/src/main/java/com/nis/web/controller/restful/DashboardServiceController.java +++ b/src/main/java/com/nis/web/controller/restful/DashboardServiceController.java @@ -73,17 +73,11 @@ public class DashboardServiceController extends BaseRestController { AuditLogThread auditLogThread = super.saveRequestLog(servicesRequestLogService, Constants.OPACTION_GET, request, null); List list = new ArrayList(); try { - List resultList = dashboardService.getPortActiveList(); - - if (resultList!=null&&resultList.size() > 0) { - for (TrafficPortActiveStatistic port : resultList) { - Map map = new HashMap(); - - map.put("port", port.getPort()); - map.put("sum", port.getSum()); - list.add(map); - } + List resultList = dashboardService.getPortActiveList(); + if(resultList!=null&&resultList.size()>0) { + list=resultList; } + } catch (Exception e) { e.printStackTrace(); auditLogThread.setExceptionInfo(e.getMessage() + " " + e.getCause()); diff --git a/src/main/java/com/nis/web/dao/dashboard/TrafficPortActiveStatisticDao.java b/src/main/java/com/nis/web/dao/dashboard/TrafficPortActiveStatisticDao.java index bf02dfe..a910246 100644 --- a/src/main/java/com/nis/web/dao/dashboard/TrafficPortActiveStatisticDao.java +++ b/src/main/java/com/nis/web/dao/dashboard/TrafficPortActiveStatisticDao.java @@ -3,10 +3,13 @@ package com.nis.web.dao.dashboard; import java.util.List; import java.util.Map; +import org.apache.ibatis.annotations.Param; + import com.nis.domain.restful.dashboard.TrafficPortActiveStatistic; import com.nis.web.dao.MyBatisDao; @MyBatisDao public interface TrafficPortActiveStatisticDao { List getPortActiveList(); + TrafficPortActiveStatistic getPortActiveOld(@Param("port")Integer port); } \ No newline at end of file diff --git a/src/main/java/com/nis/web/dao/dashboard/TrafficPortActiveStatisticDao.xml b/src/main/java/com/nis/web/dao/dashboard/TrafficPortActiveStatisticDao.xml index 8b136e7..4c498ea 100644 --- a/src/main/java/com/nis/web/dao/dashboard/TrafficPortActiveStatisticDao.xml +++ b/src/main/java/com/nis/web/dao/dashboard/TrafficPortActiveStatisticDao.xml @@ -7,10 +7,16 @@ - + + + \ No newline at end of file diff --git a/src/main/java/com/nis/web/service/restful/DashboardService.java b/src/main/java/com/nis/web/service/restful/DashboardService.java index e867689..da11ceb 100644 --- a/src/main/java/com/nis/web/service/restful/DashboardService.java +++ b/src/main/java/com/nis/web/service/restful/DashboardService.java @@ -74,10 +74,32 @@ public class DashboardService extends BaseService{ return totalReportList; } - public List getPortActiveList(){ + /** + * 当前时间五分钟数据 + * @return + */ + public List getPortActiveList(){ + List list = new ArrayList(); List portActiveList = trafficPortActiveStatisticDao.getPortActiveList(); - - return portActiveList; + //上个时间五分钟数据 + if(portActiveList!=null&&portActiveList.size()>0) { + for (TrafficPortActiveStatistic port : portActiveList) { + if(port.getPort()!=null) { + Map map = new HashMap(); + + map.put("port", port.getPort()); + map.put("sum", port.getSum()); + TrafficPortActiveStatistic portActiveOld = trafficPortActiveStatisticDao.getPortActiveOld(port.getPort()); + if(portActiveOld!=null&&portActiveOld.getSum()!=null){ + map.put("preSum",portActiveOld.getSum()); + }else{ + map.put("preSum",0); + } + list.add(map); + } + } + } + return list; } /**