From 683ba953aa666ff777965c5648056f844fd4de7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=A2=A6=E8=BF=9C?= <1063331231@qq.com> Date: Thu, 31 Jul 2025 13:47:12 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E8=87=B3commandFeedback=20=E7=9B=91?= =?UTF-8?q?=E5=90=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handacid/app/core/event/StateChangeEvent.java | 14 -------------- .../app/core/listener/CommandFeedbackListener.java | 18 ++++++++++++++++++ .../handacid/app/service/DeviceInitService.java | 2 +- 3 files changed, 19 insertions(+), 15 deletions(-) delete mode 100644 src/main/java/com/iflytop/handacid/app/core/event/StateChangeEvent.java create mode 100644 src/main/java/com/iflytop/handacid/app/core/listener/CommandFeedbackListener.java diff --git a/src/main/java/com/iflytop/handacid/app/core/event/StateChangeEvent.java b/src/main/java/com/iflytop/handacid/app/core/event/StateChangeEvent.java deleted file mode 100644 index df8ab75..0000000 --- a/src/main/java/com/iflytop/handacid/app/core/event/StateChangeEvent.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.iflytop.handacid.app.core.event; -import lombok.AllArgsConstructor; -import lombok.Data; - -/** - * 状态变更事件 - */ -@Data -@AllArgsConstructor -public class StateChangeEvent { - private String fieldPath; - private Object oldValue; - private Object newValue; -} diff --git a/src/main/java/com/iflytop/handacid/app/core/listener/CommandFeedbackListener.java b/src/main/java/com/iflytop/handacid/app/core/listener/CommandFeedbackListener.java new file mode 100644 index 0000000..ebca7eb --- /dev/null +++ b/src/main/java/com/iflytop/handacid/app/core/listener/CommandFeedbackListener.java @@ -0,0 +1,18 @@ +package com.iflytop.handacid.app.core.listener; + +import com.iflytop.handacid.app.core.event.CommandFeedbackEvent; +import com.iflytop.handacid.app.service.DeviceCommandService; +import lombok.RequiredArgsConstructor; +import org.springframework.context.event.EventListener; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class CommandFeedbackListener { + private final DeviceCommandService deviceCommandService; + + @EventListener + public void handleCommandFeedbackEvent(CommandFeedbackEvent event) { + deviceCommandService.completeCommandResponse(event.getJsonResponse()); + } +} diff --git a/src/main/java/com/iflytop/handacid/app/service/DeviceInitService.java b/src/main/java/com/iflytop/handacid/app/service/DeviceInitService.java index 9f23c48..8cc7686 100644 --- a/src/main/java/com/iflytop/handacid/app/service/DeviceInitService.java +++ b/src/main/java/com/iflytop/handacid/app/service/DeviceInitService.java @@ -74,7 +74,7 @@ public class DeviceInitService { /** * 初始化所有设备使能 */ - public void initEnable() throws Exception { + public void initEnable() { DeviceCommand pump1Enable = DeviceCommandGenerator.pump1Enable(); deviceCommandService.sendCommand(pump1Enable);