From 01012b189841fa26a9a99ad8e8c43a2455b82d6a Mon Sep 17 00:00:00 2001
From: GUO <1923636941@qq.com>
Date: Mon, 17 Jun 2024 00:34:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=B7=E5=BA=B7=E5=8D=A1=E4=B8=BB=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java  |  6 ++----
 .../worker/service/impl/WorkerInfoServiceImpl.java     | 10 ++++++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java b/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java
index 7a4197108..58485ce8c 100644
--- a/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java
+++ b/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java
@@ -521,8 +521,7 @@ public class AsyncHikvision {
                         }
                     }
                     for (Future future : futures) {
-                        while (!future.isDone()) {
-                        }
+                        future.get();
                     }
                 }
                 Map<String, UfaceDev> devSnMap = allDevList.stream().collect(Collectors.toMap(UfaceDev::getDevSn, Function.identity()));
@@ -545,8 +544,7 @@ public class AsyncHikvision {
                     futures.add(future);
                 }
                 for (Future future : futures) {
-                    while (!future.isDone()) {
-                    }
+                    future.get();
                 }
             }
             //下发完成
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
index 2ac9f9f43..0d56f5c2b 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java
@@ -84,6 +84,7 @@ import java.math.BigDecimal;
 import java.nio.charset.Charset;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
@@ -2252,9 +2253,14 @@ public class WorkerInfoServiceImpl extends ServiceImpl<WorkerInfoMapper, WorkerI
             Future future = workerInfoService.editWorkerInfoAsync(workerInfo);
             futures.add(future);
         }
-        for (Future future : futures) {
-            while (!future.isDone()) {
+        try {
+            for (Future future : futures) {
+                future.get();
             }
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        } catch (ExecutionException e) {
+            throw new RuntimeException(e);
         }
         //通知
         if (SecurityUtils.getUser() != null && SecurityUtils.getUser().getUserId() != null) {