From 07fd54bff5a0a8bf77c47abc400fa1db1db88e48 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Mon, 6 Jan 2025 16:18:44 +0800 Subject: [PATCH] update --- src/main/java/a8k/app/a8ktype/error/AppError.java | 11 ++++++++++- .../java/a8k/app/a8ktype/state/DeviceWorkState.java | 18 ++++++++++-------- .../a8k/app/hardware/type/a8kcanprotocol/A8kEcode.java | 1 + .../mainctrl/mainflowctrl/MainFlowCtrlScheduler.java | 5 ++++- .../mainflowctrl/action/P30ScanTubeHolderTask.java | 13 +++++++------ .../service/statemgr/DeviceWorkStateMgrService.java | 7 +++++++ .../page/frond_end_test/VirtualEventGeneratorPage.java | 7 ------- 7 files changed, 39 insertions(+), 23 deletions(-) diff --git a/src/main/java/a8k/app/a8ktype/error/AppError.java b/src/main/java/a8k/app/a8ktype/error/AppError.java index df4abfb..e9d77cd 100644 --- a/src/main/java/a8k/app/a8ktype/error/AppError.java +++ b/src/main/java/a8k/app/a8ktype/error/AppError.java @@ -6,7 +6,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import java.io.Serializable; -public class AppError implements Serializable { +public class AppError implements Serializable { @Schema(description = "错误码") public A8kEcode code; public String type; @@ -27,4 +27,13 @@ public class AppError implements Serializable { public String toString() { return ZJsonHelper.objectToJson(this); } + + public Boolean eq(A8kEcode... ecode) { + for (A8kEcode e : ecode) { + if (e == code) { + return true; + } + } + return false; + } } \ No newline at end of file diff --git a/src/main/java/a8k/app/a8ktype/state/DeviceWorkState.java b/src/main/java/a8k/app/a8ktype/state/DeviceWorkState.java index fef77a4..165dabb 100644 --- a/src/main/java/a8k/app/a8ktype/state/DeviceWorkState.java +++ b/src/main/java/a8k/app/a8ktype/state/DeviceWorkState.java @@ -21,10 +21,12 @@ public class DeviceWorkState implements Serializable { public A8kWorkState lastWorkState = A8kWorkState.IDLE; //上一个工作状态 - public Boolean stopActionPending = false; //停止动作等待 - public Boolean pauseActionPending = false; //暂停动作等待 - public Boolean resumeActionPending = false; //恢复动作等待 - public Boolean startActionPending = false; //开始动作等待 + public Boolean stopActionPending = false; //停止动作等待 + public Boolean pauseActionPending = false; //暂停动作等待 + public Boolean resumeActionPending = false; //恢复动作等待 + public Boolean startActionPending = false; //开始动作等待 + + public Boolean consumeNotEnoughErrorFlag = false; @Schema(description = "当前状态是否切换完成") public Boolean isPending() { @@ -32,10 +34,10 @@ public class DeviceWorkState implements Serializable { } public void clearPending() { - stopActionPending = false; - pauseActionPending = false; - resumeActionPending = false; - startActionPending = false; + stopActionPending = false; + pauseActionPending = false; + resumeActionPending = false; + startActionPending = false; } } diff --git a/src/main/java/a8k/app/hardware/type/a8kcanprotocol/A8kEcode.java b/src/main/java/a8k/app/hardware/type/a8kcanprotocol/A8kEcode.java index d10457d..a955ee3 100644 --- a/src/main/java/a8k/app/hardware/type/a8kcanprotocol/A8kEcode.java +++ b/src/main/java/a8k/app/hardware/type/a8kcanprotocol/A8kEcode.java @@ -216,4 +216,5 @@ public enum A8kEcode { } + } diff --git a/src/main/java/a8k/app/service/mainctrl/mainflowctrl/MainFlowCtrlScheduler.java b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/MainFlowCtrlScheduler.java index 88a809d..e280d12 100644 --- a/src/main/java/a8k/app/service/mainctrl/mainflowctrl/MainFlowCtrlScheduler.java +++ b/src/main/java/a8k/app/service/mainctrl/mainflowctrl/MainFlowCtrlScheduler.java @@ -103,22 +103,25 @@ public class MainFlowCtrlScheduler implements ApplicationListener doAction() { //获取试管架配置 TubeHolderSetting tubeSetting = tubeSettingMgrService.getThelastActiveTubeHolderSettingAndLock(); - Boolean suc = false; + Boolean suc; try { suc = priDoAction(tubeSetting); } catch (AppException e) { diff --git a/src/main/java/a8k/app/service/statemgr/DeviceWorkStateMgrService.java b/src/main/java/a8k/app/service/statemgr/DeviceWorkStateMgrService.java index f972c85..b01357a 100644 --- a/src/main/java/a8k/app/service/statemgr/DeviceWorkStateMgrService.java +++ b/src/main/java/a8k/app/service/statemgr/DeviceWorkStateMgrService.java @@ -62,5 +62,12 @@ public class DeviceWorkStateMgrService { deviceWorkState.fatalErrorFlag = fatalErrorFlag; } + synchronized public void setConsumeNotEnoughErrorFlag(Boolean consumeNotEnoughErrorFlag) { + deviceWorkState.consumeNotEnoughErrorFlag = consumeNotEnoughErrorFlag; + } + + synchronized public Boolean getConsumeNotEnoughErrorFlag() { + return deviceWorkState.consumeNotEnoughErrorFlag; + } } diff --git a/src/main/java/a8k/extui/page/frond_end_test/VirtualEventGeneratorPage.java b/src/main/java/a8k/extui/page/frond_end_test/VirtualEventGeneratorPage.java index a01569e..0bc02ba 100644 --- a/src/main/java/a8k/extui/page/frond_end_test/VirtualEventGeneratorPage.java +++ b/src/main/java/a8k/extui/page/frond_end_test/VirtualEventGeneratorPage.java @@ -1,18 +1,13 @@ package a8k.extui.page.frond_end_test; import a8k.app.a8ktype.appevent.*; -import a8k.app.a8ktype.error.AEConsumeNotEnoughError; -import a8k.app.a8ktype.error.AETubeError; import a8k.app.a8ktype.ui.*; -import a8k.app.factory.ZAppPromoptFactory; import a8k.app.service.bases.AppEventBusService; import a8k.app.service.bases.FrontEndMessageBoxAndEventMgr; -import a8k.app.service.statemgr.ConsumableStateAnalyzer; import a8k.extui.mgr.ExtApiPageMgr; import a8k.extui.type.ExtUIPageCfg; import jakarta.annotation.PostConstruct; import jakarta.annotation.Resource; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.ArrayList; @@ -26,8 +21,6 @@ public class VirtualEventGeneratorPage { @Resource ExtApiPageMgr extApiPageMgr; - - ZAppPromoptTable buildZAppPromoptTable() { ZAppPromoptTable table = new ZAppPromoptTable(); table.addHeader("耗材名称", "需求量", "使用量");