From d207fb987d9e2688f6a9d58ec6fe164831a35f43 Mon Sep 17 00:00:00 2001 From: huangxiang <155373492@qq.com> Date: Sun, 27 Apr 2025 21:20:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?doc:=E6=A2=B3=E7=90=86=E6=94=B6=E5=88=B0?= =?UTF-8?q?=E5=8C=85=E5=A4=84=E7=90=86=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/检测流程.md | 24 --------- doc/耗材管理.md | 7 +-- doc/设备通信流程梳理.md | 59 ++++++++++++++++++++++ .../app/hardware/channel/A8kCanBusConnection.java | 7 +-- 4 files changed, 65 insertions(+), 32 deletions(-) create mode 100644 doc/设备通信流程梳理.md diff --git a/doc/检测流程.md b/doc/检测流程.md index e885d19..164d378 100644 --- a/doc/检测流程.md +++ b/doc/检测流程.md @@ -174,30 +174,6 @@ flowchart TD ```mermaid --- -title: Can总线服务类图 ---- -classDiagram - class A8kCanBusService { - - } - - class A8kCanBusConnection { - + onOpen() - + onMessage() - + callcmd() - + send() - + moduleGetStatus() - } - - class WebSocketClient - - A8kCanBusService --> A8kCanBusConnection - A8kCanBusConnection --|> WebSocketClient - -``` - -```mermaid ---- title: 单次任务执行时序 --- sequenceDiagram diff --git a/doc/耗材管理.md b/doc/耗材管理.md index 45c4476..d1720b7 100644 --- a/doc/耗材管理.md +++ b/doc/耗材管理.md @@ -55,12 +55,12 @@ sequenceDiagram participant ConsumablesScanCtrlService user->>+ConsumableScanControler: 开始扫描 - ConsumableScanControler->>+AppConsumablesScanService: scanConsumables AppConsumablesScanService->>+GStateMgrService: isDeviceInited GStateMgrService->>-AppConsumablesScanService: 设备初始化结果 alt 未初始化 + ConsumableScanControler->>+AppConsumablesScanService: scanConsumables AppConsumablesScanService->>-ConsumableScanControler: 抛出系统未初始化异常 - else + else 初始化完成 AppConsumablesScanService->>+ConsumablesScanCtrlService: doScanConsumablesAction ConsumablesScanCtrlService->>-AppConsumablesScanService: scanRawResults原始扫描结果 loop 遍历扫描结果 @@ -72,7 +72,8 @@ sequenceDiagram AppConsumablesScanService->>+AppConsumablesScanService: loadingConsumables AppConsumablesScanService->>-AppConsumablesScanService: 解析后的结果 end - AppConsumablesScanService->>-ConsumableScanControler:ConsumablesScanResultPacket + ConsumableScanControler->>+AppConsumablesScanService: scanConsumables + AppConsumablesScanService->>-ConsumableScanControler:result end ConsumableScanControler->>-user:ConsumablesScanResultPacket diff --git a/doc/设备通信流程梳理.md b/doc/设备通信流程梳理.md new file mode 100644 index 0000000..52d6c02 --- /dev/null +++ b/doc/设备通信流程梳理.md @@ -0,0 +1,59 @@ +```mermaid +--- +title: Can总线服务类图 +--- +classDiagram + class A8kCanBusService { + + } + + class A8kCanBusConnection { + + onOpen() + + onMessage() + + callcmd() + + send() + + moduleGetStatus() + } + + class WebSocketClient + + A8kCanBusService --> A8kCanBusConnection + A8kCanBusConnection --|> WebSocketClient + +``` + +```mermaid +--- +title: 收到设备发送的包处理流程 +--- +sequenceDiagram + participant A8kCanBusConnection + participant ByteArray + participant A8kPacket + participant ProcessContext + participant AppEventBusService + participant BlockingQueue + + A8kCanBusConnection ->>+ A8kCanBusConnection: onMessage + A8kCanBusConnection ->>+ A8kCanBusConnection: processCanRxMessage + + %% 将16进制字符串转换成二级制字节 + A8kCanBusConnection ->>+ ByteArray: hexStringToBytes() + ByteArray ->>- A8kCanBusConnection: byte[] + A8kCanBusConnection ->>+ A8kPacket: A8kPacket() + A8kPacket ->>- A8kCanBusConnection: packet + opt 包类型为PACKET_TYPE_ACK 或者 PACKET_TYPE_ERROR_ACK + A8kCanBusConnection->>+ProcessContext: pushReceipt() + + %% 执行这边之前需要判断收到的包的序号是不是当前发送的包的序号相同，并且比较moduleId和commandId是否相等 + ProcessContext->>+BlockingQueue: add() + BlockingQueue->>-ProcessContext: void + ProcessContext->>-A8kCanBusConnection: void + end + + opt 包类型为PACKET_TYPE_EVENT 处理设备上报事件 + A8kCanBusConnection->>+AppEventBusService: pushEvent() + AppEventBusService->>-A8kCanBusConnection: void + end +``` + diff --git a/src/main/java/a8k/app/hardware/channel/A8kCanBusConnection.java b/src/main/java/a8k/app/hardware/channel/A8kCanBusConnection.java index 0986867..4a97a1b 100644 --- a/src/main/java/a8k/app/hardware/channel/A8kCanBusConnection.java +++ b/src/main/java/a8k/app/hardware/channel/A8kCanBusConnection.java @@ -67,11 +67,8 @@ public class A8kCanBusConnection extends WebSocketClient { } synchronized void pushReceipt(A8kPacket receipt) { - if (this.cmdPacket != null - && this.cmdPacket.getPacketIndex() == receipt.getPacketIndex() - ) { - if (this.cmdPacket.getModuleId() == receipt.getModuleId() - && this.cmdPacket.getCmdId() == receipt.getCmdId()) { + if (this.cmdPacket != null && this.cmdPacket.getPacketIndex() == receipt.getPacketIndex()) { + if (this.cmdPacket.getModuleId() == receipt.getModuleId() && this.cmdPacket.getCmdId() == receipt.getCmdId()) { receiptQueue.add(receipt); this.cmdPacket = null; } else { From 7d4eee46b6bce03a42ce5455bd82aacaefe5bee8 Mon Sep 17 00:00:00 2001 From: huangxiang <155373492@qq.com> Date: Mon, 28 Apr 2025 09:47:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?doc:=E6=9B=B4=E6=96=B0=E6=8E=A5=E6=94=B6?= =?UTF-8?q?=E7=A1=AC=E4=BB=B6=E6=95=B0=E6=8D=AE=E5=8C=85=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=97=B6=E5=BA=8F=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/设备通信流程梳理.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/设备通信流程梳理.md b/doc/设备通信流程梳理.md index 52d6c02..3c1f72b 100644 --- a/doc/设备通信流程梳理.md +++ b/doc/设备通信流程梳理.md @@ -35,7 +35,7 @@ sequenceDiagram participant BlockingQueue A8kCanBusConnection ->>+ A8kCanBusConnection: onMessage - A8kCanBusConnection ->>+ A8kCanBusConnection: processCanRxMessage + A8kCanBusConnection ->>+ A8kCanBusConnection: processCanRxMessage() %% 将16进制字符串转换成二级制字节 A8kCanBusConnection ->>+ ByteArray: hexStringToBytes() @@ -55,5 +55,7 @@ sequenceDiagram A8kCanBusConnection->>+AppEventBusService: pushEvent() AppEventBusService->>-A8kCanBusConnection: void end + A8kCanBusConnection->>-A8kCanBusConnection: void + A8kCanBusConnection->>-A8kCanBusConnection: void ```