Merge remote-tracking branch 'origin/develop' into develop

# Conflicts: # src/main/java/com/nis/galaxy/template/ForBlockingInterface.java # src/main/java/com/nis/galaxy/template/ForEventsInterface.java # src/main/java/com/nis/galaxy/web/dao/EventsDao.java # src/main/java/com/nis/galaxy/web/service/impl/EventsServiceImpl.java
author: doufenghu <[email protected]> 2019-01-10 16:47:43 +0600
committer: doufenghu <[email protected]> 2019-01-10 16:47:43 +0600
commit: acf2aff5ccfda32f7c979fb8d2323acd84521764 (patch)
tree: b3ca0df9b47992119b03b935b1480bb892035520 /src
parent: f7dacd45f499d4b57eec3878e236eb68a68d323d (diff)
parent: a15b69bcc63e1a2fa3a9a783c9a599c70676728c (diff)
71 files changed, 2814 insertions, 1742 deletions
diff --git a/src/main/java/com/nis/galaxy/common/InterfaceBase.java b/src/main/java/com/nis/galaxy/common/InterfaceBase.java
index 5555e4a..5e91918 100644
--- a/src/main/java/com/nis/galaxy/common/InterfaceBase.java
+++ b/src/main/java/com/nis/galaxy/common/InterfaceBase.java
@@ -1,17 +1,15 @@
 package com.nis.galaxy.common;
 
 import com.nis.galaxy.util.ConfigUtil;
-import com.nis.galaxy.util.DateUtils;
+import com.nis.galaxy.util.DateUtil;
 import com.nis.galaxy.util.JsonMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.RestTemplate;
 
-import java.io.*;
 import java.util.*;
 
 import static org.springframework.http.MediaType.*;
@@ -83,11 +81,11 @@ public class InterfaceBase {
      * @param contentValue
      * @return
      */
-    public static HttpEntity<String> getHttpEntity02(String tagValue, List contentValue) {
+    public static HttpEntity<String> getHttpEntity_old(String tagValue, List contentValue) {
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(APPLICATION_JSON_UTF8);
         Map map = new HashMap(16);
-        map.put("publicsh_time", DateUtils.getDateTime());
+        map.put("publicsh_time", new Date());
         map.put("tag", tagValue);
         map.put("content", contentValue);
         String params = JsonMapper.toJsonString(map);
@@ -106,7 +104,7 @@ public class InterfaceBase {
      */
     public static HttpEntity<String> getHttpEntity(HttpHeaders headers, Map reserve, String tagValue, List contentValue) {
         Map map = new LinkedHashMap();
-        map.put("publicsh_time", DateUtils.getDateTime());
+        map.put("publicsh_time", DateUtil.getFormatDate(new Date(), DateUtil.YYYY_MM_DD_HH24_MM_SS));
         map.put("tag", tagValue);
         if (reserve != null) {
             map.putAll(reserve);
@@ -119,6 +117,7 @@ public class InterfaceBase {
 
     /**
      * 判断contentValue为空或者null
+     *
      * @param contentValue
      * @return
      */
diff --git a/src/main/java/com/nis/galaxy/config/ShedlockConfig.java b/src/main/java/com/nis/galaxy/config/ShedlockConfig.java
index a06b6d6..bf78b6d 100644
--- a/src/main/java/com/nis/galaxy/config/ShedlockConfig.java
+++ b/src/main/java/com/nis/galaxy/config/ShedlockConfig.java
@@ -1,7 +1,7 @@
 package com.nis.galaxy.config;
 
 
-import com.nis.galaxy.util.DateUtils;
+import com.nis.galaxy.util.DateUtil;
 import net.javacrumbs.shedlock.core.LockProvider;
 import net.javacrumbs.shedlock.provider.jdbctemplate.JdbcTemplateLockProvider;
 import net.javacrumbs.shedlock.spring.ScheduledLockConfiguration;
@@ -64,7 +64,7 @@ public class ShedlockConfig {
                     logger.info("大屏推送服务启动监测查询出现异常\t监测次数：" + count, ex);
                 }
             }
-            String date = DateUtils.getAfter1h(DateUtils.getDateTime());
+            Date date = DateUtil.getSomeHour(new Date(),1);
             if (count == 1) {
                 logger.warn("需开启大屏全部接口首次推送");
                 jdbcTemplate.execute("DELETE FROM shedlock WHERE name LIKE 'FirstPush%'");
diff --git a/src/main/java/com/nis/galaxy/domain/AreaBPSTime.java b/src/main/java/com/nis/galaxy/domain/AreaBPSTime.java
index 0684cbc..bd94c74 100644
--- a/src/main/java/com/nis/galaxy/domain/AreaBPSTime.java
+++ b/src/main/java/com/nis/galaxy/domain/AreaBPSTime.java
@@ -1,12 +1,13 @@
 package com.nis.galaxy.domain;
 
 
-import com.nis.galaxy.util.DateUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 @SuppressWarnings("serial")
 @NoArgsConstructor
 @AllArgsConstructor
@@ -15,5 +16,5 @@ import lombok.experimental.Accessors;
 public class AreaBPSTime {
     private String area;
     private long bps;
-    private String time;
+    private Date time;
 }
diff --git a/src/main/java/com/nis/galaxy/domain/AreaBlockProtocol.java b/src/main/java/com/nis/galaxy/domain/AreaBlockProtocol.java
index eeadc20..1887ed8 100644
--- a/src/main/java/com/nis/galaxy/domain/AreaBlockProtocol.java
+++ b/src/main/java/com/nis/galaxy/domain/AreaBlockProtocol.java
@@ -1,11 +1,12 @@
 package com.nis.galaxy.domain;
 
-import com.nis.galaxy.util.DateUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * @author GouGe
  * @data 2018/8/23 20:47
@@ -17,7 +18,7 @@ import lombok.experimental.Accessors;
 @Data
 @Accessors(chain=true)
 public class AreaBlockProtocol {
-    private String time;// 时间
+    private Date time;// 时间
     private String area; // 区域
     private String type; // 协议类型
     private long count; //  流量
diff --git a/src/main/java/com/nis/galaxy/domain/AreaCount.java b/src/main/java/com/nis/galaxy/domain/AreaCount.java
index f51a54e..3d48070 100644
--- a/src/main/java/com/nis/galaxy/domain/AreaCount.java
+++ b/src/main/java/com/nis/galaxy/domain/AreaCount.java
@@ -1,11 +1,12 @@
 package com.nis.galaxy.domain;
 
-import com.nis.galaxy.util.DateUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * @author GouGe
  * @data 2018/9/1 15:39
@@ -16,7 +17,7 @@ import lombok.experimental.Accessors;
 @Data
 @Accessors(chain=true)
 public class AreaCount {
-    private String time;
+    private Date time;
     private String area;
     private long count;
 }
diff --git a/src/main/java/com/nis/galaxy/domain/BlockingArea.java b/src/main/java/com/nis/galaxy/domain/BlockingArea.java
new file mode 100644
index 0000000..6124fed
--- /dev/null
+++ b/src/main/java/com/nis/galaxy/domain/BlockingArea.java
@@ -0,0 +1,41 @@
+package com.nis.galaxy.domain;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
+
+@SuppressWarnings("serial")
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+@Accessors(chain=true)
+public class BlockingArea implements Serializable {
+
+    private static final long serialVersionUID = -2264018301181992285L;
+
+    private Date time;         // 时间
+    private String area;         // 地区
+    private long controlNum;  // 管控数量
+    private long monitorNum; // 监测数量
+    private long networkFlowNum; // 网络流量数量
+    private long upstreamNum; // 上行数量
+    private long downstreamNum; // 上行数量
+    private long newLinkNum;   // 新建连接数
+    private long activeConNum;   // 活跃连接数
+    private long dropConNum;// 丢弃连接数
+    private long refluxConNum;  // 回流连接数
+
+    public BlockingArea(Date time, String area, long controlNum, long monitorNum, long networkFlowNum, long upstreamNum, long downstreamNum) {
+        this.time = time;
+        this.area = area;
+        this.controlNum = controlNum;
+        this.monitorNum = monitorNum;
+        this.networkFlowNum = networkFlowNum;
+        this.upstreamNum = upstreamNum;
+        this.downstreamNum = downstreamNum;
+    }
+}
diff --git a/src/main/java/com/nis/galaxy/domain/CfgTypeCount.java b/src/main/java/com/nis/galaxy/domain/CfgTypeCount.java
index d9dfd34..6d5bdb2 100644
--- a/src/main/java/com/nis/galaxy/domain/CfgTypeCount.java
+++ b/src/main/java/com/nis/galaxy/domain/CfgTypeCount.java
@@ -1,11 +1,13 @@
 package com.nis.galaxy.domain;
 
-import com.nis.galaxy.util.DateUtils;
+import com.nis.galaxy.util.DateUtil;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * @author GouGe
  * @data 2018/8/29 11:08
@@ -18,11 +20,11 @@ import lombok.experimental.Accessors;
 @Data
 @Accessors(chain=true)
 public class CfgTypeCount {
-    private String time;
+    private Date time;
     private String type;
     private long count;
-    public String getTime() {
-         time= DateUtils.getRangeOfday(DateUtils.getDateTime());
-        return time=DateUtils.getRangeNdayOfTime(time,-1);
+    public Date getTime() {
+         time= DateUtil.getFormatDay(new Date());
+        return time=DateUtil.getSomeDate(time,-1);
     }
 }
diff --git a/src/main/java/com/nis/galaxy/domain/EventsAppMonitor.java b/src/main/java/com/nis/galaxy/domain/EventsAppMonitor.java
index 5c04ab0..d1afca1 100644
--- a/src/main/java/com/nis/galaxy/domain/EventsAppMonitor.java
+++ b/src/main/java/com/nis/galaxy/domain/EventsAppMonitor.java
@@ -6,13 +6,15 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 @SuppressWarnings("serial")
 @NoArgsConstructor
 @AllArgsConstructor
 @Data
 @Accessors(chain=true)
 public class EventsAppMonitor {
-    private String time;
+    private Date time;
     private String name;
     private long num;
 }
diff --git a/src/main/java/com/nis/galaxy/domain/EventsBlock.java b/src/main/java/com/nis/galaxy/domain/EventsBlock.java
index 3ebe808..86af12d 100644
--- a/src/main/java/com/nis/galaxy/domain/EventsBlock.java
+++ b/src/main/java/com/nis/galaxy/domain/EventsBlock.java
@@ -6,6 +6,9 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.sql.Date;
+
+
 @SuppressWarnings("serial")
 @NoArgsConstructor
 @AllArgsConstructor
@@ -18,5 +21,5 @@ public class EventsBlock {
     private long mailNum;  // 邮件数量
     private long vedioNum; // 视频次数
     private long agentNum;  // 代理次数
-    private String time;      // 时间
+    private Date time;      // 时间
 }
diff --git a/src/main/java/com/nis/galaxy/domain/EventsDdosAlarm.java b/src/main/java/com/nis/galaxy/domain/EventsDdosAlarm.java
index 23cbe41..59b528f 100644
--- a/src/main/java/com/nis/galaxy/domain/EventsDdosAlarm.java
+++ b/src/main/java/com/nis/galaxy/domain/EventsDdosAlarm.java
@@ -6,6 +6,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 @SuppressWarnings("serial")
 @NoArgsConstructor
 @AllArgsConstructor
@@ -14,7 +16,7 @@ import lombok.experimental.Accessors;
 public class EventsDdosAlarm {
 
     private String name; // 名称
-    private String time;    // 时间
+    private Date time;    // 时间
     private String level;    // 等级
 
 }
diff --git a/src/main/java/com/nis/galaxy/domain/EventsDeviceNum.java b/src/main/java/com/nis/galaxy/domain/EventsDeviceNum.java
index f4f35fc..a344097 100644
--- a/src/main/java/com/nis/galaxy/domain/EventsDeviceNum.java
+++ b/src/main/java/com/nis/galaxy/domain/EventsDeviceNum.java
@@ -6,6 +6,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 @SuppressWarnings("serial")
 @NoArgsConstructor
 @AllArgsConstructor
@@ -13,7 +15,7 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 public class EventsDeviceNum {
     private String area;    //地域
-    private String time;    // 时间
+    private Date time;    // 时间
     private String type;    // 业务分类
     private long num;      //数量
 
diff --git a/src/main/java/com/nis/galaxy/domain/EventsKeyPointSafaguardThing.java b/src/main/java/com/nis/galaxy/domain/EventsKeyProtection.java
index 1c3c4b4..d1fb312 100644
--- a/src/main/java/com/nis/galaxy/domain/EventsKeyPointSafaguardThing.java
+++ b/src/main/java/com/nis/galaxy/domain/EventsKeyProtection.java
@@ -6,15 +6,18 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
+
 @SuppressWarnings("serial")
 @NoArgsConstructor
 @AllArgsConstructor
 @Data
 @Accessors(chain = true)
-public class EventsKeyPointSafaguardThing {
-    private String time;
+public class EventsKeyProtection {
+    private Date time;
     private String taskName;
-    private String taskTime;
+    private java.sql.Date taskTime;
     private long letterNum;// 来函件数
     private long configNum;// 配置总数
     private long monitorNum;// 监测数量
diff --git a/src/main/java/com/nis/galaxy/domain/EventsLetterCount.java b/src/main/java/com/nis/galaxy/domain/EventsLetterCount.java
index a26ae32..1f62a34 100644
--- a/src/main/java/com/nis/galaxy/domain/EventsLetterCount.java
+++ b/src/main/java/com/nis/galaxy/domain/EventsLetterCount.java
@@ -1,7 +1,6 @@
 package com.nis.galaxy.domain;
 
 
-import com.nis.galaxy.util.DateUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -15,12 +14,8 @@ import java.util.Date;
 @Data
 @Accessors(chain = true)
 public class EventsLetterCount {
-    private String time;  // 时间
+    private Date time;  // 时间
     private String letterNo;    // 来函编号
     private String topic;    // 主题
     private long num;
-
-    public void setTime(Date time) {
-        this.time = DateUtils.formatDateTime(time);
-    }
 }
diff --git a/src/main/java/com/nis/galaxy/domain/EventsMonitor.java b/src/main/java/com/nis/galaxy/domain/EventsMonitor.java
index de10ccc..0881b26 100644
--- a/src/main/java/com/nis/galaxy/domain/EventsMonitor.java
+++ b/src/main/java/com/nis/galaxy/domain/EventsMonitor.java
@@ -6,6 +6,9 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.sql.Date;
+
+
 @SuppressWarnings("serial")
 @NoArgsConstructor
 @AllArgsConstructor
@@ -18,6 +21,6 @@ public class EventsMonitor {
     private long mailNum;  // 邮件数量
     private long vedioNum; // 视频次数
     private long agentNum;  // 代理次数
-    private String time;      // 时间
+    private Date time;      // 时间
 
 }
diff --git a/src/main/java/com/nis/galaxy/domain/EventsNameNumTime.java b/src/main/java/com/nis/galaxy/domain/EventsNameNumTime.java
index 2e91f32..6edf7c4 100644
--- a/src/main/java/com/nis/galaxy/domain/EventsNameNumTime.java
+++ b/src/main/java/com/nis/galaxy/domain/EventsNameNumTime.java
@@ -1,5 +1,7 @@
 package com.nis.galaxy.domain;
 
+import java.util.Date;
+
 /**
  * @author GouGe
  * @data 2018/12/17 15:42
@@ -8,13 +10,13 @@ package com.nis.galaxy.domain;
 public class EventsNameNumTime {
     private String name;
     private long num;
-    private String time;
+    private Date time;
 
     public EventsNameNumTime(){
         super();
     }
 
-    public EventsNameNumTime(String name, long num, String time) {
+    public EventsNameNumTime(String name, long num, Date time) {
         this.name = name;
         this.num = num;
         this.time = time;
@@ -36,11 +38,11 @@ public class EventsNameNumTime {
         this.num = num;
     }
 
-    public String getTime() {
+    public Date getTime() {
         return time;
     }
 
-    public void setTime(String time) {
+    public void setTime(Date time) {
         this.time = time;
     }
 }
diff --git a/src/main/java/com/nis/galaxy/domain/EventsPortInfo.java b/src/main/java/com/nis/galaxy/domain/EventsPortInfo.java
index 8da6385..1c9936d 100644
--- a/src/main/java/com/nis/galaxy/domain/EventsPortInfo.java
+++ b/src/main/java/com/nis/galaxy/domain/EventsPortInfo.java
@@ -5,6 +5,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * @author GouGe
  * @data 2018/12/19 15:11
@@ -15,7 +17,7 @@ import lombok.experimental.Accessors;
 @Data
 @Accessors(chain = true)
 public class EventsPortInfo {
-    private String time;
+    private Date time;
     private String area;
     private String hostname;
     private String port;
diff --git a/src/main/java/com/nis/galaxy/domain/EventsServiceCount.java b/src/main/java/com/nis/galaxy/domain/EventsServiceCount.java
index edb3328..1ec1ecb 100644
--- a/src/main/java/com/nis/galaxy/domain/EventsServiceCount.java
+++ b/src/main/java/com/nis/galaxy/domain/EventsServiceCount.java
@@ -6,13 +6,15 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 @SuppressWarnings("serial")
 @NoArgsConstructor
 @AllArgsConstructor
 @Data
 @Accessors(chain = true)
 public class EventsServiceCount {
-    private String time;     // 时间
+    private Date time;     // 时间
     private String type;    // 业务分类
     private long num;     //数量
 }
diff --git a/src/main/java/com/nis/galaxy/domain/EventsSpecificWebsites.java b/src/main/java/com/nis/galaxy/domain/EventsSpecificWebsites.java
index 2bbe2cd..2b5b842 100644
--- a/src/main/java/com/nis/galaxy/domain/EventsSpecificWebsites.java
+++ b/src/main/java/com/nis/galaxy/domain/EventsSpecificWebsites.java
@@ -6,13 +6,15 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 @SuppressWarnings("serial")
 @NoArgsConstructor
 @AllArgsConstructor
 @Data
 @Accessors(chain = true)
 public class EventsSpecificWebsites {
-    private String time;    // 时间
+    private Date time;    // 时间
     private String name;    // 网站名称
     private long num;    //数量
 
diff --git a/src/main/java/com/nis/galaxy/domain/EvevtsTargetNetwork.java b/src/main/java/com/nis/galaxy/domain/EvevtsTargetNetwork.java
index 6a66376..ba7adbf 100644
--- a/src/main/java/com/nis/galaxy/domain/EvevtsTargetNetwork.java
+++ b/src/main/java/com/nis/galaxy/domain/EvevtsTargetNetwork.java
@@ -6,6 +6,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 @SuppressWarnings("serial")
 @NoArgsConstructor
 @AllArgsConstructor
@@ -15,5 +17,5 @@ public class EvevtsTargetNetwork {
     private String account;  // 账号
     private String nas_ip;    // 接入IP
     private long num;    // 次数
-    private String time;    // 时间
+    private Date time;    // 时间
 }
diff --git a/src/main/java/com/nis/galaxy/domain/HotStatistic.java b/src/main/java/com/nis/galaxy/domain/HotStatistic.java
index 4589a78..20e7a11 100644
--- a/src/main/java/com/nis/galaxy/domain/HotStatistic.java
+++ b/src/main/java/com/nis/galaxy/domain/HotStatistic.java
@@ -1,11 +1,12 @@
 package com.nis.galaxy.domain;
 
-import com.nis.galaxy.util.DateUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * @author GouGe
  * @data 2018/8/23 19:19
@@ -18,7 +19,7 @@ import lombok.experimental.Accessors;
 @Data
 @Accessors(chain = true)
 public class HotStatistic {
-    private String time;   // 时间
+    private Date time;   // 时间
     private String area;// 区域
     private String src_ip; // 源IP
     private String dst_ip;   // 目的IP
diff --git a/src/main/java/com/nis/galaxy/domain/IpActiveInfo.java b/src/main/java/com/nis/galaxy/domain/IpActiveInfo.java
index 6d54c0c..73222d8 100644
--- a/src/main/java/com/nis/galaxy/domain/IpActiveInfo.java
+++ b/src/main/java/com/nis/galaxy/domain/IpActiveInfo.java
@@ -1,18 +1,19 @@
 package com.nis.galaxy.domain;
 
-import com.nis.galaxy.util.DateUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 @SuppressWarnings("serial")
 @NoArgsConstructor
 @AllArgsConstructor
 @Data
 @Accessors(chain = true)
 public class IpActiveInfo {
-    private String time;
+    private Date time;
     private String ip;
     private String area;
     private long links;
diff --git a/src/main/java/com/nis/galaxy/domain/IpActiveInt.java b/src/main/java/com/nis/galaxy/domain/IpActiveInt.java
index 9fada0e..1b02e84 100644
--- a/src/main/java/com/nis/galaxy/domain/IpActiveInt.java
+++ b/src/main/java/com/nis/galaxy/domain/IpActiveInt.java
@@ -1,19 +1,20 @@
 package com.nis.galaxy.domain;
 
 
-import com.nis.galaxy.util.DateUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 @SuppressWarnings("serial")
 @NoArgsConstructor
 @AllArgsConstructor
 @Data
 @Accessors(chain = true)
 public class IpActiveInt {
-    private String time;// 时间
+    private Date time;// 时间
     private String type;//up OR down
     private String area;// 区域
     private String IP;// 活跃IP
diff --git a/src/main/java/com/nis/galaxy/domain/NetFlowWaterPush.java b/src/main/java/com/nis/galaxy/domain/NetFlowWaterPush.java
index d03ccff..152827e 100644
--- a/src/main/java/com/nis/galaxy/domain/NetFlowWaterPush.java
+++ b/src/main/java/com/nis/galaxy/domain/NetFlowWaterPush.java
@@ -14,7 +14,7 @@ import java.util.Date;
 @Data
 @Accessors(chain=true)
 public class NetFlowWaterPush {
-    private String time;
+    private Date time;
     private String area;
     private long count;
 }
diff --git a/src/main/java/com/nis/galaxy/domain/NetWaterMonitor.java b/src/main/java/com/nis/galaxy/domain/NetWaterMonitor.java
index c56dd44..daf150b 100644
--- a/src/main/java/com/nis/galaxy/domain/NetWaterMonitor.java
+++ b/src/main/java/com/nis/galaxy/domain/NetWaterMonitor.java
@@ -6,13 +6,15 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 @SuppressWarnings("serial")
 @NoArgsConstructor
 @AllArgsConstructor
 @Data
 @Accessors(chain = true)
 public class NetWaterMonitor {
-    private String time;
+    private Date time;
     private String area;
     private String type;
     private long count;
diff --git a/src/main/java/com/nis/galaxy/domain/NetflowMonitor.java b/src/main/java/com/nis/galaxy/domain/NetflowMonitor.java
index a1616f8..e41b02b 100644
--- a/src/main/java/com/nis/galaxy/domain/NetflowMonitor.java
+++ b/src/main/java/com/nis/galaxy/domain/NetflowMonitor.java
@@ -1,7 +1,6 @@
 package com.nis.galaxy.domain;
 
 
-import com.nis.galaxy.util.DateUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -17,9 +16,5 @@ import java.util.Date;
 public class NetflowMonitor {
     private String type;
     private String url;    // 图片url
-    private String time;    // 时间
-
-    public void setTime(Date time) {
-        this.time = DateUtils.formatDateTime(time);
-    }
+    private Date time;    // 时间
 }
diff --git a/src/main/java/com/nis/galaxy/domain/NetflowProtocol.java b/src/main/java/com/nis/galaxy/domain/NetflowProtocol.java
index f79a1d4..efc9c71 100644
--- a/src/main/java/com/nis/galaxy/domain/NetflowProtocol.java
+++ b/src/main/java/com/nis/galaxy/domain/NetflowProtocol.java
@@ -1,19 +1,20 @@
 package com.nis.galaxy.domain;
 
 
-import com.nis.galaxy.util.DateUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 @SuppressWarnings("serial")
 @NoArgsConstructor
 @AllArgsConstructor
 @Data
 @Accessors(chain = true)
 public class NetflowProtocol {
-    private String time; // 时间
+    private Date time; // 时间
     private String type;        // 协议类型
     private long linknum;// 链路数
     private long pakeagenum;  //  数据包数
diff --git a/src/main/java/com/nis/galaxy/domain/NmsServerBean.java b/src/main/java/com/nis/galaxy/domain/NmsServerBean.java
index a481fa4..d43e9db 100644
--- a/src/main/java/com/nis/galaxy/domain/NmsServerBean.java
+++ b/src/main/java/com/nis/galaxy/domain/NmsServerBean.java
@@ -1,6 +1,6 @@
 package com.nis.galaxy.domain;
 
-import com.nis.galaxy.util.DateUtils;
+import com.nis.galaxy.util.DateUtil;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -19,7 +19,7 @@ import java.util.List;
 @Data
 @Accessors(chain = true)
 public class NmsServerBean {
-    private String time;
+    private Date time;
     private String system;
     private String area;
     private long total;
@@ -27,8 +27,8 @@ public class NmsServerBean {
     private long abnormal;
     private List<AbnormalBean> abnormalmachines;
 
-    public String getTime() {
-        return time = DateUtils.getRangeOf1min(new Date());
+    public Date getTime() {
+        return time = DateUtil.getFormatMinuteOne(new Date());
     }
 
     public String getSystem() {
diff --git a/src/main/java/com/nis/galaxy/domain/NtcEntranceReport.java b/src/main/java/com/nis/galaxy/domain/NtcEntranceReport.java
index cb46660..aaeff9e 100644
--- a/src/main/java/com/nis/galaxy/domain/NtcEntranceReport.java
+++ b/src/main/java/com/nis/galaxy/domain/NtcEntranceReport.java
@@ -1,23 +1,19 @@
 package com.nis.galaxy.domain;
 
-import com.nis.galaxy.util.DateUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 @SuppressWarnings("serial")
 @NoArgsConstructor
 @AllArgsConstructor
 @Data
 @Accessors(chain=true)
 public class NtcEntranceReport {
-    private String time;
+    private Date time;
     private String area;
     private long count;
-
-    public String getTime() {
-        time = DateUtils.getRangeOf5min(DateUtils.getDateTime());
-        return time = DateUtils.getBeforeNminOfTime(time, -5);
-    }
 }
 \ No newline at end of file
diff --git a/src/main/java/com/nis/galaxy/domain/NtcRejectUrlStatistic.java b/src/main/java/com/nis/galaxy/domain/NtcRejectUrlStatistic.java
index 6c0c091..eb128ce 100644
--- a/src/main/java/com/nis/galaxy/domain/NtcRejectUrlStatistic.java
+++ b/src/main/java/com/nis/galaxy/domain/NtcRejectUrlStatistic.java
@@ -1,6 +1,5 @@
 package com.nis.galaxy.domain;
 
-import com.nis.galaxy.util.DateUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -14,7 +13,7 @@ import java.util.Date;
 @Data
 @Accessors(chain = true)
 public class NtcRejectUrlStatistic {
-    private String time;
+    private Date time;
     private String type;
     private long count;
 }
diff --git a/src/main/java/com/nis/galaxy/domain/NtcRejectWebsiteStatistic.java b/src/main/java/com/nis/galaxy/domain/NtcRejectWebsiteStatistic.java
index f991414..b04e5cf 100644
--- a/src/main/java/com/nis/galaxy/domain/NtcRejectWebsiteStatistic.java
+++ b/src/main/java/com/nis/galaxy/domain/NtcRejectWebsiteStatistic.java
@@ -1,19 +1,20 @@
 package com.nis.galaxy.domain;
 
 
-import com.nis.galaxy.util.DateUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 @SuppressWarnings("serial")
 @NoArgsConstructor
 @AllArgsConstructor
 @Data
 @Accessors(chain=true)
 public class NtcRejectWebsiteStatistic {
-    private String time;
+    private Date time;
     private String type;
     private long count;
 
diff --git a/src/main/java/com/nis/galaxy/domain/NtcTagReport.java b/src/main/java/com/nis/galaxy/domain/NtcTagReport.java
index 02e604e..eaf2a7d 100644
--- a/src/main/java/com/nis/galaxy/domain/NtcTagReport.java
+++ b/src/main/java/com/nis/galaxy/domain/NtcTagReport.java
@@ -1,19 +1,20 @@
 package com.nis.galaxy.domain;
 
 
-import com.nis.galaxy.util.DateUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 @SuppressWarnings("serial")
 @NoArgsConstructor
 @AllArgsConstructor
 @Data
 @Accessors(chain = true)
 public class NtcTagReport {
-    private String time;
+    private Date time;
     private String type;
     private long count;
 }
diff --git a/src/main/java/com/nis/galaxy/domain/NtcTotalReport.java b/src/main/java/com/nis/galaxy/domain/NtcTotalReport.java
index bab69e2..d1281c8 100644
--- a/src/main/java/com/nis/galaxy/domain/NtcTotalReport.java
+++ b/src/main/java/com/nis/galaxy/domain/NtcTotalReport.java
@@ -1,13 +1,12 @@
 package com.nis.galaxy.domain;
 
-import com.nis.galaxy.util.DateUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.util.Date;
 
 @SuppressWarnings("serial")
 @NoArgsConstructor
@@ -16,7 +15,7 @@ import java.io.Serializable;
 @Accessors(chain = true)
 public class NtcTotalReport implements Serializable {
 
-    private String time;        // 时间
+    private Date time;        // 时间
     private long controlNum; // 管控数量
     private long monitorNum;// 监测数量
     private long networkFlowNum; // 网络流量数量
diff --git a/src/main/java/com/nis/galaxy/domain/NtcUrlIpCount.java b/src/main/java/com/nis/galaxy/domain/NtcUrlIpCount.java
index 322e81b..09a6ac3 100644
--- a/src/main/java/com/nis/galaxy/domain/NtcUrlIpCount.java
+++ b/src/main/java/com/nis/galaxy/domain/NtcUrlIpCount.java
@@ -1,11 +1,12 @@
 package com.nis.galaxy.domain;
 
-import com.nis.galaxy.util.DateUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * @author GouGe
  * @data 2018/8/28 16:54
@@ -18,7 +19,7 @@ import lombok.experimental.Accessors;
 @Data
 @Accessors(chain=true)
 public class NtcUrlIpCount {
-    private String time;
+    private Date time;
     private String ip;
     private String type;
     private long count;
diff --git a/src/main/java/com/nis/galaxy/domain/NtcWebIpCount.java b/src/main/java/com/nis/galaxy/domain/NtcWebIpCount.java
index 9f733b6..cb82a09 100644
--- a/src/main/java/com/nis/galaxy/domain/NtcWebIpCount.java
+++ b/src/main/java/com/nis/galaxy/domain/NtcWebIpCount.java
@@ -1,11 +1,12 @@
 package com.nis.galaxy.domain;
 
-import com.nis.galaxy.util.DateUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 /**
  * @author GouGe
  * @data 2018/8/28 17:29
@@ -17,7 +18,7 @@ import lombok.experimental.Accessors;
 @Data
 @Accessors(chain=true)
 public class NtcWebIpCount {
-    private String time;
+    private Date time;
     private String ip;
     private String type;
     private long count;
diff --git a/src/main/java/com/nis/galaxy/domain/PointMap.java b/src/main/java/com/nis/galaxy/domain/PointMap.java
index 32d69e4..8029021 100644
--- a/src/main/java/com/nis/galaxy/domain/PointMap.java
+++ b/src/main/java/com/nis/galaxy/domain/PointMap.java
@@ -1,6 +1,5 @@
 package com.nis.galaxy.domain;
 
-import com.nis.galaxy.util.DateUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -19,13 +18,9 @@ import java.util.Date;
 @Data
 @Accessors(chain = true)
 public class PointMap {
-    private String time;      // 时间
+    private Date time;      // 时间
     private String src_ip;    //  源IP
     private String dst_ip;//  目的IP
     private String type; //    类型
     private long count;
-
-    public void setTime(Date time) {
-        this.time=DateUtils.formatDateTime(time);
-    }
 }
diff --git a/src/main/java/com/nis/galaxy/domain/PortBPSTime.java b/src/main/java/com/nis/galaxy/domain/PortBPSTime.java
index a634a81..df14c17 100644
--- a/src/main/java/com/nis/galaxy/domain/PortBPSTime.java
+++ b/src/main/java/com/nis/galaxy/domain/PortBPSTime.java
@@ -6,6 +6,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 @SuppressWarnings("serial")
 @NoArgsConstructor
 @AllArgsConstructor
@@ -15,7 +17,7 @@ public class PortBPSTime {
 
     private String port;
     private long bps;
-    private String time;
+    private Date time;
 
     public void setBps(double bps) {
         this.bps =(long) bps;
diff --git a/src/main/java/com/nis/galaxy/domain/TimeTypeCount.java b/src/main/java/com/nis/galaxy/domain/TimeTypeCount.java
index 34f68bc..e59522d 100644
--- a/src/main/java/com/nis/galaxy/domain/TimeTypeCount.java
+++ b/src/main/java/com/nis/galaxy/domain/TimeTypeCount.java
@@ -1,18 +1,19 @@
 package com.nis.galaxy.domain;
 
-import com.nis.galaxy.util.DateUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.Date;
+
 @SuppressWarnings("serial")
 @NoArgsConstructor
 @AllArgsConstructor
 @Data
 @Accessors(chain=true)
 public class TimeTypeCount {
-    private String time;
+    private Date time;
     private String type;
     private long count;
 }
diff --git a/src/main/java/com/nis/galaxy/template/ForBlockingInterface.java b/src/main/java/com/nis/galaxy/template/ForBlockingInterface.java
index a109f21..834c73b 100644
--- a/src/main/java/com/nis/galaxy/template/ForBlockingInterface.java
+++ b/src/main/java/com/nis/galaxy/template/ForBlockingInterface.java
@@ -2,7 +2,7 @@ package com.nis.galaxy.template;
 
 import com.nis.galaxy.common.InterfaceBase;
 import com.nis.galaxy.config.PushParams;
-import com.nis.galaxy.util.DateUtils;
+import com.nis.galaxy.util.DateUtil;
 import com.nis.galaxy.web.service.BlockingService;
 import net.javacrumbs.shedlock.core.SchedulerLock;
 import org.slf4j.Logger;
@@ -16,6 +16,7 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
+import java.util.Date;
 import java.util.List;
 
 
@@ -31,8 +32,7 @@ public class ForBlockingInterface {
     @Autowired
     PushParams pushParams;
 
-    private int a = 1;
-    private int before5m = -5;
+    private int firstPushCount = 1;
 
     @Value("${scheduled.block.enable}")
     private String scheduledBlockEnable;
@@ -51,20 +51,23 @@ public class ForBlockingInterface {
         if (!Boolean.parseBoolean(scheduledBlockEnable)) {
             return;
         }
+        String logMark = "封堵信息整体显示";
+        Date end = DateUtil.getFormatMinute(new Date());
+        Date start = DateUtil.getSomeMinute(end, -5);
         List contentValue = null;
         try {
-            contentValue = blockingService.getAllBlockInformation();
+            contentValue = blockingService.getAllBlockInformation(start, end, logMark);
         } catch (Exception e) {
-            logger.error("封堵信息整体显示\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("封堵信息整体显示无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "blocking.global", contentValue);
-        logger.info("开始推送======>>>封堵信息整体显示\t请求头和请求体：" + httpEntity);
+        logger.info("开始推送======>>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_BLOCKING, httpEntity);
-        logger.info("封堵信息整体显示\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
@@ -72,27 +75,27 @@ public class ForBlockingInterface {
      */
     @Scheduled(cron = "${5m.scheduled.cron.plan}")
     @SchedulerLock(name = "blocking.area", lockAtLeastForString = "PT2M", lockAtMostForString = "PT4M")
-    public void getDisBlockInformation() {
+    public void getBlockingArea() {
         if (!Boolean.parseBoolean(scheduledBlockEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOf5min(now);
-        String start = DateUtils.getBeforeNminOfTime(end, before5m);
+        String logMark = "封堵信息分布显示";
+        Date end = DateUtil.getFormatMinute(new Date());
+        Date start = DateUtil.getSomeMinute(end, -5);
         List contentValue = null;
         try {
-            contentValue = blockingService.getDisBlockInformation(start, end);
+            contentValue = blockingService.getBlockingArea(start, end, logMark);
         } catch (Exception e) {
-            logger.error("封堵信息分布显示\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("封堵信息分布显示\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "blocking.area", contentValue);
-        logger.info("开始推送======>>>封堵信息分布显示\t请求头和请求体：" + httpEntity);
+        logger.info("开始推送======>>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_BLOCKING, httpEntity);
-        logger.info("封堵信息分布显示\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
@@ -104,24 +107,24 @@ public class ForBlockingInterface {
         if (!Boolean.parseBoolean(scheduledBlockEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOf5min(now);
-        String start = DateUtils.getBeforeNminOfTime(end, before5m);
+        String logMark = "DNS欺骗信息显示";
+        Date end = DateUtil.getFormatMinute(new Date());
+        Date start = DateUtil.getSomeMinute(end, -5);
         List contentValue = null;
         try {
             //获得封装数据
-            contentValue = blockingService.getDNSDeceiveInformation(start, end);
+            contentValue = blockingService.getDNSDeceiveInformation(start, end, logMark);
         } catch (Exception e) {
-            logger.error("DNS欺骗信息显示\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("DNS欺骗信息显示\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "blocking.dns.deceive", contentValue);
-        logger.info("开始推送======>>>DNS欺骗信息显示\t请求头和请求体：" + httpEntity);
+        logger.info("开始推送======>>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_BLOCKING, httpEntity);
-        logger.info("DNS欺骗信息显示\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
@@ -133,26 +136,26 @@ public class ForBlockingInterface {
         if (!Boolean.parseBoolean(scheduledBlockEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOf5min(now);
-        String start = DateUtils.getBeforeNminOfTime(end, before5m);
+        String logMark = "24小时内全国范围阻断协议信息";
+        Date end = DateUtil.getFormatMinute(new Date());
+        Date start = DateUtil.getSomeMinute(end, -5);
         List contentValue = null;
         try {
-            contentValue = blockingService.get24hAllBlockEachProtocol(start, end, AllBlockEachProtocolExpTimes);
+            contentValue = blockingService.get24hAllBlockEachProtocol(start, end, AllBlockEachProtocolExpTimes, logMark);
         } catch (Exception e) {
-            logger.error("24小时内全国范围阻断协议信息\t查询异常\trestTemplate" + ++AllBlockEachProtocolExpTimes, e);
+            logger.error(logMark + "\t查询异常\trestTemplate" + ++AllBlockEachProtocolExpTimes, e);
         }
         if (AllBlockEachProtocolExpTimes > 0 && contentValue != null) {
             AllBlockEachProtocolExpTimes = 0;
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("24小时内全国范围阻断协议信息\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "blocking.24hour.global.protocol.block", contentValue);
-        logger.info("开始推送======>>>24小时内全国范围阻断协议信息\t请求头和请求体：" + httpEntity);
+        logger.info("开始推送======>>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_BLOCKING, httpEntity);
-        logger.info("24小时内全国范围阻断协议信息\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
@@ -160,55 +163,55 @@ public class ForBlockingInterface {
      */
     @Scheduled(cron = "${5m.scheduled.cron.plan}")
     @SchedulerLock(name = "blocking.24hour.thermodynamic", lockAtLeastForString = "PT2M", lockAtMostForString = "PT4M")
-    public void getAllHotStatistis() {
+    public void getBlocking24HourThermodynamic() {
         if (!Boolean.parseBoolean(scheduledBlockEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOf5min(now);
-        String start = DateUtils.getBeforeNminOfTime(end, before5m);
+        String logMark = "24小时内全国热力图";
+        Date end = DateUtil.getFormatMinute(new Date());
+        Date start = DateUtil.getSomeMinute(end, -5);
         //获取并封装数据
         List contentValue = null;
         try {
-            contentValue = blockingService.getAllHotStatistis(start, end);
+            contentValue = blockingService.getBlocking24HourThermodynamic(start, end, logMark);
         } catch (Exception e) {
-            logger.error("24小时内全国热力图\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("24小时内全国热力图\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "blocking.24hour.thermodynamic", contentValue);
-        logger.info("开始推送======>>>24小时内全国热力图\t请求头和请求体：" + httpEntity);
+        logger.info("开始推送======>>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_BLOCKING, httpEntity);
-        logger.info("24小时内全国热力图\t推送返回结果" + response);
-
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
      * 实时打点图 10s
      */
-    @Scheduled(cron = "${10s.scheduled.cron.plan}")
-    @SchedulerLock(name = "blocking.realtime.point", lockAtLeastForString = "PT4S", lockAtMostForString = "PT8S")
+//    @Scheduled(cron = "${10s.scheduled.cron.plan}")
+//    @SchedulerLock(name = "blocking.realtime.point", lockAtLeastForString = "PT4S", lockAtMostForString = "PT8S")
     public void getPointMapOf10s() {
         if (!Boolean.parseBoolean(scheduledBlockEnable)) {
             return;
         }
+        String logMark = "实时打点图";
         List contentValue = null;
         try {
             //获取并封装数据
-            contentValue = blockingService.getPointMapOf10s();
+            contentValue = blockingService.getPointMapOf10s(logMark);
         } catch (Exception e) {
-            logger.error("实时打点图\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("实时打点图\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "blocking.realtime.point", contentValue);
-        logger.info("开始推送======>>>实时打点图\t请求头和请求体：" + httpEntity);
+        logger.info("开始推送======>>>{}\t请求头和请求体\t{}" + httpEntity);
         ResponseEntity<String> response = restTemplate.postForEntity(REST_URL_PREFIX_PUSH + SERVICE_PATH_BLOCKING, httpEntity, String.class);
-        logger.info("实时打点图\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
 
     }
 
@@ -221,24 +224,24 @@ public class ForBlockingInterface {
         if (!Boolean.parseBoolean(scheduledBlockEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOf5min(now);
-        String start = DateUtils.getBeforeNminOfTime(end, before5m);
+        String logMark = "热力图接口";
+        Date end = DateUtil.getFormatMinute(new Date());
+        Date start = DateUtil.getSomeMinute(end, -5);
         List contentValue = null;
         try {
             //获取并封装数据
-            contentValue = blockingService.getDisBlockMap(start, end);
+            contentValue = blockingService.getDisBlockMap(start, end, logMark);
         } catch (Exception e) {
-            logger.error("热力图接口\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("热力图接口\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "blocking.thermodynamic", contentValue);
-        logger.info("开始推送======>>>热力图接口\t请求头和请求体：" + httpEntity);
+        logger.info("开始推送======>>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_BLOCKING, httpEntity);
-        logger.info("热力图接口\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
@@ -246,41 +249,42 @@ public class ForBlockingInterface {
      */
     @Scheduled(cron = "${24h.scheduled.cron.plan}")
     @SchedulerLock(name = "blocking.global.protocol.config", lockAtLeastForString = "PT1H", lockAtMostForString = "PT2H")
-    public void getAllCfgInfo() {
+    public void getBlockingGlobalProtocolConfig() {
         if (!Boolean.parseBoolean(scheduledBlockEnable)) {
             return;
         }
+        String logMark = "全国协议配置信息";
         List contentValue = null;
         try {
             //获取并封装数据
-            contentValue = blockingService.getAllCfgInfo();
+            contentValue = blockingService.getBlockingGlobalProtocolConfig(logMark);
         } catch (Exception e) {
-            logger.error("全国协议配置信息\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
 
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("全国协议配置信息\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "blocking.global.protocol.config", contentValue);
-        logger.info("开始推送======>>>全国协议配置信息 请求头和请求体：" + httpEntity);
+        logger.info("开始推送======>>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_BLOCKING, httpEntity);
-        logger.info("全国协议配置信息\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     @Scheduled(fixedRate = 999999999)
     @SchedulerLock(name = "FirstPushBlockingInterface", lockAtLeastForString = "PT1H", lockAtMostForString = "PT2H")
     public void run() throws InterruptedException {
-        if (a++ > 1) {
+        if (firstPushCount++ > 1) {
             return;
         }
         logger.warn("应用启动首次推送所有接口1/6");
-//        getAllBlockInformation();
-        getDisBlockInformation();
-//        getDNSDeceiveInformation();
+//        getAllBlockInformation();//
+        getBlockingArea();
+//        getDNSDeceiveInformation();//
         get24hAllBlockEachProtocol();
-        getAllHotStatistis();
-//        getDisBlockMap();
-        getAllCfgInfo();
+        getBlocking24HourThermodynamic();
+//        getDisBlockMap();//
+        getBlockingGlobalProtocolConfig();
     }
 }
 \ No newline at end of file
diff --git a/src/main/java/com/nis/galaxy/template/ForBlockingTopNInterface.java b/src/main/java/com/nis/galaxy/template/ForBlockingTopNInterface.java
index 6d58e4c..06a0f00 100644
--- a/src/main/java/com/nis/galaxy/template/ForBlockingTopNInterface.java
+++ b/src/main/java/com/nis/galaxy/template/ForBlockingTopNInterface.java
@@ -2,7 +2,7 @@ package com.nis.galaxy.template;
 
 import com.nis.galaxy.common.InterfaceBase;
 import com.nis.galaxy.config.PushParams;
-import com.nis.galaxy.util.DateUtils;
+import com.nis.galaxy.util.DateUtil;
 import com.nis.galaxy.web.service.BlockingTopNService;
 import net.javacrumbs.shedlock.core.SchedulerLock;
 import org.slf4j.Logger;
@@ -51,24 +51,24 @@ public class ForBlockingTopNInterface {
         if (!Boolean.parseBoolean(scheduledBlockTopnEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOfday(now);
-        String start = DateUtils.getBeforeNminOfTime(end,before60m*24);
+        String logMark = "24小时内区域阻断协议TOP10";
+        Date end = DateUtil.getFormatDay(new Date());
+        Date start = DateUtil.getSomeDate(end, -1);
         List contentValue = null;
         try {
             //获取并封装数据
-            contentValue = blockingTopNService.getAreaBlockTop10ProtocolOf24(start, end);
+            contentValue = blockingTopNService.getAreaBlockTop10ProtocolOf24(start, end, logMark);
         } catch (Exception e) {
-            logger.error("24小时内区域阻断协议TOP10\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("24小时内区域阻断协议TOP10\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
-        HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(),null,"blocking.24hour.area.protocol.block", contentValue);
-        logger.info("开始推送======>>>24小时内区域阻断协议TOP10\t请求头和请求体：" + httpEntity);
+        HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "blocking.24hour.area.protocol.block", contentValue);
+        logger.info("开始推送======>>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_BLOCKING, httpEntity);
-        logger.info("24小时内区域阻断协议TOP10\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
@@ -80,24 +80,24 @@ public class ForBlockingTopNInterface {
         if (!Boolean.parseBoolean(scheduledBlockTopnEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOfhour(now);
-        String start = DateUtils.getBeforeNminOfTime(end, before60m);
+        String logMark = "1小时内全国阻断URLTOP10";
+        Date end = DateUtil.getFormatHour(new Date());
+        Date start = DateUtil.getSomeDate(end, -1);
         List contentValue = null;
         try {
             //获取并封装数据
-            contentValue = blockingTopNService.getBlockTop10URLOf1h(start, end);
+            contentValue = blockingTopNService.getBlockTop10URLOf1h(start, end, logMark);
         } catch (Exception e) {
-            logger.error("1小时内全国阻断URLTOP10\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("1小时内全国阻断URLTOP10\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
-        HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(),null,"blocking.1hour.url.top_10", contentValue);
-        logger.info("开始推送======>>>1小时内全国阻断URLTOP10 请求头和请求体：" + httpEntity);
+        HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "blocking.1hour.url.top_10", contentValue);
+        logger.info("开始推送======>>>{}请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_BLOCKING, httpEntity);
-        logger.info("1小时内全国阻断URLTOP10\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
@@ -109,24 +109,24 @@ public class ForBlockingTopNInterface {
         if (!Boolean.parseBoolean(scheduledBlockTopnEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOfhour(now);
-        String start = DateUtils.getBeforeNminOfTime(end, before60m);
+        String logMark = "1小时内全国阻断URLTOP10";
+        Date end = DateUtil.getFormatHour(new Date());
+        Date start = DateUtil.getSomeDate(end, -1);
         List contentValue = null;
         try {
             //获取并封装推送数据
-            contentValue = blockingTopNService.getBlockTop10WebsiteOf1h(start, end);
+            contentValue = blockingTopNService.getBlockTop10WebsiteOf1h(start, end, logMark);
         } catch (Exception e) {
-            logger.error("1小时内全国阻断网站TOP10\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("1小时内全国阻断网站TOP10\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
-        HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(),null,"blocking.1hour.website.top_10", contentValue);
-        logger.info("开始推送======>>>1小时内全国阻断网站TOP10 请求头和请求体：" + httpEntity);
+        HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "blocking.1hour.website.top_10", contentValue);
+        logger.info("开始推送======>>>{}请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_BLOCKING, httpEntity);
-        logger.info("1小时内全国阻断网站TOP10\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t", logMark, response);
 
     }
 
@@ -140,25 +140,25 @@ public class ForBlockingTopNInterface {
         if (!Boolean.parseBoolean(scheduledBlockTopnEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOf5min(now);
-        String start = DateUtils.getBeforeNminOfTime(end, before5m);
+        String logMark = "5分钟内全国阻断URLTOP10";
+        Date end = DateUtil.getFormatMinute(new Date());
+        Date start = DateUtil.getSomeMinute(end, -5);
         List contentValue = null;
         try {
             //获取并封装数据
-            contentValue = blockingTopNService.getBlockTop10URLOf5m(start, end);
+            contentValue = blockingTopNService.getBlockTop10URLOf5m(start, end, logMark);
 
         } catch (Exception e) {
-            logger.error("5分钟内全国阻断URLTOP10\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("5分钟内全国阻断URLTOP10\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
-        HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(),null,"blocking.5minute.url.top_10", contentValue);
-        logger.info("开始推送======>>>5分钟内全国阻断URLTOP10 请求头和请求体：" + httpEntity);
+        HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "blocking.5minute.url.top_10", contentValue);
+        logger.info("开始推送======>>>{}请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_BLOCKING, httpEntity);
-        logger.info("5分钟内全国阻断URLTOP10\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
 
     }
 
@@ -171,25 +171,25 @@ public class ForBlockingTopNInterface {
         if (!Boolean.parseBoolean(scheduledBlockTopnEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOf5min(now);
-        String start = DateUtils.getBeforeNminOfTime(end, before5m);
+        String logMark = "5分钟内全国阻断网站TOP10";
+        Date end = DateUtil.getFormatMinute(new Date());
+        Date start = DateUtil.getSomeMinute(end, -5);
         List contentValue = null;
         try {
             //获取并封装数据
-            contentValue = blockingTopNService.getBlockTop10WebsiteOf5m(start, end);
+            contentValue = blockingTopNService.getBlockTop10WebsiteOf5m(start, end, logMark);
 
         } catch (Exception e) {
-            logger.error("5分钟内全国阻断网站TOP10\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("5分钟内全国阻断网站TOP10\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
-        HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(),null,"blocking.5minute.website.top_10", contentValue);
-        logger.info("开始推送======>>>5分钟内全国阻断网站TOP10 请求头和请求体：" + httpEntity);
+        HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "blocking.5minute.website.top_10", contentValue);
+        logger.info("开始推送======>>>{}请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_BLOCKING, httpEntity);
-        logger.info("5分钟内全国阻断网站TOP10\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
 
     }
 
@@ -202,39 +202,38 @@ public class ForBlockingTopNInterface {
         if (!Boolean.parseBoolean(scheduledBlockTopnEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOfhour(now);
-        String start = DateUtils.getBeforeNminOfTime(end, before60m);
+        String logMark = "1小时内全国阻断标签TOP10";
+        Date end = DateUtil.getFormatHour(new Date());
+        Date start = DateUtil.getSomeHour(end, -1);
         List contentValue = null;
         try {
             //获取并封装数据
-            contentValue = blockingTopNService.getBlockTop100Tag1h(start, end);
+            contentValue = blockingTopNService.getBlockTop100Tag1h(start, end, logMark);
         } catch (Exception e) {
-            logger.error("1小时内全国阻断标签TOP10\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("1小时内全国阻断标签TOP10\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
-        HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(),null,"netflow.1hour.keyword.top_10", contentValue);
-        logger.info("开始推送======>>>1小时内全国阻断标签TOP10 请求头和请求体：" + httpEntity);
+        HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "netflow.1hour.keyword.top_10", contentValue);
+        logger.info("开始推送======>>>{}请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_BLOCKING, httpEntity);
-        logger.info("1小时内全国阻断标签TOP10\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     @Scheduled(fixedRate = 999999999)
-    @SchedulerLock(name = "FirstPushBlockingTopN", lockAtLeastForString = "PT1H",lockAtMostForString = "PT2H")
+    @SchedulerLock(name = "FirstPushBlockingTopN", lockAtLeastForString = "PT1H", lockAtMostForString = "PT2H")
     public void run() throws InterruptedException {
         if (a++ > 1) {
             return;
         }
         logger.warn("应用启动首次推送所有接口2/6");
-//        getAreaBlockTop10ProtocolOf24h();
-//        getBlockTop10URLOf1h();
-//        getBlockTop10WebsiteOf1h();
-//        getBlockTop10URLOf5m();
-//        getBlockTop10WebsiteOf5m();
-//        getBlockTop100Tag1h();
-
+//        getAreaBlockTop10ProtocolOf24h();//
+//        getBlockTop10URLOf1h();//
+//        getBlockTop10WebsiteOf1h();//
+//        getBlockTop10URLOf5m();//
+//        getBlockTop10WebsiteOf5m();//
+//        getBlockTop100Tag1h();//
     }
 }
diff --git a/src/main/java/com/nis/galaxy/template/ForEventsInterface.java b/src/main/java/com/nis/galaxy/template/ForEventsInterface.java
index 4082138..644f4dc 100644
--- a/src/main/java/com/nis/galaxy/template/ForEventsInterface.java
+++ b/src/main/java/com/nis/galaxy/template/ForEventsInterface.java
@@ -3,7 +3,7 @@ package com.nis.galaxy.template;
 
 import com.nis.galaxy.common.InterfaceBase;
 import com.nis.galaxy.config.PushParams;
-import com.nis.galaxy.util.DateUtils;
+import com.nis.galaxy.util.DateUtil;
 import com.nis.galaxy.web.service.EventsService;
 import net.javacrumbs.shedlock.core.SchedulerLock;
 import org.slf4j.Logger;
@@ -17,6 +17,7 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
+import java.util.Date;
 import java.util.List;
 
 @Component
@@ -32,8 +33,6 @@ public class ForEventsInterface {
     PushParams pushParams;
 
     private int a = 1;
-    private int before1day = -60 * 24;
-    private int before60m = -60;
 
 
     @Value("${scheduled.events.enable}")
@@ -49,28 +48,28 @@ public class ForEventsInterface {
      */
 //    @Scheduled(cron = "${24h.scheduled.cron.plan}")
 //    @SchedulerLock(name = "system.total", lockAtLeastForString = "PT1H", lockAtMostForString = "PT2H")
-    public void getSystemTotalOf1Day() {
+    public void getSystemTotal() {
         if (!Boolean.parseBoolean(scheduledEventsEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOfday(now);
-        String start = DateUtils.getBeforeNminOfTime(end, before1day);
+        String logMark = "系统总计";
+        Date end = DateUtil.getFormatDay(new Date());
+        Date start = DateUtil.getSomeDate(end, -1);
         List contentValue = null;
         try {
-            contentValue = eventsService.getSystemTotalOf1Day(start, end);
+            contentValue = eventsService.getSystemTotal(start, end, logMark);
         } catch (Exception e) {
-            logger.error("系统总计\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("系统总计\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "system.total", contentValue);
-        logger.info("开始推送=======>>系统总计 请求头和请求体：" + httpEntity);
+        logger.info("开始推送=======>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_EVENTS, httpEntity);
-        logger.info("系统总计\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
@@ -82,24 +81,24 @@ public class ForEventsInterface {
         if (!Boolean.parseBoolean(scheduledEventsEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOfhour(now);
-        String start = DateUtils.getBeforeNminOfTime(end, before60m);
+        String logMark = "特定APP访问监控";
+        Date end = DateUtil.getFormatHour(new Date());
+        Date start = DateUtil.getSomeHour(end, -1);
         List contentValue = null;
         try {
-            contentValue = eventsService.getSpecifiedAPPMonitor(start, end);
+            contentValue = eventsService.getSpecifiedAPPMonitor(start, end, logMark);
         } catch (Exception e) {
-            logger.error("特定APP访问监控\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("特定APP访问监控\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "specific.app", contentValue);
-        logger.info("开始推送=======>>特定APP访问监控 请求头和请求体：" + httpEntity);
+        logger.info("开始推送=======>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_EVENTS, httpEntity);
-        logger.info("特定APP访问监控\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t", logMark, response);
     }
 
     /**
@@ -111,21 +110,22 @@ public class ForEventsInterface {
         if (!Boolean.parseBoolean(scheduledEventsEnable)) {
             return;
         }
+        String logMark = "来函统计报表";
         List contentValue = null;
         try {
-            contentValue = eventsService.getLetterCount();
+            contentValue = eventsService.getLetterCount(logMark);
         } catch (Exception e) {
-            logger.error("来函统计报表\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("来函统计报表\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "letter.count", contentValue);
-        logger.info("开始推送=======>>来函统计报表 请求头和请求体：" + httpEntity);
+        logger.info("开始推送=======>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_EVENTS, httpEntity);
-        logger.info("来函统计报表\t推送返回结果" + response);
+        logger.info(logMark + "\t推送返回结果" + response);
     }
 
     /**
@@ -137,24 +137,24 @@ public class ForEventsInterface {
         if (!Boolean.parseBoolean(scheduledEventsEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOfday(now);
-        String start = DateUtils.getBeforeNminOfTime(end, before1day);
+        String logMark = "业务类型统计报表";
+        Date end = DateUtil.getFormatDay(new Date());
+        Date start = DateUtil.getSomeDate(end, -1);
         List contentValue = null;
         try {
-            contentValue = eventsService.getServiceCount(start, end);
+            contentValue = eventsService.getServiceCount(start, end, logMark);
         } catch (Exception e) {
-            logger.error("业务类型统计报表\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("业务类型统计报表\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "trans.type", contentValue);
-        logger.info("开始推送=======>>业务类型统计报表 请求头和请求体：" + httpEntity);
+        logger.info("开始推送=======>>{}\t请求头和请求体\t", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_EVENTS, httpEntity);
-        logger.info("业务类型统计报表\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
@@ -162,27 +162,28 @@ public class ForEventsInterface {
      */
     @Scheduled(cron = "${24h.scheduled.cron.plan}")
     @SchedulerLock(name = "events.key.protection", lockAtLeastForString = "PT1H", lockAtMostForString = "PT2H")
-    public void getKeyPointSafaguardThing() {
+    public void getEventsKeyProtection() {
         if (!Boolean.parseBoolean(scheduledEventsEnable)) {
             return;
         }
-        String end = DateUtils.getRangeOfday(DateUtils.getDateTime());
-        String start = DateUtils.getRangeNdayOfTime(end, -1);
+        String logMark = "重点保障事件总览";
+        Date endTime = DateUtil.getFormatDay(new Date());
+        Date start = DateUtil.getSomeDate(endTime, -1);
         List contentValue = null;
         try {
-            contentValue = eventsService.getKeyPointSafaguardThing(start);
+            contentValue = eventsService.getEventsKeyProtection(start, logMark);
         } catch (Exception e) {
-            logger.error("重点保障事件总览\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("重点保障事件总览\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "events.key.protection", contentValue);
-        logger.info("开始推送=======>>重点保障事件总览 请求头和请求体：" + httpEntity);
+        logger.info("开始推送=======>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_EVENTS, httpEntity);
-        logger.info("重点保障事件总览\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
@@ -194,24 +195,23 @@ public class ForEventsInterface {
         if (!Boolean.parseBoolean(scheduledEventsEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOfhour(now);
+        String logMark = "特定网站监控";
+        Date push = DateUtil.getFormatHour(new Date());
         List contentValue = null;
         try {
-            contentValue = eventsService.getSpecificWebsites(end);
-
+            contentValue = eventsService.getSpecificWebsites(push, logMark);
         } catch (Exception e) {
-            logger.error("特定网站监控\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("特定网站监控\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "specific.websites", contentValue);
-        logger.info("开始推送=======>>特定网站监控 请求头和请求体：" + httpEntity);
+        logger.info("开始推送=======>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_EVENTS, httpEntity);
-        logger.info("特定网站监控\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
@@ -223,23 +223,22 @@ public class ForEventsInterface {
         if (!Boolean.parseBoolean(scheduledEventsEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOfhour(now);
+        String logMark = "事件监测";
         List contentValue = null;
         try {
-            contentValue = eventsService.getEventsMonitor(end);
+            contentValue = eventsService.getEventsMonitor(logMark);
         } catch (Exception e) {
-            logger.error("事件监测\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("事件监测\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "events.monitor", contentValue);
-        logger.info("开始推送=======>>事件监测 请求头和请求体：" + httpEntity);
+        logger.info("开始推送=======>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_EVENTS, httpEntity);
-        logger.info("事件监测\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
@@ -251,23 +250,22 @@ public class ForEventsInterface {
         if (!Boolean.parseBoolean(scheduledEventsEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOfhour(now);
+        String logMark = "事件封堵";
         List contentValue = null;
         try {
-            contentValue = eventsService.getEventsBlock(end);
+            contentValue = eventsService.getEventsBlock(logMark);
         } catch (Exception e) {
-            logger.error("事件封堵\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("事件封堵\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "events.block", contentValue);
-        logger.info("开始推送=======>>事件封堵 请求头和请求体：" + httpEntity);
+        logger.info("开始推送=======>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_EVENTS, httpEntity);
-        logger.info("事件封堵\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
@@ -279,24 +277,24 @@ public class ForEventsInterface {
         if (!Boolean.parseBoolean(scheduledEventsEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOfhour(now);
-        String start = DateUtils.getBeforeNminOfTime(end, before60m);
+        String logMark = "音频监控";
+        Date end = DateUtil.getFormatHour(new Date());
+        Date start = DateUtil.getSomeHour(end, -1);
         List contentValue = null;
         try {
-            contentValue = eventsService.getEventsAudioMonitor(start, end);
+            contentValue = eventsService.getEventsAudioMonitor(start, end, logMark);
         } catch (Exception e) {
-            logger.error("音频监控\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("音频监控\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "audio.monitor", contentValue);
-        logger.info("开始推送=======>>音频监控 请求头和请求体：" + httpEntity);
+        logger.info("开始推送=======>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_EVENTS, httpEntity);
-        logger.info("音频监控\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
@@ -308,24 +306,24 @@ public class ForEventsInterface {
         if (!Boolean.parseBoolean(scheduledEventsEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOfhour(now);
-        String start = DateUtils.getBeforeNminOfTime(end, before60m);
+        String logMark = "视频监控";
+        Date end = DateUtil.getFormatHour(new Date());
+        Date start = DateUtil.getSomeHour(end, -1);
         List contentValue = null;
         try {
-            contentValue = eventsService.getVedioMonitor(start, end);
+            contentValue = eventsService.getVedioMonitor(start, end, logMark);
         } catch (Exception e) {
-            logger.error("视频监控\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("视频监控\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "vedio.monitor", contentValue);
-        logger.info("开始推送=======>>视频监控 请求头和请求体：" + httpEntity);
+        logger.info("开始推送=======>>{}请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_EVENTS, httpEntity);
-        logger.info("视频监控\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
@@ -337,24 +335,24 @@ public class ForEventsInterface {
         if (!Boolean.parseBoolean(scheduledEventsEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOfhour(now);
-        String start = DateUtils.getBeforeNminOfTime(end, before60m);
+        String logMark = "图片监控";
+        Date end = DateUtil.getFormatHour(new Date());
+        Date start = DateUtil.getSomeHour(end, -1);
         List contentValue = null;
         try {
-            contentValue = eventsService.getImageMonitor(start, end);
+            contentValue = eventsService.getImageMonitor(start, end, logMark);
         } catch (Exception e) {
-            logger.error("图片监控\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("图片监控\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "image.monitor", contentValue);
-        logger.info("开始推送=======>>图片监控 请求头和请求体：" + httpEntity);
+        logger.info("开始推送=======>>{}请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_EVENTS, httpEntity);
-        logger.info("图片监控\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
@@ -366,24 +364,24 @@ public class ForEventsInterface {
         if (!Boolean.parseBoolean(scheduledEventsEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOfhour(now);
-        String start = DateUtils.getBeforeNminOfTime(end, before60m);
+        String logMark = "VOIP监控";
+        Date end = DateUtil.getFormatHour(new Date());
+        Date start = DateUtil.getSomeHour(end, -1);
         List contentValue = null;
         try {
-            contentValue = eventsService.getVoipMonitor(start, end);
+            contentValue = eventsService.getVoipMonitor(start, end, logMark);
         } catch (Exception e) {
-            logger.error("VOIP监控\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("VOIP监控\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "voip.monitor", contentValue);
-        logger.info("开始推送=======>>VOIP监控 请求头和请求体：" + httpEntity);
+        logger.info("开始推送=======>>{}请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_EVENTS, httpEntity);
-        logger.info("VOIP监控\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
@@ -395,24 +393,24 @@ public class ForEventsInterface {
         if (!Boolean.parseBoolean(scheduledEventsEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOfhour(now);
-        String start = DateUtils.getBeforeNminOfTime(end, before60m);
+        String logMark = "网络行为预警";
+        Date end = DateUtil.getFormatHour(new Date());
+        Date start = DateUtil.getSomeHour(end, -1);
         List contentValue = null;
         try {
-            contentValue = eventsService.getDdosAlarm(start, end);
+            contentValue = eventsService.getDdosAlarm(start, end, logMark);
         } catch (Exception e) {
-            logger.error("网络行为预警\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("网络行为预警\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "ddos.alarm", contentValue);
-        logger.info("开始推送=======>>网络行为预警 请求头和请求体：" + httpEntity);
+        logger.info("开始推送=======>>{}请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_EVENTS, httpEntity);
-        logger.info("网络行为预警\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
@@ -424,24 +422,24 @@ public class ForEventsInterface {
         if (!Boolean.parseBoolean(scheduledEventsEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOfday(now);
-        String start = DateUtils.getBeforeNminOfTime(end, before1day);
+        String logMark = "目标行为网络监测";
+        Date end = DateUtil.getFormatDay(new Date());
+        Date start = DateUtil.getSomeDate(end, -1);
         List contentValue = null;
         try {
-            contentValue = eventsService.getTargetNetwork(start, end);
+            contentValue = eventsService.getTargetNetwork(start, end, logMark);
         } catch (Exception e) {
-            logger.error("目标行为网络监测\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("目标行为网络监测\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "target.network", contentValue);
-        logger.info("开始推送=======>>目标行为网络监测 请求头和请求体：" + httpEntity);
+        logger.info("开始推送=======>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_EVENTS, httpEntity);
-        logger.info("目标行为网络监测\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
@@ -453,23 +451,23 @@ public class ForEventsInterface {
         if (!Boolean.parseBoolean(scheduledEventsEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOfday(now);
+        String logMark = "硬件设备统计";
+        Date push = DateUtil.getFormatDay(new Date());
         List contentValue = null;
         try {
-            contentValue = eventsService.getDeviceNum(end);
+            contentValue = eventsService.getDeviceNum(push, logMark);
         } catch (Exception e) {
-            logger.error("硬件设备统计\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("硬件设备统计\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "device.num", contentValue);
-        logger.info("开始推送=======>>硬件设备统计 请求头和请求体：" + httpEntity);
+        logger.info("开始推送=======>>{}请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_EVENTS, httpEntity);
-        logger.info("硬件设备统计\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
@@ -481,24 +479,24 @@ public class ForEventsInterface {
         if (!Boolean.parseBoolean(scheduledEventsEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOfhour(now);
-        String start = DateUtils.getBeforeNminOfTime(end, before60m);
+        String logMark = "运行状况";
+        Date end = DateUtil.getFormatHour(new Date());
+        Date start = DateUtil.getSomeHour(end, -1);
         List contentValue = null;
         try {
-            contentValue = eventsService.getRunningState(start, end);
+            contentValue = eventsService.getRunningState(start, end, logMark);
         } catch (Exception e) {
-            logger.error("运行状况\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("运行状况\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "running.state", contentValue);
-        logger.info("开始推送=======>>运行状况 请求头和请求体：" + httpEntity);
+        logger.info("开始推送=======>>{}请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_EVENTS, httpEntity);
-        logger.info("运行状况\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
@@ -510,27 +508,25 @@ public class ForEventsInterface {
         if (!Boolean.parseBoolean(scheduledEventsEnable)) {
             return;
         }
-        String end = DateUtils.getRangeOfhour(DateUtils.getDateTime());
-        String start = DateUtils.getBeforeNminOfTime(end, before60m);
+        String logMark = "HTTPS监控TOP10";
+        Date end = DateUtil.getFormatHour(new Date());
+        Date start = DateUtil.getSomeHour(end, -1);
         List contentValue = null;
         String type = "HttpsMonitor";
         try {
-           // contentValue = eventsService.getTypeMonitorReject(start, end, type);
-
-            contentValue = eventsService.getFocusWebsite(start, end); //修改大屏为关注网站接口
-
+            contentValue = eventsService.getTypeMonitorReject(start, end, type);
         } catch (Exception e) {
-            logger.error("HTTPS监控TOP10\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("HTTPS监控TOP10\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "https.monitor", contentValue);
-        logger.info("开始推送=======>>HTTPS监控TOP10 请求头和请求体：" + httpEntity);
+        logger.info("开始推送=======>>{}请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_EVENTS, httpEntity);
-        logger.info("HTTPS监控TOP10\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
@@ -542,24 +538,25 @@ public class ForEventsInterface {
         if (!Boolean.parseBoolean(scheduledEventsEnable)) {
             return;
         }
-        String end = DateUtils.getRangeOfhour(DateUtils.getDateTime());
-        String start = DateUtils.getBeforeNminOfTime(end, before60m);
+        String logMark = "IP监控TOP10";
+        Date end = DateUtil.getFormatHour(new Date());
+        Date start = DateUtil.getSomeHour(end, -1);
         List contentValue = null;
         String type = "IpMonitor";
         try {
             contentValue = eventsService.getTypeMonitorReject(start, end, type);
         } catch (Exception e) {
-            logger.error("IP监控TOP10\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("IP监控TOP10\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "ip.monitor", contentValue);
-        logger.info("开始推送=======>>IP监控TOP10 请求头和请求体：" + httpEntity);
+        logger.info("开始推送=======>>{}请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_EVENTS, httpEntity);
-        logger.info("IP监控TOP10\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
@@ -571,24 +568,25 @@ public class ForEventsInterface {
         if (!Boolean.parseBoolean(scheduledEventsEnable)) {
             return;
         }
-        String end = DateUtils.getRangeOfhour(DateUtils.getDateTime());
-        String start = DateUtils.getBeforeNminOfTime(end, before60m);
+        String logMark = "APP阻断TOP10";
+        Date end = DateUtil.getFormatHour(new Date());
+        Date start = DateUtil.getSomeHour(end, -1);
         List contentValue = null;
         String type = "SpecificAppBlock";
         try {
             contentValue = eventsService.getTypeMonitorReject(start, end, type);
         } catch (Exception e) {
-            logger.error("APP阻断TOP10\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("APP阻断TOP10\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "specific.app.block", contentValue);
-        logger.info("开始推送=======>>APP阻断TOP10 请求头和请求体：" + httpEntity);
+        logger.info("开始推送=======>>{}请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_EVENTS, httpEntity);
-        logger.info("APP阻断TOP10\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
@@ -600,24 +598,25 @@ public class ForEventsInterface {
         if (!Boolean.parseBoolean(scheduledEventsEnable)) {
             return;
         }
-        String end = DateUtils.getRangeOfhour(DateUtils.getDateTime());
-        String start = DateUtils.getBeforeNminOfTime(end, before60m);
+        String logMark = "HTTP阻断TOP10";
+        Date end = DateUtil.getFormatHour(new Date());
+        Date start = DateUtil.getSomeHour(end, -1);
         List contentValue = null;
         String type = "HttpBlock";
         try {
             contentValue = eventsService.getTypeMonitorReject(start, end, type);
         } catch (Exception e) {
-            logger.error("HTTP阻断TOP10\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("HTTP阻断TOP10\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "http.block", contentValue);
-        logger.info("开始推送=======>>HTTP阻断TOP10 请求头和请求体：" + httpEntity);
+        logger.info("开始推送=======>>{}请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_EVENTS, httpEntity);
-        logger.info("HTTP阻断TOP10\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
@@ -629,24 +628,25 @@ public class ForEventsInterface {
         if (!Boolean.parseBoolean(scheduledEventsEnable)) {
             return;
         }
-        String end = DateUtils.getRangeOfhour(DateUtils.getDateTime());
-        String start = DateUtils.getBeforeNminOfTime(end, before60m);
+        String logMark = "IP阻断TOP10";
+        Date end = DateUtil.getFormatHour(new Date());
+        Date start = DateUtil.getSomeHour(end, -1);
         List contentValue = null;
         String type = "IpBlock";
         try {
             contentValue = eventsService.getTypeMonitorReject(start, end, type);
         } catch (Exception e) {
-            logger.error("IP阻断TOP10\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("IP阻断TOP10\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "ip.block", contentValue);
-        logger.info("开始推送=======>>IP阻断TOP10 请求头和请求体：" + httpEntity);
+        logger.info("开始推送=======>>{}请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_EVENTS, httpEntity);
-        logger.info("IP阻断TOP10\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
@@ -658,23 +658,24 @@ public class ForEventsInterface {
         if (!Boolean.parseBoolean(scheduledEventsEnable)) {
             return;
         }
-        String end = DateUtils.getRangeOfhour(DateUtils.getDateTime());
-        String start = DateUtils.getBeforeNminOfTime(end, before60m);
+        String logMark = "端口信息";
+        Date end = DateUtil.getFormatHour(new Date());
+        Date start = DateUtil.getSomeHour(end, -1);
         List contentValue = null;
         try {
-            contentValue = eventsService.getPortInfo(start, end);
+            contentValue = eventsService.getPortInfo(start, end, logMark);
         } catch (Exception e) {
-            logger.error("端口信息\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("端口信息\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "ip.block", contentValue);
-        logger.info("开始推送=======>>端口信息 请求头和请求体：" + httpEntity);
+        logger.info("开始推送=======>>{}请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_EVENTS, httpEntity);
-        logger.info("端口信息\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
 
@@ -685,27 +686,27 @@ public class ForEventsInterface {
             return;
         }
         logger.warn("应用启动首次推送所有接口3/6");
-//        getSystemTotalOf1Day();
+//        getSystemTotal();//
         getSpecifiedAPPMonitor();
         getLetterCount();
         getServiceCount();
-        getKeyPointSafaguardThing();
-//        getSpecificWebsites();
+        getEventsKeyProtection();
+//        getSpecificWebsites();//
         getEventsMonitor();
         getEventsBlock();
         getEventsAudioMonitor();
         getVedioMonitor();
         getImageMonitor();
         getVoipMonitor();
-//        getDdosAlarm();
-//        getDeviceNum();
-//        getRunningState();
-//        getTargetNetwork();
+//        getDdosAlarm();//
+//        getDeviceNum();//
+//        getRunningState();//
+//        getTargetNetwork();//
         getHttpsMonitor();
         getIpMonitor();
         getSpecificAppBlock();
         getHttpBlock();
         getIpBlock();
-//        getPortInfo();
+//        getPortInfo();//
     }
 }
diff --git a/src/main/java/com/nis/galaxy/template/ForMonitorInterface.java b/src/main/java/com/nis/galaxy/template/ForMonitorInterface.java
index e6c89bf..05781ec 100644
--- a/src/main/java/com/nis/galaxy/template/ForMonitorInterface.java
+++ b/src/main/java/com/nis/galaxy/template/ForMonitorInterface.java
@@ -2,7 +2,7 @@ package com.nis.galaxy.template;
 
 import com.nis.galaxy.common.InterfaceBase;
 import com.nis.galaxy.config.PushParams;
-import com.nis.galaxy.util.DateUtils;
+import com.nis.galaxy.util.DateUtil;
 import com.nis.galaxy.web.service.MonitorService;
 import net.javacrumbs.shedlock.core.SchedulerLock;
 import org.slf4j.Logger;
@@ -16,6 +16,7 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -50,77 +51,78 @@ public class ForMonitorInterface {
      * 系统监控
      */
     @Scheduled(cron = "${1m.scheduled.cron.plan}")
-    @SchedulerLock(name = "system_monitoring.global.gis", lockAtLeastForString = "PT20S",lockAtMostForString = "PT40S")
-    public void getIpActiveInfoOf5min() {
+    @SchedulerLock(name = "system_monitoring.global.gis", lockAtLeastForString = "PT20S", lockAtMostForString = "PT40S")
+    public void getSystemMonitoringGlobalGis() {
         if (!Boolean.parseBoolean(scheduledMonitorEnable)) {
             return;
         }
+        String logMark = "系统监控";
         List contentValue = null;
         try {
-            contentValue = monitorService.getMonitorOf1m();
+            contentValue = monitorService.getSystemMonitoringGlobalGis(logMark);
         } catch (Exception e) {
-            logger.info("系统监控\t查询异常\trestTemplate", e);
+            logger.info(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("系统监控\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "system_monitoring.global.gis", contentValue);
-        logger.info("开始推送======>>>系统监控\t请求头和请求体：" + httpEntity);
+        logger.info("开始推送======>>>{}\t请求头和请求体{}", logMark, httpEntity);
         ResponseEntity<String> response = restTemplate.postForEntity(REST_URL_PREFIX_PUSH + SERVICE_PATH_MONITOR, httpEntity, String.class);
-        logger.info("系统监控\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
      * 网络流量监控_5min
      */
     @Scheduled(cron = "${5m.scheduled.cron.plan}")
-    @SchedulerLock(name = "network.waterflow", lockAtLeastForString = "PT2M",lockAtMostForString = "PT4M")
+    @SchedulerLock(name = "network.waterflow", lockAtLeastForString = "PT2M", lockAtMostForString = "PT4M")
     public void getNetWaterMonitor() {
         if (!Boolean.parseBoolean(scheduledMonitorEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOf5min(now);
-        String start = DateUtils.getBeforeNminOfTime(end, before5m);
+        String logMark = "网络流量监控";
+        Date end = DateUtil.getFormatMinute(new Date());
+        Date start = DateUtil.getSomeMinute(end, -5);
         List contentValue = null;
         try {
-            contentValue = monitorService.getNetWaterMonitor(start, end, areaNetWaterMonitorExpTimes);
+            contentValue = monitorService.getNetWaterMonitor(start, end, areaNetWaterMonitorExpTimes, logMark);
         } catch (Exception e) {
-            logger.info("网络流量监控\t查询异常\trestTemplate" + ++areaNetWaterMonitorExpTimes, e);
+            logger.info(logMark + "\t查询异常\trestTemplate" + ++areaNetWaterMonitorExpTimes, e);
         }
         if (areaNetWaterMonitorExpTimes > 0 && contentValue != null) {
             areaNetWaterMonitorExpTimes = 0;
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("网络流量监控\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "network.waterflow", contentValue);
-        logger.info("开始推送======>>>网络流量监控\t请求头和请求体：" + httpEntity);
+        logger.info("开始推送======>>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_BLOCKING, httpEntity);
-        logger.info("网络流量监控\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     @Scheduled(fixedRate = 999999999)
-    @SchedulerLock(name = "FirstPushMonitor", lockAtLeastForString = "PT1H",lockAtMostForString = "PT2H")
+    @SchedulerLock(name = "FirstPushMonitor", lockAtLeastForString = "PT1H", lockAtMostForString = "PT2H")
     public void run() throws InterruptedException {
         if (a++ > 1) {
             return;
         }
         logger.warn("应用启动首次推送所有接口4/6");
-        getIpActiveInfoOf5min();
+        getSystemMonitoringGlobalGis();
         getNetWaterMonitor();
     }
 
     /**
      * 服务应用监控
      */
-    @Scheduled(fixedRate = 10*1000)
-    @SchedulerLock(name = "PushServiceMonitor", lockAtLeastForString = "PT5S",lockAtMostForString = "PT8S")
-    public void monitor(){
+    @Scheduled(fixedRate = 10 * 1000)
+    @SchedulerLock(name = "PushServiceMonitor", lockAtLeastForString = "PT5S", lockAtMostForString = "PT8S")
+    public void monitor() {
         logger.debug("服务应用监控");
     }
 
diff --git a/src/main/java/com/nis/galaxy/template/ForNetflowInterface.java b/src/main/java/com/nis/galaxy/template/ForNetflowInterface.java
index 431ba84..aa8fbc9 100644
--- a/src/main/java/com/nis/galaxy/template/ForNetflowInterface.java
+++ b/src/main/java/com/nis/galaxy/template/ForNetflowInterface.java
@@ -2,7 +2,7 @@ package com.nis.galaxy.template;
 
 import com.nis.galaxy.common.InterfaceBase;
 import com.nis.galaxy.config.PushParams;
-import com.nis.galaxy.util.DateUtils;
+import com.nis.galaxy.util.DateUtil;
 import com.nis.galaxy.web.service.NetflowService;
 import net.javacrumbs.shedlock.core.SchedulerLock;
 import org.slf4j.Logger;
@@ -16,6 +16,7 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
+import java.util.Date;
 import java.util.List;
 
 @Component
@@ -43,7 +44,6 @@ public class ForNetflowInterface {
     private String SERVICE_PATH_NETFLOW;
 
 
-
     /**
      * 5分钟内网络流量统计
      */
@@ -53,86 +53,86 @@ public class ForNetflowInterface {
         if (!Boolean.parseBoolean(scheduledNetflowEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOf5min(now);
-        String start = DateUtils.getBeforeNminOfTime(end, before5m);
+        String logMark = "5分钟内网络流量统计";
+        Date end = DateUtil.getFormatMinute(new Date());
+        Date start = DateUtil.getSomeMinute(end, -5);
         List contentValue = null;
         try {
             //获取并封装数据
-            contentValue = netflowService.getNetflowStatistic5m(start, end);
+            contentValue = netflowService.getNetflowStatistic5m(start, end, logMark);
         } catch (Exception e) {
-            logger.error("5分钟内网络流量统计\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("5分钟内网络流量统计\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "netflow.5min.waterflow", contentValue);
-        logger.info("开始推送========>>>5分钟内网络流量统计 请求头和请求体：" + httpEntity);
+        logger.info("开始推送========>>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_NETFLOW, httpEntity);
-        logger.info("5分钟内网络流量统计\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
      * 1小时内网络协议统计
      */
     @Scheduled(cron = "${5m.scheduled.cron.plan}")
-    @SchedulerLock(name = "netflow.1hour.protocol", lockAtLeastForString = "PT2M",lockAtMostForString = "PT4M")
-    public void getProtocolStatisticOf1h() {
+    @SchedulerLock(name = "netflow.1hour.protocol", lockAtLeastForString = "PT2M", lockAtMostForString = "PT4M")
+    public void getNetflow1HourProtocol() {
         if (!Boolean.parseBoolean(scheduledNetflowEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOf5min(now);
-        String start = DateUtils.getBeforeNminOfTime(end, before5m);
+        String logMark = "1小时内网络协议统计";
+        Date end = DateUtil.getFormatMinute(new Date());
+        Date start = DateUtil.getSomeMinute(end, -5);
         List contentValue = null;
         try {
             //获取并封装数据
-            contentValue = netflowService.getProtocolStatisticOf1h(start, end);
+            contentValue = netflowService.getNetflow1HourProtocol(start, end, logMark);
         } catch (Exception e) {
-            logger.error("1小时内网络协议统计\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("1小时内网络协议统计\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "netflow.1hour.protocol", contentValue);
-        logger.info("开始推送======>>>1小时内网络协议统计 请求头和请求体：" + httpEntity);
+        logger.info("开始推送======>>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_NETFLOW, httpEntity);
-        logger.info("1小时内网络协议统计\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
      * 5分钟内活跃IP信息
      */
     @Scheduled(cron = "${5m.scheduled.cron.plan}")
-    @SchedulerLock(name = "netflow.5min.ip.active", lockAtLeastForString = "PT2M",lockAtMostForString = "PT4M")
+    @SchedulerLock(name = "netflow.5min.ip.active", lockAtLeastForString = "PT2M", lockAtMostForString = "PT4M")
     public void getIpActiveInfoOf5min() {
         if (!Boolean.parseBoolean(scheduledNetflowEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOf5min(now);
-        String start = DateUtils.getBeforeNminOfTime(end, before5m);
+        String logMark = "5分钟内活跃IP信息";
+        Date end = DateUtil.getFormatMinute(new Date());
+        Date start = DateUtil.getSomeMinute(end, -5);
         List contentValue = null;
         try {
             //获取并封装推送数据
-            contentValue = netflowService.getIpActiveInfoOf5min(start, end);
+            contentValue = netflowService.getIpActiveInfoOf5min(start, end, logMark);
 
         } catch (Exception e) {
-            logger.error("5分钟内活跃IP信息\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("5分钟内活跃IP信息\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "netflow.5min.ip.active", contentValue);
-        logger.info("开始推送======>>>5分钟内活跃IP信息 请求头和请求体：" + httpEntity);
+        logger.info("开始推送======>>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_NETFLOW, httpEntity);
-        logger.info("5分钟内活跃IP信息\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
 
     }
 
@@ -145,29 +145,29 @@ public class ForNetflowInterface {
         if (!Boolean.parseBoolean(scheduledNetflowEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOf5min(now);
-        String start = DateUtils.getBeforeNminOfTime(end, before5m);
+        String logMark = "地域流量";
+        Date end = DateUtil.getFormatMinute(new Date());
+        Date start = DateUtil.getSomeMinute(end, -5);
         List contentValue = null;
         try {
             //获取并封装推送数据
-            contentValue = netflowService.getAreaNetflowOf5min(start, end, areaNetqueryExpTimes);
+            contentValue = netflowService.getAreaNetflowOf5min(start, end, areaNetqueryExpTimes, logMark);
         } catch (Exception e) {
-            logger.error("地域流量\t查询异常\trestTemplate\t异常次数："+ ++areaNetqueryExpTimes, e);
+            logger.error(logMark + "\t查询异常\trestTemplate\t异常次数：" + ++areaNetqueryExpTimes, e);
         }
         if (areaNetqueryExpTimes > 0 && contentValue != null) {
             //清零查询异常次数
             areaNetqueryExpTimes = 0;
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("地域流量\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "netflow.area.netflow", contentValue);
-        logger.info("开始推送======>>>地域流量 请求头和请求体：" + httpEntity);
+        logger.info("开始推送======>>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_NETFLOW, httpEntity);
-        logger.info("地域流量\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
@@ -179,28 +179,28 @@ public class ForNetflowInterface {
         if (!Boolean.parseBoolean(scheduledNetflowEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOf5min(now);
-        String start = DateUtils.getBeforeNminOfTime(end, before5m);
+        String logMark = "端口流量";
+        Date end = DateUtil.getFormatMinute(new Date());
+        Date start = DateUtil.getSomeMinute(end, -5);
         List contentValue = null;
         try {
-            contentValue = netflowService.getPortNetflowOf5min(start, end, portNetqueryExpTimes);
+            contentValue = netflowService.getPortNetflowOf5min(start, end, portNetqueryExpTimes, logMark);
         } catch (Exception e) {
-            logger.error("端口流量\t查询异常{},\t异常次数："+ ++portNetqueryExpTimes, e);
+            logger.error(logMark + "\t查询异常{},\t异常次数：" + ++portNetqueryExpTimes, e);
         }
         if (portNetqueryExpTimes > 0 && contentValue != null) {
             //清零查询异常次数
             portNetqueryExpTimes = 0;
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("端口流量\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "netflow.port.netflow", contentValue);
-        logger.info("开始推送======>>>端口流量 请求头和请求体：" + httpEntity);
+        logger.info("开始推送======>>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_NETFLOW, httpEntity);
-        logger.info("端口流量\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
 
     }
 
@@ -213,22 +213,23 @@ public class ForNetflowInterface {
         if (!Boolean.parseBoolean(scheduledNetflowEnable)) {
             return;
         }
+        String logMark = "";
         List contentValue = null;
         try {
             //获取并封装推送数据
-            contentValue = netflowService.getNetflowMonitorTxt();
+            contentValue = netflowService.getNetflowMonitorTxt(logMark);
         } catch (Exception e) {
-            logger.error("文本\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("文本\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "netflow.monitor.txt", contentValue);
-        logger.info("开始推送======>>>文本 请求头和请求体：" + httpEntity);
+        logger.info("开始推送======>>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_NETFLOW, httpEntity);
-        logger.info("文本\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
 
     }
 
@@ -241,22 +242,23 @@ public class ForNetflowInterface {
         if (!Boolean.parseBoolean(scheduledNetflowEnable)) {
             return;
         }
+        String logMark = "";
         List contentValue = null;
         try {
             //获取并封装推送数据
-            contentValue = netflowService.getNetflowMonitorVideo();
+            contentValue = netflowService.getNetflowMonitorVideo(logMark);
         } catch (Exception e) {
-            logger.error("音视频\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("音视频\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "netflow.monitor.video", contentValue);
-        logger.info("开始推送======>>>音视频 请求头和请求体：" + httpEntity);
+        logger.info("开始推送======>>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_NETFLOW, httpEntity);
-        logger.info("音视频\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
 
     }
 
@@ -269,23 +271,24 @@ public class ForNetflowInterface {
         if (!Boolean.parseBoolean(scheduledNetflowEnable)) {
             return;
         }
+        String logMark = "";
         List contentValue = null;
         try {
             //获取并封装推送数据
-            contentValue = netflowService.getNetflowMonitorApp();
+            contentValue = netflowService.getNetflowMonitorApp(logMark);
 
         } catch (Exception e) {
-            logger.error("APP\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("APP\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "netflow.monitor.app", contentValue);
-        logger.info("开始推送======>>>APP 请求头和请求体：" + httpEntity);
+        logger.info("开始推送======>>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_NETFLOW, httpEntity);
-        logger.info("APP\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
 
     }
 
@@ -298,42 +301,43 @@ public class ForNetflowInterface {
         if (!Boolean.parseBoolean(scheduledNetflowEnable)) {
             return;
         }
+        String logMark = "";
         List contentValue = null;
         try {
             //获取并封装推送数据
-            contentValue = netflowService.getNetflowMonitorEncrypt();
+            contentValue = netflowService.getNetflowMonitorEncrypt(logMark);
 
         } catch (Exception e) {
-            logger.error("加密管控\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("加密管控\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "netflow.monitor.encrypt", contentValue);
-        logger.info("开始推送======>>>加密管控 请求头和请求体：" + httpEntity);
+        logger.info("开始推送======>>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_NETFLOW, httpEntity);
-        logger.info("加密管控\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
 
     }
 
 
     @Scheduled(fixedRate = 999999999)
-    @SchedulerLock(name = "FirstPushNetflow", lockAtLeastForString = "PT1H",lockAtMostForString = "PT2H")
+    @SchedulerLock(name = "FirstPushNetflow", lockAtLeastForString = "PT1H", lockAtMostForString = "PT2H")
     public void run() throws InterruptedException {
         if (a++ > 1) {
             return;
         }
         logger.warn("应用启动首次推送所有接口5/6");
-//        getNetflowStatistic5m();
-        getProtocolStatisticOf1h();
+//        getNetflowStatistic5m();//
+        getNetflow1HourProtocol();
         getIpActiveInfoOf5min();
-//        getAreaNetflowOf5min();
-//        getPortNetflowOf5min();
-//        getNetflowMonitorTxt();
-//        getNetflowMonitorVideo();
-//        getNetflowMonitorApp();
-//        getNetflowMonitorEncrypt();
+//        getAreaNetflowOf5min();//
+//        getPortNetflowOf5min();//
+//        getNetflowMonitorTxt();//
+//        getNetflowMonitorVideo();//
+//        getNetflowMonitorApp();//
+//        getNetflowMonitorEncrypt();//
     }
 }
diff --git a/src/main/java/com/nis/galaxy/template/ForNetflowTopNInterface.java b/src/main/java/com/nis/galaxy/template/ForNetflowTopNInterface.java
index b31d523..7ee30ff 100644
--- a/src/main/java/com/nis/galaxy/template/ForNetflowTopNInterface.java
+++ b/src/main/java/com/nis/galaxy/template/ForNetflowTopNInterface.java
@@ -2,7 +2,7 @@ package com.nis.galaxy.template;
 
 import com.nis.galaxy.common.InterfaceBase;
 import com.nis.galaxy.config.PushParams;
-import com.nis.galaxy.util.DateUtils;
+import com.nis.galaxy.util.DateUtil;
 import com.nis.galaxy.web.service.NetflowTopNService;
 import net.javacrumbs.shedlock.core.SchedulerLock;
 import org.slf4j.Logger;
@@ -49,24 +49,24 @@ public class ForNetflowTopNInterface {
         if (!Boolean.parseBoolean(scheduledNetflowTopnEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOf5min(now);
-        String start = DateUtils.getBeforeNminOfTime(end, before5m);
+        String logMark = "5分钟内活跃IP流量";
+        Date end = DateUtil.getFormatMinute(new Date());
+        Date start = DateUtil.getSomeMinute(end, -5);
         List contentValue = null;
         try {
-            contentValue = netflowTopNService.getNetflow5minIpActiveWaterflow(start, end);
+            contentValue = netflowTopNService.getNetflow5minIpActiveWaterflow(start, end, logMark);
         } catch (Exception e) {
-            logger.error("5分钟内活跃IP流量\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("5分钟内活跃IP流量\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "netflow.5min.ip.active.waterflow", contentValue);
-        logger.info("开始推送=======>>5分钟内活跃IP流量 请求头和请求体：" + httpEntity);
+        logger.info("开始推送=======>>\t{}请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_NETFLOW, httpEntity);
-        logger.info("5分钟内活跃IP流量\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
@@ -74,120 +74,120 @@ public class ForNetflowTopNInterface {
      */
     @Scheduled(cron = "${5m.scheduled.cron.plan}")
     @SchedulerLock(name = "netflow.1hour.waterflow.top_10", lockAtLeastForString = "PT2M", lockAtMostForString = "PT4M")
-    public void getNetFlowWaterTop10() {
+    public void getNetflow1HourWaterflowTop10() {
         if (!Boolean.parseBoolean(scheduledNetflowTopnEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOf5min(now);
-        String start = DateUtils.getBeforeNminOfTime(end, before60m);
+        String logMark = "1小时内互联网流量TOP10";
+        Date end = DateUtil.getFormatMinute(new Date());
+        Date start = DateUtil.getSomeHour(end, -1);
         List contentValue = null;
         int range = 1;
         try {
             //获取并封装数据
-            contentValue = netflowTopNService.getNetFlowWaterTop10(start, end, range);
+            contentValue = netflowTopNService.getNetflowNHourWaterflowTop10(start, end, range, logMark);
         } catch (Exception e) {
-            logger.error("1小时内互联网流量TOP10\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("1小时内互联网流量TOP10\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "netflow.1hour.waterflow.top_10", contentValue);
-        logger.info("开始推送=======>>1小时内互联网流量TOP10 请求头和请求体：" + httpEntity);
+        logger.info("开始推送=======>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_NETFLOW, httpEntity);
-        logger.info("1小时内互联网流量TOP10\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
-     * 1小时内互联网流量TOP10
+     * 1小时内互联网流量TOP10_test
      */
 //    @Scheduled(cron = "${5m.scheduled.cron.plan}")
 //    @SchedulerLock(name = "netflow.1hour.waterflow.top_10", lockAtLeastForString = "PT2M", lockAtMostForString = "PT4M")
-    public void getNetflow1HourWaterflowTop10() {
+    public void getNetflow1HourWaterflowTop10_test() {
         if (!Boolean.parseBoolean(scheduledNetflowTopnEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOf5min(now);
+        String logMark = "1小时内互联网流量TOP10_test方法";
+        Date end = DateUtil.getFormatMinute(new Date());
         List contentValue = null;
         try {
-            contentValue = netflowTopNService.getNetflow1HourWaterflowTop10(end);
+            contentValue = netflowTopNService.getNetflow1HourWaterflowTop10(end, logMark);
         } catch (Exception e) {
-            logger.error("1小时内互联网流量TOP10\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("1小时内互联网流量TOP10\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "netflow.1hour.waterflow.top_10", contentValue);
-        logger.info("开始推送=======>>1小时内互联网流量TOP10 请求头和请求体：" + httpEntity);
+        logger.info("开始推送=======>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_NETFLOW, httpEntity);
-        logger.info("1小时内互联网流量TOP10\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
      * 24小时内互联网流量TOP10
      */
     @Scheduled(cron = "${5m.scheduled.cron.plan}")
-    @SchedulerLock(name = "netflow.24hour.waterflow.top_10", lockAtLeastForString = "PT2M",lockAtMostForString = "PT4M")
-    public void getNetFlowWaterTop10Of24h() {
+    @SchedulerLock(name = "netflow.24hour.waterflow.top_10", lockAtLeastForString = "PT2M", lockAtMostForString = "PT4M")
+    public void getNetflow24HourWaterflowTop10() {
         if (!Boolean.parseBoolean(scheduledNetflowTopnEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOf5min(now);
-        String start = DateUtils.getBeforeNminOfTime(end, before60m * 24);
+        String logMark = "24小时内互联网流量TOP10";
+        Date end = DateUtil.getFormatMinute(new Date());
+        Date start = DateUtil.getSomeHour(end, -24);
         List contentValue = null;
         int range = 24;
         try {
             //获取并封装数据
-            contentValue = netflowTopNService.getNetFlowWaterTop10(start, end, range);
+            contentValue = netflowTopNService.getNetflowNHourWaterflowTop10(start, end, range, logMark);
         } catch (Exception e) {
-            logger.error("24小时内互联网流量TOP10\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("24小时内互联网流量TOP10\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "netflow.24hour.waterflow.top_10", contentValue);
-        logger.info("开始推送=======>>24小时内互联网流量TOP10 请求头和请求体：" + httpEntity);
+        logger.info("开始推送=======>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_NETFLOW, httpEntity);
-        logger.info("24小时内互联网流量TOP10\t推送返回结果" + response);
+        logger.info("{}\t推送返回结果\t{}", logMark, response);
     }
 
     /**
      * 7天内互联网流量TOP10
      */
     @Scheduled(cron = "${5m.scheduled.cron.plan}")
-    @SchedulerLock(name = "netflow.7day.waterflow.top_10", lockAtLeastForString = "PT2M",lockAtMostForString = "PT4M")
-    public void getNetFlowWaterTop10Of7Day() {
+    @SchedulerLock(name = "netflow.7day.waterflow.top_10", lockAtLeastForString = "PT2M", lockAtMostForString = "PT4M")
+    public void getNetflow7DayWaterflowTop10() {
         if (!Boolean.parseBoolean(scheduledNetflowTopnEnable)) {
             return;
         }
-        String now = DateUtils.getDateTime();
-        String end = DateUtils.getRangeOf5min(now);
-        String start = DateUtils.getBeforeNminOfTime(end, before60m * 24 * 7);
+        String logMark = "7天内互联网流量TOP10";
+        Date end = DateUtil.getFormatMinute(new Date());
+        Date start = DateUtil.getSomeDate(end, -7);
         int range = 7;
         List contentValue = null;
         try {
             //获取并封装数据
-            contentValue = netflowTopNService.getNetFlowWaterTop10(start, end, range);
+            contentValue = netflowTopNService.getNetflowNHourWaterflowTop10(start, end, range, logMark);
         } catch (Exception e) {
-            logger.error("7天内互联网流量TOP10\t查询异常\trestTemplate", e);
+            logger.error(logMark + "\t查询异常\trestTemplate", e);
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
-            logger.warn("7天内互联网流量TOP10\t无数据\t取消本次推送");
+            logger.warn(logMark + "\t无数据\t取消本次推送");
             return;
         }
         // 请求头和请求体
         HttpEntity<String> httpEntity = InterfaceBase.getHttpEntity(pushParams.getHeaders(), null, "netflow.7day.waterflow.top_10", contentValue);
-        logger.info("开始推送=======>>7天内互联网流量TOP10 请求头和请求体：" + httpEntity);
+        logger.info("开始推送=======>>{}\t请求头和请求体\t{}", logMark, httpEntity);
         ResponseEntity<String> response = InterfaceBase.pushStart(restTemplate, REST_URL_PREFIX_PUSH + SERVICE_PATH_NETFLOW, httpEntity);
-        logger.info("7天内互联网流量TOP10\t推送返回结果" + response);
+        logger.info(logMark + "\t推送返回结果\t{}", logMark, response);
     }
 
 
@@ -199,10 +199,10 @@ public class ForNetflowTopNInterface {
         }
         logger.warn("应用启动首次推送所有接口6/6");
         getNetflow5minIpActiveWaterflow();
-        getNetFlowWaterTop10();
-        getNetFlowWaterTop10Of24h();
-        getNetFlowWaterTop10Of7Day();
-//        getNetflow1HourWaterflowTop10();
+        getNetflow1HourWaterflowTop10();
+        getNetflow24HourWaterflowTop10();
+        getNetflow7DayWaterflowTop10();
+//        getNetflow1HourWaterflowTop10_test();//
 
     }
 }
diff --git a/src/main/java/com/nis/galaxy/util/DateUtil.java b/src/main/java/com/nis/galaxy/util/DateUtil.java
new file mode 100644
index 0000000..926940c
--- /dev/null
+++ b/src/main/java/com/nis/galaxy/util/DateUtil.java
@@ -0,0 +1,651 @@
+package com.nis.galaxy.util;
+
+import org.joda.time.*;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ *
+ * <p>时间/日期处理工具类</p>
+ * @author 中电积至有限公司 darnell
+ * @version 1.0 创建时间：2010-11-8 下午04:48:57
+ */
+public class DateUtil implements TimeConstants {
+
+    /**
+     *<p>Description:抑制默认的构造器,避免实例化对象 </p>
+     */
+    private DateUtil() {
+
+    }
+
+    /** <p>获得当前日期，格式为默认yyyy-MM-dd.</p>
+            * <pre>
+    * DateUtil.getCurrentDate() = "2010-11-02"
+            * </pre>
+            * @see #getCurrentDate(String)
+    * @return String    返回标准日期格式(yyyy-MM-dd)
+    */
+    public static String getCurrentDate() {
+
+        DateTime dateTime = DateTime.now();
+
+        return dateTime.toString(TimeConstants.YYYY_MM_DD);
+    }
+
+
+    /**
+     *
+     * <p>
+     * 获得当前时间.
+     * 如果pattern为空,将抛出{@link NullPointerException}
+     * </p>
+     * <pre>
+     * DateUtil.getCurrentDate(TimeConstants.YYYY_MM_DD) = "2010-11-02"
+     * DateUtil.getCurrentDate("yyyy-MM-dd HH:mm:ss") = "2010-11-02 17:20:59"
+     * </pre>
+     * @param pattern 描述日期和时间格式.
+     * @return 当前日期
+     *
+     */
+    public static String getCurrentDate(String pattern) {
+
+        if(StringUtil.isEmpty(pattern)){
+            throw new NullPointerException("未规定时间格式...");
+        }
+        DateTime dateTime = DateTime.now();
+        return dateTime.toString(pattern);
+    }
+
+
+    /**
+     *
+     * <p> 获得昨天时间.通过指定日期和时间格式,具体可参考本类提供的时间格式常量.</p>
+     * <pre>
+     * DateUtil.getDateOfYesterday(TimeConstants.YYYY_MM_DD_HH24_MM_SS) = "2010-11-04 16:59:13"
+     * </pre>
+     * @param pattern  描述日期和时间格式
+     * @see #getFormatDate(Date, String)
+     * @return String    返回日期的字符串表现形式值.
+     */
+    public static String getDateOfYesterday(String pattern) {
+        DateTime dateTime = new DateTime();
+        DateTime yesterday = dateTime.minusDays(1);
+        return yesterday.toString(pattern);
+
+    }
+
+
+
+    /**
+     *
+     * <p>
+     * 得到距离当天<code>offset</code>天数的某天日期，通过 <code>offset</code> 的值（+/-）来确定增减计算.
+     * </p>
+     * <pre>
+     * 当天日期： 2010-11-05
+     * DateUtil.getSomeDate("yyyy-MM-dd", 2) = 2010-11-07
+     * DateUtil.getSomeDate("yyyy-MM-dd", -2) = 2010-11-03
+     * DateUtil.getSomeDate("yyyy-MM-dd", 0) = 2010-11-05
+     * </pre>
+     * @param pattern 描述日期和时间格式
+     * @param offset 描述增加\减少几日,为0时为当前日期.
+     * @see #getFormatDate(Date, String)
+     * @return  返回日期格式的字符串
+     */
+
+    public static String getSomeDate(String pattern, int offset) {
+        DateTime dateTime = new DateTime();
+        DateTime someDate = dateTime.withFieldAdded(DurationFieldType.days(), offset);
+        return someDate.toString(pattern);
+    }
+
+    /**
+     *
+     * <p>
+     * 得到距离指定时间<code>offset</code>天数的时间，通过 <code>offset</code> 的值（+/-）来确定增减计算.
+     * </p>
+     * <pre>
+     * 当天日期： 2010-11-05
+     * DateUtil.getSomeDate("yyyy-MM-dd", 2) = 2010-11-07
+     * DateUtil.getSomeDate("yyyy-MM-dd", -2) = 2010-11-03
+     * DateUtil.getSomeDate("yyyy-MM-dd", 0) = 2010-11-05
+     * </pre>
+     * @param  date 时间
+     * @param offset 描述增加\减少几日,为0时为当前日期.
+     * @return  返回日期格式的字符串
+     */
+
+    public static Date getSomeDate(Date date, int offset) {
+        DateTime dateTime = new DateTime(date);
+        return dateTime.plusDays(offset).toDate();
+    }
+
+
+
+    /**
+     *
+     * <p>
+     * 得到距离当前时间<code>offset</code>小时的时间，通过 <code>offset</code> 的值（+/-）来确定增减计算.
+     * </p>
+     * <pre>
+     * 当天时间： 2018-11-05 11:13:22
+     * DateUtil.getSomeHour(date, 2) =  2018-11-05 13:13:22
+     * DateUtil.getSomeHour(date, -2) = 2018-11-05 09:13:22
+     * DateUtil.getSomeHour(date, 0) = 2018-11-05 11:13:22
+     * </pre>
+     * @param date 时间
+     * @param offset 描述增加\减少小时数,为0时为当前日期.
+     * @return  返回距离当前时间小时数的时间
+     */
+    public static Date getSomeHour(Date date, int offset) {
+        DateTime dateTime = new DateTime(date);
+        return dateTime.plusHours(offset).toDate();
+    }
+
+
+
+    /**
+     *
+     * <p>
+     * 得到距离当前时间<code>offset</code>分钟数的时间，通过 <code>offset</code> 的值（+/-）来确定增减计算.
+     * </p>
+     * <pre>
+     * 当天时间： 2018-11-05 11:13:22
+     * DateUtil.getSomeMinute(date, 2) =  2018-11-05 11:15:22
+     * DateUtil.getSomeMinute(date, -2) = 2018-11-05 11:11:22
+     * DateUtil.getSomeMinute(date, 0) = 2018-11-05 11:13:22
+     * </pre>
+     * @param date 时间
+     * @param offset 描述增加\减少分钟数,为0时为当前日期.
+     * @return  返回距离当前时间分钟数的时间
+     */
+    public static Date getSomeMinute(Date date, int offset) {
+        DateTime dateTime = new DateTime(date);
+        return dateTime.plusMinutes(offset).toDate();
+    }
+
+    /**
+     *
+     * <p>
+     * 得到距离当前时间格式化分钟后的时间，1分钟倍数
+     * </p>
+     * <pre>
+     * 当天时间： 2018-11-05 11:13:22
+     * DateUtil.getFormatMinuteOne(date) =  2018-11-05 11:13:00
+     * </pre>
+     * @param date 时间
+     * @return  返回距离当前时间1分钟倍数的时间
+     */
+    public static Date getFormatMinuteOne(Date date) {
+        DateTime dateTime = new DateTime(date);
+        int minute = dateTime.getMinuteOfHour();
+        dateTime = dateTime.withMinuteOfHour(minute).withSecondOfMinute(0).withMillisOfSecond(0);
+        return dateTime.toDate();
+    }
+
+    /**
+     *
+     * <p>
+     * 得到距离当前时间格式化分钟后的时间，5分钟倍数
+     * </p>
+     * <pre>
+     * 当天时间： 2018-11-05 11:13:22
+     * DateUtil.getFormatMinute(date) =  2018-11-05 11:10:00
+     * </pre>
+     * @param date 时间
+     * @return  返回距离当前时间5分钟倍数的时间
+     */
+    public static Date getFormatMinute(Date date) {
+        DateTime dateTime = new DateTime(date);
+        int minute = dateTime.getMinuteOfHour();
+        int formatMinute = minute % 5;
+        minute = minute - formatMinute;
+        dateTime = dateTime.withMinuteOfHour(minute).withSecondOfMinute(0).withMillisOfSecond(0);
+        return dateTime.toDate();
+    }
+
+
+     /**
+     *
+     * <p>
+     * 得到距离当前时间格式化小时后的时间，整点(小时)的倍数
+     * </p>
+     * <pre>
+     * 当天时间： 2018-11-05 11:13:22
+     * DateUtil.getFormatHour(date) =  2018-11-05 11:00:00
+     * </pre>
+     * @param date 时间
+     * @return  返回距离当前时间整小时的时间
+     */
+    public static Date getFormatHour(Date date) {
+        DateTime dateTime = new DateTime(date);
+        int hour = dateTime.getHourOfDay();
+        dateTime = dateTime.withHourOfDay(hour).withMinuteOfHour(0).withSecondOfMinute(0).withMillisOfSecond(0);
+        return dateTime.toDate();
+    }
+
+     /**
+     *
+     * <p>
+     * 得到距离当前时间格式化天后的时间，天为粒度
+     * </p>
+     * <pre>
+     * 当天时间： 2018-11-05 11:13:22
+     * DateUtil.getFormatDay(date) =  2018-11-05 00:00:00
+     * </pre>
+     * @param date 时间
+     * @return  返回距离当前时间整天的时间
+     */
+    public static Date getFormatDay(Date date) {
+        DateTime dateTime = new DateTime(date);
+        int day = dateTime.getDayOfMonth();
+        dateTime = dateTime.withDayOfMonth(day).withHourOfDay(0).withMinuteOfHour(0).withSecondOfMinute(0).withMillisOfSecond(0);
+        return dateTime.toDate();
+    }
+
+    /**
+     *
+     * <p>
+     * 得到距离当前时间<code>offset</code>秒数的时间，通过 <code>offset</code> 的值（+/-）来确定增减计算.
+     * </p>
+     * <pre>
+     * 当天时间： 2018-11-05 11:13:22
+     * DateUtil.getSomeSecond(date, 2) =  2018-11-05 11:13:24
+     * DateUtil.getSomeSecond(date, -2) = 2018-11-05 11:13:20
+     * DateUtil.getSomeSecond(date, 0) = 2018-11-05 11:13:22
+     * </pre>
+     * @param date 时间
+     * @param offset 描述增加\减少秒数,为0时为当前日期.
+     * @return  返回距离当前时间秒数的时间
+     */
+    public static Date getSomeSecond(Date date, int offset) {
+        DateTime dateTime = new DateTime(date);
+        return dateTime.plusMinutes(offset).toDate();
+    }
+
+
+
+    /**
+     *
+     * <p>获得指定日期当前周第一天</p>
+     * <pre>
+     *  当前时间 2018-12-26 11:47:00
+     * DateUtil.getFirstDayOfWeek(new Date(),TimeConstants.YYYY_MM_DD_HH24_MM_SS) = "2018-12-24 00:00:00"
+     * </pre>
+     * @param date 指定日期.
+     * @param pattern  描述日期和时间格式
+     * @return 返回日期格式的字符串
+     */
+    public static String getFirstDayOfWeek(Date date, String pattern) {
+
+        if (StringUtil.isEmpty(pattern) || StringUtil.isEmpty(date)) {
+            throw new NullPointerException("时间不能为空或解析格式不能为空");
+        }
+
+        DateTime firstDay = DateTime.parse(getFormatDate(date, TimeConstants.YYYY_MM_DD))
+                .dayOfWeek().setCopy(1).toDateTime();
+
+        return firstDay.toString(pattern);
+    }
+
+
+    /**
+     *
+     * <p>获得指定日期当前周最后一天</p>
+     * <pre>
+     *  当前时间 2018-12-26 11:47:00
+     * DateUtil.getFirstDayOfWeek(new Date(),TimeConstants.YYYY_MM_DD_HH24_MM_SS) = "2018-12-30 23:59:59"
+     * </pre>
+     * @param date 指定日期.
+     * @param pattern  描述日期和时间格式
+     * @return 返回日期格式的字符串
+     */
+    public static String getLastDayOfWeek(Date date, String pattern) {
+
+        if (StringUtil.isEmpty(pattern) || StringUtil.isEmpty(date)) {
+            throw new NullPointerException("时间不能为空或解析格式不能为空");
+        }
+
+        DateTime lastDay =  new DateTime(date)
+                .dayOfWeek().withMaximumValue().millisOfDay().withMaximumValue().toDateTime();
+
+        return lastDay.toString(pattern);
+    }
+
+
+
+
+
+
+    /**
+     *
+     * <p>获得指定日期当月第一天</p>
+     * <pre>
+     * DateUtil.getFirstDayOfMonth(new Date(), TimeConstants.YYYY_MM_DD_HH24_MM_SS) = "2010-11-01 00:00:00"
+     * </pre>
+     * @param date 指定日期.
+     * @param pattern  描述日期和时间格式
+     * @return 返回日期格式的字符串
+     */
+    public static String getFirstDayOfMonth(Date date, String pattern) {
+
+        if (StringUtil.isEmpty(pattern) || StringUtil.isEmpty(date)) {
+            throw new NullPointerException("时间不能为空或解析格式不能为空");
+        }
+
+        DateTime firstDay = DateTime.parse(getFormatDate(date, TimeConstants.YYYY_MM_DD))
+                        .dayOfMonth().setCopy(1).toDateTime();
+
+        return firstDay.toString(pattern);
+    }
+
+
+    /**
+     *
+     * <p>获得指定日期当月最后一天</p>
+     * <pre>
+     * DateUtil.getLastDayOfMonth(new Date(), TimeConstants.YYYY_MM_DD_HH24_MM_SS) = "2010-11-30 23:59:59"
+     * </pre>
+     * @param date 指定日期
+     * @param pattern  描述日期和时间格式
+     * @return 返回日期格式的字符串
+     */
+    public static String getLastDayOfMonth(Date date,
+                                           String pattern) {
+
+        if (StringUtil.isEmpty(pattern) || StringUtil.isEmpty(date)) {
+            throw new NullPointerException("时间不能为空或解析格式不能为空");
+        }
+
+        DateTime lastDay =  new DateTime(date)
+                    .dayOfMonth().withMaximumValue().millisOfDay().withMaximumValue().toDateTime();
+
+        return lastDay.toString(pattern);
+    }
+
+
+
+
+
+    /**
+     *
+     * <p>获得指定日期的日.</p>
+     * @param date 日期值
+     * @return 返回日期的日.如果{@link java.util.Date}为<code>null</code>,抛出异常.
+     * @throws NullPointerException
+     */
+    public static String getDDFromDate(Date date) {
+        if (StringUtil.isEmpty(date)) {
+            throw new NullPointerException("date 不能为空");
+        }
+
+        return String.valueOf(new DateTime(date).getDayOfMonth());
+
+    }
+
+
+    /**
+     *
+     * <p>获得指定日期的月.</p>
+     * @param date 指定日期
+     * @return 返回日期的月.如果{@link java.util.Date}为<code>null</code>,抛出异常.
+     * @throws NullPointerException
+     */
+    public static String getMMFromDate(Date date) {
+
+        if (StringUtil.isEmpty(date)) {
+            throw new NullPointerException("date 不能为空");
+        }
+        return String.valueOf(new DateTime(date).getMonthOfYear());
+
+    }
+
+
+    /**
+     *
+     * <p>获得指定日期的年.</p>
+     * @param date 指定日期
+     * @return 返回日期的年.如果{@link java.util.Date}为<code>null</code>,抛出异常.
+     * @throws NullPointerException
+     */
+    public static String getYYFromDate(Date date) {
+
+        if (StringUtil.isEmpty(date)) {
+            throw new NullPointerException("date 不能为空");
+        }
+        return String.valueOf(new DateTime(date).getYear());
+
+    }
+
+
+
+
+
+    /**
+     *
+     * <p>返回两个日期之间的所有天数,放入集合{@link List}中.</p>
+     * <pre>
+     * DateUtil.getDateList(DateUtil.convertStringToDate(DateUtil.DATE_PATTERN_YYYY_MM_DD,
+     *				"2010-10-22"),new Date()) =  list
+     * </pre>
+     * @param begin  开始时间
+     * @param end 结束时间
+     * @return 返回两个日期相隔时间集合
+     * @throws NullPointerException
+     */
+    public static List<Date> getDateList(Date begin, Date end) {
+
+        if (StringUtil.isEmpty(begin) || StringUtil.isEmpty(end)) {
+            throw new NullPointerException("date 不能为空");
+        }
+
+        List<Date> result = new ArrayList<Date>();
+        DateTime beginDate = new DateTime(begin);
+        DateTime endDate = new DateTime(end);
+
+        while (endDate.isAfter(beginDate)) {
+            result.add(beginDate.toDate());
+            beginDate = beginDate.plusDays(1);
+        }
+
+
+
+
+        return result;
+
+    }
+
+
+    /**
+     *
+     * <p>根据两个日期获得之间所有的工作日期返回一个日期数组 (工作日不包括星期六和星期日)</p>
+     * <pre>
+     * DateUtil.getWorkingdayList(DateUtil.convertStringToDate(TimeConstants.YYYY_MM_DD,
+     "2010-10-15"),new Date()) = list
+     * </pre>
+     * @param begin 开始日期
+     * @param end 结束日期
+     * @return 返回两个日期相隔时间集合
+     * @throws NullPointerException
+     */
+    public static List<Date> getWorkingdayList(Date begin,
+                                               Date end) {
+        if (null == begin || null == end ) {
+            throw new NullPointerException();
+        }
+        List<Date> list = getDateList(begin, end);
+        List<Date> result = new ArrayList<Date>();
+        for (int i = 0; i < list.size(); i++) {
+
+            if (new DateTime(list.get(i)).getDayOfWeek() == 6
+                    || new DateTime(list.get(i)).getDayOfWeek() == 7) {
+                continue;
+            } else {
+                result.add(list.get(i));
+            }
+        }
+
+        return result;
+    }
+
+
+    /**
+     *
+     * <p>根据日期类型的数组获得数组内所有日期对应的星期X列表</p>
+     * @param list 日期类型的数组
+     * @return  星期X列表
+     */
+    public static List<String> getListOfDayOfWeek(List<Date> list) {
+
+        List<String> result = new ArrayList<String>();
+
+        for (Date date:list) {
+           DateTime dateTime = new DateTime(date);
+
+            switch (dateTime.getDayOfWeek()) {
+
+                case DateTimeConstants.SUNDAY:
+                    result.add("星期日");
+                    break;
+                case DateTimeConstants.MONDAY:
+                    result.add("星期一");
+                    break;
+                case DateTimeConstants.TUESDAY:
+                    result.add("星期二");
+                    break;
+                case DateTimeConstants.WEDNESDAY:
+                    result.add("星期三");
+                    break;
+                case DateTimeConstants.THURSDAY:
+                    result.add("星期四");
+                    break;
+                case DateTimeConstants.FRIDAY:
+                    result.add("星期五");
+                    break;
+                case DateTimeConstants.SATURDAY:
+                    result.add("星期六");
+                    break;
+                default:
+                    break;
+            }
+
+        }
+        return result;
+    }
+
+
+    /**
+     *
+     * <p>将日期,转换成10进制日期</p>
+     * <p>
+     * pattern需跟date格式相同,才可进行转换.转换后的长整型.
+     * </p>
+     * <pre>
+     * DateUtil.convertStringToTimestamp(TimeConstants.YYYY_MM_DD, "2010-10-11") = 1286726400
+     * </pre>
+     * @param date 时间值
+     * @param pattern 描述日期与格式
+     * @throws NullPointerException
+     * @see #convertTimestampToString(long, String)
+     * @return 返回10进制时间值字符串
+     */
+    public static long convertStringToTimestamp(String date,  String pattern) {
+
+        if(StringUtil.isEmpty(date) || StringUtil.isEmpty(pattern)) {
+            throw new NullPointerException("date 与 pattern 不能为空");
+        }
+
+        DateTimeFormatter format = DateTimeFormat.forPattern(pattern);
+        return  DateTime.parse(date, format).toDateTime().getMillis() / 1000;
+
+    }
+
+
+
+    /**
+     *
+     * <p>将10进制,转换日期字符串类型.</p>
+     * <pre>
+     * DateUtil.convertTimestampToString(TimeConstants.YYYY_MM_DD, 1286726400l) = "2010-10-11 00:00:00"
+     * </pre>
+     * @param time10 时间戳值
+     * @param  pattern 描述日期与格式
+     * @see #getFormatDate(Date, String)
+     * @see #convertStringToTimestamp(String, String)
+     * @return 返回日期字符串
+     * @throws NullPointerException
+     */
+    public static String convertTimestampToString(long time10, String pattern) {
+
+        if(StringUtil.isBlank(pattern)) {
+            throw new NullPointerException("pattern 不能为空");
+        }
+
+       return   DateTime.now().withMillis(time10 * 1000).toString(pattern);
+    }
+
+
+
+
+
+
+
+    /**
+     *
+     * <p>
+     *  将日期转变为字符串的表现形式.
+     * </p>
+     * <p>
+     * 日期格式可以参考本类提供的日期常量,也可自己定义日期格式.
+     * 当<code>pattern</code> 或 <code>date</code> 为空时,抛出空指针异常.
+     * </p>
+     * <pre>
+     * DateUtil.getFormatDate("yyyyMMddHHmmss", new Date()) = "20101102174448"
+     * </pre>
+     * @param date 解析的日期值
+     * @param pattern 描述日期与时间格式
+     * @return  返回日期的字符串表现形式.
+     * @throws NullPointerException
+     */
+    public static String getFormatDate(Date date , String pattern) {
+
+        if(StringUtil.isEmpty(pattern) || StringUtil.isEmpty(date)){
+            throw new NullPointerException("参数为NULL......");
+        }
+        DateTime  dateTime = new DateTime(date);
+
+        return dateTime.toString(pattern);
+    }
+
+    /**
+     *
+     * <p>通过字符串日期类型,转换为Date类型日期.</p>
+     * <p>
+     * pattern格式，需跟提供的日期字符串格式相统一，否则解析异常返回NULL值。
+     * </P>
+     * <pre>
+     * DateUtil.convertStringToDate(TimeConstants.YYYY_MM_DD, "2010-09-11") = date类型日期
+     * DateUtil.convertStringToDate(TimeConstants.YYYY_MM_DD_HH_MM, "2010-09-11") = NULL.
+     * </pre>
+     * @param date 字符串类型日期.
+     * @param pattern 描述日期与时间格式.
+     * @return 返回解析后的{@link java.util.Date }类型日期.
+     * @throws NullPointerException
+     */
+    public static Date convertStringToDate(String date, String pattern) {
+
+
+        if (StringUtil.isEmpty(date) || StringUtil.isEmpty(pattern)) {
+            throw new NullPointerException("date 与 pattern 不能为空");
+        }
+
+        DateTimeFormatter format = DateTimeFormat.forPattern(pattern);
+
+        return DateTime.parse(date, format).toDate();
+    }
+}
diff --git a/src/main/java/com/nis/galaxy/util/DateUtils.java b/src/main/java/com/nis/galaxy/util/DateUtils.java
deleted file mode 100644
index f4ec234..0000000
--- a/src/main/java/com/nis/galaxy/util/DateUtils.java
+++ /dev/null
@@ -1,464 +0,0 @@
-/**
- * Copyright &copy; 2012-2014 <a href="https://github.com/thinkgem/jeesite">JeeSite</a> All rights reserved.
- */
-package com.nis.galaxy.util;
-
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-
-import org.apache.commons.lang3.time.DateFormatUtils;
-import org.springframework.beans.factory.annotation.Value;
-
-/**
- * 日期工具类, 继承org.apache.commons.lang.time.DateUtils类
- *
- * @author ThinkGem
- * @version 2014-4-15
- */
-public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
-
-    private static String[] parsePatterns = {
-            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
-            "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
-            "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
-
-    /**
-     * 将String类型时间转成Date、若出现异常则返回当前时间
-     *
-     * @param time
-     * @return
-     */
-    public static Date getDateOfString(String time) {
-        if (time == null) {
-            new Throwable("Parameters of the abnormal");
-        }
-        DateFormat myFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        try {
-            Date parse = myFormat.parse(time);
-            return parse;
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
-        return new Date();
-    }
-
-    /**
-     * 获取距当前24h30s前的时间
-     *
-     * @return
-     */
-    public static String getBeforeTimeOf24h30s() {
-        GregorianCalendar gc = new GregorianCalendar();
-        gc.add(Calendar.DATE, -1);
-        gc.add(Calendar.SECOND, -30);
-        return DateUtils.formatDateTime(gc.getTime());
-        //return "2018-07-01 00:00:00";
-    }
-
-    /**
-     * 距参数time 5min之后的时间点
-     *
-     * @param time
-     * @return
-     */
-    public static String getAfter5min(String time) {
-        if (time == null || "".equals(time.trim())) {
-            return "";
-        }
-        Date date = DateUtils.parseDate(time);
-        GregorianCalendar gc = new GregorianCalendar();
-        gc.setTime(date);
-        gc.add(Calendar.MINUTE, 5);
-        return DateUtils.formatDateTime(gc.getTime());
-        //return "2018-12-01 00:00:00";
-    }
-
-    /**
-     * 距time 24h之后
-     *
-     * @param time
-     * @return
-     */
-    public static String getAfter24h(String time) {
-        if (time == null || time.isEmpty()) {
-            return "";
-        }
-        Date date = DateUtils.parseDate(time);
-        GregorianCalendar gc = new GregorianCalendar();
-        gc.setTime(date);
-        gc.add(Calendar.DATE, 1);
-        return DateUtils.formatDateTime(gc.getTime());
-        //return "2018-12-01 00:00:00";
-    }
-
-    /**
-     * 距time 1小时之后的时间
-     *
-     * @param time
-     * @return
-     */
-    public static String getAfter1h(String time) {
-        if (time == null || time.isEmpty()) {
-            return "";
-        }
-        Date date = DateUtils.parseDate(time);
-        GregorianCalendar gc = new GregorianCalendar();
-        gc.setTime(date);
-        gc.add(Calendar.HOUR, 1);
-        return DateUtils.formatDateTime(gc.getTime());
-        //return "2018-12-01 00:00:00";
-    }
-
-    /**
-     * 得到当前日期字符串 格式（yyyy-MM-dd）
-     *
-     * @param l
-     */
-    public static String getDate(long l) {
-        return getDate("yyyy-MM-dd");
-    }
-
-    /**
-     * 得到当前日期字符串 格式（yyyy-MM-dd） pattern可以为："yyyy-MM-dd" "HH:mm:ss" "E"
-     */
-    public static String getDate(String pattern) {
-        return DateFormatUtils.format(new Date(), pattern);
-    }
-
-    /**
-     * 得到日期字符串 默认格式（yyyy-MM-dd） pattern可以为："yyyy-MM-dd" "HH:mm:ss" "E"
-     */
-    public static String formatDate(Date date, Object... pattern) {
-        String formatDate = null;
-        if (pattern != null && pattern.length > 0) {
-            formatDate = DateFormatUtils.format(date, pattern[0].toString());
-        } else {
-            formatDate = DateFormatUtils.format(date, "yyyy-MM-dd");
-        }
-        return formatDate;
-    }
-
-    /**
-     * 得到日期时间字符串，转换格式（yyyy-MM-dd HH:mm:ss）
-     */
-    public static String formatDateTime(Date date) {
-        if (date == null || "".equals(date)) {
-            return "";
-        }
-        return formatDate(date, "yyyy-MM-dd HH:mm:ss");
-    }
-
-    /**
-     * 得到当前时间字符串 格式（HH:mm:ss）
-     */
-    public static String getTime() {
-        return formatDate(new Date(), "HH:mm:ss");
-    }
-
-    /**
-     * 得到当前日期和时间字符串 格式（yyyy-MM-dd HH:mm:ss）
-     */
-    public static String getDateTime() {
-        return formatDate(new Date(), "yyyy-MM-dd HH:mm:ss");
-    }
-
-    /**
-     * 得到当前年份字符串 格式（yyyy）
-     */
-    public static String getYear() {
-        return formatDate(new Date(), "yyyy");
-    }
-
-    /**
-     * 得到当前月份字符串 格式（MM）
-     */
-    public static String getMonth() {
-        return formatDate(new Date(), "MM");
-    }
-
-    /**
-     * 得到当天字符串 格式（dd）
-     */
-    public static String getDay() {
-        return formatDate(new Date(), "dd");
-    }
-
-    /**
-     * 得到当前星期字符串 格式（E）星期几
-     */
-    public static String getWeek() {
-        return formatDate(new Date(), "E");
-    }
-
-    /**
-     * 日期型字符串转化为日期 格式
-     * { "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm",
-     * "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm",
-     * "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm" }
-     */
-    public static Date parseDate(Object str) {
-        if (str == null) {
-            return null;
-        }
-        try {
-            return parseDate(str.toString(), parsePatterns);
-        } catch (ParseException e) {
-            return null;
-        }
-    }
-
-    /**
-     * 获取过去的天数
-     *
-     * @param date
-     * @return
-     */
-    public static long pastDays(Date date) {
-        long t = System.currentTimeMillis() - date.getTime();
-        return t / (24 * 60 * 60 * 1000);
-    }
-
-    /**
-     * 获取过去的小时
-     *
-     * @param date
-     * @return
-     */
-    public static long pastHour(Date date) {
-        long t = System.currentTimeMillis() - date.getTime();
-        return t / (60 * 60 * 1000);
-    }
-
-    /**
-     * 获取过去的分钟
-     *
-     * @param date
-     * @return
-     */
-    public static long pastMinutes(Date date) {
-        long t = System.currentTimeMillis() - date.getTime();
-        return t / (60 * 1000);
-    }
-
-    /**
-     * 转换为时间（天,时:分:秒.毫秒）
-     *
-     * @param timeMillis
-     * @return
-     */
-    public static String formatDateTime(long timeMillis) {
-        long day = timeMillis / (24 * 60 * 60 * 1000);
-        long hour = (timeMillis / (60 * 60 * 1000) - day * 24);
-        long min = ((timeMillis / (60 * 1000)) - day * 24 * 60 - hour * 60);
-        long s = (timeMillis / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60);
-        long sss = (timeMillis - day * 24 * 60 * 60 * 1000 - hour * 60 * 60 * 1000 - min * 60 * 1000 - s * 1000);
-        return (day > 0 ? day + "," : "") + hour + ":" + min + ":" + s + "." + sss;
-    }
-
-    /**
-     * 获取两个日期之间的天数
-     *
-     * @param before
-     * @param after
-     * @return
-     */
-    public static double getDistanceOfTwoDate(Date before, Date after) {
-        long beforeTime = before.getTime();
-        long afterTime = after.getTime();
-        return (afterTime - beforeTime) / (1000 * 60 * 60 * 24);
-    }
-
-    /**
-     * @param args
-     * @throws ParseException
-     */
-    public static void main(String[] args) throws ParseException {
-//		System.out.println(formatDate(parseDate("2010/3/6")));
-//		System.out.println(getDate("yyyy年MM月dd日 E"));
-//		long time = new Date().getTime()-parseDate("2012-11-19").getTime();
-//		System.out.println(time/(24*60*60*1000));
-    }
-
-
-    /**
-     * 获取time时间的前整点时间点
-     * eg:2018-12-12 12:06:36 结果为：2018-12-12 00:00:00
-     * 2018-12-12 00:59:36 结果为：2018-12-12 00:00:00
-     *
-     * @param time
-     * @return 取前一个整天的时间, 如果返回为null检查输入的String类型时间格式
-     */
-    public static String getRangeOfday(String time) {
-        if (time == null || time.isEmpty()) {
-            return "";
-        }
-        int length = time.length();
-        int cut = 8;
-        if (length <= cut) {
-            return "";
-        }
-        try {
-            time = time.substring(0, length - cut);
-            time = time.concat("00:00:00");
-        } catch (Exception e) {
-            e.printStackTrace();
-            return "";
-        }
-        return time;
-    }
-
-
-    /**
-     * 获取time时间的前整点时间点
-     * eg:2018-12-12 12:06:36 结果为：2018-12-12 12:00:00
-     * 2018-12-12 00:59:36 结果为：2018-12-12 00:00:00
-     *
-     * @param time
-     * @return 取前一个整点的时间, 如果返回为null检查输入的String类型时间格式
-     */
-    public static String getRangeOfhour(String time) {
-        if (time == null || time.isEmpty()) {
-            return "";
-        }
-        int length = time.length();
-        int cut = 8;
-        if (length <= cut) {
-            return "";
-        }
-        try {
-            time = time.substring(0, length - 5);
-            time = time.concat("00:00");
-        } catch (Exception e) {
-            e.printStackTrace();
-            return "";
-        }
-        return time;
-    }
-
-    /**
-     * 获取time时间的前整5分钟的时间点
-     * eg:  2018-12-12 12:06:36 结果为：2018-12-12 12:05:00
-     * 2018-12-12 12:04:36 结果为：2018-12-12 12:00:00
-     *
-     * @param time
-     * @return 取前一个5分钟的时间，若返回为null则检查传入的string类型时间格式
-     */
-    public static String getRangeOf5min(String time) {
-        if (time == null || time.isEmpty()) {
-            return "";
-        }
-        int length = time.length();
-        int cut = 4;
-        if (length <= cut) {
-            return "";
-        }
-        int max = 5;
-        //获取分钟数的个位
-        int compare;
-        try {
-            compare = Integer.parseInt(time.substring(length - cut, length - cut + 1));
-            time = time.substring(0, length - cut);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return "";
-        }
-        if (compare >= 0 && compare < max) {
-            time = time.concat("0:00");
-        } else if (compare >= max) {
-            time = time.concat("5:00");
-        }
-        return time;
-    }
-
-    /**
-     * 获取time的整时间点：1min粒度
-     * eg:  2018-12-12 12:06:36 结果为：2018-12-12 12:06:00
-     *
-     * @param time
-     * @return
-     */
-    public static String getRangeOf1min(Date time) {
-        String timeString = DateUtils.formatDateTime(time);
-        if (timeString == null || timeString.length() < 19) {
-            return "";
-        }
-        timeString.length();
-        timeString = timeString.substring(0, 17);
-        timeString = timeString.concat("00");
-        return timeString;
-    }
-
-    /**
-     * 获取距离time时间minute分钟的时间,之前需加符号-、之后为正+
-     *
-     * @param time
-     * @param minute
-     * @return
-     */
-    public static String getBeforeNminOfTime(String time, int minute) {
-        if (time == null || time.isEmpty()) {
-            return "";
-        }
-        Date date = DateUtils.parseDate(time);
-        GregorianCalendar gc = new GregorianCalendar();
-        gc.setTime(date);
-        gc.add(Calendar.MINUTE, minute);
-        return DateUtils.formatDateTime(gc.getTime());
-    }
-
-    /**
-     * 获取距离time时间hour小时的时间,之前需加符号-、之后为正+
-     *
-     * @param time
-     * @param hour
-     * @return
-     */
-    public static String getRangeNhourOfTime(String time, int hour) {
-        if (time == null) {
-            return "";
-        }
-        Date date = DateUtils.parseDate(time);
-        GregorianCalendar gc = new GregorianCalendar();
-        gc.setTime(date);
-        gc.add(Calendar.HOUR, hour);
-        return DateUtils.formatDateTime(gc.getTime());
-    }
-
-    /**
-     * 获取距离time时间day天的时间,之前需加符号-、之后为正+
-     *
-     * @param time
-     * @param day
-     * @return
-     */
-    public static String getRangeNdayOfTime(String time, int day) {
-        if (time == null || time.isEmpty()) {
-            return "";
-        }
-        Date date = DateUtils.parseDate(time);
-        GregorianCalendar gc = new GregorianCalendar();
-        gc.setTime(date);
-        gc.add(Calendar.DATE, day);
-        return DateUtils.formatDateTime(gc.getTime());
-    }
-
-    /**
-     * 截取时间 eg：截取时间参数：2018-09-18 14:30:00.0 结果为：2018-09-18 14:30:00
-     *
-     * @param time
-     * @return
-     */
-    public static String getSubstringTime(String time) {
-        if (time == null || time.length() != 21 || time.isEmpty()) {
-            return "";
-        }
-        time = time.substring(0, time.length() - 2);
-        return time;
-    }
-
-
-}
diff --git a/src/main/java/com/nis/galaxy/util/StringUtil.java b/src/main/java/com/nis/galaxy/util/StringUtil.java
new file mode 100644
index 0000000..c1bc936
--- /dev/null
+++ b/src/main/java/com/nis/galaxy/util/StringUtil.java
@@ -0,0 +1,770 @@
+package com.nis.galaxy.util;
+
+
+import org.apache.commons.lang3.StringUtils;
+import sun.misc.BASE64Encoder;
+
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ *
+ * <p>字符串处理工具类</p>
+ * @author 中电积至有限公司 E-mail: [email protected]
+ * @version 1.0 创建时间：2010-11-8 下午04:50:39
+ *
+ */
+
+
+public final class StringUtil extends StringUtils {
+	
+    private static int size = 0;
+	
+	private static final String[] SIMPLIFIED_CASE = { "O", "一", "二", "三", "四", "五",
+		"六", "七", "八", "九", "十" };
+	
+	private static final String[] TRADITIONAL_CASE = { "零", "壹", "贰", "叁", "肆", "伍",
+		"陆", "柒", "捌", "玖", "拾" };
+
+    private static final String PATTERN_EMPTY_FULL = "[\u4e00-\u9fa5]";
+    private static final String PATTERN_EMPTY_CHARACTER = "\\s*|\t|\r|\n";
+
+	/**
+     * The empty String <code>""</code>.
+     */
+    public static final String EMPTY = "";
+    
+    /**
+     *空 <code>String</code> 数组.
+     */
+    public static final String[] EMPTY_STRING_ARRAY = new String[0];
+    public static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
+	
+	/**
+	 * ISO8859_1 编码集
+	 */
+	public static final String CODE_ISO8859_1 = "ISO8859_1";
+	/**
+	 * GB2312 编码集
+	 */
+	public static final String CODE_GB2312 = "GB2312";
+	/**
+	 * GBK 编码集
+	 */
+	public static final String CODE_GBK = "GBK";
+	/**
+	 * UTF-8 编码集
+	 */
+	public static final String CODE_UTF_8 = "UTF-8";
+
+	
+	/**
+	 *<p>Description:抑制默认的构造器,避免实例化对象 </p>
+	 */
+	private StringUtil() {
+
+	}
+
+   /**
+	* 
+	* <p>判断一个对象是否为空</p>
+	* <p>
+	* <code>object</code>元素判断所有对象是否为空.
+	* 另外对{@link String}、{@link Collection}及其子类 、{@link Map}及其子类、数组 进行长度验证,如果长度为0,视为空对象.
+	* </p>
+	* <pre>
+	* String aa = " ";
+	* List list = new ArrayList()
+	* LinkedHashSet set = new LinkedHashSet();
+	* StringUtil.isEmpty(aa) = true
+	* StringUtil.isEmpty(list) = true
+	* StringUtil.isEmpty(set) = true
+	* StringUtil.isEmpty("\t") = true
+	* </pre> 
+	* @param object 对象元素
+	* @return  <code>true</code> 对象为<code>null</code>,<code>false</code> 对象不为<code>null</code>.
+	*/
+	public static boolean isEmpty(Object object) {
+		initSize(object);
+		return size == 0;
+	}
+
+
+	/**
+	 *
+	 * <p>判断一个对象不为空</p>
+	 * <p>
+	 * <code>object</code>元素判断不为空验证
+	 * 另外对{@link String}、{@link Collection}及其子类 、{@link Map}及其子类、数组 进行长度验证,如果长度为0,视为空对象.
+	 * </p>
+	 * <pre>
+	 * String aa = " ";
+	 * List list = new ArrayList()
+	 * LinkedHashSet set = new LinkedHashSet();
+	 * StringUtil.isNotEmpty(aa) = false
+	 * StringUtil.isEmpty(list) = false
+	 * StringUtil.isEmpty(set) = false
+	 * StringUtil.isEmpty("\t") = false
+	 * </pre>
+	 * @param object 对象元素
+	 * @return  <code>true</code> 对象为<code>null</code>,<code>false</code> 对象不为<code>null</code>.
+	 */
+	public static boolean isNotEmpty(Object object) {
+		initSize(object);
+		return size != 0;
+	}
+	
+	
+	/**
+	 * 
+	 * 判断对象是否有数据存在? 不存在为0、存在不为0的值.
+	 * @param object 对象值
+	 */
+	private static  void initSize(Object object){
+		if (object == null) {
+			size = 0;
+		} else {
+			if (object instanceof String) {
+				size = isBlank((String)object)?0:1;
+			} else if (object instanceof Collection) {
+				size = ((Collection)object).size();
+			} else if (object instanceof Map) {
+				size = ((Map)object).size();
+			} else if (object instanceof Object[]) {
+					Object[] objectArray = (Object[])object;	
+					size = objectArray.length;
+				//其他数据类型
+			} else {
+				size = 1;
+			}
+
+		}
+		
+	}
+	
+	
+	
+	
+	
+	/**
+	* <p>判断字符串是否为空.
+	*  为空条件:全角\半角\tab 等没有实际意义的字符.
+    *  具体参看{@link Character#isWhitespace(char)}对空格的定义.
+	* </p>
+     *
+	* <pre>
+	* StringUtils.isBlank("  ") = true 为半角空格
+	* StringUtils.isBlank("　　") = true 为全角空格
+	* StringUtils.isBlank("	") = true 为tab键
+	* </pre>   
+	* @param str 字符串
+	* @return <code>true</code> 字符串为空 ,<code>false</code> 不为空
+	 */
+	public static boolean isBlank(String str) {
+        int strLen;
+        if (str == null || (strLen = str.length()) == 0) {
+            return true;
+        }
+        for (int i = 0; i < strLen; i++) {
+            if ((Character.isWhitespace(str.charAt(i)) == false)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+
+    /**
+     *
+     * <p>判断字符串不为空.
+     * 为空条件:全角\半角\tab 等没有实际意义的字符.
+     * 具体参看{@link Character#isWhitespace(char)}对空格的定义.
+     * </p>
+     * <pre>
+     * StringUtils.isBlank("  ") = false 为半角空格
+     * StringUtils.isBlank("　　") = false 为全角空格
+     * StringUtils.isBlank("	") = false 为tab键
+     * </pre>
+     * @param str 字符串
+     * @return <code>true</code> 字符串为空 ,<code>false</code> 不为空
+     */
+    public static boolean isNotBlank(String str) {
+
+        return !isBlank(str);
+    }
+	
+
+
+	/**
+	 * 
+	* <p>
+	* 获得文件扩展名
+	* TXT,HTML,HTM,EML,DOC,DOCX,XLS,XLSX,PPT,PPTX,PDF
+	* </p>
+	* @param filePath 文件路径
+	* @return <code>string</code> 扩展名 ,<code>null</code> 无扩展名
+	 */
+	public static String getFileExtendName(String filePath){
+		String extendName = null;
+		if(filePath.lastIndexOf(".")!=-1){
+			extendName = filePath.substring(filePath.lastIndexOf(".")+1).trim().toUpperCase();
+		}
+		return extendName;
+	}
+	
+	
+	
+	
+   /**
+	* 
+	* <p>去掉字符串两边空格.
+	* 去掉空格规则:
+	* 半角\全角\tab等无实际意义的字符.
+	* 具体参看{@link Character#isWhitespace(char)}对空格的定义.
+	* </p>
+	* <pre>
+	* StringUtil.strip("　	aa　　").length() = 2 
+	* StringUtil.strip(" ").length() = 0 
+	* </pre>   
+	* @param str 字符
+	* @return <code>str</code> 两边去空后字符串,<code>""</code> 字符串为null时.
+	*/
+	public static String strip(String str){
+		
+		if(isEmpty(str)){
+			return EMPTY;
+		}
+		int start = 0;
+		int end = str.length();
+		//去掉前边空格
+		while ((start != end) && Character.isWhitespace(str.charAt(start))) {
+             start++;
+        }
+		//去掉后边空格
+		 while ((end != 0) && Character.isWhitespace(str.charAt(end - 1))) {
+             end--;
+         }
+		
+		return str.substring(start,end);
+	}
+
+	/**
+	 *
+	 * <p>去掉字符串空格，如果为中文去掉所有空格，英文去两边空格。
+	 * 去掉空格规则:
+	 * 半角\全角\tab等无实际意义的字符.
+	 *
+	 * </p>
+	 * <pre>
+	 * StringUtil.strip("　	a a　　").length() = 2
+	 * StringUtil.strip(" ").length() = 0
+	 * </pre>
+	 * @param str 字符
+	 * @return <code>str</code> 去空后字符串,<code>""<code> 字符串为null时.
+	 */
+	public static String stripAll(String str){
+		String dest="";
+		Pattern p = Pattern.compile(PATTERN_EMPTY_FULL);
+		Matcher m = p.matcher(str);
+		if(m.find()){
+			if(str != null){
+				p = Pattern.compile(PATTERN_EMPTY_CHARACTER);
+				str = str.replace((char)12288,' ');
+				Matcher matcher = p.matcher(str);
+				dest = matcher.replaceAll("");
+			}
+		}else {
+			dest = str.trim();
+		}
+
+		return dest;
+	}
+
+
+	/**
+	* 
+	* <p>如果对象为空时,返回默认值.</p>
+	* @param object 要判断是否为空的对象
+	* @param defaultValue 为空时设的默认值
+	* @see #isEmpty(Object)
+	* @return 获取处理后的数据
+	*/
+	public static Object setDefaultIfEmpty(Object object,Object defaultValue){
+		
+		return isEmpty(object)?defaultValue:object;
+	}
+
+   /**
+	* 
+	* <p>对字符串进行MD5加密.</p>
+	* <p>
+	* 一般作为密码的处理方式,首先通过MD5进行加密，然后将字符串进行Base64编码获得所需字符.
+	* </p>
+	* <pre>
+	* String str = "ceshi";
+	* StringUtil.md5(str) = "zBfDDNERxyFfyPUfh5Dg4Q=="
+	* </pre> 
+	* @param msg 要加密的字符串
+	* @return 返回加密后的25位字符,如果解析出现异常将返回<code>null</code>.
+	*/
+	public static String md5(String msg) {
+			try {
+				MessageDigest md = MessageDigest.getInstance("MD5");
+				byte[] b = md.digest(msg.getBytes());
+				BASE64Encoder encoder = new BASE64Encoder();
+				return  encoder.encode(b);
+			} catch (NoSuchAlgorithmException e) {
+				e.printStackTrace();
+				 return EMPTY;	
+			} 
+	}
+
+	
+   /**
+	* <p>截取处理字符串,当字符串超过指定的截取长度时,用“......”补充</p>
+	* <pre>
+	* String str = "中华人民共和国";
+	* StringUtil.getMoreString(str, 6) = "中华人民共和......"
+	* </pre>   
+	* @param text 字符串数据
+	* @param length 截取的长度值
+	* @return  返回处理后字符
+	*/
+	public static String getMoreString(String text,int length){
+		StringBuilder textBuilder = new StringBuilder();
+		
+		if(isEmpty(text)){
+			return EMPTY;
+		}
+		int endIndex = Math.min(length, text.length());
+		if(endIndex==length){
+			text = text.substring(0,length);
+			textBuilder.append(text).append("......");
+		}else {
+			textBuilder.append(text);
+		}
+		
+		
+		return textBuilder.toString();
+	}
+	
+	
+   /**
+	* 
+	* <p>通过给定url获取域名地址.</p>
+	* <p>
+	* 获得域名信息需去除 http/https/ftp 与 www 一些头信息,获取有效地址. 
+	* </p>
+	* <pre>
+	* StringUtil.getDomain("http://www.baidu.com") = "baidu.com"
+	* </pre>   
+	* @param webSiteUrl url 地址
+	* @return  返回截取后的域名地址
+	*/
+	public static String getDomain(String webSiteUrl) {
+		String url ;
+		
+		if(isEmpty(webSiteUrl)){
+			return EMPTY;
+		}
+
+		if (webSiteUrl.indexOf("http://") >= 0) {
+			url = webSiteUrl.substring("http://".length(), webSiteUrl.length());
+		} else if (webSiteUrl.indexOf("https://", 0) >= 0) {
+			url = webSiteUrl.substring("https://".length(), webSiteUrl.length());
+		} else if (webSiteUrl.indexOf("ftp://", 0) >= 0) {
+			url = webSiteUrl.substring("ftp://".length(), webSiteUrl.length());
+		} else {
+			url = webSiteUrl;
+		}
+
+		if (url.indexOf("/", 0) >= 0) {
+			url = url.substring(0, url.indexOf("/", 1));
+		}
+		if (url.indexOf("www.") == 0) {
+			url = url.substring(url.indexOf(".") + 1, url.length());
+		}
+		if (url.indexOf("?") >= 0) {
+			url = url.substring(0, url.indexOf("?"));
+		}
+		
+		return url;
+	}
+
+   /**
+	* 
+	* <p>按照规则解析字符串得到一个数组.</p>
+	* <pre>
+	* StringUtil.Split(null, "*") = null
+	* StringUtil.Split("", *) = []
+	* StringUtil.Split("a.b.c", ".") = ["a", "b", "c"]
+	* StringUtil.Split("a\tb\nc", null) = []
+	* StringUtil.Split("a b c", " ") = ["a", "b", "c"]
+	* </pre>   
+	* @param str 需要分隔的字符串
+	* @param regex 分隔规则
+	* @return  返回字符串数组,如果分隔字符串为空返回<code>null</code>.
+	*/
+	public static String[] split(String str,String regex) {
+		
+		if(str == null){
+			return null;
+		}
+		
+		if(str.length() == 0 || regex == null){
+			return EMPTY_STRING_ARRAY;
+		}
+		
+		
+        return str.split(regex);
+	
+    }
+	
+	/**
+	 * 
+	* <p>判断字符集编码是否在java中支持.</p>
+	* @param name 所要求的字符集
+	* @return  <code>true</code> java 虚拟机下支持该字符集,<code>false</code> 不支持该字符集
+	 */
+	 public static boolean isSupported(String name) {
+	        if (name == null) {
+	            return false;
+	        }
+	        try {
+	            new String(EMPTY_BYTE_ARRAY, name);
+	        } catch (UnsupportedEncodingException e) {
+	            return false;
+	        }
+	        return true;
+	  }
+
+	
+	/**
+	* 
+	* <p>字符编码转换，需要提供字符串的源编码与目的编码格式.</p>
+	* <p>
+	* 字符串工具类中提供一些字符编码常量：
+	* {@link #CODE_GB2312}\{@link #CODE_GBK}\{@link #CODE_ISO8859_1}\{@link #CODE_UTF_8}
+	* </p>
+	* @param value 要编码的值
+	* @param sourceCodingFormat 字符的原始编码格式,具体编码格式可看本类提供的编码样式.
+	* @param destCodingFormat 要转换字符的编码格式,具体编码格式可看本类提供的编码样式.
+	* @return  返回编码后的字符串.
+	* @throws UnsupportedEncodingException 
+	*/
+	public static String  getCodingConversionResult(String value,String sourceCodingFormat,
+			String destCodingFormat ) throws UnsupportedEncodingException{
+		
+		if(!isSupported(sourceCodingFormat) || !isSupported(destCodingFormat)){
+			throw new UnsupportedEncodingException("JVM 下不支持该字符集编码");
+		}
+		
+		if(isEmpty(value)){
+			return EMPTY;
+		}
+		
+	
+		return new String(value.getBytes(sourceCodingFormat), destCodingFormat);
+	}
+	
+ 
+
+    
+   /**
+    * 
+    * <p>判断字符串是否是数字格式(包括小数形式).</p>
+    * <pre>
+    * String a1 = "12";
+	* String a2 = "0.01";
+	* String a3 = "0.0.1";
+	* String a4 = "123a";
+	* StringUtil.isNumeric(a1) = true
+	* StringUtil.isNumeric(a2) = true
+	* StringUtil.isNumeric(a3) = false
+	* StringUtil.isNumeric(a4) = false
+    * </pre>   
+    * @param numberString 数字格式字符串
+    * @return  <code>true</code> 符合数字格式(包括小数),<code>false</code> 不符合数字格式.
+    */ 
+    public static boolean isNumeric(String numberString){
+    	
+    	if(isEmpty(numberString)){
+    		return false;
+    	}
+    	
+    	if(numberString.startsWith(".")||numberString.endsWith(".")){
+    		return  false;
+    	}
+    	
+    	int length = numberString.split("\\.").length-1; //判断小数点在字符串中出现的次数。
+    	
+    	
+    	if(length>1) { //小数点大于1次，不符合数字规范
+    		
+    		return false;
+    	}
+    	
+    	
+    	for(int i=0; i<numberString.length(); i++){
+    		if(!Character.isDigit(numberString.charAt(i))&&!".".equals(String.valueOf(numberString.charAt(i)))){
+    			return false;
+    		}
+    	}
+    	
+    	return true;
+    }
+    
+    /**
+     * 
+    * <p>压缩字符串</p>
+    * <p>
+    * 将带有换行\回车等字符替换为空格格式.具体替换有：
+    * \t,\n,\f,\r .
+    * </p>
+    * <pre>
+    * StringUtil.compressString("ceshi\too\f") = "ceshi oo " 
+    * </pre>   
+    * @param text 要替换的字符串,可能为<code>null</code> 
+     */
+    public static String compressString(String text){
+    	if(isBlank(text)){
+    		return text;
+    	}
+    	return text.replaceAll("[ \t\n\f\r ]+"," ");
+    }
+    
+    /**
+     * 
+    * <p>将查找的字符串全部替换为设置的字符串</p>
+    * <p>
+    * 当该方法无操作时,返回<code>null</code>引用.
+    * </p> 
+    * <pre>
+    * StringUtil.replace(null, "*","*") = null
+    * StringUtil.replace("str", null, "*") = "str"
+    * StringUtil.replace("ceshi", "c", "") = "eshi"
+    * StringUtil.replace("aba", "a", "z") = "zbz"
+    * </pre>   
+    * @see #replace(String, String, String, int)
+    * @param text 需处理的字符串
+    * @param searchString 查找的字符
+    * @param replaceString 替换的字符
+    * @return 返回替换后的字符串,文本为空时返回null.
+     */
+    public static String replace(String text, String searchString, String replaceString ){
+    	
+    	return replace(text, searchString, replaceString, -1);
+    }
+    
+    /**
+     * 
+    * <p>将查找字符串替换为设置字符串,根据<code>count</code>决定替换几次.
+    * 当<code>text</code> 为空不进行任何操作..
+    * </p>
+    * <pre>
+    * StringUtil.replace("abaa", "a", null, -1) = "abaa"
+    * StringUtil.replace("abaa", "a", "", -1)   = "b"
+    * StringUtil.replace("abaa", "a", "z", 0)   = "abaa"
+    * StringUtil.replace("abaa", "a", "z", 1)   = "zbaa"
+    * </pre>   
+    * @param text 需要处理的字符串
+    * @param searchString 查找的字符
+    * @param replaceString 替换字符
+    * @param count 替换的总次数,<code>-1</code> 替换所有满足条件的字符,<code>0</code> 不进行替换.
+    * @return  返回替换后的字符串,文本为空时返回null.
+     */
+    public static String replace(String text, String searchString, String replaceString, int count) {
+    	
+    	 if (isBlank(text) || isBlank(searchString) || replaceString == null || count == 0) {
+             return text;
+         }
+    	 
+    	 int start = 0;
+         int end = text.indexOf(searchString, start);
+         if (end == -1) {
+             return text;
+         }
+         int replLength = searchString.length();
+         
+         int increase = replaceString.length() - replLength;
+         increase = (increase < 0 ? 0 : increase);
+         increase *= (count < 0 ? 16 : (count > 64 ? 64 : count));
+         StringBuffer buf = new StringBuffer(text.length() + increase);
+         while (end != -1) {
+             buf.append(text.substring(start, end)).append(replaceString);
+             start = end + replLength;
+             if (--count == 0) {
+                 break;
+             }
+             end = text.indexOf(searchString, start);
+         }
+         buf.append(text.substring(start));
+         return buf.toString();
+         
+    }
+    
+    
+    
+   /**
+    * 
+    * <p>将字符串数字转换为简体大写中文格式.</p>
+    * <pre>
+    * StringUtil.convertSimplifiedCase("325") = ”三二五"
+    * </pre>   
+    * @param numberString 数字字符串
+    * @return  返回简体大写后的数字
+    */
+    public static String convertSimplifiedCase(String numberString) {
+    	
+    	StringBuilder simplifiedBuilder = new StringBuilder();
+		
+    	if(isEmpty(numberString)){
+    		return null;
+    	}
+
+		
+		for (int i = 0; i < numberString.length(); i++) {
+			String tempNumberString = String.valueOf(numberString.charAt(i));
+			if ("0123456789".indexOf(tempNumberString) >= 0) {
+				int number = Integer.parseInt(tempNumberString);
+				simplifiedBuilder.append(SIMPLIFIED_CASE[number]);
+			} else {
+				simplifiedBuilder.append(tempNumberString);
+			}
+		}
+		
+		return simplifiedBuilder.toString();
+	}
+    
+    
+   /**
+    * 
+    * <p>把字符串中的数字转换成繁体大写中文的格式.</p>
+    * <pre>
+    * StringUtil.convertTraditionalCase("325") = "叁贰伍"
+    * </pre>   
+    * @param numberString 数字字符串
+    * @return  返回繁体大写后的数字
+    */
+    public static String convertTraditionalCase(String numberString) {
+    	
+    	StringBuilder simplifiedBuilder = new StringBuilder();
+		
+    	if(isEmpty(numberString)){
+    		return null;
+    	}
+    	
+		
+		for (int i = 0; i < numberString.length(); i++) {
+			String tempNumberString = String.valueOf(numberString.charAt(i));
+			if ("0123456789".indexOf(tempNumberString) >= 0) {
+				int number = Integer.parseInt(tempNumberString);
+				simplifiedBuilder.append(TRADITIONAL_CASE[number]);
+			} else {
+				simplifiedBuilder.append(tempNumberString);
+			}
+		}
+		
+		return simplifiedBuilder.toString();
+	}
+    
+  /**
+   * 
+   * <p>创建唯一标识字符串.</p>
+   * <pre>
+   * StringUtil.createUUID() = "00000DAF3CFC4E0B8DF2D5BEACB14D75" 
+   * </pre>   
+   * @return  返回标识符字符串 
+   */
+	public static String createUUID() {
+		String uuid = UUID.randomUUID().toString();
+		uuid = uuid.replace("-", "");
+		return uuid.toUpperCase();
+	}
+
+
+   /**
+	* 
+	* <p>字符串过滤,负责将html的textarea属性获得的字符转换成html格式的字符集.</p>
+	* @param str 要解析的字符串
+	* @return  是解析后的字符串
+	*/
+	public static String htmlFilter(String str) {
+		StringBuffer stringbuffer = new StringBuffer();
+		for (int i = 0; i < str.length(); i++) {
+			char c = str.charAt(i);
+			switch (c) {
+
+			case 39:
+				stringbuffer.append("&#039;");
+				break;
+
+			case 34:
+				stringbuffer.append("&quot;");
+				break;
+
+			case 60:
+				stringbuffer.append("&lt;");
+				break;
+
+			case 62:
+				stringbuffer.append("&gt;");
+				break;
+
+			case 38:
+				stringbuffer.append("&amp;");
+				break;
+
+			case 32:
+				stringbuffer.append("&#32;");
+				break;
+
+			case 10:
+				stringbuffer.append("<br>");
+				break;
+
+			case 8220:
+				stringbuffer.append("&ldquo;");
+				break;
+
+			case 8221:
+				stringbuffer.append("&rdquo;");
+				break;
+
+			default:
+				stringbuffer.append(c);
+				break;
+			}
+		}
+
+		return stringbuffer.toString();
+	}
+
+
+    /**
+     *
+     * @Title: getFromRegEx
+     * @Description: 统一正则抽取字符方法
+     * @param  str
+     * @param  pattern
+     * @param  index
+     * @return String    返回类型
+     * @author （darnell） 2017年8月21日 下午4:25:31
+     */
+    public static String getFromRegEx(String str, String pattern, int index) {
+        String value = "";
+        Pattern p = Pattern.compile(pattern);
+        Matcher matcher = p.matcher(str);
+        while(matcher.find()) {
+            value = matcher.group(index);
+        }
+        return value;
+    }
+
+}
diff --git a/src/main/java/com/nis/galaxy/util/TimeConstants.java b/src/main/java/com/nis/galaxy/util/TimeConstants.java
new file mode 100644
index 0000000..734405c
--- /dev/null
+++ b/src/main/java/com/nis/galaxy/util/TimeConstants.java
@@ -0,0 +1,40 @@
+package com.nis.galaxy.util;
+
+/**
+ * 
+ * <p>日期常量</p>
+ * @author 中电积至有限公司 darnell
+ * @version 1.0 创建时间：2011-07-07 下午11:24:57
+ *
+ */
+public interface TimeConstants {
+	/**
+	 * 处理日期时，用到参数。格式24小时制yyyy-MM-dd HH:mm:ss
+	 */
+	String YYYY_MM_DD_HH24_MM_SS = "yyyy-MM-dd HH:mm:ss";
+	/**
+	 * 处理日期时，用到参数。格式12小时制yyyy-MM-dd hh:mm:ss
+	 */
+	String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd hh:mm:ss";
+	/**
+	 * 处理日期时，用到参数。格式为yyyy-MM-dd
+	 */
+	String YYYY_MM_DD = "yyyy-MM-dd";
+	/**
+	 * 处理日期时，用到参数。格式24小时制yyyy-MM-dd HH:mm
+	 */
+	String YYYY_MM_DD_HH_MM = "yyyy-MM-dd HH:mm";
+	/**
+	 * 处理日期时，用到参数。格式24小时制yyyyMMddHHmmss
+	 */
+	String YYYYMMDDHH24MMSS = "yyyyMMddHHmmss";
+	/**
+	 * 处理日期时，用到参数。格式为yyyyMMdd
+	 */
+	String YYYYMMDD = "yyyyMMdd";
+	/**
+	 * 处理日期时，用到参数。格式为HHmmss
+	 */
+	String HH24MMSS = "HHmmss";
+
+}
diff --git a/src/main/java/com/nis/galaxy/web/controller/UpImage.java b/src/main/java/com/nis/galaxy/web/controller/UpImage.java
index 994c9aa..358cdc0 100644
--- a/src/main/java/com/nis/galaxy/web/controller/UpImage.java
+++ b/src/main/java/com/nis/galaxy/web/controller/UpImage.java
@@ -1,7 +1,6 @@
 package com.nis.galaxy.web.controller;
 
 
-import com.nis.galaxy.util.DateUtils;
 import com.nis.galaxy.util.FileUtil;
 import com.nis.galaxy.web.service.UpService;
 import org.slf4j.Logger;
@@ -15,6 +14,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 
 import java.io.IOException;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -65,7 +65,7 @@ public class UpImage {
         params.put("module", request.getParameter("module").trim());
         params.put("type", request.getParameter("type").trim());
         params.put("url", path);
-        params.put("datetime", DateUtils.getDateTime());
+        params.put("datetime", new Date().toString());
         try {
             upService.upImage(params);
         } catch (Exception e) {
diff --git a/src/main/java/com/nis/galaxy/web/dao/BlockingDao.java b/src/main/java/com/nis/galaxy/web/dao/BlockingDao.java
index b6fedf0..a8f9df7 100644
--- a/src/main/java/com/nis/galaxy/web/dao/BlockingDao.java
+++ b/src/main/java/com/nis/galaxy/web/dao/BlockingDao.java
@@ -10,32 +10,32 @@ import java.util.List;
 
 @Mapper
 public interface BlockingDao {
-    List<NtcTotalReport> getAllBlockInformation(@Param("push") String push,@Param("start") String start, @Param("end") String end);
+    List<NtcTotalReport> getAllBlockInformation(@Param("push") Date push,@Param("start") Date start, @Param("end") Date end);
 
-    List<NtcEntranceReport> getDNSDeceiveInformationOnly(@Param("push") String push,@Param("start") String start, @Param("end") String end);
+    List<NtcEntranceReport> getDNSDeceiveInformationOnly(@Param("push") Date push,@Param("start") Date start, @Param("end") Date end);
 
-    List<CfgTypeCount> getAllCfgInfoOnly();
+    List<CfgTypeCount> getBlockingGlobalProtocolConfig();
 
-    List<TimeTypeCount> get24hAllBlockEachProtocolOnly(@Param("push") String push,@Param("start") String start, @Param("end") String end);
+    List<TimeTypeCount> get24hAllBlockEachProtocolOnly(@Param("push") Date push,@Param("start") Date start, @Param("end") Date end);
 
-    List<HotStatistic> getAllHotStatistisOnly(@Param("push") String push,@Param("start") String start, @Param("end") String end);
+    List<HotStatistic> getBlocking24HourThermodynamic(@Param("push") Date push,@Param("start") Date start, @Param("end") Date end);
 
     List<PointMap> getPointMapOf10sOnly();
 
-    List<NtcDisReport> getDisBlockInformationOnly(@Param("push") String push,@Param("start") String start, @Param("end") String end);
+    List<BlockingArea> getBlockingArea(@Param("push") Date push, @Param("start") Date start, @Param("end") Date end);
 
-    List<AreaCount> getDisBlockMapOnly(@Param("push") String push,@Param("start") String start, @Param("end") String end);
+    List<AreaCount> getDisBlockMapOnly(@Param("push") Date push,@Param("start") Date start, @Param("end") Date end);
 
-    Date getAllBlockInformationLastTime(@Param("end") String end);
+    Date getAllBlockInformationLastTime(@Param("end") Date end);
 
-    Date getDisBlockInformationLastTime(@Param("end") String end);
+    Date getBlockingAreaLastTime(@Param("end") Date end);
 
-    Date getDNSDeceiveInformationLastTime(@Param("end") String end);
+    Date getDNSDeceiveInformationLastTime(@Param("end") Date end);
 
-    Date get24hAllBlockEachProtocolOLastTime(@Param("end") String end);
+    Date get24hAllBlockEachProtocolOLastTime(@Param("end") Date end);
 
-    Date getAllHotStatistisLastTime(@Param("end") String end);
+    Date getBlocking24HourThermodynamicLastTime(@Param("end") Date end);
 
-    Date getDisBlockMapLastTime(@Param("end") String end);
+    Date getDisBlockMapLastTime(@Param("end") Date end);
 
 }
diff --git a/src/main/java/com/nis/galaxy/web/dao/BlockingTopNDao.java b/src/main/java/com/nis/galaxy/web/dao/BlockingTopNDao.java
index 7289d4d..a510c06 100644
--- a/src/main/java/com/nis/galaxy/web/dao/BlockingTopNDao.java
+++ b/src/main/java/com/nis/galaxy/web/dao/BlockingTopNDao.java
@@ -9,27 +9,27 @@ import java.util.List;
 
 @Mapper
 public interface BlockingTopNDao {
-    List<NtcRejectUrlStatistic> getBlockTop10URLOf1h(@Param("push") String push,@Param("start") String start, @Param("end") String end);
+    List<NtcRejectUrlStatistic> getBlockTop10URLOf1h(@Param("push") Date push,@Param("start") Date start, @Param("end") Date end);
 
-    List<NtcRejectWebsiteStatistic> getBlockTop10WebsiteOf1h(@Param("push") String push,@Param("start") String start, @Param("end") String end);
+    List<NtcRejectWebsiteStatistic> getBlockTop10WebsiteOf1h(@Param("push") Date push,@Param("start") Date start, @Param("end") Date end);
 
-    List<NtcUrlIpCount> getBlockTop10URLOf5m(@Param("push") String push,@Param("start") String start, @Param("end") String end);
+    List<NtcUrlIpCount> getBlockTop10URLOf5m(@Param("push") Date push,@Param("start") Date start, @Param("end") Date end);
 
-    List<NtcWebIpCount> getBlockTop10WebsiteOf5m(@Param("push") String push,@Param("start") String start, @Param("end") String end);
+    List<NtcWebIpCount> getBlockTop10WebsiteOf5m(@Param("push") Date push,@Param("start") Date start, @Param("end") Date end);
 
-    List<AreaBlockProtocol> getAreaBlockTop10ProtocolOf24hOnly(@Param("push") String push,@Param("start") String start, @Param("end") String end);
+    List<AreaBlockProtocol> getAreaBlockTop10ProtocolOf24hOnly(@Param("push") Date push,@Param("start") Date start, @Param("end") Date end);
 
-    List<NtcTagReport> getBlockTop10Tag5mOnly(@Param("push") String push,@Param("start") String start, @Param("end") String end);
+    List<NtcTagReport> getBlockTop10Tag5mOnly(@Param("push") Date push,@Param("start") Date start, @Param("end") Date end);
 
-    Date getAreaBlockTop10ProtocolOf24hLastTime(@Param("end") String end);
+    Date getAreaBlockTop10ProtocolOf24hLastTime(@Param("end") Date end);
 
-    Date getBlockTop10URLOf1hLastTime(@Param("end") String end);
+    Date getBlockTop10URLOf1hLastTime(@Param("end") Date end);
 
-    Date getBlockTop10WebsiteOf1hLastTime(@Param("end") String end);
+    Date getBlockTop10WebsiteOf1hLastTime(@Param("end") Date end);
 
-    Date getBlockTop10URLOf5mLastTime(@Param("end") String end);
+    Date getBlockTop10URLOf5mLastTime(@Param("end") Date end);
 
-    Date getBlockTop10WebsiteOf5mLastTime(@Param("end") String end);
+    Date getBlockTop10WebsiteOf5mLastTime(@Param("end") Date end);
 
-    Date getBlockTop10Tag5mOnlyLastTime(@Param("end") String end);
+    Date getBlockTop10Tag5mOnlyLastTime(@Param("end") Date end);
 }
diff --git a/src/main/java/com/nis/galaxy/web/dao/EventsDao.java b/src/main/java/com/nis/galaxy/web/dao/EventsDao.java
index 7559da9..40c0794 100644
--- a/src/main/java/com/nis/galaxy/web/dao/EventsDao.java
+++ b/src/main/java/com/nis/galaxy/web/dao/EventsDao.java
@@ -9,59 +9,57 @@ import java.util.List;
 
 @Mapper
 public interface EventsDao {
-    List<SystemTotal> getSystemTotalOf1Day(@Param("push") String push, @Param("start") String start, @Param("end") String end);
+    List<SystemTotal> getSystemTotal(@Param("start") Date start, @Param("end") Date end);
 
-    Date getSystemTotalOf1DayLastTime(@Param("end") String end);
+    Date getSystemTotalLastTime(@Param("end") Date end);
 
-    List<EventsAppMonitor> getSpecifiedAPPMonitor(@Param("push") String push, @Param("start") String start, @Param("end") String end);
+    List<EventsAppMonitor> getSpecifiedAPPMonitor(@Param("push") Date push, @Param("start") Date start, @Param("end") Date end);
 
-    Date getSpecifiedAPPMonitorLastTime(@Param("end") String end);
+    Date getSpecifiedAPPMonitorLastTime(@Param("end") Date end);
 
     List<EventsLetterCount> getLetterCount();
 
-    List<EventsServiceCount> getServiceCount(@Param("push") String push, @Param("start") String start, @Param("end") String end);
+    List<EventsServiceCount> getServiceCount(@Param("push") Date push, @Param("start") Date start, @Param("end") Date end);
 
-    Date getServiceCountLastTime(@Param("end") String end);
+    Date getServiceCountLastTime(@Param("end") Date end);
 
-    List<EventsKeyPointSafaguardThing> getKeyPointSafaguardThing(@Param("start") String start);
+    List<EventsKeyProtection> getEventsKeyProtection(@Param("start") Date start);
 
-    List<EventsSpecificWebsites> getSpecificWebsites(@Param("end") String end);
+    List<EventsSpecificWebsites> getSpecificWebsites(@Param("push") Date push);
 
-    List<EventsSpecificWebsites> getFocusWebsite(@Param("start") String start, @Param("end") String end);
+    List<EventsAudioMonitor> getEventsAudioMonitor(@Param("push") Date push, @Param("start") Date start, @Param("end") Date end);
 
-    List<EventsAudioMonitor> getEventsAudioMonitor(@Param("push") String push, @Param("start") String start, @Param("end") String end);
+    Date getEventsAudioMonitorLastTime(@Param("end") Date end);
 
-    Date getEventsAudioMonitorLastTime(@Param("end") String end);
+    List<EventsVedioMonitor> getVedioMonitor(@Param("push") Date push, @Param("start") Date start, @Param("end") Date end);
 
-    List<EventsVedioMonitor> getVedioMonitor(@Param("push") String push, @Param("start") String start, @Param("end") String end);
+    Date getVedioMonitorLastTime(@Param("end") Date end);
 
-    Date getVedioMonitorLastTime(@Param("end") String end);
+    List<EventsImageMonitor> getImageMonitor(@Param("push") Date push, @Param("start") Date start, @Param("end") Date end);
 
-    List<EventsImageMonitor> getImageMonitor(@Param("push") String push, @Param("start") String start, @Param("end") String end);
+    Date getImageMonitorLastTime(@Param("end") Date end);
 
-    Date getImageMonitorLastTime(@Param("end") String end);
+    Date getVoipMonitorLastTime(@Param("end") Date end);
 
-    Date getVoipMonitorLastTime(@Param("end") String end);
+    List<EventsVoipMonitor> getVoipMonitor(@Param("push") Date push, @Param("start") Date start, @Param("end") Date end);
 
-    List<EventsVoipMonitor> getVoipMonitor(@Param("push") String push, @Param("start") String start, @Param("end") String end);
+    List<EventsRunningState> getRunningState(@Param("push") Date push, @Param("start") Date start, @Param("end") Date end);
 
-    List<EventsRunningState> getRunningState(@Param("push") String push, @Param("start") String start, @Param("end") String end);
-
-    Date getRunningStateLastTime(@Param("end") String end);
+    Date getRunningStateLastTime(@Param("end") Date end);
 
     List<EventsMonitor> getEventsMonitor();
 
     List<EventsBlock> getEventsBlock();
 
-    List<EvevtsTargetNetwork> getTargetNetwork(@Param("push") String push, @Param("start") String start, @Param("end") String end);
+    List<EvevtsTargetNetwork> getTargetNetwork(@Param("push") Date push, @Param("start") Date start, @Param("end") Date end);
 
-    Date getTargetNetworkLastTime(@Param("end") String end);
+    Date getTargetNetworkLastTime(@Param("end") Date end);
 
-    List<EventsNameNumTime> getHttpsMonitor(@Param("push") String push, @Param("start") Date start, @Param("end") Date end, @Param("serviceId") int serviceId);
+    List<EventsNameNumTime> getHttpsMonitor(@Param("push") Date push, @Param("start") Date start, @Param("end") Date end, @Param("serviceId") int serviceId);
 
     Date getHttpsMonitorLastTime(@Param("end") Date end, @Param("serviceId") int serviceId);
 
-    List<EventsPortInfo> getPortInfo(@Param("push") String push, @Param("start") Date start, @Param("end") Date end);
+    List<EventsPortInfo> getPortInfo(@Param("push") Date push, @Param("start") Date start, @Param("end") Date end);
 
     Date getPortInfoLastTime(@Param("end") Date end);
 }
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..6242d1f 100644
--- a/src/main/java/com/nis/galaxy/web/dao/MonitorDao.java
+++ b/src/main/java/com/nis/galaxy/web/dao/MonitorDao.java
@@ -15,9 +15,9 @@ 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") Date push,@Param("start") Date start, @Param("end") Date end);
 
-    Date getNetWaterMonitorLastTime(@Param("end") String end);
+    Date getNetWaterMonitorLastTime(@Param("end") Date end);
 
-    List<NmsServerBean> getSystemMonitor();
+    List<NmsServerBean> getSystemMonitoringGlobalGis();
 }
diff --git a/src/main/java/com/nis/galaxy/web/dao/NetflowDao.java b/src/main/java/com/nis/galaxy/web/dao/NetflowDao.java
index 7537d73..1b248f8 100644
--- a/src/main/java/com/nis/galaxy/web/dao/NetflowDao.java
+++ b/src/main/java/com/nis/galaxy/web/dao/NetflowDao.java
@@ -11,25 +11,25 @@ import java.util.Map;
 
 @Mapper
 public interface NetflowDao {
-    List<IpActiveInfo> getIpActiveInfoOf5minOnly(@Param("push") String push,@Param("start") String start, @Param("end") String end);
+    List<IpActiveInfo> getIpActiveInfoOf5minOnly(@Param("push") Date push,@Param("start") Date start, @Param("end") Date end);
 
-    List<NetflowProtocol> getProtocolStatisticOf1hOnly(@Param("push") String push,@Param("start") String start, @Param("end") String end);
+    List<NetflowProtocol> getNetflow1HourProtocol(@Param("push") Date push,@Param("start") Date start, @Param("end") Date end);
 
-    List<TimeTypeCount> getNetflowStatistic5mOnly(@Param("push") String push,@Param("start") String start, @Param("end") String end);
+    List<TimeTypeCount> getNetflowStatistic5mOnly(@Param("push") Date push,@Param("start") Date start, @Param("end") Date end);
 
-    Date getNetflowStatistic5mLastTime(@Param("end") String end);
+    Date getNetflowStatistic5mLastTime(@Param("end") Date end);
 
-    Date getProtocolStatisticOf1hLastTime(@Param("end") String end);
+    Date getNetflow1HourProtocolLastTime(@Param("end") Date end);
 
-    Date getIpActiveInfoOf5minLastTime(@Param("end") String end);
+    Date getIpActiveInfoOf5minLastTime(@Param("end") Date end);
 
-    List<AreaBPSTime> getAreaNetflowOf5min(@Param("push") String push,@Param("start") String start, @Param("end") String end);
+    List<AreaBPSTime> getAreaNetflowOf5min(@Param("push") Date push,@Param("start") Date start, @Param("end") Date end);
 
-    Date getAreaNetflowOf5minLastTime(@Param("end") String end);
+    Date getAreaNetflowOf5minLastTime(@Param("end") Date end);
 
-    Date getPortNetflowOf5minLastTime(@Param("end") String end);
+    Date getPortNetflowOf5minLastTime(@Param("end") Date end);
 
-    List<PortBPSTime> getPortNetflowOf5min(@Param("push") String push,@Param("start") String start, @Param("end") String end);
+    List<PortBPSTime> getPortNetflowOf5min(@Param("push") Date push,@Param("start") Date start, @Param("end") Date end);
 
     List<NetflowMonitor> getNetflowMonitor(@Param("type") String type, @Param("ip") String ipPort,@Param("serverPort") int serverPort);
 }
diff --git a/src/main/java/com/nis/galaxy/web/dao/NetflowTopNDao.java b/src/main/java/com/nis/galaxy/web/dao/NetflowTopNDao.java
index e16369a..887ab89 100644
--- a/src/main/java/com/nis/galaxy/web/dao/NetflowTopNDao.java
+++ b/src/main/java/com/nis/galaxy/web/dao/NetflowTopNDao.java
@@ -15,13 +15,13 @@ import java.util.Map;
 @Mapper
 public interface NetflowTopNDao {
 
-    List<IpActiveInt> getNetflow5minIpActiveWaterflow(@Param("push") String push, @Param("start") Date start, @Param("end") Date end);
+    List<IpActiveInt> getNetflow5minIpActiveWaterflow(@Param("push") Date push, @Param("start") Date start, @Param("end") Date end);
 
     Date getNetflow5minIpActiveWaterflowLastTime(@Param("end") Date end);
 
-    List<NetFlowWaterPush> getNetFlowWaterTop10(@Param("push") String push, @Param("start") String start, @Param("end") String end);
+    List<NetFlowWaterPush> getNetflowNHourWaterflowTop10(@Param("push") Date push, @Param("start") Date start, @Param("end") Date end);
 
-    Date getNetFlowWaterTop10LastTime(@Param("end") String end);
+    Date getNetflowNHourWaterflowTop10LastTime(@Param("end") Date end);
 
     List<Entrance> getIpEntranceRe();
 
diff --git a/src/main/java/com/nis/galaxy/web/service/BlockingService.java b/src/main/java/com/nis/galaxy/web/service/BlockingService.java
index afc5bfe..4d2c72d 100644
--- a/src/main/java/com/nis/galaxy/web/service/BlockingService.java
+++ b/src/main/java/com/nis/galaxy/web/service/BlockingService.java
@@ -1,32 +1,51 @@
 package com.nis.galaxy.web.service;
 
 import com.nis.galaxy.domain.*;
+
+import java.util.Date;
 import java.util.List;
+
 public interface BlockingService {
     /**
      * 封堵信息整体显示
+     *
      * @return
      */
-    List getAllBlockInformation();
+    List getAllBlockInformation(Date start, Date end, String logMark);
 
-    List<NtcEntranceReport> getDNSDeceiveInformation(String start, String end);
+    List<NtcEntranceReport> getDNSDeceiveInformation(Date start, Date end, String logMark);
 
     /**
      * 24小时内全国范围阻断协议信息
+     *
      * @param start
      * @param end
      * @param AllBlockEachProtocolExpTimes 异常次数
      * @return
      */
-    List<TimeTypeCount> get24hAllBlockEachProtocol(String start, String end,int AllBlockEachProtocolExpTimes);
+    List<TimeTypeCount> get24hAllBlockEachProtocol(Date start, Date end, int AllBlockEachProtocolExpTimes, String logMark);
 
-    List<NtcDisReport> getDisBlockInformation(String start, String end);
+    List<BlockingArea> getBlockingArea(Date start, Date end, String logMark);
 
-    List<HotStatistic> getAllHotStatistis(String start, String end);
+    /**
+     * 24小时内全国热力图
+     *
+     * @param start
+     * @param end
+     * @param logMark
+     * @return
+     */
+    List<HotStatistic> getBlocking24HourThermodynamic(Date start, Date end, String logMark);
 
-    List<PointMap> getPointMapOf10s();
+    List<PointMap> getPointMapOf10s(String logMark);
 
-    List<AreaCount> getDisBlockMap(String start, String end);
+    List<AreaCount> getDisBlockMap(Date start, Date end, String logMark);
 
-    List<CfgTypeCount> getAllCfgInfo();
+    /**
+     * 全国协议配置信息
+     *
+     * @param logMark
+     * @return
+     */
+    List<CfgTypeCount> getBlockingGlobalProtocolConfig(String logMark);
 }
diff --git a/src/main/java/com/nis/galaxy/web/service/BlockingTopNService.java b/src/main/java/com/nis/galaxy/web/service/BlockingTopNService.java
index 6f5797a..e6ad09e 100644
--- a/src/main/java/com/nis/galaxy/web/service/BlockingTopNService.java
+++ b/src/main/java/com/nis/galaxy/web/service/BlockingTopNService.java
@@ -1,18 +1,20 @@
 package com.nis.galaxy.web.service;
 
 import com.nis.galaxy.domain.*;
+
+import java.util.Date;
 import java.util.List;
 
 public interface BlockingTopNService {
-    List<NtcRejectUrlStatistic> getBlockTop10URLOf1h(String start, String end);
+    List<NtcRejectUrlStatistic> getBlockTop10URLOf1h(Date start, Date end,String logMark);
 
-    List<NtcRejectWebsiteStatistic> getBlockTop10WebsiteOf1h(String start, String end);
+    List<NtcRejectWebsiteStatistic> getBlockTop10WebsiteOf1h(Date start, Date end,String logMark);
 
-    List<AreaBlockProtocol> getAreaBlockTop10ProtocolOf24(String start, String end);
+    List<AreaBlockProtocol> getAreaBlockTop10ProtocolOf24(Date start, Date end,String logMark);
 
-    List<NtcUrlIpCount> getBlockTop10URLOf5m(String start, String end);
+    List<NtcUrlIpCount> getBlockTop10URLOf5m(Date start, Date end,String logMark);
 
-    List<NtcWebIpCount> getBlockTop10WebsiteOf5m(String start, String end);
+    List<NtcWebIpCount> getBlockTop10WebsiteOf5m(Date start, Date end,String logMark);
 
-    List<NtcTagReport> getBlockTop100Tag1h(String start, String end);
+    List<NtcTagReport> getBlockTop100Tag1h(Date start, Date end,String logMark);
 }
diff --git a/src/main/java/com/nis/galaxy/web/service/EventsService.java b/src/main/java/com/nis/galaxy/web/service/EventsService.java
index e2f2957..15c2e89 100644
--- a/src/main/java/com/nis/galaxy/web/service/EventsService.java
+++ b/src/main/java/com/nis/galaxy/web/service/EventsService.java
@@ -2,55 +2,63 @@ package com.nis.galaxy.web.service;
 
 import com.nis.galaxy.domain.*;
 
+import java.util.Date;
 import java.util.List;
 
 public interface EventsService {
+
     /**
      * 系统总计
      *
      * @param start
      * @param end
+     * @param logMark
      * @return
      */
-    List<SystemTotal> getSystemTotalOf1Day(String start, String end);
+    List<SystemTotal> getSystemTotal(Date start, Date end, String logMark);
 
     /**
      * 特定APP访问监控
      *
      * @param start
      * @param end
+     * @param logMark
      * @return
      */
-    List<EventsAppMonitor> getSpecifiedAPPMonitor(String start, String end);
+    List<EventsAppMonitor> getSpecifiedAPPMonitor(Date start, Date end, String logMark);
 
     /**
      * 来函统计报表
      *
      * @return
      */
-    List<EventsLetterCount> getLetterCount();
+    List<EventsLetterCount> getLetterCount(String logMark);
 
     /**
      * 业务类型统计报表
      *
+     * @param start
+     * @param end
+     * @param logMark
      * @return
      */
-    List<EventsServiceCount> getServiceCount(String start, String end);
+    List<EventsServiceCount> getServiceCount(Date start, Date end, String logMark);
 
     /**
      * 重点保障事件总览
      *
      * @param start
+     * @param logMark
      * @return
      */
-    List<EventsKeyPointSafaguardThing> getKeyPointSafaguardThing(String start);
+    List<EventsKeyProtection> getEventsKeyProtection(Date start,String logMark);
 
     /**
      * 特定网站监控
      *
      * @return
      */
-    List<EventsSpecificWebsites> getSpecificWebsites(String end);
+    List<EventsSpecificWebsites> getSpecificWebsites(Date push,String logMark);
 
 
 
@@ -60,18 +68,18 @@ public interface EventsService {
     /**
      * 事件监测
      *
-     * @param end
+     * @param logMark
      * @return
      */
-    List<EventsMonitor> getEventsMonitor(String end);
+    List<EventsMonitor> getEventsMonitor(String logMark);
 
     /**
      * 事件封堵
      *
-     * @param end
+     * @param logMark
      * @return
      */
-    List<EventsBlock> getEventsBlock(String end);
+    List<EventsBlock> getEventsBlock(String logMark);
 
     /**
      * 音频监控
@@ -80,7 +88,7 @@ public interface EventsService {
      * @param end
      * @return
      */
-    List<EventsAudioMonitor> getEventsAudioMonitor(String start, String end);
+    List<EventsAudioMonitor> getEventsAudioMonitor(Date start, Date end,String logMark);
 
     /**
      * 视频监控
@@ -89,7 +97,7 @@ public interface EventsService {
      * @param end
      * @return
      */
-    List<EventsVedioMonitor> getVedioMonitor(String start, String end);
+    List<EventsVedioMonitor> getVedioMonitor(Date start, Date end,String logMark);
 
     /**
      * 图片监控
@@ -98,7 +106,7 @@ public interface EventsService {
      * @param end
      * @return
      */
-    List<EventsImageMonitor> getImageMonitor(String start, String end);
+    List<EventsImageMonitor> getImageMonitor(Date start, Date end,String logMark);
 
     /**
      * VOIP监控
@@ -107,7 +115,7 @@ public interface EventsService {
      * @param end
      * @return
      */
-    List<EventsVoipMonitor> getVoipMonitor(String start, String end);
+    List<EventsVoipMonitor> getVoipMonitor(Date start, Date end,String logMark);
 
     /**
      * 网络行为预警
@@ -116,7 +124,7 @@ public interface EventsService {
      * @param end
      * @return
      */
-    List<EventsDdosAlarm> getDdosAlarm(String start, String end);
+    List<EventsDdosAlarm> getDdosAlarm(Date start, Date end,String logMark);
 
     /**
      * 目标行为网络监测
@@ -125,15 +133,15 @@ public interface EventsService {
      * @param end
      * @return
      */
-    List<EvevtsTargetNetwork> getTargetNetwork(String start, String end);
+    List<EvevtsTargetNetwork> getTargetNetwork(Date start, Date end,String logMark);
 
     /**
      * 部署设备数量
      *
-     * @param end
+     * @param push
      * @return
      */
-    List<EventsDeviceNum> getDeviceNum(String end);
+    List<EventsDeviceNum> getDeviceNum(Date push,String logMark);
 
     /**
      * 运行状态
@@ -142,7 +150,7 @@ public interface EventsService {
      * @param end
      * @return
      */
-    List<EventsRunningState> getRunningState(String start, String end);
+    List<EventsRunningState> getRunningState(Date start, Date end,String logMark);
 
     /**
      * HTTPS监控TOP10、IP监控TOP10、APP阻断TOP10、HTTP阻断TOP10、IP阻断TOP10
@@ -152,7 +160,7 @@ public interface EventsService {
      * @param type
      * @return
      */
-    List<EventsNameNumTime> getTypeMonitorReject(String start, String end, String type);
+    List<EventsNameNumTime> getTypeMonitorReject(Date start, Date end, String type);
 
     /**
      * 端口信息
@@ -161,5 +169,5 @@ public interface EventsService {
      * @param end
      * @return
      */
-    List<EventsPortInfo> getPortInfo(String start, String end);
+    List<EventsPortInfo> getPortInfo(Date start, Date end,String logMark);
 }
diff --git a/src/main/java/com/nis/galaxy/web/service/MonitorService.java b/src/main/java/com/nis/galaxy/web/service/MonitorService.java
index d103908..59668f7 100644
--- a/src/main/java/com/nis/galaxy/web/service/MonitorService.java
+++ b/src/main/java/com/nis/galaxy/web/service/MonitorService.java
@@ -2,6 +2,8 @@ package com.nis.galaxy.web.service;
 
 import com.nis.galaxy.domain.NetWaterMonitor;
 import com.nis.galaxy.domain.NmsServerBean;
+
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -10,15 +12,22 @@ import java.util.List;
  */
 public interface MonitorService {
 
-    List<NmsServerBean> getMonitorOf1m();
+    /**
+     * 系统监控
+     *
+     * @param logMark
+     * @return
+     */
+    List<NmsServerBean> getSystemMonitoringGlobalGis(String logMark);
 
     /**
      * 网络流量监控
+     *
      * @param start
      * @param end
      * @param areaNetWaterMonitorExpTimes
      * @return
      */
-    List<NetWaterMonitor> getNetWaterMonitor(String start, String end,int areaNetWaterMonitorExpTimes);
+    List<NetWaterMonitor> getNetWaterMonitor(Date start, Date end, int areaNetWaterMonitorExpTimes, String logMark);
 
 }
diff --git a/src/main/java/com/nis/galaxy/web/service/NetflowService.java b/src/main/java/com/nis/galaxy/web/service/NetflowService.java
index 588c58b..afd43c8 100644
--- a/src/main/java/com/nis/galaxy/web/service/NetflowService.java
+++ b/src/main/java/com/nis/galaxy/web/service/NetflowService.java
@@ -1,14 +1,24 @@
 package com.nis.galaxy.web.service;
 
 import com.nis.galaxy.domain.*;
+
+import java.util.Date;
 import java.util.List;
 
 public interface NetflowService {
-    List<TimeTypeCount> getNetflowStatistic5m(String start, String end);
+    List<TimeTypeCount> getNetflowStatistic5m(Date start, Date end,String logMark);
 
-    List<NetflowProtocol> getProtocolStatisticOf1h(String start, String end);
+    /**
+     * 1小时内网络协议统计
+     *
+     * @param start
+     * @param end
+     * @param logMark
+     * @return
+     */
+    List<NetflowProtocol> getNetflow1HourProtocol(Date start, Date end,String logMark);
 
-    List<IpActiveInfo> getIpActiveInfoOf5min(String start, String end);
+    List<IpActiveInfo> getIpActiveInfoOf5min(Date start, Date end,String logMark);
 
     /**
      * 地域流量
@@ -17,7 +27,7 @@ public interface NetflowService {
      * @param end
      * @return
      */
-    List<AreaBPSTime> getAreaNetflowOf5min(String start, String end,int areaNetqueryExpTimes);
+    List<AreaBPSTime> getAreaNetflowOf5min(Date start, Date end,int areaNetqueryExpTimes,String logMark);
 
     /**
      * 端口流量
@@ -26,29 +36,29 @@ public interface NetflowService {
      * @param end
      * @return
      */
-    List<PortBPSTime> getPortNetflowOf5min(String start, String end,int portNetqueryExpTimes);
+    List<PortBPSTime> getPortNetflowOf5min(Date start, Date end,int portNetqueryExpTimes,String logMark);
 
     /**
      * 文本
      * @return
      */
-    List<NetflowMonitor> getNetflowMonitorTxt();
+    List<NetflowMonitor> getNetflowMonitorTxt(String logMark);
 
     /**
      * 音视频
      * @return
      */
-    List<NetflowMonitor> getNetflowMonitorVideo();
+    List<NetflowMonitor> getNetflowMonitorVideo(String logMark);
 
     /**
      * APP
      * @return
      */
-    List<NetflowMonitor> getNetflowMonitorApp();
+    List<NetflowMonitor> getNetflowMonitorApp(String logMark);
 
     /**
      * 加密类型
      * @return
      */
-    List<NetflowMonitor> getNetflowMonitorEncrypt();
+    List<NetflowMonitor> getNetflowMonitorEncrypt(String logMark);
 }
diff --git a/src/main/java/com/nis/galaxy/web/service/NetflowTopNService.java b/src/main/java/com/nis/galaxy/web/service/NetflowTopNService.java
index f181b72..8f8e193 100644
--- a/src/main/java/com/nis/galaxy/web/service/NetflowTopNService.java
+++ b/src/main/java/com/nis/galaxy/web/service/NetflowTopNService.java
@@ -4,6 +4,7 @@ import com.nis.galaxy.domain.IpActiveInt;
 import com.nis.galaxy.domain.NetFlowWater;
 import com.nis.galaxy.domain.NetFlowWaterPush;
 
+import java.util.Date;
 import java.util.List;
 
 public interface NetflowTopNService {
@@ -15,7 +16,7 @@ public interface NetflowTopNService {
      * @param end
      * @return
      */
-    List<IpActiveInt> getNetflow5minIpActiveWaterflow(String start, String end);
+    List<IpActiveInt> getNetflow5minIpActiveWaterflow(Date start, Date end,String logMark);
 
     /**
      * 互联网流量TOP10
@@ -25,7 +26,7 @@ public interface NetflowTopNService {
      * @param range
      * @return
      */
-    List<NetFlowWaterPush> getNetFlowWaterTop10(String start, String end, int range);
+    List<NetFlowWaterPush> getNetflowNHourWaterflowTop10(Date start, Date end, int range,String logMark);
 
     /**
      * 1小时互联网流量TOP10
@@ -33,5 +34,5 @@ public interface NetflowTopNService {
      * @param end
      * @return
      */
-    List<NetFlowWaterPush> getNetflow1HourWaterflowTop10(String end);
+    List<NetFlowWaterPush> getNetflow1HourWaterflowTop10(Date end,String logMark);
 }
diff --git a/src/main/java/com/nis/galaxy/web/service/impl/BlockingServiceImp.java b/src/main/java/com/nis/galaxy/web/service/impl/BlockingServiceImp.java
index b76fd49..b04b471 100644
--- a/src/main/java/com/nis/galaxy/web/service/impl/BlockingServiceImp.java
+++ b/src/main/java/com/nis/galaxy/web/service/impl/BlockingServiceImp.java
@@ -5,7 +5,7 @@ import com.nis.galaxy.domain.*;
 import com.nis.galaxy.domain.dict.NtcServiceDict;
 import com.nis.galaxy.domain.dict.AreaDictInfo;
 import com.nis.galaxy.util.ConfigUtil;
-import com.nis.galaxy.util.DateUtils;
+import com.nis.galaxy.util.DateUtil;
 import com.nis.galaxy.util.ListUtils;
 import com.nis.galaxy.web.dao.BlockingDao;
 import com.nis.galaxy.web.service.BlockingService;
@@ -55,15 +55,13 @@ public class BlockingServiceImp implements BlockingService {
      * @return
      */
     @Override
-    public List getAllBlockInformation() {
-        String end = DateUtils.getRangeOf5min(DateUtils.getDateTime());
-        String start = DateUtils.getBeforeNminOfTime(end, -5);
+    public List getAllBlockInformation(Date start, Date end, String logMark) {
         List<NtcTotalReport> list = new ArrayList<>();
         long timeMillisStart = System.currentTimeMillis();
         try {
             list = blockingDao.getAllBlockInformation(start, start, end);
         } catch (Exception e) {
-            logger.error("封堵信息整体显示\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
         if (ConfigUtil.actualData) {
             if (!ListUtils.isEmptyList(list) && list.size() == 1) {
@@ -74,24 +72,24 @@ public class BlockingServiceImp implements BlockingService {
                 }
             }
             if (ListUtils.isEmptyList(list)) {
-                logger.warn("封堵信息整体显示\tNTC_TOTAL_REPORT\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
+                logger.warn("{}\tNTC_TOTAL_REPORT\t{}至{}\t期间无数据\t查询最近数据", logMark, start, end);
                 try {
-                    Date lastTime = blockingDao.getAllBlockInformationLastTime(end);
-                    if (lastTime != null) {
-                        String time = DateUtils.formatDateTime(lastTime);
-                        time = DateUtils.getRangeOf5min(time);
-                        list = blockingDao.getAllBlockInformation(start, time, DateUtils.getAfter5min(time));
+                    Date startLastTime = blockingDao.getAllBlockInformationLastTime(end);
+                    if (startLastTime != null) {
+                        startLastTime = DateUtil.getFormatMinute(startLastTime);
+                        Date endLastTime = DateUtil.getSomeMinute(startLastTime, 5);
+                        list = blockingDao.getAllBlockInformation(start, startLastTime, endLastTime);
                     } else {
-                        logger.warn("封堵信息整体显示\tNTC_TOTAL_REPORT\t无数据");
+                        logger.warn(logMark + "\tNTC_TOTAL_REPORT\t无数据");
                     }
                 } catch (Exception e) {
-                    logger.error("封堵信息整体显示\t最近数据\t查询异常\tserviceImpl", e);
+                    logger.error(logMark + "\t最近数据\t查询异常\tserviceImpl", e);
                 }
             }
         }
-        logger.info("封堵信息整体显示耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("封堵信息整体显示------->测试数据");
+            logger.info(logMark + "------->测试数据");
             int testInt = (int) (Math.random() * 100);
             long testLong = (long) (Math.random() * 1000);
             list.add(new NtcTotalReport(start, testLong, testLong + 46, testInt * 10000 + testInt, testInt * 500, testInt * 1100 + testInt, testLong + 300, testLong + 10, testLong, testLong));
@@ -106,7 +104,7 @@ public class BlockingServiceImp implements BlockingService {
      * @return
      */
     @Override
-    public List<NtcEntranceReport> getDNSDeceiveInformation(String start, String end) {
+    public List<NtcEntranceReport> getDNSDeceiveInformation(Date start, Date end, String logMark) {
         //地域表
         Map<String, AreaDictInfo> listArea = listAreaDictInfo();
         List<NtcEntranceReport> list = new ArrayList<>();
@@ -114,7 +112,7 @@ public class BlockingServiceImp implements BlockingService {
         try {
             list = blockingDao.getDNSDeceiveInformationOnly(start, start, end);
         } catch (Exception e) {
-            logger.error("DNS欺骗信息显示\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
         if (ConfigUtil.actualData) {
             if (!ListUtils.isEmptyList(list)) {
@@ -127,18 +125,18 @@ public class BlockingServiceImp implements BlockingService {
                 }
             }
             if (ListUtils.isEmptyList(list)) {
-                logger.warn("DNS欺骗信息显示\tNTC_ENTRANCE_REPORT\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
+                logger.warn("{}\tNTC_ENTRANCE_REPORT\t{}至{}\t期间无数据\t查询最近数据", logMark, start, end);
                 try {
-                    Date lastTime = blockingDao.getDNSDeceiveInformationLastTime(end);
-                    if (lastTime != null) {
-                        String time = DateUtils.formatDateTime(lastTime);
-                        time = DateUtils.getRangeOf5min(time);
-                        list = blockingDao.getDNSDeceiveInformationOnly(start, time, DateUtils.getAfter5min(time));
+                    Date startLastTime = blockingDao.getDNSDeceiveInformationLastTime(end);
+                    if (startLastTime != null) {
+                        startLastTime = DateUtil.getFormatMinute(startLastTime);
+                        Date endLastTime = DateUtil.getSomeMinute(startLastTime, 5);
+                        list = blockingDao.getDNSDeceiveInformationOnly(start, startLastTime, endLastTime);
                     } else {
-                        logger.warn("DNS欺骗信息显示\tNTC_ENTRANCE_REPORT\t无数据");
+                        logger.warn(logMark + "\tNTC_ENTRANCE_REPORT\t无数据");
                     }
                 } catch (Exception e) {
-                    logger.error("DNS欺骗信息显示\t最近数据\t查询异常\tserviceImpl", e);
+                    logger.error(logMark + "\t最近数据\t查询异常\tserviceImpl", e);
                 }
             }
         }
@@ -157,9 +155,9 @@ public class BlockingServiceImp implements BlockingService {
                 }
             }
         }
-        logger.info("DNS欺骗信息显示耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("DNS欺骗信息显示------->测试数据");
+            logger.info(logMark + "------->测试数据");
             list.add(new NtcEntranceReport(start, "Астана", (int) (Math.random() * 100)));
             list.add(new NtcEntranceReport(start, "Алматы", (int) (Math.random() * 100)));
         }
@@ -174,7 +172,7 @@ public class BlockingServiceImp implements BlockingService {
      * @return
      */
     @Override
-    public List<TimeTypeCount> get24hAllBlockEachProtocol(String start, String end, int AllBlockEachProtocolExpTimes) {
+    public List<TimeTypeCount> get24hAllBlockEachProtocol(Date start, Date end, int AllBlockEachProtocolExpTimes, String logMark) {
         List<TimeTypeCount> list = new ArrayList<>();
         long timeMillisStart = System.currentTimeMillis();
         try {
@@ -185,8 +183,8 @@ public class BlockingServiceImp implements BlockingService {
                     AllBlockEachProtocolExpTimes = 3;
                 }
                 for (int i = 1; i <= AllBlockEachProtocolExpTimes; i++) {
-                    String emptStart = DateUtils.getBeforeNminOfTime(start, -5 * i);
-                    list = blockingDao.get24hAllBlockEachProtocolOnly(emptStart, emptStart, DateUtils.getAfter5min(emptStart));
+                    Date emptStart = DateUtil.getSomeMinute(start, -5 * i);
+                    list = blockingDao.get24hAllBlockEachProtocolOnly(emptStart, emptStart, DateUtil.getSomeMinute(emptStart, 5));
                 }
             }
         } catch (Exception e) {
@@ -195,18 +193,18 @@ public class BlockingServiceImp implements BlockingService {
         }
         //若查询结果为空，查询上时间段的数据
         if (ListUtils.isEmptyList(list) && ConfigUtil.tendencyData) {
-            logger.warn("24小时内全国范围阻断协议信息\tNTC_SERVICE_REPORT\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
+            logger.warn("{}\tNTC_SERVICE_REPORT\t{}至{}\t期间无数据\t查询最近数据", logMark, start, end);
             try {
-                Date lastTime = blockingDao.get24hAllBlockEachProtocolOLastTime(end);
-                if (lastTime != null) {
-                    String time = DateUtils.formatDateTime(lastTime);
-                    time = DateUtils.getRangeOf5min(time);
-                    list = blockingDao.get24hAllBlockEachProtocolOnly(start, time, DateUtils.getAfter5min(time));
+                Date startLastTime = blockingDao.get24hAllBlockEachProtocolOLastTime(end);
+                if (startLastTime != null) {
+                    startLastTime = DateUtil.getFormatMinute(startLastTime);
+                    Date endLastTime = DateUtil.getSomeMinute(startLastTime, 5);
+                    list = blockingDao.get24hAllBlockEachProtocolOnly(start, startLastTime, endLastTime);
                 } else {
-                    logger.warn("24小时内全国范围阻断协议信息\tNTC_SERVICE_REPORT\t无数据");
+                    logger.warn(logMark + "\tNTC_SERVICE_REPORT\t无数据");
                 }
             } catch (Exception e) {
-                logger.error("24小时内全国范围阻断协议信息\t最近数据\t查询异常\tserviceImpl", e);
+                logger.error(logMark + "\t最近数据\t查询异常\tserviceImpl", e);
             }
         }
         if (!ListUtils.isEmptyList(list)) {
@@ -232,9 +230,9 @@ public class BlockingServiceImp implements BlockingService {
                 }
             }
         }
-        logger.info("24小时全国范围阻断协议信息耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("24小时全国范围阻断协议信息------->测试数据");
+            logger.info(logMark + "------->测试数据");
             list.add(new TimeTypeCount(start, "Protocol Identify Block", (int) (Math.random() * 100)));
             list.add(new TimeTypeCount(start, "HTTP(s) Redirect", (int) (Math.random() * 100)));
         }
@@ -249,36 +247,35 @@ public class BlockingServiceImp implements BlockingService {
      * @return
      */
     @Override
-    public List<NtcDisReport> getDisBlockInformation(String start, String end) {
-        //地域表
-        Map<String, AreaDictInfo> listArea = listAreaDictInfo();
-        List<NtcDisReport> list = new ArrayList<>();
+    public List<BlockingArea> getBlockingArea(Date start, Date end, String logMark) {
         long timeMillisStart = System.currentTimeMillis();
+        Map<String, AreaDictInfo> listArea = listAreaDictInfo();
+        List<BlockingArea> list = new ArrayList<>();
         try {
-            list = blockingDao.getDisBlockInformationOnly(start, start, end);
+            list = blockingDao.getBlockingArea(start, start, end);
         } catch (Exception e) {
-            logger.error("封堵信息分布显示\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl\t", e);
         }
         if (ListUtils.isEmptyList(list) && ConfigUtil.actualData) {
-            logger.warn("封堵信息分布显示\tNTC_ENTRANCE_REPORT\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
+            logger.warn("{}\tNTC_ENTRANCE_REPORT\t{}至{}\t期间无数据\t查询最近数据", logMark, start, end);
             try {
-                Date lastTime = blockingDao.getDisBlockInformationLastTime(end);
-                if (lastTime != null) {
-                    String time = DateUtils.formatDateTime(lastTime);
-                    time = DateUtils.getRangeOf5min(time);
-                    list = blockingDao.getDisBlockInformationOnly(start, time, DateUtils.getAfter5min(time));
+                Date startLastTime = blockingDao.getBlockingAreaLastTime(end);
+                if (startLastTime != null) {
+                    startLastTime = DateUtil.getFormatMinute(startLastTime);
+                    Date endLastTime = DateUtil.getSomeMinute(startLastTime, 5);
+                    list = blockingDao.getBlockingArea(start, startLastTime, endLastTime);
                 } else {
-                    logger.warn("封堵信息分布显示\tNTC_ENTRANCE_REPORT\t无数据");
+                    logger.warn(logMark + "\tNTC_ENTRANCE_REPORT\t无数据");
                 }
             } catch (Exception e) {
-                logger.error("封堵信息分布显示\t最近数据\t查询异常\tserviceImpl", e);
+                logger.error(logMark + "\t最近数据\t查询异常\tserviceImpl\t", e);
             }
         }
         //迭代映射地域表，过滤无地域映射数据
         if (!ListUtils.isEmptyList(list)) {
-            Iterator<NtcDisReport> ntcDisReport = list.iterator();
+            Iterator<BlockingArea> ntcDisReport = list.iterator();
             while (ntcDisReport.hasNext()) {
-                NtcDisReport next = ntcDisReport.next();
+                BlockingArea next = ntcDisReport.next();
                 String area = next.getArea();
                 AreaDictInfo areaDictInfo = listArea.get(area);
                 if (areaDictInfo == null) {
@@ -289,11 +286,11 @@ public class BlockingServiceImp implements BlockingService {
                 }
             }
         }
-        logger.info("封堵信息分布显示耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info(logMark + "耗时：" + (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("封堵信息分布显示------->测试数据");
-            list.add(new NtcDisReport(start, "Астана", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100)));
-            list.add(new NtcDisReport(start, "Алматы", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100)));
+            logger.info(logMark + "------->测试数据");
+            list.add(new BlockingArea(start, "Астана", (long) (Math.random() * 100), (long) (Math.random() * 100), (long) (Math.random() * 100), (long) (Math.random() * 100), (long) (Math.random() * 100)));
+            list.add(new BlockingArea(start, "Алматы", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100)));
         }
         return list;
     }
@@ -304,29 +301,29 @@ public class BlockingServiceImp implements BlockingService {
      * @return
      */
     @Override
-    public List<HotStatistic> getAllHotStatistis(String start, String end) {
+    public List<HotStatistic> getBlocking24HourThermodynamic(Date start, Date end, String logMark) {
         Map<String, NtcServiceDict> listNtcService = listNtcService();
         Map<String, AreaDictInfo> listArea = listAreaDictInfo();
         List<HotStatistic> list = new ArrayList<>();
         long timeMillisStart = System.currentTimeMillis();
         try {
-            list = blockingDao.getAllHotStatistisOnly(start, start, end);
+            list = blockingDao.getBlocking24HourThermodynamic(start, start, end);
         } catch (Exception e) {
             logger.error("24小时内全国热力图\t查询异常\tserviceImpl", e);
         }
         if (ListUtils.isEmptyList(list) && ConfigUtil.recentData) {
-            logger.warn("24小时内全国热力图\tNTC_SERVICE_BEHAV_STATISTIC\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
+            logger.warn("{}\tNTC_SERVICE_BEHAV_STATISTIC\t{}至{}\t期间无数据\t查询最近数据", logMark, start, end);
             try {
-                Date lastTime = blockingDao.getAllHotStatistisLastTime(end);
-                if (lastTime != null) {
-                    String time = DateUtils.formatDateTime(lastTime);
-                    time = DateUtils.getRangeOf5min(time);
-                    list = blockingDao.getAllHotStatistisOnly(start, time, DateUtils.getAfter5min(time));
+                Date startLastTime = blockingDao.getBlocking24HourThermodynamicLastTime(end);
+                if (startLastTime != null) {
+                    startLastTime = DateUtil.getFormatMinute(startLastTime);
+                    Date endLastTime = DateUtil.getSomeMinute(startLastTime, 5);
+                    list = blockingDao.getBlocking24HourThermodynamic(start, startLastTime, endLastTime);
                 } else {
-                    logger.warn("24小时内全国热力图\tNTC_SERVICE_BEHAV_STATISTIC\t无数据");
+                    logger.warn(logMark + "\tNTC_SERVICE_BEHAV_STATISTIC\t无数据");
                 }
             } catch (Exception e) {
-                logger.error("24小时内全国热力图\t最近数据\t查询异常\tserviceImpl", e);
+                logger.error(logMark + "\t最近数据\t查询异常\tserviceImpl", e);
             }
         }
         //迭代映射地域表，过滤无地域映射数据
@@ -356,9 +353,9 @@ public class BlockingServiceImp implements BlockingService {
                 }
             }
         }
-        logger.info("24小时内全国热力图：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("24小时内全国热力图------->测试数据");
+            logger.info(logMark + "------->测试数据");
             list.add(new HotStatistic(start, "Астана", "103.227.81.43", "10.11.36.42", "IP Address Monitor", (int) (Math.random() * 100)));
             list.add(new HotStatistic(start, "Астана", "103.227.81.1", "10.11.36.12", "HTTP Monitor", (int) (Math.random() * 100)));
             list.add(new HotStatistic(start, "Алматы", "103.227.81.36", "10.11.36.11", "IP Address Monitor", (int) (Math.random() * 100)));
@@ -372,25 +369,25 @@ public class BlockingServiceImp implements BlockingService {
      * @return
      */
     @Override
-    public List<PointMap> getPointMapOf10s() {
+    public List<PointMap> getPointMapOf10s(String logMark) {
         Map<String, NtcServiceDict> listNtcService = listNtcService();
         List<PointMap> list = new ArrayList<>();
         long timeMillisStart = System.currentTimeMillis();
         try {
             list = blockingDao.getPointMapOf10sOnly();
         } catch (Exception e) {
-            logger.error("实时打点图\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
         try {
             int serviceCount = dictService.getNtcServiceDictCount();
             if (listNtcService != null && serviceCount != listNtcService.size()) {
-                logger.warn("实时打点图\t业务表需要重新加载");
+                logger.warn(logMark + "\t业务表需要重新加载");
                 List<NtcServiceDict> ntcServiceDict = new ArrayList<>();
                 Map<String, NtcServiceDict> mapNtcService = new HashMap<>();
                 try {
                     ntcServiceDict = dictService.getNtcServiceDict();
                 } catch (Exception e) {
-                    logger.error("实时打点图\t业务表加载出现异常", e);
+                    logger.error(logMark + "\t业务表加载出现异常", e);
                 }
                 if (!ntcServiceDict.isEmpty()) {
                     for (NtcServiceDict serviceDict : ntcServiceDict) {
@@ -401,7 +398,7 @@ public class BlockingServiceImp implements BlockingService {
             }
         } catch (Exception ex) {
             listNtcService = listNtcService();
-            logger.warn("实时打点图\t业务表逻辑处理出现异常\t使用5min加载的业务表", ex);
+            logger.warn(logMark + "\t业务表逻辑处理出现异常\t使用5min加载的业务表", ex);
         }
         if (!ListUtils.isEmptyList(list)) {
             for (PointMap pointMap : list) {
@@ -421,10 +418,10 @@ public class BlockingServiceImp implements BlockingService {
                 }
             }
         }
-        logger.info("实时打点图耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("实时打点图------->测试数据");
-            String time = DateUtils.getDateTime();
+            logger.info(logMark + "------->测试数据");
+            Date time = new Date();
             list.add(new PointMap(time, "103.227.81.43", "10.11.36.42", "HTTP Monitor", (int) (Math.random() * 100)));
             list.add(new PointMap(time, "103.227.81.33", "10.11.36.4", "IP Address Monitor", (int) (Math.random() * 100)));
             list.add(new PointMap(time, "103.227.81.15", "10.11.36.23", "HTTP Monitor", (int) (Math.random() * 100)));
@@ -440,29 +437,29 @@ public class BlockingServiceImp implements BlockingService {
      * @return
      */
     @Override
-    public List<AreaCount> getDisBlockMap(String start, String end) {
+    public List<AreaCount> getDisBlockMap(Date start, Date end, String logMark) {
         Map<String, AreaDictInfo> listArea = listAreaDictInfo();
         List<AreaCount> list = new ArrayList<>();
         long timeMillisStart = System.currentTimeMillis();
         try {
             list = blockingDao.getDisBlockMapOnly(start, start, end);
         } catch (Exception e) {
-            logger.error("热力图接口\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
         //如果此次没有查询到数据查上一个5min的数据
         if (ListUtils.isEmptyList(list) && ConfigUtil.recentData) {
-            logger.warn("热力图接口\tNTC_ENTRANCE_REPORT\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
+            logger.warn("{}\tNTC_ENTRANCE_REPORT\t{}至{}\t期间无数据\t查询最近数据", logMark, start, end);
             try {
-                Date lastTime = blockingDao.getDisBlockMapLastTime(end);
-                if (lastTime != null) {
-                    String time = DateUtils.formatDateTime(lastTime);
-                    time = DateUtils.getRangeOf5min(time);
-                    list = blockingDao.getDisBlockMapOnly(start, time, DateUtils.getAfter5min(time));
+                Date startLastTime = blockingDao.getDisBlockMapLastTime(end);
+                if (startLastTime != null) {
+                    startLastTime = DateUtil.getFormatMinute(startLastTime);
+                    Date endLastTime = DateUtil.getSomeMinute(startLastTime, 5);
+                    list = blockingDao.getDisBlockMapOnly(start, startLastTime, endLastTime);
                 } else {
-                    logger.warn("热力图接口\tNTC_ENTRANCE_REPORT\t无数据");
+                    logger.warn(logMark + "\tNTC_ENTRANCE_REPORT\t无数据");
                 }
             } catch (Exception e) {
-                logger.error("热力图接口\t最近数据\t查询异常\tserviceImpl", e);
+                logger.error(logMark + "\t最近数据\t查询异常\tserviceImpl", e);
             }
         }
         //迭代映射地域表，过滤无地域映射数据
@@ -480,9 +477,9 @@ public class BlockingServiceImp implements BlockingService {
                 }
             }
         }
-        logger.info("热力图接口耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("热力图接口------->测试数据");
+            logger.info(logMark + "------->测试数据");
             list.add(new AreaCount(start, "Астана", (int) (Math.random() * 1000)));
             list.add(new AreaCount(start, "Алматы", (int) (Math.random() * 1000)));
         }
@@ -495,14 +492,14 @@ public class BlockingServiceImp implements BlockingService {
      * @return
      */
     @Override
-    public List<CfgTypeCount> getAllCfgInfo() {
+    public List<CfgTypeCount> getBlockingGlobalProtocolConfig(String logMark) {
         List<CfgTypeCount> list = new ArrayList<>();
         Map<String, NtcServiceDict> listNtcService = listNtcService();
         long timeMillisStart = System.currentTimeMillis();
         try {
-            list = blockingDao.getAllCfgInfoOnly();
+            list = blockingDao.getBlockingGlobalProtocolConfig();
         } catch (Exception e) {
-            logger.error("全国协议配置信息\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
         if (!ListUtils.isEmptyList(list) && ConfigUtil.recentData) {
             for (CfgTypeCount cfgTypeCount : list) {
@@ -519,10 +516,10 @@ public class BlockingServiceImp implements BlockingService {
                 }
             }
         }
-        logger.info("全国协议配置信息耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("全国协议配置信息------->测试数据");
-            String time = DateUtils.getRangeOfday(DateUtils.getDateTime());
+            logger.info(logMark + "------->测试数据");
+            Date time = new Date();
             list.add(new CfgTypeCount(time, "APP Monitor", (int) (Math.random() * 20)));
             list.add(new CfgTypeCount(time, "File Digest Block", (int) (Math.random() * 20)));
             list.add(new CfgTypeCount(time, "VoIP Voice Sample Monitor", (int) (Math.random() * 20)));
diff --git a/src/main/java/com/nis/galaxy/web/service/impl/BlockingTopNServiceImpl.java b/src/main/java/com/nis/galaxy/web/service/impl/BlockingTopNServiceImpl.java
index 8d13a8c..2c45757 100644
--- a/src/main/java/com/nis/galaxy/web/service/impl/BlockingTopNServiceImpl.java
+++ b/src/main/java/com/nis/galaxy/web/service/impl/BlockingTopNServiceImpl.java
@@ -6,7 +6,7 @@ import com.nis.galaxy.domain.dict.NtcServiceDict;
 import com.nis.galaxy.domain.dict.AreaDictInfo;
 import com.nis.galaxy.domain.dict.UiTagDictInfo;
 import com.nis.galaxy.util.ConfigUtil;
-import com.nis.galaxy.util.DateUtils;
+import com.nis.galaxy.util.DateUtil;
 import com.nis.galaxy.util.ListUtils;
 import com.nis.galaxy.web.dao.BlockingTopNDao;
 import com.nis.galaxy.web.service.BlockingTopNService;
@@ -62,28 +62,28 @@ public class BlockingTopNServiceImpl implements BlockingTopNService {
      * @return
      */
     @Override
-    public List<NtcRejectUrlStatistic> getBlockTop10URLOf1h(String start, String end) {
+    public List<NtcRejectUrlStatistic> getBlockTop10URLOf1h(Date start, Date end, String logMark) {
         List<NtcRejectUrlStatistic> list = new ArrayList<>();
         long timeMillisStart = System.currentTimeMillis();
         try {
             list = blockingTopNDao.getBlockTop10URLOf1h(start, start, end);
         } catch (Exception e) {
-            logger.error("1小时内全国阻断URLTOP10\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
         //如果此次没有查询到数据查上一个1h的数据
         if (ListUtils.isEmptyList(list) && ConfigUtil.recentData) {
-            logger.warn("1小时内全国阻断URLTOP10\tNTC_REJECT_URL_STATISTIC\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
+            logger.warn("{}\tNTC_REJECT_URL_STATISTIC\t{}至{}\t期间无数据\t查询最近数据", logMark, start, end);
             try {
-                Date lastTime = blockingTopNDao.getBlockTop10URLOf1hLastTime(end);
-                if (lastTime != null) {
-                    String time = DateUtils.formatDateTime(lastTime);
-                    time = DateUtils.getRangeOfhour(time);
-                    list = blockingTopNDao.getBlockTop10URLOf1h(start, time, DateUtils.getAfter1h(time));
+                Date startLastTime = blockingTopNDao.getBlockTop10URLOf1hLastTime(end);
+                if (startLastTime != null) {
+                    startLastTime = DateUtil.getFormatHour(startLastTime);
+                    Date endLastTime = DateUtil.getSomeHour(startLastTime, 1);
+                    list = blockingTopNDao.getBlockTop10URLOf1h(start, startLastTime, endLastTime);
                 } else {
-                    logger.warn("1小时内全国阻断URLTOP10\tNTC_REJECT_URL_STATISTIC\t无数据");
+                    logger.warn(logMark + "\tNTC_REJECT_URL_STATISTIC\t无数据");
                 }
             } catch (Exception e) {
-                logger.error("1小时内全国阻断URLTOP10\t最近数据\t查询异常\tserviceImpl", e);
+                logger.error(logMark + "\t最近数据\t查询异常\tserviceImpl", e);
             }
         }
         if (!ListUtils.isEmptyList(list)) {
@@ -95,9 +95,9 @@ public class BlockingTopNServiceImpl implements BlockingTopNService {
                 }
             }
         }
-        logger.info("1小时内全国阻断URLTOP10耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("1小时内全国阻断URLTOP10------->测试数据");
+            logger.info(logMark + "------->测试数据");
             int i = (int) (Math.random() * 200);
             list.add(new NtcRejectUrlStatistic(start, "astyouth.forum.com.kz/viewtopic.php?id=122", i + 20));
             list.add(new NtcRejectUrlStatistic(start, "www.bing.com/dict/xls.aspx?Type=Event.ClientInst?", i + 18));
@@ -121,27 +121,27 @@ public class BlockingTopNServiceImpl implements BlockingTopNService {
      * @return
      */
     @Override
-    public List<NtcRejectWebsiteStatistic> getBlockTop10WebsiteOf1h(String start, String end) {
+    public List<NtcRejectWebsiteStatistic> getBlockTop10WebsiteOf1h(Date start, Date end, String logMark) {
         List<NtcRejectWebsiteStatistic> list = new ArrayList<>();
         long timeMillisStart = System.currentTimeMillis();
         try {
             list = blockingTopNDao.getBlockTop10WebsiteOf1h(start, start, end);
         } catch (Exception e) {
-            logger.error("1小时内全国阻断网站TOP10\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
         if (ListUtils.isEmptyList(list) && ConfigUtil.recentData) {
-            logger.warn("1小时内全国阻断网站TOP10\tNTC_REJECT_WEBSITE_STATISTIC\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
+            logger.warn("{}\tNTC_REJECT_WEBSITE_STATISTIC\t{}至{}\t期间无数据\t查询最近数据", logMark, start, end);
             try {
-                Date lastTime = blockingTopNDao.getBlockTop10WebsiteOf1hLastTime(end);
-                if (lastTime != null) {
-                    String time = DateUtils.formatDateTime(lastTime);
-                    time = DateUtils.getRangeOfhour(time);
-                    list = blockingTopNDao.getBlockTop10WebsiteOf1h(start, time, DateUtils.getAfter1h(time));
+                Date startLastTime = blockingTopNDao.getBlockTop10WebsiteOf1hLastTime(end);
+                if (startLastTime != null) {
+                    startLastTime = DateUtil.getFormatHour(startLastTime);
+                    Date endLastTime = DateUtil.getSomeHour(startLastTime, 1);
+                    list = blockingTopNDao.getBlockTop10WebsiteOf1h(start, startLastTime, endLastTime);
                 } else {
-                    logger.warn("1小时内全国阻断网站TOP10\tNTC_REJECT_WEBSITE_STATISTIC\t无数据");
+                    logger.warn(logMark + "\tNTC_REJECT_WEBSITE_STATISTIC\t无数据");
                 }
             } catch (Exception e) {
-                logger.error("1小时内全国阻断网站TOP10\t最近数据\t查询异常\tserviceImpl", e);
+                logger.error(logMark + "\t最近数据\t查询异常\tserviceImpl", e);
             }
         }
         if (!ListUtils.isEmptyList(list)) {
@@ -153,9 +153,9 @@ public class BlockingTopNServiceImpl implements BlockingTopNService {
                 }
             }
         }
-        logger.info("1小时内全国阻断网站TOP10耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("1小时内全国阻断网站TOP10------->测试数据");
+            logger.info(logMark + "------->测试数据");
             int i = (int) (Math.random() * 200);
             list.add(new NtcRejectWebsiteStatistic(start, "7.au.download.windowsupdate.com", i + 40));
             list.add(new NtcRejectWebsiteStatistic(start, "3.au.download.windowsupdate.com", i + 33));
@@ -179,7 +179,7 @@ public class BlockingTopNServiceImpl implements BlockingTopNService {
      * @return
      */
     @Override
-    public List<AreaBlockProtocol> getAreaBlockTop10ProtocolOf24(String start, String end) {
+    public List<AreaBlockProtocol> getAreaBlockTop10ProtocolOf24(Date start, Date end, String logMark) {
         List<AreaBlockProtocol> list = new ArrayList<>();
         Map<String, AreaDictInfo> listArea = listAreaDictInfo();
         Map<String, NtcServiceDict> listNtcService = listNtcService();
@@ -188,21 +188,21 @@ public class BlockingTopNServiceImpl implements BlockingTopNService {
             //查分钟报
             list = blockingTopNDao.getAreaBlockTop10ProtocolOf24hOnly(start, start, end);
         } catch (Exception e) {
-            logger.error("24小时内区域阻断协议TOP10\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
         if (ListUtils.isEmptyList(list) && ConfigUtil.recentData) {
-            logger.warn("24小时内区域阻断协议TOP10\tNTC_ENTRANCE_REPORT\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
+            logger.warn("{}\tNTC_ENTRANCE_REPORT\t{}至{}\t期间无数据\t查询最近数据", logMark, start, end);
             try {
-                Date lastTime = blockingTopNDao.getAreaBlockTop10ProtocolOf24hLastTime(end);
-                if (lastTime != null) {
-                    String time = DateUtils.formatDateTime(lastTime);
-                    time = DateUtils.getRangeOfday(time);
-                    list = blockingTopNDao.getAreaBlockTop10ProtocolOf24hOnly(start, time, DateUtils.getAfter24h(time));
+                Date startLastTime = blockingTopNDao.getAreaBlockTop10ProtocolOf24hLastTime(end);
+                if (startLastTime != null) {
+                    startLastTime = DateUtil.getFormatHour(startLastTime);
+                    Date endLastTime = DateUtil.getSomeHour(startLastTime, 1);
+                    list = blockingTopNDao.getAreaBlockTop10ProtocolOf24hOnly(start, startLastTime, endLastTime);
                 } else {
-                    logger.warn("24小时内区域阻断协议TOP10\tNTC_ENTRANCE_REPORT\t无数据");
+                    logger.warn(logMark + "\tNTC_ENTRANCE_REPORT\t无数据");
                 }
             } catch (Exception e) {
-                logger.error("24小时内区域阻断协议TOP10\t最近数据\t查询异常\tserviceImpl", e);
+                logger.error(logMark + "\t最近数据\t查询异常\tserviceImpl", e);
             }
         }
         //迭代映射地域表，过滤无地域映射数据
@@ -235,9 +235,9 @@ public class BlockingTopNServiceImpl implements BlockingTopNService {
                 list = list.subList(0, 10);
             }
         }
-        logger.info("24小时内区域阻断协议TOP10耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("24小时内区域阻断协议TOP10------->测试数据");
+            logger.info(logMark + "------->测试数据");
             int i = (int) (Math.random() * 400);
             list.add(new AreaBlockProtocol(start, "Астана", "IP Address Monitor", i + 40));
             list.add(new AreaBlockProtocol(start, "Алматы", "Protocol Identify Monitor", i + 31));
@@ -260,28 +260,28 @@ public class BlockingTopNServiceImpl implements BlockingTopNService {
      * @return
      */
     @Override
-    public List<NtcUrlIpCount> getBlockTop10URLOf5m(String start, String end) {
+    public List<NtcUrlIpCount> getBlockTop10URLOf5m(Date start, Date end, String logMark) {
         List<NtcUrlIpCount> list = new ArrayList<>();
         long timeMillisStart = System.currentTimeMillis();
         try {
             list = blockingTopNDao.getBlockTop10URLOf5m(start, start, end);
 
         } catch (Exception e) {
-            logger.error("5分钟内全国阻断URLTOP10\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
         if (ListUtils.isEmptyList(list) && ConfigUtil.recentData) {
-            logger.warn("5分钟内全国阻断URLTOP10\tNTC_REJECT_URL_STATISTIC\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
+            logger.warn("{}\tNTC_REJECT_URL_STATISTIC\t{}至{}\t期间无数据\t查询最近数据", logMark, start, end);
             try {
-                Date lastTime = blockingTopNDao.getBlockTop10URLOf5mLastTime(end);
-                if (lastTime != null) {
-                    String time = DateUtils.formatDateTime(lastTime);
-                    time = DateUtils.getRangeOf5min(time);
-                    list = blockingTopNDao.getBlockTop10URLOf5m(start, time, DateUtils.getAfter5min(time));
+                Date startLastTime = blockingTopNDao.getBlockTop10URLOf5mLastTime(end);
+                if (startLastTime != null) {
+                    startLastTime = DateUtil.getFormatMinute(startLastTime);
+                    Date endLastTime = DateUtil.getSomeMinute(startLastTime, 5);
+                    list = blockingTopNDao.getBlockTop10URLOf5m(start, startLastTime, endLastTime);
                 } else {
-                    logger.warn("5分钟内全国阻断URLTOP10\tNTC_REJECT_URL_STATISTIC\t无数据");
+                    logger.warn(logMark + "\tNTC_REJECT_URL_STATISTIC\t无数据");
                 }
             } catch (Exception e) {
-                logger.error("5分钟内全国阻断URLTOP10\t最近数据\t查询异常\tserviceImpl", e);
+                logger.error(logMark + "\t最近数据\t查询异常\tserviceImpl", e);
             }
         }
         if (!ListUtils.isEmptyList(list)) {
@@ -294,9 +294,9 @@ public class BlockingTopNServiceImpl implements BlockingTopNService {
 
             }
         }
-        logger.info("5分钟内全国阻断URLTOP10耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("5分钟内全国阻断URLTOP10------->测试数据");
+            logger.info(logMark + "------->测试数据");
             int i = (int) (Math.random() * 100);
             list.add(new NtcUrlIpCount(start, "204.79.197.200", "www.bing.com/fd/ls/lsp.aspx", i + 70));
             list.add(new NtcUrlIpCount(start, "204.79.197.200", "www.bing.com/fd/ls/lsp.aspx?", i + 64));
@@ -320,28 +320,28 @@ public class BlockingTopNServiceImpl implements BlockingTopNService {
      * @return
      */
     @Override
-    public List<NtcWebIpCount> getBlockTop10WebsiteOf5m(String start, String end) {
+    public List<NtcWebIpCount> getBlockTop10WebsiteOf5m(Date start, Date end, String logMark) {
         List<NtcWebIpCount> list = new ArrayList<>();
         long timeMillisStart = System.currentTimeMillis();
         try {
             list = blockingTopNDao.getBlockTop10WebsiteOf5m(start, start, end);
         } catch (Exception e) {
-            logger.error("5分钟内全国阻断网站TOP10\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
         //查询不到时，继续向前一段时间
         if (ListUtils.isEmptyList(list) && ConfigUtil.recentData) {
-            logger.warn("5分钟内全国阻断网站TOP10\tNTC_REJECT_WEBSITE_STATISTIC\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
+            logger.warn("{}\tNTC_REJECT_WEBSITE_STATISTIC\t{}至{}\t期间无数据\t查询最近数据", logMark, start, end);
             try {
-                Date lastTime = blockingTopNDao.getBlockTop10WebsiteOf5mLastTime(end);
-                if (lastTime != null) {
-                    String time = DateUtils.formatDateTime(lastTime);
-                    time = DateUtils.getRangeOf5min(time);
-                    list = blockingTopNDao.getBlockTop10WebsiteOf5m(start, time, DateUtils.getAfter5min(time));
+                Date startLastTime = blockingTopNDao.getBlockTop10WebsiteOf5mLastTime(end);
+                if (startLastTime != null) {
+                    startLastTime = DateUtil.getFormatMinute(startLastTime);
+                    Date endLastTime = DateUtil.getSomeMinute(startLastTime, 5);
+                    list = blockingTopNDao.getBlockTop10WebsiteOf5m(start, startLastTime, endLastTime);
                 } else {
-                    logger.warn("5分钟内全国阻断网站TOP10\tNTC_REJECT_WEBSITE_STATISTIC\t无数据");
+                    logger.warn(logMark + "\tNTC_REJECT_WEBSITE_STATISTIC\t无数据");
                 }
             } catch (Exception e) {
-                logger.error("5分钟内全国阻断网站TOP10\t最近数据\t查询异常\tserviceImpl", e);
+                logger.error(logMark + "\t最近数据\t查询异常\tserviceImpl", e);
             }
         }
         if (!ListUtils.isEmptyList(list)) {
@@ -353,9 +353,9 @@ public class BlockingTopNServiceImpl implements BlockingTopNService {
                 }
             }
         }
-        logger.info("5分钟内全国阻断网站TOP10耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("5分钟内全国阻断网站TOP10------->测试数据");
+            logger.info(logMark + "------->测试数据");
             int i = (int) (Math.random() * 100);
             list.add(new NtcWebIpCount(start, "204.79.197.200", "www.bing.com/fd/ls/ls", i + 10));
             list.add(new NtcWebIpCount(start, "204.79.197.200", "www.bing.com/fd/ls/ldfs", i + 9));
@@ -380,28 +380,28 @@ public class BlockingTopNServiceImpl implements BlockingTopNService {
      * @return
      */
     @Override
-    public List<NtcTagReport> getBlockTop100Tag1h(String start, String end) {
+    public List<NtcTagReport> getBlockTop100Tag1h(Date start, Date end, String logMark) {
         List<NtcTagReport> list = new ArrayList<>();
         Map<String, UiTagDictInfo> listUiTagDicInfo = listUiTagDicInfo();
         long timeMillisStart = System.currentTimeMillis();
         try {
             list = blockingTopNDao.getBlockTop10Tag5mOnly(start, start, end);
         } catch (Exception e) {
-            logger.error("1小时内全国阻断标签TOP10\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
         if (ListUtils.isEmptyList(list) && ConfigUtil.recentData) {
-            logger.warn("1小时内全国阻断标签TOP10\tNTC_TAG_REPORT\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
+            logger.warn("{}\tNTC_TAG_REPORT\t{}至{}\t期间无数据\t查询最近数据", logMark, start, end);
             try {
-                Date lastTime = blockingTopNDao.getBlockTop10Tag5mOnlyLastTime(end);
-                if (lastTime != null) {
-                    String time = DateUtils.formatDateTime(lastTime);
-                    time = DateUtils.getRangeOfhour(time);
-                    list = blockingTopNDao.getBlockTop10Tag5mOnly(start, time, DateUtils.getAfter1h(time));
+                Date startLastTime = blockingTopNDao.getBlockTop10Tag5mOnlyLastTime(end);
+                if (startLastTime != null) {
+                    startLastTime = DateUtil.getFormatHour(startLastTime);
+                    Date endLastTime = DateUtil.getSomeHour(startLastTime, 1);
+                    list = blockingTopNDao.getBlockTop10Tag5mOnly(start, startLastTime, endLastTime);
                 } else {
-                    logger.warn("1小时内全国阻断标签TOP10\tNTC_TAG_REPORT\t无数据");
+                    logger.warn(logMark + "\tNTC_TAG_REPORT\t无数据");
                 }
             } catch (Exception e) {
-                logger.error("1小时内全国阻断标签TOP10\t最近数据\t查询异常\tserviceImpl", e);
+                logger.error(logMark + "\t最近数据\t查询异常\tserviceImpl", e);
             }
         }
         if (!ListUtils.isEmptyList(list)) {
@@ -414,9 +414,9 @@ public class BlockingTopNServiceImpl implements BlockingTopNService {
                 ntcTagReport.setType(uiTagDicInfo.getItemValue());
             }
         }
-        logger.info("1小时内全国阻断标签TOP10耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("1小时内全国阻断标签TOP10------->测试数据");
+            logger.info(logMark + "------->测试数据");
             int i = (int) (Math.random() * 200);
             list.add(new NtcTagReport(start, "News", i + 30));
             list.add(new NtcTagReport(start, "kill", i + 30));
diff --git a/src/main/java/com/nis/galaxy/web/service/impl/EventsServiceImpl.java b/src/main/java/com/nis/galaxy/web/service/impl/EventsServiceImpl.java
index acdf1a5..4062e29 100644
--- a/src/main/java/com/nis/galaxy/web/service/impl/EventsServiceImpl.java
+++ b/src/main/java/com/nis/galaxy/web/service/impl/EventsServiceImpl.java
@@ -5,7 +5,7 @@ import com.nis.galaxy.domain.*;
 import com.nis.galaxy.domain.dict.AreaDictInfo;
 import com.nis.galaxy.domain.dict.NtcServiceDict;
 import com.nis.galaxy.util.ConfigUtil;
-import com.nis.galaxy.util.DateUtils;
+import com.nis.galaxy.util.DateUtil;
 import com.nis.galaxy.util.ListUtils;
 import com.nis.galaxy.web.dao.EventsDao;
 import com.nis.galaxy.web.service.EventsService;
@@ -73,32 +73,32 @@ public class EventsServiceImpl implements EventsService {
      * @return
      */
     @Override
-    public List<SystemTotal> getSystemTotalOf1Day(String start, String end) {
+    public List<SystemTotal> getSystemTotal(Date start, Date end, String logMark) {
         List<SystemTotal> list = new ArrayList<>();
         long timeMillisStart = System.currentTimeMillis();
         try {
-            list = eventsDao.getSystemTotalOf1Day(start, start, end);
+            list = eventsDao.getSystemTotal(start, end);
         } catch (Exception e) {
-            logger.error("系统总计\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
         if (ListUtils.isEmptyList(list) && ConfigUtil.recentData) {
-            logger.warn("系统总计\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
+            logger.warn("{}\t{}至{}\t期间无数据\t查询最近数据", logMark, start, end);
             try {
-                Date lastTime = eventsDao.getSystemTotalOf1DayLastTime(end);
-                if (lastTime != null) {
-                    String time = DateUtils.formatDateTime(lastTime);
-                    time = DateUtils.getRangeOfday(time);
-                    list = eventsDao.getSystemTotalOf1Day(start, time, DateUtils.getAfter24h(time));
+                Date startLastTime = eventsDao.getSystemTotalLastTime(end);
+                if (startLastTime != null) {
+                    startLastTime = DateUtil.getFormatDay(startLastTime);
+                    Date endLastTime = DateUtil.getSomeDate(startLastTime, 1);
+                    list = eventsDao.getSystemTotal(startLastTime, endLastTime);
                 } else {
-                    logger.warn("系统总计\t无数据");
+                    logger.warn(logMark + "\t无数据");
                 }
             } catch (Exception e) {
-                logger.error("系统总计\t最近数据\t查询异常\tserviceImpl", e);
+                logger.error(logMark + "\t最近数据\t查询异常\tserviceImpl", e);
             }
         }
-        logger.info("系统总计耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("系统总计------->测试数据");
+            logger.info(logMark + "------->测试数据");
             int i = (int) (Math.random() * 20);
             list.add(new SystemTotal(i + 182, i + 2836, i + 3026, i + 442688, i + 4565, i + 463));
         }
@@ -113,27 +113,27 @@ public class EventsServiceImpl implements EventsService {
      * @return
      */
     @Override
-    public List<EventsAppMonitor> getSpecifiedAPPMonitor(String start, String end) {
+    public List<EventsAppMonitor> getSpecifiedAPPMonitor(Date start, Date end, String logMark) {
         List<EventsAppMonitor> list = new ArrayList<>();
         long timeMillisStart = System.currentTimeMillis();
         try {
             list = eventsDao.getSpecifiedAPPMonitor(start, start, end);
         } catch (Exception e) {
-            logger.error("特定APP访问监控\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
         if (ListUtils.isEmptyList(list) && ConfigUtil.recentData) {
-            logger.warn("特定APP访问监控\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
+            logger.warn("{}\t{}至{}\t期间无数据\t查询最近数据", logMark, start, end);
             try {
-                Date lastTime = eventsDao.getSpecifiedAPPMonitorLastTime(end);
-                if (lastTime != null) {
-                    String time = DateUtils.formatDateTime(lastTime);
-                    time = DateUtils.getRangeOfhour(time);
-                    list = eventsDao.getSpecifiedAPPMonitor(start, time, DateUtils.getAfter1h(time));
+                Date startLastTime = eventsDao.getSpecifiedAPPMonitorLastTime(end);
+                if (startLastTime != null) {
+                    startLastTime = DateUtil.getFormatHour(startLastTime);
+                    Date endLastTime = DateUtil.getSomeHour(startLastTime, 1);
+                    list = eventsDao.getSpecifiedAPPMonitor(start, startLastTime, endLastTime);
                 } else {
-                    logger.warn("特定APP访问监控\t无数据");
+                    logger.warn(logMark + "\t无数据");
                 }
             } catch (Exception e) {
-                logger.error("特定APP访问监控\t最近数据\t查询异常\tserviceImpl", e);
+                logger.error(logMark + "\t最近数据\t查询异常\tserviceImpl", e);
             }
         }
         if (!ListUtils.isEmptyList(list)) {
@@ -150,9 +150,9 @@ public class EventsServiceImpl implements EventsService {
                 }
             });
         }
-        logger.info("特定APP访问监控耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("特定APP访问监控------->测试数据");
+            logger.info(logMark + "------->测试数据");
             int i = (int) (Math.random() * 100);
             list.add(new EventsAppMonitor(start, "Youtube", i + 66));
             list.add(new EventsAppMonitor(start, "Periscope", i + 45));
@@ -170,25 +170,25 @@ public class EventsServiceImpl implements EventsService {
      * @return
      */
     @Override
-    public List<EventsLetterCount> getLetterCount() {
+    public List<EventsLetterCount> getLetterCount(String logMark) {
         List<EventsLetterCount> list = new ArrayList<>();
         long timeMillisStart = System.currentTimeMillis();
         try {
             list = eventsDao.getLetterCount();
         } catch (Exception e) {
-            logger.error("来函统计报表\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
-        logger.info("来函统计报表耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("来函统计报表------->测试数据");
+            logger.info(logMark + "------->测试数据");
             int i = (int) (Math.random() * 100);
-            list.add(new EventsLetterCount("2018-04-05", "Request Title", "125", 12 + i));
-            list.add(new EventsLetterCount("2018-07-19", "test letter num", "025", 19 + i));
-            list.add(new EventsLetterCount("2018-02-19", "Request_10002", "3655", 16 + i));
-            list.add(new EventsLetterCount("2018-09-19", "reqeest_02111", "5", 0 + i));
-            list.add(new EventsLetterCount("2018-06-20", "letter number statistic", "5625", 7 + i));
-            list.add(new EventsLetterCount("2018-07-05", "20180321_001", "1256", 2 + i));
-            list.add(new EventsLetterCount("2018-04-19", "reqeest_02111", "625", 32 + i));
+            list.add(new EventsLetterCount(new Date(), "Request Title", "125", 12 + i));
+            list.add(new EventsLetterCount(new Date(), "test letter num", "025", 19 + i));
+            list.add(new EventsLetterCount(new Date(), "Request_10002", "3655", 16 + i));
+            list.add(new EventsLetterCount(new Date(), "reqeest_02111", "5", 0 + i));
+            list.add(new EventsLetterCount(new Date(), "letter number statistic", "5625", 7 + i));
+            list.add(new EventsLetterCount(new Date(), "20180321_001", "1256", 2 + i));
+            list.add(new EventsLetterCount(new Date(), "reqeest_02111", "625", 32 + i));
         }
         return list;
     }
@@ -199,28 +199,28 @@ public class EventsServiceImpl implements EventsService {
      * @return
      */
     @Override
-    public List<EventsServiceCount> getServiceCount(String start, String end) {
+    public List<EventsServiceCount> getServiceCount(Date start, Date end, String logMark) {
         Map<String, NtcServiceDict> listNtcService = listNtcService();
         List<EventsServiceCount> list = new ArrayList<>();
         long timeMillisStart = System.currentTimeMillis();
         try {
             list = eventsDao.getServiceCount(start, start, end);
         } catch (Exception e) {
-            logger.error("业务类型统计报表\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
         if (ListUtils.isEmptyList(list) && ConfigUtil.recentData) {
-            logger.warn("业务类型统计报表\tNTC_SERVICE_REPORT\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
+            logger.warn("{}\tNTC_SERVICE_REPORT\t{}至{}\t期间无数据\t查询最近数据", logMark, start, end);
             try {
-                Date lastTime = eventsDao.getServiceCountLastTime(end);
-                if (lastTime != null) {
-                    String time = DateUtils.formatDateTime(lastTime);
-                    time = DateUtils.getRangeOfhour(time);
-                    list = eventsDao.getServiceCount(start, time, DateUtils.getAfter1h(time));
+                Date startLastTime = eventsDao.getServiceCountLastTime(end);
+                if (startLastTime != null) {
+                    startLastTime = DateUtil.getFormatHour(startLastTime);
+                    Date endLastTime = DateUtil.getSomeHour(startLastTime, 1);
+                    list = eventsDao.getServiceCount(start, startLastTime, endLastTime);
                 } else {
-                    logger.warn("业务类型统计报表\tNTC_SERVICE_REPORT\t无数据");
+                    logger.warn(logMark + "\tNTC_SERVICE_REPORT\t无数据");
                 }
             } catch (Exception e) {
-                logger.error("业务类型统计报表\t最近数据\t查询异常\tserviceImpl", e);
+                logger.error(logMark + "\t最近数据\t查询异常\tserviceImpl", e);
             }
         }
         if (!ListUtils.isEmptyList(list)) {
@@ -238,9 +238,9 @@ public class EventsServiceImpl implements EventsService {
                 }
             }
         }
-        logger.info("业务类型统计报表耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("业务类型统计报表------->测试数据");
+            logger.info(logMark + "------->测试数据");
             list.add(new EventsServiceCount(start, "Website Keyword Monitor", (int) (Math.random() * 100)));
             list.add(new EventsServiceCount(start, "HTTP(s) Monitor", (int) (Math.random() * 100)));
         }
@@ -254,20 +254,21 @@ public class EventsServiceImpl implements EventsService {
      * @return
      */
     @Override
-    public List<EventsKeyPointSafaguardThing> getKeyPointSafaguardThing(String start) {
-        List<EventsKeyPointSafaguardThing> list = new ArrayList<>();
+    public List<EventsKeyProtection> getEventsKeyProtection(Date start, String logMark) {
+        List<EventsKeyProtection> list = new ArrayList<>();
         long timeMillisStart = System.currentTimeMillis();
         try {
-            list = eventsDao.getKeyPointSafaguardThing(start);
+            list = eventsDao.getEventsKeyProtection(start);
         } catch (Exception e) {
-            logger.error("重点保障事件总览\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
-        logger.info("重点保障事件总览耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("重点保障事件总览------->测试数据");
-            list.add(new EventsKeyPointSafaguardThing(start, "double agent", start, (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100)));
-            list.add(new EventsKeyPointSafaguardThing(start, "Second task", start, (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100)));
-            list.add(new EventsKeyPointSafaguardThing(start, "Subject Tests", start, (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100)));
+            java.sql.Date taskTime = new java.sql.Date(start.getTime());
+            logger.info(logMark + "------->测试数据");
+            list.add(new EventsKeyProtection(start, "double agent", taskTime, (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100)));
+            list.add(new EventsKeyProtection(start, "Second task", taskTime, (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100)));
+            list.add(new EventsKeyProtection(start, "Subject Tests", taskTime, (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100)));
         }
         return list;
     }
@@ -278,58 +279,28 @@ public class EventsServiceImpl implements EventsService {
      * @return
      */
     @Override
-    public List<EventsSpecificWebsites> getSpecificWebsites(String end) {
-        List<EventsSpecificWebsites> list = new ArrayList<>();
-        long timeMillisStart = System.currentTimeMillis();
-        try {
-            list = eventsDao.getSpecificWebsites(end);
-        } catch (Exception e) {
-            logger.error("特定网站监控\t查询异常\tserviceImpl", e);
-        }
-        logger.info("特定网站监控耗时：" + (System.currentTimeMillis() - timeMillisStart));
-        if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("特定网站监控------->测试数据");
-            int i = (int) (Math.random() * 100);
-            list.add(new EventsSpecificWebsites(end, "Facebook", i + 100));
-            list.add(new EventsSpecificWebsites(end, "Wikipedia", i + 90));
-            list.add(new EventsSpecificWebsites(end, "Reddit", i + 80));
-            list.add(new EventsSpecificWebsites(end, "Qq", i + 50));
-            list.add(new EventsSpecificWebsites(end, "Taobao", i + 30));
-            list.add(new EventsSpecificWebsites(end, "Tmall", i + 25));
-            list.add(new EventsSpecificWebsites(end, "Baidu", i + 20));
-            list.add(new EventsSpecificWebsites(end, "Souhu", i + 15));
-            list.add(new EventsSpecificWebsites(end, "Google", i + 10));
-            list.add(new EventsSpecificWebsites(end, "Wikipedia", i + 6));
-        }
-        return list;
-    }
-
-
-
-
-    @Override
-    public List<EventsSpecificWebsites> getFocusWebsite(String start, String end) {
+    public List<EventsSpecificWebsites> getSpecificWebsites(Date push, String logMark) {
         List<EventsSpecificWebsites> list = new ArrayList<>();
         long timeMillisStart = System.currentTimeMillis();
         try {
-            list = eventsDao.getFocusWebsite(start, end);
+            list = eventsDao.getSpecificWebsites(push);
         } catch (Exception e) {
-            logger.error("特定网站监控\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
-        logger.info("特定网站监控耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("特定网站监控------->测试数据");
+            logger.info(logMark + "------->测试数据");
             int i = (int) (Math.random() * 100);
-            list.add(new EventsSpecificWebsites(end, "Facebook", i + 100));
-            list.add(new EventsSpecificWebsites(end, "Wikipedia", i + 90));
-            list.add(new EventsSpecificWebsites(end, "Reddit", i + 80));
-            list.add(new EventsSpecificWebsites(end, "Qq", i + 50));
-            list.add(new EventsSpecificWebsites(end, "Taobao", i + 30));
-            list.add(new EventsSpecificWebsites(end, "Tmall", i + 25));
-            list.add(new EventsSpecificWebsites(end, "Baidu", i + 20));
-            list.add(new EventsSpecificWebsites(end, "Souhu", i + 15));
-            list.add(new EventsSpecificWebsites(end, "Google", i + 10));
-            list.add(new EventsSpecificWebsites(end, "Wikipedia", i + 6));
+            list.add(new EventsSpecificWebsites(push, "Facebook", i + 100));
+            list.add(new EventsSpecificWebsites(push, "Wikipedia", i + 90));
+            list.add(new EventsSpecificWebsites(push, "Reddit", i + 80));
+            list.add(new EventsSpecificWebsites(push, "Qq", i + 50));
+            list.add(new EventsSpecificWebsites(push, "Taobao", i + 30));
+            list.add(new EventsSpecificWebsites(push, "Tmall", i + 25));
+            list.add(new EventsSpecificWebsites(push, "Baidu", i + 20));
+            list.add(new EventsSpecificWebsites(push, "Souhu", i + 15));
+            list.add(new EventsSpecificWebsites(push, "Google", i + 10));
+            list.add(new EventsSpecificWebsites(push, "Wikipedia", i + 6));
         }
         return list;
     }
@@ -337,28 +308,30 @@ public class EventsServiceImpl implements EventsService {
     /**
      * 事件监测
      *
-     * @param end
+     * @param logMark
      * @return
      */
     @Override
-    public List<EventsMonitor> getEventsMonitor(String end) {
+    public List<EventsMonitor> getEventsMonitor(String logMark) {
         List<EventsMonitor> list = new ArrayList<>();
         long timeMillisStart = System.currentTimeMillis();
         try {
             list = eventsDao.getEventsMonitor();
         } catch (Exception e) {
-            logger.error("事件监测\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
-        logger.info("事件监测耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("事件监测------->测试数据");
-            list.add(new EventsMonitor("double agent", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end));
-            list.add(new EventsMonitor("nuclear program", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end));
-            list.add(new EventsMonitor("Subject Tests", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end));
-            list.add(new EventsMonitor("fake task", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end));
-            list.add(new EventsMonitor("savage", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end));
-            list.add(new EventsMonitor("satellite", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end));
-            list.add(new EventsMonitor("taskName", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end));
+            logger.info(logMark + "------->测试数据");
+            Date taskTimeTemp = DateUtil.getFormatHour(new Date());
+            java.sql.Date taskTime = new java.sql.Date(taskTimeTemp.getTime());
+            list.add(new EventsMonitor("double agent", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), taskTime));
+            list.add(new EventsMonitor("nuclear program", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), taskTime));
+            list.add(new EventsMonitor("Subject Tests", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), taskTime));
+            list.add(new EventsMonitor("fake task", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), taskTime));
+            list.add(new EventsMonitor("savage", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), taskTime));
+            list.add(new EventsMonitor("satellite", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), taskTime));
+            list.add(new EventsMonitor("taskName", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), taskTime));
         }
         return list;
     }
@@ -366,28 +339,30 @@ public class EventsServiceImpl implements EventsService {
     /**
      * 事件封堵
      *
-     * @param end
+     * @param logMark
      * @return
      */
     @Override
-    public List<EventsBlock> getEventsBlock(String end) {
+    public List<EventsBlock> getEventsBlock(String logMark) {
         List<EventsBlock> list = new ArrayList<>();
         long timeMillisStart = System.currentTimeMillis();
         try {
             list = eventsDao.getEventsBlock();
         } catch (Exception e) {
-            logger.error("事件封堵\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
-        logger.info("事件封堵耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("事件封堵------->测试数据");
-            list.add(new EventsBlock("spy", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end));
-            list.add(new EventsBlock("test", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end));
-            list.add(new EventsBlock("second task", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end));
-            list.add(new EventsBlock("Two Sessions", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end));
-            list.add(new EventsBlock("taskName", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end));
-            list.add(new EventsBlock("ACTIVATING EVENT", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end));
-            list.add(new EventsBlock("Meeting event", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), end));
+            logger.info(logMark + "------->测试数据");
+            Date taskTimeTemp = DateUtil.getFormatHour(new Date());
+            java.sql.Date taskTime = new java.sql.Date(taskTimeTemp.getTime());
+            list.add(new EventsBlock("spy", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), taskTime));
+            list.add(new EventsBlock("test", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), taskTime));
+            list.add(new EventsBlock("second task", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), taskTime));
+            list.add(new EventsBlock("Two Sessions", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), taskTime));
+            list.add(new EventsBlock("taskName", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), taskTime));
+            list.add(new EventsBlock("ACTIVATING EVENT", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), taskTime));
+            list.add(new EventsBlock("Meeting event", (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), (int) (Math.random() * 100), taskTime));
         }
         return list;
     }
@@ -400,22 +375,22 @@ public class EventsServiceImpl implements EventsService {
      * @return
      */
     @Override
-    public List<EventsAudioMonitor> getEventsAudioMonitor(String start, String end) {
+    public List<EventsAudioMonitor> getEventsAudioMonitor(Date start, Date end, String logMark) {
         List<EventsAudioMonitor> list = new ArrayList<>();
         long timeMillisStart = System.currentTimeMillis();
         try {
             list = eventsDao.getEventsAudioMonitor(start, start, end);
         } catch (Exception e) {
-            logger.error("音频监控\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
         if (ListUtils.isEmptyList(list) && ConfigUtil.recentData) {
-            logger.warn("音频监控\tMM_AUDIO_REPORT\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
+            logger.warn("{}\tMM_AUDIO_REPORT\t{}至{}\t期间无数据\t查询最近数据", logMark, start, end);
             try {
-                Date lastTime = eventsDao.getEventsAudioMonitorLastTime(end);
-                if (lastTime != null) {
-                    String time = DateUtils.formatDateTime(lastTime);
-                    time = DateUtils.getRangeOfhour(time);
-                    list = eventsDao.getEventsAudioMonitor(start, time, DateUtils.getAfter1h(time));
+                Date startLastTime = eventsDao.getEventsAudioMonitorLastTime(end);
+                if (startLastTime != null) {
+                    startLastTime = DateUtil.getFormatHour(startLastTime);
+                    Date endLastTime = DateUtil.getSomeHour(startLastTime, 1);
+                    list = eventsDao.getEventsAudioMonitor(start, startLastTime, endLastTime);
                 } else {
                     logger.warn("音频监控\tMM_AUDIO_REPORT\t无数据");
                 }
@@ -449,32 +424,32 @@ public class EventsServiceImpl implements EventsService {
      * @return
      */
     @Override
-    public List<EventsVedioMonitor> getVedioMonitor(String start, String end) {
+    public List<EventsVedioMonitor> getVedioMonitor(Date start, Date end, String logMark) {
         List<EventsVedioMonitor> list = new ArrayList<>();
         long timeMillisStart = System.currentTimeMillis();
         try {
             list = eventsDao.getVedioMonitor(start, start, end);
         } catch (Exception e) {
-            logger.error("视频监控\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
         if (ListUtils.isEmptyList(list) && ConfigUtil.recentData) {
-            logger.warn("视频监控\tMM_VIDEO_REPORT\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
+            logger.warn("{}\tMM_VIDEO_REPORT\t{}至{}\t期间无数据\t查询最近数据", logMark, start, end);
             try {
-                Date lastTime = eventsDao.getVedioMonitorLastTime(end);
-                if (lastTime != null) {
-                    String time = DateUtils.formatDateTime(lastTime);
-                    time = DateUtils.getRangeOfhour(time);
-                    list = eventsDao.getVedioMonitor(start, time, DateUtils.getAfter1h(time));
+                Date startLastTime = eventsDao.getVedioMonitorLastTime(end);
+                if (startLastTime != null) {
+                    startLastTime = DateUtil.getFormatHour(startLastTime);
+                    Date endLastTime = DateUtil.getSomeHour(startLastTime, 1);
+                    list = eventsDao.getVedioMonitor(start, startLastTime, endLastTime);
                 } else {
-                    logger.warn("视频监控\tMM_VIDEO_REPORT\t无数据");
+                    logger.warn(logMark + "\tMM_VIDEO_REPORT\t无数据");
                 }
             } catch (Exception e) {
-                logger.error("视频监控\t最近数据\t查询异常\tserviceImpl", e);
+                logger.error(logMark + "\t最近数据\t查询异常\tserviceImpl", e);
             }
         }
-        logger.info("视频监控耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("视频监控------->测试数据");
+            logger.info(logMark + "------->测试数据");
             int i = (int) (Math.random() * 100);
             list.add(new EventsVedioMonitor("" + (int) (Math.random() * 50), i + 320, "http://baidu/video/eefv/h66"));
             list.add(new EventsVedioMonitor("" + (int) (Math.random() * 50), i + 311, "http://sougou/dig/86/ty"));
@@ -498,32 +473,32 @@ public class EventsServiceImpl implements EventsService {
      * @return
      */
     @Override
-    public List<EventsImageMonitor> getImageMonitor(String start, String end) {
+    public List<EventsImageMonitor> getImageMonitor(Date start, Date end, String logMark) {
         List<EventsImageMonitor> list = new ArrayList<>();
         long timeMillisStart = System.currentTimeMillis();
         try {
             list = eventsDao.getImageMonitor(start, start, end);
         } catch (Exception e) {
-            logger.error("图片监控\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
         if (ListUtils.isEmptyList(list) && ConfigUtil.recentData) {
-            logger.warn("图片监控\tMM_PIC_REPORT" + start + "至" + end + "\t期间无数据\t查询最近数据");
+            logger.warn(logMark + "\tMM_PIC_REPORT{}至{}\t期间无数据\t查询最近数据", logMark, start, end);
             try {
-                Date lastTime = eventsDao.getImageMonitorLastTime(end);
-                if (lastTime != null) {
-                    String time = DateUtils.formatDateTime(lastTime);
-                    time = DateUtils.getRangeOfhour(time);
-                    list = eventsDao.getImageMonitor(start, time, DateUtils.getAfter1h(time));
+                Date startLastTime = eventsDao.getImageMonitorLastTime(end);
+                if (startLastTime != null) {
+                    startLastTime = DateUtil.getFormatHour(startLastTime);
+                    Date endLastTime = DateUtil.getSomeHour(startLastTime, 1);
+                    list = eventsDao.getImageMonitor(start, startLastTime, endLastTime);
                 } else {
-                    logger.warn("图片监控\tMM_PIC_REPORT\t无数据");
+                    logger.warn(logMark + "\tMM_PIC_REPORT\t无数据");
                 }
             } catch (Exception e) {
-                logger.error("图片监控\t最近数据\t查询异常\tserviceImpl", e);
+                logger.error(logMark + "\t最近数据\t查询异常\tserviceImpl", e);
             }
         }
-        logger.info("视频监控耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("图片监控------->测试数据");
+            logger.info(logMark + "------->测试数据");
             int i = (int) (Math.random() * 100);
             list.add(new EventsImageMonitor("" + (int) (Math.random() * 50), i + 320, "http://baidu/dfedf/h66"));
             list.add(new EventsImageMonitor("" + (int) (Math.random() * 50), i + 310, "http://souhu/users/sign_in"));
@@ -547,30 +522,30 @@ public class EventsServiceImpl implements EventsService {
      * @return
      */
     @Override
-    public List<EventsVoipMonitor> getVoipMonitor(String start, String end) {
+    public List<EventsVoipMonitor> getVoipMonitor(Date start, Date end, String logMark) {
         List<EventsVoipMonitor> list = new ArrayList<>();
         try {
             list = eventsDao.getVoipMonitor(start, start, end);
         } catch (Exception e) {
-            logger.error("VOIP监控\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
         if (ListUtils.isEmptyList(list) && ConfigUtil.recentData) {
-            logger.warn("VOIP监控\tMM_VOIP_REPORT\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
+            logger.warn("{}\tMM_VOIP_REPORT\t{}至{}\t期间无数据\t查询最近数据", logMark, start, end);
             try {
-                Date lastTime = eventsDao.getVoipMonitorLastTime(end);
-                if (lastTime != null) {
-                    String time = DateUtils.formatDateTime(lastTime);
-                    time = DateUtils.getRangeOfhour(time);
-                    list = eventsDao.getVoipMonitor(start, time, DateUtils.getAfter1h(time));
+                Date startLastTime = eventsDao.getVoipMonitorLastTime(end);
+                if (startLastTime != null) {
+                    startLastTime = DateUtil.getFormatHour(startLastTime);
+                    Date endLastTime = DateUtil.getSomeHour(startLastTime, 1);
+                    list = eventsDao.getVoipMonitor(start, startLastTime, endLastTime);
                 } else {
-                    logger.warn("VOIP监控\tMM_VOIP_REPORT\t无数据");
+                    logger.warn(logMark + "\tMM_VOIP_REPORT\t无数据");
                 }
             } catch (Exception e) {
-                logger.error("VOIP监控\t最近数据\t查询异常\tserviceImpl", e);
+                logger.error(logMark + "\t最近数据\t查询异常\tserviceImpl", e);
             }
         }
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("VOIP监控------->测试数据");
+            logger.info(logMark + "------->测试数据");
             int i = (int) (Math.random() * 100);
             list.add(new EventsVoipMonitor("" + (int) (Math.random() * 10000) + 1982345254, i + 560, "http://baidu/iphi/picture/grennd/efd=3"));
             list.add(new EventsVoipMonitor("" + (int) (Math.random() * 10000) + 1760145025, i + 230, "http://sougoole/news/vedio/id=3"));
@@ -594,9 +569,9 @@ public class EventsServiceImpl implements EventsService {
      * @return
      */
     @Override
-    public List<EventsDdosAlarm> getDdosAlarm(String start, String end) {
+    public List<EventsDdosAlarm> getDdosAlarm(Date start, Date end, String loMark) {
         List<EventsDdosAlarm> list = new ArrayList<>();
-        logger.info("网络行为预警------->测试数据");
+        logger.info(loMark + "------->测试数据");
         list.add(new EventsDdosAlarm("DDOS Attack", start, "Level 1"));
         list.add(new EventsDdosAlarm("DOS Attack", start, "Level 2"));
         list.add(new EventsDdosAlarm("CC Attack", start, "Level 3"));
@@ -611,33 +586,33 @@ public class EventsServiceImpl implements EventsService {
      * @return
      */
     @Override
-    public List<EvevtsTargetNetwork> getTargetNetwork(String start, String end) {
+    public List<EvevtsTargetNetwork> getTargetNetwork(Date start, Date end, String logMark) {
         List<EvevtsTargetNetwork> list = new ArrayList<>();
         long timeMillisStart = System.currentTimeMillis();
         try {
             list = eventsDao.getTargetNetwork(start, start, end);
         } catch (Exception e) {
-            logger.error("目标行为网络监测\t查询异常\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\t查询异常\tserviceImpl", e);
         }
         if (ListUtils.isEmptyList(list) && ConfigUtil.recentData) {
-            logger.warn("目标行为网络监测\tNTC_RADIUS_REPORT\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
+            logger.warn("{}\tNTC_RADIUS_REPORT\t{}至{}\t期间无数据\t查询最近数据", logMark, start, end);
             try {
-                Date lastTime = eventsDao.getTargetNetworkLastTime(end);
-                if (lastTime != null) {
-                    String time = DateUtils.formatDateTime(lastTime);
-                    time = DateUtils.getRangeOfday(time);
-                    list = eventsDao.getTargetNetwork(start, time, DateUtils.getAfter24h(time));
+                Date startLastTime = eventsDao.getTargetNetworkLastTime(end);
+                if (startLastTime != null) {
+                    startLastTime = DateUtil.getFormatDay(startLastTime);
+                    Date endLastTime = DateUtil.getSomeDate(startLastTime, 1);
+                    list = eventsDao.getTargetNetwork(start, startLastTime, endLastTime);
                 } else {
-                    logger.warn("目标行为网络监测\tNTC_RADIUS_REPORT\t无数据");
+                    logger.warn(logMark + "\tNTC_RADIUS_REPORT\t无数据");
                 }
             } catch (Exception e) {
-                logger.error("目标行为网络监测\t最近数据\t查询异常\tserviceImpl", e);
+                logger.error(logMark + "\t最近数据\t查询异常\tserviceImpl", e);
             }
         }
-        logger.info("目标行为网络监测耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         //&& ConfigUtil.testData
         if (ListUtils.isEmptyList(list)) {
-            logger.info("目标行为网络监测------->测试数据");
+            logger.info(logMark + "------->测试数据");
             int i = (int) (Math.random() * 100);
             list.add(new EvevtsTargetNetwork("admin", "10.25.6." + (int) (Math.random() * 50), i + 10, start));
             list.add(new EvevtsTargetNetwork("root", "192.78.7.." + (int) (Math.random() * 50), i + 6, start));
@@ -650,23 +625,23 @@ public class EventsServiceImpl implements EventsService {
     /**
      * 硬件设备统计
      *
-     * @param end
+     * @param push
      * @return
      */
     @Override
-    public List<EventsDeviceNum> getDeviceNum(String end) {
+    public List<EventsDeviceNum> getDeviceNum(Date push, String logMark) {
         List<EventsDeviceNum> list = new ArrayList<>();
         Map<String, AreaDictInfo> listArea = listAreaDictInfo();
-        list.add(new EventsDeviceNum("1", end, "server", AstanaDeviceServerNum));
-        list.add(new EventsDeviceNum("1", end, "core swtich", AstanaDeviceCoreSwtichNum));
-        list.add(new EventsDeviceNum("1", end, "access switch", AstanaDeviceAccessSwitchNum));
-        list.add(new EventsDeviceNum("1", end, "asem", AstanaDeviceAsemNum));
-        list.add(new EventsDeviceNum("1", end, "adc", AstanaDeviceAdcNum));
-        list.add(new EventsDeviceNum("2", end, "server", AlmatyDeviceServerNum));
-        list.add(new EventsDeviceNum("2", end, "core swtich", AlmatyDeviceCoreSwtichNum));
-        list.add(new EventsDeviceNum("2", end, "access switch", AlmatyDeviceAccessSwitchNum));
-        list.add(new EventsDeviceNum("2", end, "asem", AlmatyDeviceAsemNum));
-        list.add(new EventsDeviceNum("2", end, "adc", AlmatyDeviceAdcNum));
+        list.add(new EventsDeviceNum("1", push, "server", AstanaDeviceServerNum));
+        list.add(new EventsDeviceNum("1", push, "core swtich", AstanaDeviceCoreSwtichNum));
+        list.add(new EventsDeviceNum("1", push, "access switch", AstanaDeviceAccessSwitchNum));
+        list.add(new EventsDeviceNum("1", push, "asem", AstanaDeviceAsemNum));
+        list.add(new EventsDeviceNum("1", push, "adc", AstanaDeviceAdcNum));
+        list.add(new EventsDeviceNum("2", push, "server", AlmatyDeviceServerNum));
+        list.add(new EventsDeviceNum("2", push, "core swtich", AlmatyDeviceCoreSwtichNum));
+        list.add(new EventsDeviceNum("2", push, "access switch", AlmatyDeviceAccessSwitchNum));
+        list.add(new EventsDeviceNum("2", push, "asem", AlmatyDeviceAsemNum));
+        list.add(new EventsDeviceNum("2", push, "adc", AlmatyDeviceAdcNum));
         if (!ListUtils.isEmptyList(list)) {
             Iterator<EventsDeviceNum> ntcDisReport = list.iterator();
             while (ntcDisReport.hasNext()) {
@@ -691,34 +666,32 @@ public class EventsServiceImpl implements EventsService {
      * @return
      */
     @Override
-    public List<EventsRunningState> getRunningState(String start, String end) {
+    public List<EventsRunningState> getRunningState(Date start, Date end, String loaMark) {
         List<EventsRunningState> list = new ArrayList<>();
         long timeMillisStart = System.currentTimeMillis();
         try {
             list = eventsDao.getRunningState(start, start, end);
-            list.removeAll(Collections.singleton(null));
         } catch (Exception e) {
-            logger.error("运行状态\t查询异常\tserviceImpl", e);
+            logger.error(loaMark + "\t查询异常\tserviceImpl", e);
         }
         if (ListUtils.isEmptyList(list) && ConfigUtil.recentData) {
-            logger.warn("运行状况\tPXY_TOTAL_REPORT\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
+            logger.warn(loaMark + "\tPXY_TOTAL_REPORT\t{}至{}\t期间无数据\t查询最近数据", loaMark, start, end);
             try {
-                Date lastTime = eventsDao.getRunningStateLastTime(end);
-                if (lastTime != null) {
-                    String time = DateUtils.formatDateTime(lastTime);
-                    time = DateUtils.getRangeOfhour(time);
-                    list = eventsDao.getRunningState(start, time, DateUtils.getAfter1h(time));
-                    list.removeAll(Collections.singleton(null));
+                Date startLastTime = eventsDao.getRunningStateLastTime(end);
+                if (startLastTime != null) {
+                    startLastTime = DateUtil.getFormatHour(startLastTime);
+                    Date endLastTime = DateUtil.getSomeHour(startLastTime, 1);
+                    list = eventsDao.getRunningState(start, startLastTime, endLastTime);
                 } else {
-                    logger.warn("运行状况\tPXY_TOTAL_REPORT\t无数据");
+                    logger.warn(loaMark + "\tPXY_TOTAL_REPORT\t无数据");
                 }
             } catch (Exception e) {
-                logger.error("运行状况\t最近数据\t查询异常\tserviceImpl", e);
+                logger.error(loaMark + "\t最近数据\t查询异常\tserviceImpl", e);
             }
         }
-        logger.info("运行状况耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", loaMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("运行状况------->测试数据");
+            logger.info(loaMark + "------->测试数据");
             list.add(new EventsRunningState((int) (Math.random() * 300), (int) (Math.random() * 200), (int) (Math.random() * 300)));
         }
         return list;
@@ -733,7 +706,7 @@ public class EventsServiceImpl implements EventsService {
      * @return
      */
     @Override
-    public List<EventsNameNumTime> getTypeMonitorReject(String start, String end, String type) {
+    public List<EventsNameNumTime> getTypeMonitorReject(Date start, Date end, String type) {
         long timeMillisStart = System.currentTimeMillis();
         String logMark = null;
         int serviceId;
@@ -753,24 +726,20 @@ public class EventsServiceImpl implements EventsService {
             logMark = "IP阻断TOP10";
             serviceId = 16;
         }
-        Date startDate = DateUtils.getDateOfString(start);
-        Date endDate = DateUtils.getDateOfString(end);
         List<EventsNameNumTime> list = new ArrayList<>();
         try {
-            list = eventsDao.getHttpsMonitor(start, startDate, endDate, serviceId);
-
+            list = eventsDao.getHttpsMonitor(start, start, end, serviceId);
         } catch (Exception e) {
             logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
         if (ListUtils.isEmptyList(list) && ConfigUtil.recentData) {
             logger.warn(logMark + "\tNTC_PZ_REPORT\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
             try {
-                Date lastTime = eventsDao.getHttpsMonitorLastTime(DateUtils.getDateOfString(end), serviceId);
-                if (lastTime != null) {
-                    String startTime = DateUtils.formatDateTime(lastTime);
-                    startTime = DateUtils.getRangeOfhour(startTime);
-                    String endTime = DateUtils.getAfter1h(startTime);
-                    list = eventsDao.getHttpsMonitor(start, DateUtils.getDateOfString(startTime), DateUtils.getDateOfString(endTime), serviceId);
+                Date startLastTime = eventsDao.getHttpsMonitorLastTime(end, serviceId);
+                if (startLastTime != null) {
+                    startLastTime = DateUtil.getFormatHour(startLastTime);
+                    Date endLastTime = DateUtil.getSomeHour(startLastTime, 1);
+                    list = eventsDao.getHttpsMonitor(start, startLastTime, endLastTime, serviceId);
                 } else {
                     logger.warn(logMark + "\tNTC_PZ_REPORT\t无数据");
                 }
@@ -821,31 +790,30 @@ public class EventsServiceImpl implements EventsService {
      * @return
      */
     @Override
-    public List<EventsPortInfo> getPortInfo(String start, String end) {
+    public List<EventsPortInfo> getPortInfo(Date start, Date end, String logMark) {
         long timeMillisStart = System.currentTimeMillis();
         List<EventsPortInfo> list = new ArrayList<>();
         try {
-            list = eventsDao.getPortInfo(start, DateUtils.getDateOfString(start), DateUtils.getDateOfString(end));
+            list = eventsDao.getPortInfo(start, start, end);
         } catch (Exception e) {
-            logger.error("端口信息\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
         if (ListUtils.isEmptyList(list) && ConfigUtil.recentData) {
-            logger.warn("端口信息\t********\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
+            logger.warn("{}\t********\t{}至{}\t期间无数据\t查询最近数据", logMark, start, end);
             try {
-                Date lastTime = eventsDao.getPortInfoLastTime(DateUtils.getDateOfString(end));
-                if (lastTime != null) {
-                    String startRecent = DateUtils.formatDateTime(lastTime);
-                    startRecent = DateUtils.getRangeOfhour(startRecent);
-                    String endRecent = DateUtils.getAfter1h(startRecent);
-                    list = eventsDao.getPortInfo(start, DateUtils.getDateOfString(startRecent), DateUtils.getDateOfString(endRecent));
+                Date startLastTime = eventsDao.getPortInfoLastTime(end);
+                if (startLastTime != null) {
+                    startLastTime = DateUtil.getFormatHour(startLastTime);
+                    Date endLastTime = DateUtil.getSomeHour(startLastTime, 1);
+                    list = eventsDao.getPortInfo(start, startLastTime, endLastTime);
                 } else {
-                    logger.warn("端口信息\t*********\t无数据");
+                    logger.warn(logMark + "\t*********\t无数据");
                 }
             } catch (Exception e) {
-                logger.error("端口信息\t最近数据\t查询异常\tserviceImpl", e);
+                logger.error(logMark + "\t最近数据\t查询异常\tserviceImpl", e);
             }
         }
-        logger.info("端口信息耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
             logger.info("端口信息------->测试数据");
             list = new ArrayList<>();
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..6a63d03 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
@@ -4,7 +4,7 @@ import com.nis.galaxy.config.MyLoad;
 import com.nis.galaxy.domain.*;
 import com.nis.galaxy.domain.dict.AreaDictInfo;
 import com.nis.galaxy.util.ConfigUtil;
-import com.nis.galaxy.util.DateUtils;
+import com.nis.galaxy.util.DateUtil;
 import com.nis.galaxy.util.ListUtils;
 import com.nis.galaxy.web.dao.MonitorDao;
 import com.nis.galaxy.web.service.MonitorService;
@@ -37,20 +37,15 @@ public class MonitorServiceImpl implements MonitorService {
         return listAreaDictInfo;
     }
 
-    /**
-     * 系统监控
-     *
-     * @return
-     */
     @Override
-    public List<NmsServerBean> getMonitorOf1m() {
+    public List<NmsServerBean> getSystemMonitoringGlobalGis(String logMark) {
+        long timeMillisStart = System.currentTimeMillis();
         List<NmsServerBean> list = new ArrayList<>();
         Map<String, AreaDictInfo> listArea = listAreaDictInfo();
-        long timeMillisStart = System.currentTimeMillis();
         try {
-            list = monitorDao.getSystemMonitor();
+            list = monitorDao.getSystemMonitoringGlobalGis();
         } catch (Exception e) {
-            logger.error("系统监控\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
         //迭代映射地域表，过滤无地域映射数据
         if (!ListUtils.isEmptyList(list)) {
@@ -67,16 +62,16 @@ public class MonitorServiceImpl implements MonitorService {
                 }
             }
         }
-        logger.info("系统监控耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("系统监控------->测试数据");
+            logger.info(logMark + "------->测试数据");
             list = new ArrayList<>();
             NmsServerBean nmsServerBean = new NmsServerBean();
             nmsServerBean.setAbnormal(2);
             nmsServerBean.setArea("Астана");
             nmsServerBean.setNormal(8);
             nmsServerBean.setSystem("ntc");
-            nmsServerBean.setTime(DateUtils.getRangeOf1min(new Date()));
+            nmsServerBean.setTime(DateUtil.getFormatMinuteOne(new Date()));
             nmsServerBean.setTotal(10);
             AbnormalBean abnormalBean1 = new AbnormalBean("serverMachine01", "10.3.48.6");
             AbnormalBean abnormalBean2 = new AbnormalBean("serverMachine02", "10.3.48.8");
@@ -97,40 +92,40 @@ public class MonitorServiceImpl implements MonitorService {
      * @return
      */
     @Override
-    public List<NetWaterMonitor> getNetWaterMonitor(String start, String end, int areaNetWaterMonitorExpTimes) {
+    public List<NetWaterMonitor> getNetWaterMonitor(Date start, Date end, int areaNetWaterMonitorExpTimes, String logMark) {
         List<NetWaterMonitor> list = new ArrayList<>();
         Map<String, AreaDictInfo> listArea = listAreaDictInfo();
         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) {
                     areaNetWaterMonitorExpTimes = 3;
                 }
                 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));
+                    Date emptStart = DateUtil.getSomeMinute(start, -5 * i);
+                    Date emptEnd = DateUtil.getSomeMinute(emptStart, 5);
+                    list = monitorDao.getNetWaterMonitor(emptStart, emptStart, emptEnd);
                 }
             }
         } catch (Exception e) {
-            logger.error("网络流量监控\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
             throw new RuntimeException();
         }
         if (ListUtils.isEmptyList(list) && ConfigUtil.tendencyData) {
-            logger.warn("网络流量监控\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
+            logger.warn("{}\t{}至{}\t期间无数据\t查询最近数据", logMark, start, end);
             try {
-                Date lastTime = monitorDao.getNetWaterMonitorLastTime(end);
-                if (lastTime != null) {
-                    String time = DateUtils.formatDateTime(lastTime);
-                    time = DateUtils.getRangeOf5min(time);
-                    list = monitorDao.getNetWaterMonitor(start, time, DateUtils.getAfter5min(time), DateUtils.getBeforeNminOfTime(time, -5));
+                Date startLastTime = monitorDao.getNetWaterMonitorLastTime(end);
+                if (startLastTime != null) {
+                    startLastTime = DateUtil.getFormatMinute(startLastTime);
+                    Date endLastTime = DateUtil.getSomeMinute(startLastTime, 5);
+                    list = monitorDao.getNetWaterMonitor(start, startLastTime, endLastTime);
                 } else {
-                    logger.warn("网络流量监控\t无数据");
+                    logger.warn(logMark + "\t无数据");
                 }
             } catch (Exception e) {
-                logger.error("网络流量监控\t最近数据\t查询异常\tserviceImpl", e);
+                logger.error(logMark + "\t最近数据\t查询异常\tserviceImpl", e);
             }
         }
         if (!ListUtils.isEmptyList(list)) {
@@ -147,15 +142,15 @@ public class MonitorServiceImpl implements MonitorService {
                 }
             }
         }
-        logger.info("网络流量监控耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("网络流量监控------->测试数据");
+            logger.info(logMark + "------->测试数据");
             if (ConfigUtil.languageChose == 3) {
-                list.add(new NetWaterMonitor(start, "Астана", "INOCTETS", (long) (Math.random() * 20000)));
-                list.add(new NetWaterMonitor(start, "Астана", "OUTOCTETS", (long) (Math.random() * 20000)));
+                list.add(new NetWaterMonitor(start, "Астана", "IN", (long) (Math.random() * 20000)));
+                list.add(new NetWaterMonitor(start, "Астана", "OUT", (long) (Math.random() * 20000)));
             } else {
-                list.add(new NetWaterMonitor(start, "Astana", "OUTOCTETS", (long) (Math.random() * 20000)));
-                list.add(new NetWaterMonitor(start, "Astana", "INOCTETS", (long) (Math.random() * 20000)));
+                list.add(new NetWaterMonitor(start, "Astana", "IN", (long) (Math.random() * 20000)));
+                list.add(new NetWaterMonitor(start, "Astana", "OUT", (long) (Math.random() * 20000)));
             }
         }
         return list;
diff --git a/src/main/java/com/nis/galaxy/web/service/impl/NetflowServiceImpl.java b/src/main/java/com/nis/galaxy/web/service/impl/NetflowServiceImpl.java
index a982b43..5ffa887 100644
--- a/src/main/java/com/nis/galaxy/web/service/impl/NetflowServiceImpl.java
+++ b/src/main/java/com/nis/galaxy/web/service/impl/NetflowServiceImpl.java
@@ -4,7 +4,7 @@ import com.nis.galaxy.config.MyLoad;
 import com.nis.galaxy.domain.*;
 import com.nis.galaxy.domain.dict.AreaDictInfo;
 import com.nis.galaxy.util.ConfigUtil;
-import com.nis.galaxy.util.DateUtils;
+import com.nis.galaxy.util.DateUtil;
 import com.nis.galaxy.util.ListUtils;
 import com.nis.galaxy.web.dao.NetflowDao;
 import com.nis.galaxy.web.service.NetflowService;
@@ -65,28 +65,28 @@ public class NetflowServiceImpl implements NetflowService {
      * @return
      */
     @Override
-    public List<TimeTypeCount> getNetflowStatistic5m(String start, String end) {
+    public List<TimeTypeCount> getNetflowStatistic5m(Date start, Date end, String logMark) {
         List<TimeTypeCount> list = new ArrayList<>();
         Map<String, String> listProtocolDict = listProtocolDict();
         long timeMillisStart = System.currentTimeMillis();
         try {
             list = netflowDao.getNetflowStatistic5mOnly(start, start, end);
         } catch (Exception e) {
-            logger.error("5分钟内网络流量统计\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
         if (ListUtils.isEmptyList(list) && ConfigUtil.recentData) {
-            logger.warn("5分钟内网络流量统计\tTRAFFIC_PROTOCOL_STATISTIC\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
+            logger.warn("{}\tTRAFFIC_PROTOCOL_STATISTIC\t{}至{}\t期间无数据\t查询最近数据", logMark, start, end);
             try {
-                Date lastTime = netflowDao.getNetflowStatistic5mLastTime(end);
-                if (lastTime != null) {
-                    String time = DateUtils.formatDateTime(lastTime);
-                    time = DateUtils.getRangeOf5min(time);
-                    list = netflowDao.getNetflowStatistic5mOnly(start, time, DateUtils.getAfter5min(time));
+                Date endLastTime = netflowDao.getNetflowStatistic5mLastTime(end);
+                if (endLastTime != null) {
+                    endLastTime = DateUtil.getFormatMinute(endLastTime);
+                    Date startLastTime = DateUtil.getSomeMinute(endLastTime, 5);
+                    list = netflowDao.getNetflowStatistic5mOnly(start, startLastTime, endLastTime);
                 } else {
-                    logger.warn("5分钟内网络流量统计\tTRAFFIC_PROTOCOL_STATISTIC\t无数据");
+                    logger.warn(logMark + "\tTRAFFIC_PROTOCOL_STATISTIC\t无数据");
                 }
             } catch (Exception e) {
-                logger.error("5分钟内网络流量统计\t最近数据\t查询异常\tserviceImpl", e);
+                logger.error(logMark + "\t最近数据\t查询异常\tserviceImpl", e);
             }
         }
         if (!ListUtils.isEmptyList(list)) {
@@ -100,9 +100,9 @@ public class NetflowServiceImpl implements NetflowService {
                 }
             }
         }
-        logger.info("5分钟内网络流量统计耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("5分钟内网络流量统计------->测试数据");
+            logger.info(logMark + "------->测试数据");
             int i = (int) (Math.random() * 1000);
             list.add(new TimeTypeCount(start, "HTTP", 3600 + i));
             list.add(new TimeTypeCount(start, "IPSE", 38621 + i));
@@ -124,28 +124,28 @@ public class NetflowServiceImpl implements NetflowService {
      * @return
      */
     @Override
-    public List<NetflowProtocol> getProtocolStatisticOf1h(String start, String end) {
+    public List<NetflowProtocol> getNetflow1HourProtocol(Date start, Date end, String logMark) {
         List<NetflowProtocol> list = new ArrayList<>();
         Map<String, String> listProtocolDict = listProtocolDict();
         long timeMillisStart = System.currentTimeMillis();
         try {
-            list = netflowDao.getProtocolStatisticOf1hOnly(start, start, end);
+            list = netflowDao.getNetflow1HourProtocol(start, start, end);
         } catch (Exception e) {
-            logger.error("1小时内网络协议统计\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
         if (ListUtils.isEmptyList(list) && ConfigUtil.recentData) {
-            logger.warn("1小时内网络协议统计\tTRAFFIC_PROTOCOL_STATISTIC\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
+            logger.warn("{}\tTRAFFIC_PROTOCOL_STATISTIC\t{}至{}\t期间无数据\t查询最近数据", logMark, start, end);
             try {
-                Date lastTime = netflowDao.getProtocolStatisticOf1hLastTime(end);
-                if (lastTime != null) {
-                    String time = DateUtils.formatDateTime(lastTime);
-                    time = DateUtils.getRangeOf5min(time);
-                    list = netflowDao.getProtocolStatisticOf1hOnly(start, time, DateUtils.getAfter5min(time));
+                Date startLastTime = netflowDao.getNetflow1HourProtocolLastTime(end);
+                if (startLastTime != null) {
+                    startLastTime = DateUtil.getFormatMinute(startLastTime);
+                    Date endLastTime = DateUtil.getSomeMinute(startLastTime, 5);
+                    list = netflowDao.getNetflow1HourProtocol(start, startLastTime, endLastTime);
                 } else {
-                    logger.warn("1小时内网络协议统计\tTRAFFIC_PROTOCOL_STATISTIC\t无数据");
+                    logger.warn(logMark + "\tTRAFFIC_PROTOCOL_STATISTIC\t无数据");
                 }
             } catch (Exception e) {
-                logger.error("1小时内网络协议统计\t最近数据\t查询异常\tserviceImpl", e);
+                logger.error(logMark + "\t最近数据\t查询异常\tserviceImpl", e);
             }
         }
 
@@ -161,9 +161,9 @@ public class NetflowServiceImpl implements NetflowService {
                 }
             }
         }
-        logger.info("1小时内网络协议统计耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("1小时内网络协议统计------->测试数据");
+            logger.info(logMark + "------->测试数据");
             int i = (int) (Math.random() * 5000);
             list.add(new NetflowProtocol(start, "GRE", 2100 + i, 25000 + i, 4000 + i));
             list.add(new NetflowProtocol(start, "HTTP", 300 + i, 2520 + i, 78 + i));
@@ -186,28 +186,28 @@ public class NetflowServiceImpl implements NetflowService {
      * @return
      */
     @Override
-    public List<IpActiveInfo> getIpActiveInfoOf5min(String start, String end) {
+    public List<IpActiveInfo> getIpActiveInfoOf5min(Date start, Date end, String logMark) {
         List<IpActiveInfo> list = new ArrayList<>();
         Map<String, AreaDictInfo> listArea = listAreaDictInfo();
         long timeMillisStart = System.currentTimeMillis();
         try {
             list = netflowDao.getIpActiveInfoOf5minOnly(start, start, end);
         } catch (Exception e) {
-            logger.error("5分钟内活跃IP信息\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
         if (ListUtils.isEmptyList(list) && ConfigUtil.recentData) {
-            logger.warn("5分钟内活跃IP信息\tTRAFFIC_IP_ACTIVE_STATISTIC\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
+            logger.warn("{}\tTRAFFIC_IP_ACTIVE_STATISTIC\t{}至{}\t期间无数据\t查询最近数据", logMark, start, end);
             try {
-                Date lastTime = netflowDao.getIpActiveInfoOf5minLastTime(end);
-                if (lastTime != null) {
-                    String time = DateUtils.formatDateTime(lastTime);
-                    time = DateUtils.getRangeOf5min(time);
-                    list = netflowDao.getIpActiveInfoOf5minOnly(start, time, DateUtils.getAfter5min(time));
+                Date startLastTime = netflowDao.getIpActiveInfoOf5minLastTime(end);
+                if (startLastTime != null) {
+                    startLastTime = DateUtil.getFormatMinute(startLastTime);
+                    Date endLastTime = DateUtil.getSomeMinute(startLastTime, 5);
+                    list = netflowDao.getIpActiveInfoOf5minOnly(start, startLastTime, endLastTime);
                 } else {
-                    logger.warn("5分钟内活跃IP信息\tTRAFFIC_IP_ACTIVE_STATISTIC\t无数据");
+                    logger.warn(logMark + "\tTRAFFIC_IP_ACTIVE_STATISTIC\t无数据");
                 }
             } catch (Exception e) {
-                logger.error("5分钟内活跃IP信息\t最近数据\t查询异常\tserviceImpl", e);
+                logger.error(logMark + "\t最近数据\t查询异常\tserviceImpl", e);
             }
         }
         //迭代映射地域表，过滤无地域映射数据
@@ -225,9 +225,9 @@ public class NetflowServiceImpl implements NetflowService {
                 }
             }
         }
-        logger.info("5分钟内活跃IP信息耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}息耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("5分钟内活跃IP信息------->测试数据");
+            logger.info(logMark + "------->测试数据");
             long c = (long) (Math.random() * 5000000);
             long b = (long) (Math.random() * 5000);
             long a = (long) (Math.random() * 5000);
@@ -247,7 +247,7 @@ public class NetflowServiceImpl implements NetflowService {
      * @return
      */
     @Override
-    public List<AreaBPSTime> getAreaNetflowOf5min(String start, String end, int areaNetqueryExpTimes) {
+    public List<AreaBPSTime> getAreaNetflowOf5min(Date start, Date end, int areaNetqueryExpTimes, String logMark) {
         List<AreaBPSTime> list = new ArrayList<>();
         Map<String, AreaDictInfo> listArea = listAreaDictInfo();
         long timeMillisStart = System.currentTimeMillis();
@@ -259,27 +259,28 @@ public class NetflowServiceImpl implements NetflowService {
                     areaNetqueryExpTimes = 3;
                 }
                 for (int i = 1; i <= areaNetqueryExpTimes; i++) {
-                    String exTime = DateUtils.getBeforeNminOfTime(start, -5 * i);
-                    list.addAll(netflowDao.getAreaNetflowOf5min(exTime, exTime, DateUtils.getAfter5min(exTime)));
+                    Date exStartTime = DateUtil.getSomeMinute(start, -5 * i);
+                    Date exEndTime = DateUtil.getSomeMinute(exStartTime, 5);
+                    list.addAll(netflowDao.getAreaNetflowOf5min(exStartTime, exStartTime, exEndTime));
                 }
             }
         } catch (Exception e) {
-            logger.error("地域流量\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
             throw new RuntimeException();
         }
         if (ListUtils.isEmptyList(list) && ConfigUtil.tendencyData) {
-            logger.warn("地域流量\tTRAFFIC_NETFLOW_PORT_INFO\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
+            logger.warn("{}\tTRAFFIC_NETFLOW_PORT_INFO\t{}至{}\t期间无数据\t查询最近数据", logMark, start, end);
             try {
-                Date lastTime = netflowDao.getAreaNetflowOf5minLastTime(end);
-                if (lastTime != null) {
-                    String time = DateUtils.formatDateTime(lastTime);
-                    time = DateUtils.getRangeOf5min(time);
-                    list = netflowDao.getAreaNetflowOf5min(start, time, DateUtils.getAfter5min(time));
+                Date startLastTime = netflowDao.getAreaNetflowOf5minLastTime(end);
+                if (startLastTime != null) {
+                    startLastTime = DateUtil.getFormatMinute(startLastTime);
+                    Date endLastTime = DateUtil.getSomeMinute(startLastTime, 5);
+                    list = netflowDao.getAreaNetflowOf5min(start, startLastTime, endLastTime);
                 } else {
-                    logger.warn("地域流量\tTRAFFIC_NETFLOW_PORT_INFO\t无数据");
+                    logger.warn(logMark + "\tTRAFFIC_NETFLOW_PORT_INFO\t无数据");
                 }
             } catch (Exception e) {
-                logger.error("地域流量\t最近数据\t查询异常\tserviceImpl", e);
+                logger.error(logMark + "\t最近数据\t查询异常\tserviceImpl", e);
             }
         }
         //迭代映射地域表，过滤无地域映射数据
@@ -297,13 +298,13 @@ public class NetflowServiceImpl implements NetflowService {
                 }
             }
         }
-        logger.info("地域流量耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("地域流量------->测试数据");
+            logger.info(logMark + "------->测试数据");
             if (ConfigUtil.languageChose == 3) {
-                list.add(new AreaBPSTime("Астана", (int) (Math.random() * 10000), DateUtils.getDateTime()));
+                list.add(new AreaBPSTime("Астана", (int) (Math.random() * 10000), new Date()));
             } else {
-                list.add(new AreaBPSTime("Astana", (int) (Math.random() * 10000), DateUtils.getDateTime()));
+                list.add(new AreaBPSTime("Astana", (int) (Math.random() * 10000), new Date()));
             }
         }
         return list;
@@ -317,7 +318,7 @@ public class NetflowServiceImpl implements NetflowService {
      * @return
      */
     @Override
-    public List<PortBPSTime> getPortNetflowOf5min(String start, String end, int portNetqueryExpTimes) {
+    public List<PortBPSTime> getPortNetflowOf5min(Date start, Date end, int portNetqueryExpTimes, String logMark) {
         List<PortBPSTime> list = new ArrayList<>();
         long timeMillisStart = System.currentTimeMillis();
         try {
@@ -328,33 +329,34 @@ public class NetflowServiceImpl implements NetflowService {
                     portNetqueryExpTimes = 3;
                 }
                 for (int i = 1; i <= portNetqueryExpTimes; i++) {
-                    String exTime = DateUtils.getBeforeNminOfTime(start, -5 * i);
-                    list.addAll(netflowDao.getPortNetflowOf5min(exTime, exTime, DateUtils.getAfter5min(exTime)));
+                    Date exStartTime = DateUtil.getSomeMinute(start, -5 * i);
+                    Date exEndTime = DateUtil.getSomeMinute(exStartTime, 5);
+                    list.addAll(netflowDao.getPortNetflowOf5min(exStartTime, exStartTime, exEndTime));
                 }
             }
         } catch (Exception e) {
-            logger.error("端口流量\t查询异常{}，serviceImpl", e);
+            logger.error(logMark + "\t查询异常{}，serviceImpl", e);
             throw new RuntimeException();
         }
         if (ListUtils.isEmptyList(list) && ConfigUtil.tendencyData) {
-            logger.warn("端口流量\tTRAFFIC_NETFLOW_PORT_INFO\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
+            logger.warn("{}\tTRAFFIC_NETFLOW_PORT_INFO\t{}至{}\t期间无数据\t查询最近数据", logMark, start, end);
             try {
-                Date lastTime = netflowDao.getPortNetflowOf5minLastTime(end);
-                if (lastTime != null) {
-                    String time = DateUtils.formatDateTime(lastTime);
-                    time = DateUtils.getRangeOf5min(time);
-                    list = netflowDao.getPortNetflowOf5min(start, time, DateUtils.getAfter5min(time));
+                Date startLastTime = netflowDao.getPortNetflowOf5minLastTime(end);
+                if (startLastTime != null) {
+                    startLastTime = DateUtil.getFormatMinute(startLastTime);
+                    Date endLastTime = DateUtil.getSomeMinute(startLastTime, 5);
+                    list = netflowDao.getPortNetflowOf5min(start, startLastTime, endLastTime);
                 } else {
-                    logger.warn("端口流量\tTRAFFIC_NETFLOW_PORT_INFO\t无数据");
+                    logger.warn(logMark + "\tTRAFFIC_NETFLOW_PORT_INFO\t无数据");
                 }
             } catch (Exception e) {
-                logger.error("端口流量\t最近数据\t查询异常\tserviceImpl", e);
+                logger.error(logMark + "\t最近数据\t查询异常\tserviceImpl", e);
             }
         }
-        logger.info("端口流量耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
             list = new ArrayList<>();
-            logger.info("端口流量------->测试数据");
+            logger.info(logMark + "------->测试数据");
             list.add(new PortBPSTime("xgei_6/1/12", (int) (Math.random() * 150), start));
             list.add(new PortBPSTime("xgei_6/1/8", (int) (Math.random() * 200), start));
             list.add(new PortBPSTime("xgei_6/1/2", (int) (Math.random() * 200), start));
@@ -369,29 +371,29 @@ public class NetflowServiceImpl implements NetflowService {
      * @return
      */
     @Override
-    public List<NetflowMonitor> getNetflowMonitorTxt() {
+    public List<NetflowMonitor> getNetflowMonitorTxt(String logMark) {
         List<NetflowMonitor> list = new ArrayList<>();
         String type = "text";
         try {
             list = netflowDao.getNetflowMonitor(type, ip, serverPort);
         } catch (Exception e) {
-            logger.error("文本\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("文本------->测试数据");
-            String rangeOfday = DateUtils.getRangeOfday(DateUtils.getDateTime());
-            list.add(new NetflowMonitor("WEBSITE", "http://192.168.10.2/group1/M00/00/05/CgAG-VuuHZmADRhnAAADPT3-BI0965.jpg", rangeOfday));
-            list.add(new NetflowMonitor("URL", "http://192.168.10.2/group1/M00/00/05/CgAG-VuuHZmADRhnAAADPT3-BI0966.jpg", rangeOfday));
-            list.add(new NetflowMonitor("DNS", "http://192.168.10.2/group1/M00/00/05/CgAG-VuuHZmADRhnAAADPT3-BI0967.jpg", rangeOfday));
-            list.add(new NetflowMonitor("EMAIL", "http://192.168.10.2/group1/M00/00/05/CgAG-VuuHZmADRhnAAADPT3-BI0968.jpg", rangeOfday));
-            list.add(new NetflowMonitor("IP PORT", "http://192.168.10.2/group1/M00/00/05/CgAG-VuuHZmADRhnAAADPT3-BI0968.jpg", rangeOfday));
-            list.add(new NetflowMonitor("KEYWORDS", "http://192.168.10.2/group1/M00/00/05/CgAG-VuuHZmADRhnAAADPT3-BI0968.jpg", rangeOfday));
-            list.add(new NetflowMonitor("FTP", "http://192.168.10.2/group1/M00/00/05/CgAG-VuuHZmADRhnAAADPT3-BI0968.jpg", rangeOfday));
-            list.add(new NetflowMonitor("VPN", "http://192.168.10.2/group1/M00/00/05/CgAG-VuuHZmADRhnAAADPT3-BI0968.jpg", rangeOfday));
-            list.add(new NetflowMonitor("P2P", "http://192.168.10.2/group1/M00/00/05/CgAG-VuuHZmADRhnAAADPT3-BI0968.jpg", rangeOfday));
-            list.add(new NetflowMonitor("VOIP", "http://192.168.10.2/group1/M00/00/05/CgAG-VuuHZmADRhnAAADPT3-BI0968.jpg", rangeOfday));
-            list.add(new NetflowMonitor("DOCUMENT", "http://192.168.10.2/group1/M00/00/05/CgAG-VuuHZmADRhnAAADPT3-BI0968.jpg", rangeOfday));
-            list.add(new NetflowMonitor("TUNNEL PROTOCOL", "http://192.168.10.2/group1/M00/00/05/CgAG-VuuHZmADRhnAAADPT3-BI0968.jpg", rangeOfday));
+            logger.info(logMark + "------->测试数据");
+            Date time = DateUtil.getFormatDay(new Date());
+            list.add(new NetflowMonitor("WEBSITE", "http://192.168.10.2/group1/M00/00/05/CgAG-VuuHZmADRhnAAADPT3-BI0965.jpg", time));
+            list.add(new NetflowMonitor("URL", "http://192.168.10.2/group1/M00/00/05/CgAG-VuuHZmADRhnAAADPT3-BI0966.jpg", time));
+            list.add(new NetflowMonitor("DNS", "http://192.168.10.2/group1/M00/00/05/CgAG-VuuHZmADRhnAAADPT3-BI0967.jpg", time));
+            list.add(new NetflowMonitor("EMAIL", "http://192.168.10.2/group1/M00/00/05/CgAG-VuuHZmADRhnAAADPT3-BI0968.jpg", time));
+            list.add(new NetflowMonitor("IP PORT", "http://192.168.10.2/group1/M00/00/05/CgAG-VuuHZmADRhnAAADPT3-BI0968.jpg", time));
+            list.add(new NetflowMonitor("KEYWORDS", "http://192.168.10.2/group1/M00/00/05/CgAG-VuuHZmADRhnAAADPT3-BI0968.jpg", time));
+            list.add(new NetflowMonitor("FTP", "http://192.168.10.2/group1/M00/00/05/CgAG-VuuHZmADRhnAAADPT3-BI0968.jpg", time));
+            list.add(new NetflowMonitor("VPN", "http://192.168.10.2/group1/M00/00/05/CgAG-VuuHZmADRhnAAADPT3-BI0968.jpg", time));
+            list.add(new NetflowMonitor("P2P", "http://192.168.10.2/group1/M00/00/05/CgAG-VuuHZmADRhnAAADPT3-BI0968.jpg", time));
+            list.add(new NetflowMonitor("VOIP", "http://192.168.10.2/group1/M00/00/05/CgAG-VuuHZmADRhnAAADPT3-BI0968.jpg", time));
+            list.add(new NetflowMonitor("DOCUMENT", "http://192.168.10.2/group1/M00/00/05/CgAG-VuuHZmADRhnAAADPT3-BI0968.jpg", time));
+            list.add(new NetflowMonitor("TUNNEL PROTOCOL", "http://192.168.10.2/group1/M00/00/05/CgAG-VuuHZmADRhnAAADPT3-BI0968.jpg", time));
         }
         return list;
     }
@@ -402,21 +404,21 @@ public class NetflowServiceImpl implements NetflowService {
      * @return
      */
     @Override
-    public List<NetflowMonitor> getNetflowMonitorVideo() {
+    public List<NetflowMonitor> getNetflowMonitorVideo(String logMark) {
         List<NetflowMonitor> list = new ArrayList<>();
         String type = "audioVideo";
         try {
             list = netflowDao.getNetflowMonitor(type, ip, serverPort);
         } catch (Exception e) {
-            logger.error("音视频\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("音视频------->测试数据");
-            String rangeOfday = DateUtils.getRangeOfday(DateUtils.getDateTime());
-            list.add(new NetflowMonitor("VIDEO", "http://192.168.10.2/group2/M00/00/06/AUDIO-UIYjkjrg-MP4.jpg", rangeOfday));
-            list.add(new NetflowMonitor("AUDIO", "http://192.168.10.2/group2/M00/00/06/AUDIO-UIYjkjrg-AVI.jpg", rangeOfday));
-            list.add(new NetflowMonitor("PICTURE", "http://192.168.10.2/group2/M00/00/06/AUDIO-UIYjkjrg-MOV.jpg", rangeOfday));
-            list.add(new NetflowMonitor("Pornographic LEVEL", "http://192.168.10.2/group2/M00/00/06/AUDIO-UIYjkjrg-RM.jpg", rangeOfday));
+            logger.info(logMark + "------->测试数据");
+            Date time = DateUtil.getFormatDay(new Date());
+            list.add(new NetflowMonitor("VIDEO", "http://192.168.10.2/group2/M00/00/06/AUDIO-UIYjkjrg-MP4.jpg", time));
+            list.add(new NetflowMonitor("AUDIO", "http://192.168.10.2/group2/M00/00/06/AUDIO-UIYjkjrg-AVI.jpg", time));
+            list.add(new NetflowMonitor("PICTURE", "http://192.168.10.2/group2/M00/00/06/AUDIO-UIYjkjrg-MOV.jpg", time));
+            list.add(new NetflowMonitor("Pornographic LEVEL", "http://192.168.10.2/group2/M00/00/06/AUDIO-UIYjkjrg-RM.jpg", time));
         }
         return list;
     }
@@ -427,23 +429,23 @@ public class NetflowServiceImpl implements NetflowService {
      * @return
      */
     @Override
-    public List<NetflowMonitor> getNetflowMonitorApp() {
+    public List<NetflowMonitor> getNetflowMonitorApp(String logMark) {
         List<NetflowMonitor> list = new ArrayList<>();
         String type = "app";
         try {
             list = netflowDao.getNetflowMonitor(type, ip, serverPort);
         } catch (Exception e) {
-            logger.error("APP\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("APP------->测试数据");
-            String rangeOfday = DateUtils.getRangeOfday(DateUtils.getDateTime());
-            list.add(new NetflowMonitor("Telegram", "http://192.168.10.2/group3/M00/00/06/APP-TYILOkjUO3-Telegram.jpg", rangeOfday));
-            list.add(new NetflowMonitor("Odnoklassniki", "http://192.168.10.2/group3/M00/00/06/APP-TYILOkjUO3-Odnoklassniki.jpg", rangeOfday));
-            list.add(new NetflowMonitor("PlayMarket", "http://192.168.10.2/group3/M00/00/06/APP-TYILOkjUO3-PlayMarket.jpg", rangeOfday));
-            list.add(new NetflowMonitor("WeChat", "http://192.168.10.2/group3/M00/00/06/APP-TYILOkjUO3-WeChat.jpg", rangeOfday));
-            list.add(new NetflowMonitor("Twitter", "http://192.168.10.2/group3/M00/00/06/APP-TYILOkjUO3-Twitter.jpg", rangeOfday));
-            list.add(new NetflowMonitor("Viber", "http://192.168.10.2/group3/M00/00/06/APP-TYILOkjUO3-Viber.jpg", rangeOfday));
+            logger.info(logMark + "------->测试数据");
+            Date time = DateUtil.getFormatDay(new Date());
+            list.add(new NetflowMonitor("Telegram", "http://192.168.10.2/group3/M00/00/06/APP-TYILOkjUO3-Telegram.jpg", time));
+            list.add(new NetflowMonitor("Odnoklassniki", "http://192.168.10.2/group3/M00/00/06/APP-TYILOkjUO3-Odnoklassniki.jpg", time));
+            list.add(new NetflowMonitor("PlayMarket", "http://192.168.10.2/group3/M00/00/06/APP-TYILOkjUO3-PlayMarket.jpg", time));
+            list.add(new NetflowMonitor("WeChat", "http://192.168.10.2/group3/M00/00/06/APP-TYILOkjUO3-WeChat.jpg", time));
+            list.add(new NetflowMonitor("Twitter", "http://192.168.10.2/group3/M00/00/06/APP-TYILOkjUO3-Twitter.jpg", time));
+            list.add(new NetflowMonitor("Viber", "http://192.168.10.2/group3/M00/00/06/APP-TYILOkjUO3-Viber.jpg", time));
         }
         return list;
     }
@@ -454,22 +456,22 @@ public class NetflowServiceImpl implements NetflowService {
      * @return
      */
     @Override
-    public List<NetflowMonitor> getNetflowMonitorEncrypt() {
+    public List<NetflowMonitor> getNetflowMonitorEncrypt(String logMark) {
         List<NetflowMonitor> list = new ArrayList<>();
         String type = "encryptionControl";
         try {
             list = netflowDao.getNetflowMonitor(type, ip, serverPort);
         } catch (Exception e) {
-            logger.error("加密管控\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
-            logger.info("加密管控------->测试数据");
-            String rangeOfday = DateUtils.getRangeOfday(DateUtils.getDateTime());
-            list.add(new NetflowMonitor("PROXY INTERCEPT", "http://192.168.10.2/group4/M00/00/06/PASS-YIHK-MMPE.jpg", rangeOfday));
-            list.add(new NetflowMonitor("PROXY RATELIMIT", "http://192.168.10.2/group4/M00/00/06/PASS-YIHK-IPSEC.jpg", rangeOfday));
-            list.add(new NetflowMonitor("HTTPS REPLACE", "http://192.168.10.2/group4/M00/00/06/PASS-YIHK-PAP.jpg", rangeOfday));
-            list.add(new NetflowMonitor("HTTPS MONITOR", "http://192.168.10.2/group4/M00/00/06/PASS-YIHK-CHAP.jpg", rangeOfday));
-            list.add(new NetflowMonitor("HTTPS BLOCK", "http://192.168.10.2/group4/M00/00/06/PASS-YIHK-EAP-TLS.jpg", rangeOfday));
+            logger.info(logMark + "------->测试数据");
+            Date time = DateUtil.getFormatDay(new Date());
+            list.add(new NetflowMonitor("PROXY INTERCEPT", "http://192.168.10.2/group4/M00/00/06/PASS-YIHK-MMPE.jpg", time));
+            list.add(new NetflowMonitor("PROXY RATELIMIT", "http://192.168.10.2/group4/M00/00/06/PASS-YIHK-IPSEC.jpg", time));
+            list.add(new NetflowMonitor("HTTPS REPLACE", "http://192.168.10.2/group4/M00/00/06/PASS-YIHK-PAP.jpg", time));
+            list.add(new NetflowMonitor("HTTPS MONITOR", "http://192.168.10.2/group4/M00/00/06/PASS-YIHK-CHAP.jpg", time));
+            list.add(new NetflowMonitor("HTTPS BLOCK", "http://192.168.10.2/group4/M00/00/06/PASS-YIHK-EAP-TLS.jpg", time));
         }
         return list;
     }
diff --git a/src/main/java/com/nis/galaxy/web/service/impl/NetflowTopNServiceImpl.java b/src/main/java/com/nis/galaxy/web/service/impl/NetflowTopNServiceImpl.java
index 75aad3e..ce417d4 100644
--- a/src/main/java/com/nis/galaxy/web/service/impl/NetflowTopNServiceImpl.java
+++ b/src/main/java/com/nis/galaxy/web/service/impl/NetflowTopNServiceImpl.java
@@ -1,13 +1,12 @@
 package com.nis.galaxy.web.service.impl;
 
 import com.nis.galaxy.config.MyLoad;
-import com.nis.galaxy.domain.Entrance;
 import com.nis.galaxy.domain.IpActiveInt;
 import com.nis.galaxy.domain.NetFlowWater;
 import com.nis.galaxy.domain.NetFlowWaterPush;
 import com.nis.galaxy.domain.dict.AreaDictInfo;
 import com.nis.galaxy.util.ConfigUtil;
-import com.nis.galaxy.util.DateUtils;
+import com.nis.galaxy.util.DateUtil;
 import com.nis.galaxy.util.ListUtils;
 import com.nis.galaxy.web.dao.NetflowTopNDao;
 import com.nis.galaxy.web.service.NetflowTopNService;
@@ -44,29 +43,28 @@ public class NetflowTopNServiceImpl implements NetflowTopNService {
      * @return
      */
     @Override
-    public List<IpActiveInt> getNetflow5minIpActiveWaterflow(String start, String end) {
+    public List<IpActiveInt> getNetflow5minIpActiveWaterflow(Date start, Date end, String logMark) {
         long timeMillisStart = System.currentTimeMillis();
         List<IpActiveInt> list = new ArrayList<>();
         Map<String, AreaDictInfo> listArea = listAreaDictInfo();
         try {
-            list = netflowTopNDao.getNetflow5minIpActiveWaterflow(start, DateUtils.getDateOfString(start), DateUtils.getDateOfString(end));
+            list = netflowTopNDao.getNetflow5minIpActiveWaterflow(start, start, end);
         } catch (Exception e) {
-            logger.error("5分钟内活跃IP流量\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
         if (ListUtils.isEmptyList(list) && ConfigUtil.recentData) {
-            logger.warn("5分钟内活跃IP流量\tTRAFFIC_IP_ACTIVE_STATISTIC\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
+            logger.warn("{}\tTRAFFIC_IP_ACTIVE_STATISTIC\t{}至{}\t期间无数据\t查询最近数据", logMark, start, end);
             try {
-                Date lastTime = netflowTopNDao.getNetflow5minIpActiveWaterflowLastTime(DateUtils.getDateOfString(start));
-                if (lastTime != null) {
-                    String startRecent = DateUtils.formatDateTime(lastTime);
-                    startRecent = DateUtils.getRangeOf5min(startRecent);
-                    String endRecent = DateUtils.getAfter5min(startRecent);
-                    list = netflowTopNDao.getNetflow5minIpActiveWaterflow(start, DateUtils.getDateOfString(startRecent), DateUtils.getDateOfString(endRecent));
+                Date startLastTime = netflowTopNDao.getNetflow5minIpActiveWaterflowLastTime(end);
+                if (startLastTime != null) {
+                    startLastTime = DateUtil.getFormatMinute(startLastTime);
+                    Date endLastTime = DateUtil.getSomeMinute(startLastTime, 5);
+                    list = netflowTopNDao.getNetflow5minIpActiveWaterflow(start, startLastTime, endLastTime);
                 } else {
-                    logger.warn("5分钟内活跃IP流量\tTRAFFIC_IP_ACTIVE_STATISTIC\t无数据");
+                    logger.warn(logMark + "\tTRAFFIC_IP_ACTIVE_STATISTIC\t无数据");
                 }
             } catch (Exception e) {
-                logger.error("5分钟内活跃IP流量\t最近数据\t查询异常\tserviceImpl", e);
+                logger.error(logMark + "\t最近数据\t查询异常\tserviceImpl", e);
             }
         }
         //迭代映射地域表，过滤无地域映射数据
@@ -84,10 +82,10 @@ public class NetflowTopNServiceImpl implements NetflowTopNService {
                 }
             }
         }
-        logger.info("5分钟内活跃IP流量耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
             int i = (int) (Math.random() * 200);
-            logger.info("5分钟内活跃IP流量------->测试数据");
+            logger.info(logMark + "------->测试数据");
             list.add(new IpActiveInt(start, "up", "Астана", "119.108.229.153", i + 20));
             list.add(new IpActiveInt(start, "up", "Астана", "121.236.4.78", i + 16));
             list.add(new IpActiveInt(start, "up", "Алматы", "192.158.229.15", i + 15));
@@ -110,7 +108,7 @@ public class NetflowTopNServiceImpl implements NetflowTopNService {
      * @return
      */
     @Override
-    public List<NetFlowWaterPush> getNetFlowWaterTop10(String start, String end, int range) {
+    public List<NetFlowWaterPush> getNetflowNHourWaterflowTop10(Date start, Date end, int range, String logMark) {
         Map<String, AreaDictInfo> listArea = listAreaDictInfo();
 //        List<NetFlowWater> list = new ArrayList<>();
         List<NetFlowWaterPush> resule = new ArrayList<>();
@@ -122,32 +120,30 @@ public class NetflowTopNServiceImpl implements NetflowTopNService {
             logger.error("互联网流量TOP10\t获取局点异常\tserviceImpl", ex);
         }*/
         try {
-            resule = netflowTopNDao.getNetFlowWaterTop10(start, start, end);
+            resule = netflowTopNDao.getNetflowNHourWaterflowTop10(start, start, end);
         } catch (Exception e) {
-            logger.error("互联网流量TOP10\t查询异常\tserviceImpl", e);
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
         if (ListUtils.isEmptyList(resule) && ConfigUtil.recentData) {
-            logger.warn("互联网流量TOP10\tTRAFFIC_NETFLOW_PORT_INFO\t" + start + "至" + end + "\t期间无数据\t查询最近数据");
+            logger.warn("{}\tTRAFFIC_NETFLOW_PORT_INFO\t{}至{}\t期间无数据\t查询最近数据", logMark, start, end);
             try {
-                Date lastTime = netflowTopNDao.getNetFlowWaterTop10LastTime(end);
-                if (lastTime != null) {
-                    String time = DateUtils.formatDateTime(lastTime);
-                    time = DateUtils.getRangeOf5min(time);
-                    String lastEnd = DateUtils.getAfter5min(time);
-                    String lastStart = null;
+                Date endLastTime = netflowTopNDao.getNetflowNHourWaterflowTop10LastTime(end);
+                if (endLastTime != null) {
+                    endLastTime = DateUtil.getFormatMinute(endLastTime);
+                    Date startLastTime = null;
                     if (range == 1) {
-                        lastStart = DateUtils.getBeforeNminOfTime(lastEnd, -60);
+                        startLastTime = DateUtil.getSomeHour(endLastTime, -1);
                     } else if (range == 7) {
-                        lastStart = DateUtils.getBeforeNminOfTime(lastEnd, -60 * 24 * 7);
+                        startLastTime = DateUtil.getSomeDate(endLastTime, -7);
                     } else {
-                        lastStart = DateUtils.getBeforeNminOfTime(lastEnd, -60 * 24);
+                        startLastTime = DateUtil.getSomeDate(endLastTime, -1);
                     }
-                    resule = netflowTopNDao.getNetFlowWaterTop10(start, lastStart, lastEnd);
+                    resule = netflowTopNDao.getNetflowNHourWaterflowTop10(start, startLastTime, endLastTime);
                 } else {
-                    logger.warn("互联网流量TOP10\tTRAFFIC_NETFLOW_PORT_INFO\t无数据");
+                    logger.warn(logMark + "\tTRAFFIC_NETFLOW_PORT_INFO\t无数据");
                 }
             } catch (Exception e) {
-                logger.error("互联网流量TOP10\t最近数据\t查询异常\tserviceImpl", e);
+                logger.error(logMark + "\t最近数据\t查询异常\tserviceImpl", e);
             }
         }
         /*if (!ListUtils.isEmptyList(list)) {
@@ -237,9 +233,9 @@ public class NetflowTopNServiceImpl implements NetflowTopNService {
                 }
             }
         }
-        logger.info("互联网流量TOP10耗时：" + (System.currentTimeMillis() - timeMillisStart));
+        logger.info("{}耗时\t", logMark, (System.currentTimeMillis() - timeMillisStart));
         if (ListUtils.isEmptyList(resule) && ConfigUtil.testData) {
-            logger.info("互联网流量TOP10------->测试数据");
+            logger.info(logMark + "------->测试数据");
             if (ConfigUtil.languageChose == 3) {
                 resule.add(new NetFlowWaterPush(start, "Астана", (long) (Math.random() * 10000)));
             } else {
@@ -256,17 +252,17 @@ public class NetflowTopNServiceImpl implements NetflowTopNService {
      * @return
      */
     @Override
-    public List getNetflow1HourWaterflowTop10(String end) {
+    public List getNetflow1HourWaterflowTop10(Date end, String logMark) {
         long startTimeMillis = System.currentTimeMillis();
         List<NetFlowWaterPush> result = new ArrayList<>();
         List<NetFlowWater> resultTemp = new ArrayList<>();
         for (int j = 0; j < 2; j++) {
             List<Map<String, Date>> listMapParam = new ArrayList<>();
             for (int i = 0; i < 6; i++) {
-                String start = DateUtils.getBeforeNminOfTime(end, -5);
+                Date start = DateUtil.getSomeMinute(end, -5);
                 HashMap<String, Date> map = new HashMap<>();
-                map.put("start", DateUtils.getDateOfString(start));
-                map.put("end", DateUtils.getDateOfString(end));
+                map.put("start", start);
+                map.put("end", end);
                 listMapParam.add(map);
                 end = start;
             }
@@ -274,20 +270,18 @@ public class NetflowTopNServiceImpl implements NetflowTopNService {
             resultTemp.addAll(temp);
         }
         if (ListUtils.isEmptyList(resultTemp)) {
-            Date lastTime = netflowTopNDao.getNetFlowWaterTop10LastTime(end);
-            if (lastTime != null) {
-                end = DateUtils.formatDateTime(lastTime);
-                end = DateUtils.getRangeOf5min(end);
-                end = DateUtils.getAfter5min(end);
+            Date endLastTime = netflowTopNDao.getNetflowNHourWaterflowTop10LastTime(end);
+            if (endLastTime != null) {
+                endLastTime = DateUtil.getFormatMinute(endLastTime);
                 for (int j = 0; j < 2; j++) {
                     List<Map<String, Date>> listMapParam = new ArrayList<>();
                     for (int i = 0; i < 6; i++) {
-                        String start = DateUtils.getBeforeNminOfTime(end, -5);
+                        Date start = DateUtil.getSomeMinute(endLastTime, -5);
                         HashMap<String, Date> map = new HashMap<>();
-                        map.put("start", DateUtils.getDateOfString(start));
-                        map.put("end", DateUtils.getDateOfString(end));
+                        map.put("start", start);
+                        map.put("end", endLastTime);
                         listMapParam.add(map);
-                        end = start;
+                        endLastTime = start;
                     }
                     List<NetFlowWater> temp = netflowTopNDao.getNetflow1HourWaterflowTop10(listMapParam);
                     resultTemp.addAll(temp);
@@ -347,7 +341,7 @@ public class NetflowTopNServiceImpl implements NetflowTopNService {
                     } else {
                         continue;
                     }
-                    result.add(new NetFlowWaterPush(DateUtils.getBeforeNminOfTime(end, -60), areaId, avg));
+                    result.add(new NetFlowWaterPush(DateUtil.getSomeHour(end, -1), areaId, avg));
                 }
             } else {
                 long avg = 0;
@@ -362,7 +356,7 @@ public class NetflowTopNServiceImpl implements NetflowTopNService {
                 netFlowWaterPush.setArea(areaDictInfo.getItemValue());
             }
         }
-        logger.info("1小时互联网流量TOP10耗时(新方法)：" + (System.currentTimeMillis() - startTimeMillis));
+        logger.info(logMark + "耗时(新方法)：" + (System.currentTimeMillis() - startTimeMillis));
         return result;
     }
 }
 \ No newline at end of file
diff --git a/src/main/resources/mybatis/mapper/BlockingMapper.xml b/src/main/resources/mybatis/mapper/BlockingMapper.xml
index 0235cdf..9045f2d 100644
--- a/src/main/resources/mybatis/mapper/BlockingMapper.xml
+++ b/src/main/resources/mybatis/mapper/BlockingMapper.xml
@@ -9,14 +9,14 @@
         SELECT #{push} AS time,SUM(reject_num) AS controlNum,SUM(monitor_num) AS monitorNum,
             SUM(c2s_byte_len+s2c_byte_len)*8/300 AS networkFlowNum,SUM(c2s_byte_len)*8/300 AS upstreamNum,SUM(s2c_byte_len)*8/300 AS downstreamNum,
             SUM(new_uni_conn_num) AS newLinkNum,SUM(live_conn_num) AS activeConNum,SUM(drop_conn_num) AS dropConNum,SUM(loop_conn_num) AS refluxConNum
-        FROM NTC_TOTAL_REPORT
+            FROM NTC_TOTAL_REPORT
         WHERE report_time >= #{start}
             AND report_time < #{end}
         ]]>
     </select>
 
-    <!--封堵信息分布显示_____映射-->
-    <select id="getDisBlockInformationOnly" resultType="com.nis.galaxy.domain.NtcDisReport">
+    <!--封堵信息分布显示-->
+    <select id="getBlockingArea" resultType="com.nis.galaxy.domain.BlockingArea">
       	<![CDATA[
       	SELECT #{push} AS time,d.entrance_id AS area,SUM(controlNum) AS controlNum,SUM(monitorNum) AS monitorNum,SUM(c.up) AS upstreamNum,SUM(c.dw) AS downstreamNum,(SUM(c.up)+SUM(c.dw)) AS networkFlowNum
       	FROM(
@@ -92,7 +92,7 @@
         ]]>
     </select>
     <!--24小时内全国热力图 5min/条、粒度1min_____映射-->
-    <select id="getAllHotStatistisOnly" resultType="com.nis.galaxy.domain.HotStatistic">
+    <select id="getBlocking24HourThermodynamic" resultType="com.nis.galaxy.domain.HotStatistic">
 	   <![CDATA[
        SELECT #{push} AS time,entrance_id AS area,s_ip AS src_ip,d_ip AS dst_ip,service AS type,SUM(sum) AS count
        FROM ntc_service_behav_statistic
@@ -124,7 +124,7 @@
         ]]>
     </select>
     <!--全国协议配置信息-->
-    <select id="getAllCfgInfoOnly" resultType="com.nis.galaxy.domain.CfgTypeCount">
+    <select id="getBlockingGlobalProtocolConfig" resultType="com.nis.galaxy.domain.CfgTypeCount">
       <![CDATA[
       SELECT service_id AS type,count(0) AS count
       FROM ui_cfg_num_statistics
@@ -146,8 +146,8 @@
         LIMIT 1
         ]]>
     </select>
-    <!--封堵信息分布显示-->
-    <select id="getDisBlockInformationLastTime" resultType="java.util.Date">
+    <!--封堵信息分布显示_时间-->
+    <select id="getBlockingAreaLastTime" resultType="java.util.Date">
         <![CDATA[
          SELECT report_time
          FROM ntc_entrance_report
@@ -186,7 +186,7 @@
         ]]>
     </select>
     <!--24小时内全国热力图-->
-    <select id="getAllHotStatistisLastTime" resultType="java.util.Date">
+    <select id="getBlocking24HourThermodynamicLastTime" resultType="java.util.Date">
         <![CDATA[
         SELECT report_time
         FROM ntc_service_behav_statistic
diff --git a/src/main/resources/mybatis/mapper/EventsMapper.xml b/src/main/resources/mybatis/mapper/EventsMapper.xml
index 0d1fd7f..0b84ec7 100644
--- a/src/main/resources/mybatis/mapper/EventsMapper.xml
+++ b/src/main/resources/mybatis/mapper/EventsMapper.xml
@@ -3,8 +3,8 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.nis.galaxy.web.dao.EventsDao">
-    <!--系统总计 /天-->
-    <select id="getSystemTotalOf1Day" resultType="com.nis.galaxy.domain.SystemTotal">
+    <!--系统总计-->
+    <select id="getSystemTotal" resultType="com.nis.galaxy.domain.SystemTotal">
         <![CDATA[
         SELECT p.pz_num AS configNum,t.byte_sum AS totalNum,t.reject_sum AS blockNum,t.monitor_sum AS monitorNum,t.drop_conn_sum AS discardedNum,t.loop_conn_sum AS refluxNum
         FROM
@@ -51,7 +51,7 @@
         ]]>
     </select>
     <!--重点保障事件总览 天/次-->
-    <select id="getKeyPointSafaguardThing" resultType="com.nis.galaxy.domain.EventsKeyPointSafaguardThing">
+    <select id="getEventsKeyProtection" resultType="com.nis.galaxy.domain.EventsKeyProtection">
         <![CDATA[
         SELECT #{start} AS time,task.audit_time AS taskTime,task.task_name AS taskName,COUNT(lwhh.id) AS letterNum,
                 COALESCE(SUM(num.cfg_num),0) AS configNum,
@@ -94,7 +94,7 @@
     <!--1.	特定网站监控 小时/次-->
     <select id="getSpecificWebsites" resultType="com.nis.galaxy.domain.EventsSpecificWebsites">
         <![CDATA[
-        SELECT #{end} AS time,t.website AS name,COALESCE(SUM(s.link_sum),0) AS num
+        SELECT #{push} AS time,t.website AS name,COALESCE(SUM(s.link_sum),0) AS num
         FROM (SELECT t.id,w.website FROM ui_website_domain_topic t
                LEFT JOIN
                (SELECT item_code webid,item_value website
@@ -291,7 +291,7 @@
     </select>
 
     <!--时间：系统总计 -->
-    <select id="getSystemTotalOf1DayLastTime" resultType="java.util.Date">
+    <select id="getSystemTotalLastTime" resultType="java.util.Date">
         <![CDATA[
         SELECT report_time
         FROM NTC_TOTAL_REPORT
diff --git a/src/main/resources/mybatis/mapper/MonitorMapper.xml b/src/main/resources/mybatis/mapper/MonitorMapper.xml
index 0335236..82090b8 100644
--- a/src/main/resources/mybatis/mapper/MonitorMapper.xml
+++ b/src/main/resources/mybatis/mapper/MonitorMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.nis.galaxy.web.dao.MonitorDao">
-    <select id="getSystemMonitor"   resultMap="BaseResultMap">
+    <select id="getSystemMonitoringGlobalGis"   resultMap="BaseResultMap">
     SELECT a.time AS time,area AS area,a.total AS total,a.normal AS normal,a.abnormal AS abnormal,b.hostname AS name,b.ip AS ip
     FROM traffic_abnormal_machine AS b
     RIGHT JOIN
diff --git a/src/main/resources/mybatis/mapper/NetflowMapper.xml b/src/main/resources/mybatis/mapper/NetflowMapper.xml
index 32751a4..a1e146b 100644
--- a/src/main/resources/mybatis/mapper/NetflowMapper.xml
+++ b/src/main/resources/mybatis/mapper/NetflowMapper.xml
@@ -13,7 +13,7 @@
         ]]>
         </select>
     <!--1小时内网络协议统计_-->
-    <select id="getProtocolStatisticOf1hOnly" resultType="com.nis.galaxy.domain.NetflowProtocol">
+    <select id="getNetflow1HourProtocol" resultType="com.nis.galaxy.domain.NetflowProtocol">
         <![CDATA[
         SELECT #{push} AS time,proto_type AS type,MAX(link_num) AS linknum ,SUM(c2s_pkt_num+s2c_pkt_num) AS pakeagenum,
                 SUM(c2s_byte_len+s2c_byte_len) AS bytes
@@ -90,7 +90,7 @@
         ]]>
     </select>
     <!--时间：1小时内网络协议统计-->
-    <select id="getProtocolStatisticOf1hLastTime" resultType="java.util.Date">
+    <select id="getNetflow1HourProtocolLastTime" resultType="java.util.Date">
         <![CDATA[
         SELECT stat_time
         FROM traffic_protocol_statistic
diff --git a/src/main/resources/mybatis/mapper/NetflowTopNMapper.xml b/src/main/resources/mybatis/mapper/NetflowTopNMapper.xml
index f3208cd..406e756 100644
--- a/src/main/resources/mybatis/mapper/NetflowTopNMapper.xml
+++ b/src/main/resources/mybatis/mapper/NetflowTopNMapper.xml
@@ -36,7 +36,7 @@
     </select>
 
 
-    <select id="getNetFlowWaterTop10" resultType="com.nis.galaxy.domain.NetFlowWaterPush">
+    <select id="getNetflowNHourWaterflowTop10" resultType="com.nis.galaxy.domain.NetFlowWaterPush">
         <![CDATA[
         select entrance_id as area ,#{push} as time, IFNULL(SUM(c2s_byte_len+s2c_byte_len),0) as count
         from traffic_trans_statistic where STAT_TIME>= #{start} and STAT_TIME<#{end}
@@ -88,7 +88,7 @@
         LIMIT 1
         ]]>
     </select>
-    <select id="getNetFlowWaterTop10LastTime" resultType="java.util.Date">
+    <select id="getNetflowNHourWaterflowTop10LastTime" resultType="java.util.Date">
         <![CDATA[
         SELECT stat_time
         FROM traffic_trans_statistic
author	doufenghu <[email protected]>	2019-01-10 16:47:43 +0600
committer	doufenghu <[email protected]>	2019-01-10 16:47:43 +0600
commit	acf2aff5ccfda32f7c979fb8d2323acd84521764 (patch)
tree	b3ca0df9b47992119b03b935b1480bb892035520 /src
parent	f7dacd45f499d4b57eec3878e236eb68a68d323d (diff)
parent	a15b69bcc63e1a2fa3a9a783c9a599c70676728c (diff)