From 7a7acc33c5658643a54c42bfd6f70ed3881a3248 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 31 八月 2024 19:24:44 +0800
Subject: [PATCH] 点位新增部级标签、点位导入导出优化
---
ycl-server/src/main/java/com/ycl/task/OsdTask.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/task/OsdTask.java b/ycl-server/src/main/java/com/ycl/task/OsdTask.java
index 75443d2..2da5834 100644
--- a/ycl-server/src/main/java/com/ycl/task/OsdTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/OsdTask.java
@@ -62,14 +62,6 @@
@Autowired
private UYErrorTypeCheckService uyErrorTypeCheckService;
- private static final ExecutorService executorService = new ThreadPoolExecutor(8,
- 24,
- 5000,
- TimeUnit.SECONDS,
- new ArrayBlockingQueue<>(1000),
- new ThreadPoolExecutor.CallerRunsPolicy()
- );
-
/**
* 閫氳繃鏌ongoDB姣忔棩涓�鏈轰竴妗ｆ暟鎹幏鍙栬澶噄p
* 閫氳繃璁惧ip銆佸搧鐗岃皟鐢ㄤ笉鍚宎pi鑾峰彇osd淇℃伅
@@ -80,7 +72,7 @@
log.info("寮�濮嬭幏鍙朞SD");
// YSApi.getOsd("51.95.66.42",YSUserName,YSPassword);
- DHApi.getOsd("51.95.67.189",DHUserName,DHPassword);
+// DHApi.getOsd("51.95.67.189",DHUserName,DHPassword);
//鎵归噺淇敼娴峰悍鍝佺墝闆嗗悎
List<String> hkList = new ArrayList<>();
//鎵归噺淇敼澶у崕鍝佺墝闆嗗悎
@@ -94,9 +86,15 @@
//闇�瑕佽�冩牳鐨勬暟鎹�
List<String> serialNumbers = oneMachineFileResults.stream().map(result -> result.getSerialNumber().getValue()).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(serialNumbers)) {
+ ExecutorService executorService = new ThreadPoolExecutor(8,
+ 24,
+ 5000,
+ TimeUnit.SECONDS,
+ new ArrayBlockingQueue<>(1000),
+ new ThreadPoolExecutor.CallerRunsPolicy()
+ );
List<TMonitor> monitors = monitorMapper.selectByNumbers(serialNumbers);
monitors = monitors.stream().filter(monitor -> !StringUtils.isEmpty(monitor.getIp()) && !"127.0.0.1".equals(monitor.getIp())).collect(Collectors.toList());
-// monitors = monitors.stream().filter(monitor -> monitor.getId() < 7000).collect(Collectors.toList());
log.info("澶勭悊鏁版嵁澶у皬{}", monitors.size());
for (TMonitor monitor : monitors) {
executorService.submit(() -> {
@@ -126,6 +124,7 @@
}
});
}
+ //涓嶅啀鎺ユ敹鏂颁换鍔�
executorService.shutdown();
try {
// 绛夊緟鎵�鏈変换鍔″畬鎴愶紝鏈�澶氱瓑寰�10绉掞紙鍙互鏍规嵁闇�瑕佽皟鏁达級
--
Gitblit v1.8.0