From 8ce42d3b050ddb70383290a7abfe4f22f631b5a7 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sun, 6 Oct 2024 18:37:21 +0800 Subject: [PATCH] update --- src/main/java/a8k/hardware/A8kCanBusService.java | 3 --- .../a8k/service/appdevicectrl/scheduler/MainFlowCtrlScheduler.java | 3 +-- src/main/java/a8k/type/exception/AppException.java | 3 --- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/main/java/a8k/hardware/A8kCanBusService.java b/src/main/java/a8k/hardware/A8kCanBusService.java index 30d87da..4ad2c74 100644 --- a/src/main/java/a8k/hardware/A8kCanBusService.java +++ b/src/main/java/a8k/hardware/A8kCanBusService.java @@ -739,17 +739,14 @@ public class A8kCanBusService { receipt = receiptQueue.poll(overtime, TimeUnit.MILLISECONDS); } catch (InterruptedException e) { isWaitingReceipt = false; - // throw new AppException(MId.valueOf(pack.getModuleId()), A8kEcode.Overtime.index); throw AppException.of(new HardwareError(A8kEcode.Overtime, MId.valueOf(pack.getModuleId()), CmdId.valueOf(pack.getCmdId()))); } isWaitingReceipt = false; if (receipt == null) { - // throw new AppException(MId.valueOf(pack.getModuleId()), A8kEcode.Overtime.index); throw AppException.of(new HardwareError(A8kEcode.Overtime, MId.valueOf(pack.getModuleId()), CmdId.valueOf(pack.getCmdId()))); } if (receipt.getPacketType() == A8kPacket.PACKET_TYPE_ERROR_ACK) { - // throw new AppException(MId.valueOf(pack.getModuleId()), (receipt.getContentI32(0))); throw AppException.of(new HardwareError(A8kEcode.fromInt(receipt.getContentI32(0)), MId.valueOf(pack.getModuleId()), CmdId.valueOf(pack.getCmdId()))); diff --git a/src/main/java/a8k/service/appdevicectrl/scheduler/MainFlowCtrlScheduler.java b/src/main/java/a8k/service/appdevicectrl/scheduler/MainFlowCtrlScheduler.java index 206c5c9..c90f225 100644 --- a/src/main/java/a8k/service/appdevicectrl/scheduler/MainFlowCtrlScheduler.java +++ b/src/main/java/a8k/service/appdevicectrl/scheduler/MainFlowCtrlScheduler.java @@ -122,11 +122,10 @@ public class MainFlowCtrlScheduler { dowhatList.add(action); } } - } return dowhatList; } catch (Exception e) { - logger.info("guessWhatToDo error:{}", e.getMessage()); + logger.info("guessWhatToDo error:{}", e.toString()); appResourceMgrService.releaseAllResource(this); } return new ArrayList<>(); diff --git a/src/main/java/a8k/type/exception/AppException.java b/src/main/java/a8k/type/exception/AppException.java index 746ee8e..2433ba7 100644 --- a/src/main/java/a8k/type/exception/AppException.java +++ b/src/main/java/a8k/type/exception/AppException.java @@ -12,9 +12,6 @@ public class AppException extends Exception { // 构造函数 public AppError error; - public AppException() { - super(); - } public AppException(A8kEcode ecodeType) { super(String.format("Error code %s", ecodeType));