From c104ea8b0bb99e058633770016abebe117d53d00 Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期一, 05 十二月 2022 15:43:51 +0800
Subject: [PATCH] 新諾瓦批量截圖改成同步獲取截圖

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/utils/NovaAPIUtil.java |   26 ++++++++++----------------
 1 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/utils/NovaAPIUtil.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/utils/NovaAPIUtil.java
index 0c9ff5a..59ddeaa 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/utils/NovaAPIUtil.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/newnova/utils/NovaAPIUtil.java
@@ -911,14 +911,12 @@
         System.out.println("ViplexCore Demo nvDownLoadScreenshotAsync(鎴睆) begin... ");
         NovaFileConfig config = SpringContextHolder.getBean(NovaFileConfig.class);
         String shotPath = config.getScreenShotPath();
-        CountDownLatch countDownLatch = new CountDownLatch(param.getScreenShotList().size());
-        param.getScreenShotList().forEach(newNova -> {
-
+        for(NewNovaStatusParam.NovascreenShotDTO newNova:param.getScreenShotList()){
             StatusVO login = login(newNova.getSn(), 0);
             if (login.getStatusCode() != 0) {
-                countDownLatch.countDown();
-                return;
+                continue;
             }
+            CountDownLatch countDownLatch = new CountDownLatch(1);
             String pictureName = newNova.getSn() + ".png";
             String str = "{\n" +
                     "  \"sn\":\"" + newNova.getSn() + "\",\n" +
@@ -944,19 +942,15 @@
                         newNova.setScreenShot(data);
                     }
                     countDownLatch.countDown();
-
-                    try {
-                        countDownLatch.await(5000, TimeUnit.MILLISECONDS);
-                    } catch (InterruptedException ex) {
-                        throw new RuntimeException(ex);
-                    }
-
                 }
-
             });
-
-        });
-
+            //绛夊緟瑷倷鍥炶淇℃伅
+            try {
+                countDownLatch.await(5000, TimeUnit.MILLISECONDS);
+            } catch (InterruptedException ex) {
+                throw new RuntimeException(ex);
+            }
+        }
         return param.getScreenShotList();
     }
 

--
Gitblit v1.9.3