fix（事件封堵与监测）:修改接口通过生效配置获取日志量，遗留修正

3 files changed, 36 insertions, 2 deletions

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 11c0bfc..daec622 100644
--- a/src/main/java/com/nis/galaxy/web/dao/EventsDao.java
+++ b/src/main/java/com/nis/galaxy/web/dao/EventsDao.java
@@ -56,7 +56,7 @@ public interface EventsDao {
 
     List<EventsBlock> getEventsBlock();
 
-    List<EventsMonitor> getCfgsBlock();
+    List<EventsBlock> getCfgsBlock();
 
     List<EvevtsTargetNetwork> getTargetNetwork(@Param("push") Date push, @Param("start") Date start, @Param("end") Date end);
 
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 37e20a4..61e7e42 100644
--- a/src/main/java/com/nis/galaxy/web/service/EventsService.java
+++ b/src/main/java/com/nis/galaxy/web/service/EventsService.java
@@ -102,7 +102,7 @@ public interface EventsService {
      * @param logMark
      * @return
      */
-   List<EventsMonitor> getCfgsBlock(String logMark);
+   List<EventsBlock> getCfgsBlock(String logMark);
 
 
     /**
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 e4096d1..9924da9 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
@@ -409,6 +409,39 @@ public class EventsServiceImpl implements EventsService {
      * @return
      */
     @Override
+    public List<EventsBlock> getCfgsBlock(String logMark) {
+        List<EventsBlock> list = new ArrayList<>();
+        long timeMillisStart = System.currentTimeMillis();
+        try {
+            list = eventsDao.getCfgsBlock();
+        } catch (Exception e) {
+            logger.error(logMark + "\t查询异常\tserviceImpl", e);
+        }
+        logger.info("{}耗时\t{}", logMark, (System.currentTimeMillis() - timeMillisStart));
+        if (ListUtils.isEmptyList(list) && ConfigUtil.testData) {
+            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;
+    }
+
+
+
+    /**
+     * 事件封堵
+     *
+     * @param logMark
+     * @return
+     */
+    @Override
     public List<EventsBlock> getEventsBlock(String logMark) {
         List<EventsBlock> list = new ArrayList<>();
         long timeMillisStart = System.currentTimeMillis();
@@ -433,6 +466,7 @@ public class EventsServiceImpl implements EventsService {
         return list;
     }
 
+
     /**
      * 音频监控
      *