删除网络流量监控多余参数

2 files changed, 4 insertions, 4 deletions

diff --git a/src/main/java/com/nis/galaxy/web/dao/MonitorDao.java b/src/main/java/com/nis/galaxy/web/dao/MonitorDao.java
index 9944e76..5afbf53 100644
--- a/src/main/java/com/nis/galaxy/web/dao/MonitorDao.java
+++ b/src/main/java/com/nis/galaxy/web/dao/MonitorDao.java
@@ -15,7 +15,7 @@ import java.util.List;
 @Mapper
 public interface MonitorDao {
 
-    List<NetWaterMonitor> getNetWaterMonitor(@Param("push") String push,@Param("start") String start, @Param("end") String end, @Param("before") String before);
+    List<NetWaterMonitor> getNetWaterMonitor(@Param("push") String push,@Param("start") String start, @Param("end") String end);
 
     Date getNetWaterMonitorLastTime(@Param("end") String end);
 
diff --git a/src/main/java/com/nis/galaxy/web/service/impl/MonitorServiceImpl.java b/src/main/java/com/nis/galaxy/web/service/impl/MonitorServiceImpl.java
index acab462..0db7dee 100644
--- a/src/main/java/com/nis/galaxy/web/service/impl/MonitorServiceImpl.java
+++ b/src/main/java/com/nis/galaxy/web/service/impl/MonitorServiceImpl.java
@@ -103,7 +103,7 @@ public class MonitorServiceImpl implements MonitorService {
         long timeMillisStart = System.currentTimeMillis();
         try {
             String before = DateUtils.getBeforeNminOfTime(start, -5);
-            list = monitorDao.getNetWaterMonitor(start, start, end, before);
+            list = monitorDao.getNetWaterMonitor(start, start, end);
             //上阶段异常数据的获取
             if (areaNetWaterMonitorExpTimes > 0) {
                 if (areaNetWaterMonitorExpTimes >= 3) {
@@ -111,7 +111,7 @@ public class MonitorServiceImpl implements MonitorService {
                 }
                 for (int i = 1; i <= areaNetWaterMonitorExpTimes; i++) {
                     String emptStart = DateUtils.getBeforeNminOfTime(start, -5 * i);
-                    list = monitorDao.getNetWaterMonitor(emptStart, emptStart, DateUtils.getAfter5min(emptStart), DateUtils.getBeforeNminOfTime(emptStart, -5));
+                    list = monitorDao.getNetWaterMonitor(emptStart, emptStart, DateUtils.getAfter5min(emptStart));
                 }
             }
         } catch (Exception e) {
@@ -125,7 +125,7 @@ public class MonitorServiceImpl implements MonitorService {
                 if (lastTime != null) {
                     String time = DateUtils.formatDateTime(lastTime);
                     time = DateUtils.getRangeOf5min(time);
-                    list = monitorDao.getNetWaterMonitor(start, time, DateUtils.getAfter5min(time), DateUtils.getBeforeNminOfTime(time, -5));
+                    list = monitorDao.getNetWaterMonitor(start, time, DateUtils.getAfter5min(time));
                 } else {
                     logger.warn("网络流量监控\t无数据");
                 }