From df4faa7165db81924cf54914f72b885da8fe80c3 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Wed, 11 Dec 2024 14:05:31 +0800 Subject: [PATCH] update --- .../ctrlservice/DeviceInitCtrlService.java | 25 +++++++++++++++------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/main/java/a8k/service/app/devicectrl/ctrlservice/DeviceInitCtrlService.java b/src/main/java/a8k/service/app/devicectrl/ctrlservice/DeviceInitCtrlService.java index c679560..f8404a3 100644 --- a/src/main/java/a8k/service/app/devicectrl/ctrlservice/DeviceInitCtrlService.java +++ b/src/main/java/a8k/service/app/devicectrl/ctrlservice/DeviceInitCtrlService.java @@ -71,12 +71,12 @@ public class DeviceInitCtrlService { public static class DeviceInitedTaskState { - public Boolean deviceInited = false; - public List checkResults = new ArrayList<>(); - public Boolean isBusy = false; + public Boolean deviceInited = false; + public Boolean isBusy = false; + public Boolean passed = false; } - Thread workThread; + Thread workThread; @Getter DeviceInitedTaskState deviceInitedTaskState = new DeviceInitedTaskState(); @@ -221,12 +221,21 @@ public class DeviceInitCtrlService { } workThread = new Thread(() -> { - deviceInitedTaskState.isBusy = true; - deviceInitedTaskState.checkResults.clear(); + deviceInitedTaskState.isBusy = true; + deviceInitedTaskState.passed = false; deviceInitedTaskState.deviceInited = false; try { - deviceInitedTaskState.checkResults = initDevice(); - deviceInitedTaskState.deviceInited = true; + boolean passed = true; + List checkResults = initDevice(); + for (CheckResult checkResult : checkResults) { + if (!checkResult.pass) { + passed = false; + break; + } + } + + deviceInitedTaskState.passed = passed; + deviceInitedTaskState.deviceInited = passed; } catch (AppException e) { appEventBusService.pushAppExceptionEvent(e); }