From 12017a00ed21f8d461ab444d0bff12f61f476909 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期四, 06 二月 2025 16:29:57 +0800 Subject: [PATCH] osd测试代码清理 --- ycl-server/src/main/java/com/ycl/task/UYTask.java | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/task/UYTask.java b/ycl-server/src/main/java/com/ycl/task/UYTask.java index 227626a..81fc81c 100644 --- a/ycl-server/src/main/java/com/ycl/task/UYTask.java +++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java @@ -75,7 +75,7 @@ private String passwd; private static final ExecutorService executorService = new ThreadPoolExecutor(16, - 128, + 64, 5000, TimeUnit.SECONDS, new ArrayBlockingQueue<>(1000), @@ -214,7 +214,7 @@ OnlineCheckThread thread = new OnlineCheckThread(monitor, checkPointUtil, time); return thread.call(); // 鍋囪 OnlineCheckThread 瀹炵幇浜� Callable 鎺ュ彛 }, executorService) - .orTimeout(60, TimeUnit.SECONDS) + .orTimeout(180, TimeUnit.SECONDS) .exceptionally(ex -> { if (ex instanceof TimeoutException) { log.error("浠诲姟鎵ц瓒呮椂:"+monitor.getIp()); @@ -247,10 +247,9 @@ List<String> offLineList = new ArrayList<>(); List<String> onLineList = new ArrayList<>(); //鏌ュ嚭鏁版嵁搴撶函杞﹁締鎴栫函浜鸿劯璁惧 - List<String> serialNumbers = monitorMapper.selectCarOrFace().stream().map(TMonitor::getSerialNumber).collect(Collectors.toList()); +// List<String> serialNumbers = monitorMapper.selectCarOrFace().stream().map(TMonitor::getSerialNumber).collect(Collectors.toList()); dataList.forEach(item->{ - //鏇存柊绾溅杈嗘垨绾汉鑴哥殑璁惧鐨勫湪绾跨姸鎬�(杩欓儴鍒嗚澶囦笉浼氭媺娴佹娴�) - if(item.getPingOnline() && !CollectionUtils.isEmpty(serialNumbers) && serialNumbers.contains(item.getNo())) { + if(item.getPingOnline()) { onLineList.add(item.getIp()); } else if(!item.getPingOnline()) { //绛涢�夊嚭ping绂荤嚎鐨勮澶囷紝鏇存敼鏁版嵁搴撲负绂荤嚎 @@ -340,7 +339,6 @@ item.setNo(item.getDeviceId()); } }); - //璨屼技杩欓噷鍙互蹇界暐鐪佸巺鏍囩鍥犱负椤圭洰灞曠ず鐨勫悗闈ing鐨勬椂鍊欏瓨鐨勬暟鎹� pointService.setDeviceTagByGB(records,CheckConstants.Rule_Category_Video); //瀛樻斁鍦╩ongo涓� mongoTemplate.insertAll(records); -- Gitblit v1.8.0