fix(端口状态信息)：修改为5min推送一次

3 files changed, 6 insertions, 7 deletions

diff --git a/src/main/java/com/nis/galaxy/template/ForBlockingInterface.java b/src/main/java/com/nis/galaxy/template/ForBlockingInterface.java
index 43d75e9..1e30603 100644
--- a/src/main/java/com/nis/galaxy/template/ForBlockingInterface.java
+++ b/src/main/java/com/nis/galaxy/template/ForBlockingInterface.java
@@ -286,7 +286,7 @@ public class ForBlockingInterface {
         Date start = DateUtil.getSomeDate(end, -1);
         List contentValue = null;
         try {
-            contentValue = blockingService.getBlockingGlobalProtocolConfigDay(start,end,logMark);
+            contentValue = blockingService.getBlockingGlobalProtocolConfigDay(start, end, logMark);
         } catch (Exception e) {
             logger.error(logMark + "\t查询异常\trestTemplate", e);
 
@@ -304,7 +304,7 @@ public class ForBlockingInterface {
     /**
      * 端口状态信息 一分钟一次
      */
-    @Scheduled(cron = "${1m.scheduled.cron.plan}")
+    @Scheduled(cron = "${5m.scheduled.cron.plan}")
     @SchedulerLock(name = "port.state.info", lockAtLeastForString = "PT20S", lockAtMostForString = "PT40S")
     public void getPortStateInfo() {
         if (!Boolean.parseBoolean(scheduledBlockEnable)) {
@@ -312,13 +312,12 @@ public class ForBlockingInterface {
         }
         String logMark = "端口状态信息";
         Date end = DateUtil.getFormatMinuteOne(new Date());
-        Date start = DateUtil.getSomeMinute(end, -1);
+        Date start = DateUtil.getSomeMinute(end, -5);
         List contentValue = null;
         try {
             contentValue = blockingService.getPortStateInfo(start, end, logMark);
         } catch (Exception e) {
             logger.error(logMark + "\t查询异常\trestTemplate", e);
-
         }
         if (InterfaceBase.contentValueIsEmpty(contentValue)) {
             logger.warn(logMark + "\t无数据\t取消本次推送");
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 a1ce79c..f1e9ac7 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
@@ -539,7 +539,6 @@ public class BlockingServiceImp implements BlockingService {
         Map<String, AreaDictInfo> listArea = listAreaDictInfo();
         try {
             list = blockingDao.getPortStateInfo(start, start, end);
-            ;
         } catch (Exception e) {
             logger.error(logMark + "\t查询异常\tserviceImpl", e);
         }
@@ -548,8 +547,8 @@ public class BlockingServiceImp implements BlockingService {
             try {
                 Date startLastTime = blockingDao.getPortStateInfoLastTime(end);
                 if (startLastTime != null) {
-                    startLastTime = DateUtil.getFormatMinuteOne(startLastTime);
-                    Date endLastTime = DateUtil.getSomeMinute(startLastTime, 1);
+                    startLastTime = DateUtil.getFormatMinute(startLastTime);
+                    Date endLastTime = DateUtil.getSomeMinute(startLastTime, 5);
                     list = blockingDao.getPortStateInfo(start, startLastTime, endLastTime);
                 } else {
                     logger.warn(logMark + "\tTRAFFIC_SERIESDEVICE_PORT_INFO\t无数据");
diff --git a/src/main/resources/mybatis/mapper/BlockingMapper.xml b/src/main/resources/mybatis/mapper/BlockingMapper.xml
index 1d8ad19..4a00d30 100644
--- a/src/main/resources/mybatis/mapper/BlockingMapper.xml
+++ b/src/main/resources/mybatis/mapper/BlockingMapper.xml
@@ -152,6 +152,7 @@
       FROM traffic_seriesdevice_port_info
           WHERE commit_time > #{start}
           AND commit_time < #{end}
+      ORDER BY area ,port,status
        ]]>
     </select>