From 64efb660b2c119c00432434c0f651f8996483f18 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 21 二月 2025 15:51:13 +0800
Subject: [PATCH] OSD大华数据格式+数据中心重点标签统计数

---
 ycl-server/src/main/java/com/ycl/task/PlatformTask.java |   31 ++++++++++++++-----------------
 1 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/task/PlatformTask.java b/ycl-server/src/main/java/com/ycl/task/PlatformTask.java
index 6c8fbd4..f9ca8df 100644
--- a/ycl-server/src/main/java/com/ycl/task/PlatformTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/PlatformTask.java
@@ -44,11 +44,11 @@
 
     private static final String DICT_TYPE = "platform_online";
 
-    private static final ExecutorService executorService = new ThreadPoolExecutor(8,
-            24,
+    private static final ExecutorService executorService = new ThreadPoolExecutor(16,
+            64,
             5000,
             TimeUnit.SECONDS,
-            new ArrayBlockingQueue<>(10),
+            new ArrayBlockingQueue<>(1000),
             new ThreadPoolExecutor.CallerRunsPolicy()
     );
 
@@ -68,20 +68,19 @@
                     for (int tryTimes = 1; tryTimes < 3; tryTimes++) {
                         // 涓夌鏈猵ing閫氶噸璇曚竴娆★紝濡傛灉涓嶈鎵嶆墸鍒�
                         reachable = InetAddress.getByName(platform.getPlatformIP()).isReachable(3000);
-                        if (! reachable && tryTimes == 0) {
-                            continue;
-                        }
-                        if (! reachable) {
-                            // 濡傛灉ping涓嶉�氾紝绂荤嚎鏃堕暱鍔�5绉�
-                            redisTemplate.opsForValue().increment(REDIS_KEY_PREFIX + platform.getPlatformIP(), 5);
-                            log.warn(platform.getPlatformName() + "骞冲彴鏈猵ing閫�");
+                        if (reachable) {
+                            break;
                         }
                     }
+                    if (!reachable) {
+                        // 濡傛灉ping涓嶉�氾紝绂荤嚎鏃堕暱鍔�5绉�
+                        redisTemplate.opsForValue().increment(REDIS_KEY_PREFIX + platform.getPlatformIP(), 5);
+                        log.warn(platform.getPlatformName() + "骞冲彴鏈猵ing閫�");
+                    }
                 } catch (Exception e) {
-                    log.error("妫�鏌ュ钩鍙拌繛閫氭�ф椂鍙戠敓閿欒", e);
+                    log.error("妫�鏌ュ钩鍙拌繛閫氭�ф椂鍙戠敓d閿欒", e);
                 }
             });
-            executorService.shutdown();
         }
     }
 
@@ -100,20 +99,18 @@
             Object outLineTime = redisTemplate.opsForValue().get(REDIS_KEY_PREFIX + platform.getPlatformIP());
             Integer outlineTimeSed = Objects.isNull(outLineTime) ? 0 : (Integer) outLineTime;
             PlatformOnline one = new LambdaQueryChainWrapper<>(platformOnlineService.getBaseMapper())
-                    .eq(PlatformOnline::getPlatformIp, platform.getPlatformIP())
+                    .eq(PlatformOnline::getPlatformId, platform.getId())
                     .eq(PlatformOnline::getCreateDate, sqlDate)
                     .one();
             if (Objects.isNull(one)) {
                 one = new PlatformOnline();
-                one.setPlatformIp(platform.getPlatformIP());
-                one.setPlatformName(platform.getPlatformName());
+                one.setPlatformId(platform.getId());
                 one.setCreateDate(sqlDate);
                 one.setTodayOutlineSed(outlineTimeSed);
             } else {
                 one.setTodayOutlineSed(one.getTodayOutlineSed() + outlineTimeSed);
             }
-            one.setPlatformIp(platform.getPlatformIP());
-            one.setPlatformName(platform.getPlatformName());
+            one.setPlatformId(platform.getId());
             one.setCreateDate(sqlDate);
 
             platformOnlineService.saveOrUpdate(one);

--
Gitblit v1.8.0