From 20116e47ac39f4194607a538f1862e06e122453a Mon Sep 17 00:00:00 2001 From: xiwa Date: Wed, 8 Nov 2023 00:20:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:action=E5=A2=9E=E5=8A=A0toString=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E7=88=B6=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/core/thing/actions/AbstractAction.java | 2 ++ .../plugin/core/thing/actions/up/DeviceRegister.java | 6 ++---- .../core/thing/actions/up/DeviceStateChange.java | 6 ++---- .../plugin/core/thing/actions/up/DeviceTopology.java | 6 ++---- .../plugin/core/thing/actions/up/EventReport.java | 6 ++---- .../plugin/core/thing/actions/up/PropertyReport.java | 6 ++---- .../plugin/core/thing/actions/up/ServiceReply.java | 6 ++---- .../java/cc/iotkit/plugin/main/ThingServiceImpl.java | 12 +++++++++--- 8 files changed, 23 insertions(+), 27 deletions(-) diff --git a/iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/AbstractAction.java b/iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/AbstractAction.java index 6b327685..dafe9170 100644 --- a/iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/AbstractAction.java +++ b/iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/AbstractAction.java @@ -1,6 +1,7 @@ package cc.iotkit.plugin.core.thing.actions; import lombok.Data; +import lombok.ToString; import lombok.experimental.SuperBuilder; /** @@ -8,6 +9,7 @@ import lombok.experimental.SuperBuilder; */ @Data @SuperBuilder +@ToString(callSuper = true) public abstract class AbstractAction implements IDeviceAction { protected String id; diff --git a/iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/up/DeviceRegister.java b/iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/up/DeviceRegister.java index d99b33c8..ec1e448e 100644 --- a/iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/up/DeviceRegister.java +++ b/iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/up/DeviceRegister.java @@ -3,10 +3,7 @@ package cc.iotkit.plugin.core.thing.actions.up; import cc.iotkit.plugin.core.thing.actions.AbstractAction; import cc.iotkit.plugin.core.thing.actions.ActionType; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; +import lombok.*; import lombok.experimental.SuperBuilder; /** @@ -19,6 +16,7 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @AllArgsConstructor @SuperBuilder +@ToString(callSuper = true) public class DeviceRegister extends AbstractAction { /** diff --git a/iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/up/DeviceStateChange.java b/iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/up/DeviceStateChange.java index 2a73ff4e..17579528 100644 --- a/iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/up/DeviceStateChange.java +++ b/iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/up/DeviceStateChange.java @@ -4,10 +4,7 @@ package cc.iotkit.plugin.core.thing.actions.up; import cc.iotkit.plugin.core.thing.actions.AbstractAction; import cc.iotkit.plugin.core.thing.actions.ActionType; import cc.iotkit.plugin.core.thing.actions.DeviceState; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; +import lombok.*; import lombok.experimental.SuperBuilder; /** @@ -20,6 +17,7 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @AllArgsConstructor @SuperBuilder +@ToString(callSuper = true) public class DeviceStateChange extends AbstractAction { private DeviceState state; diff --git a/iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/up/DeviceTopology.java b/iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/up/DeviceTopology.java index 69e33812..b483bdd0 100644 --- a/iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/up/DeviceTopology.java +++ b/iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/up/DeviceTopology.java @@ -3,10 +3,7 @@ package cc.iotkit.plugin.core.thing.actions.up; import cc.iotkit.plugin.core.thing.actions.AbstractAction; import cc.iotkit.plugin.core.thing.actions.ActionType; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; +import lombok.*; import lombok.experimental.SuperBuilder; import java.util.List; @@ -21,6 +18,7 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @SuperBuilder +@ToString(callSuper = true) public class DeviceTopology extends AbstractAction { /** diff --git a/iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/up/EventReport.java b/iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/up/EventReport.java index 5cf961f3..60d804f7 100644 --- a/iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/up/EventReport.java +++ b/iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/up/EventReport.java @@ -4,10 +4,7 @@ package cc.iotkit.plugin.core.thing.actions.up; import cc.iotkit.plugin.core.thing.actions.AbstractAction; import cc.iotkit.plugin.core.thing.actions.ActionType; import cc.iotkit.plugin.core.thing.actions.EventLevel; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; +import lombok.*; import lombok.experimental.SuperBuilder; import java.util.Map; @@ -22,6 +19,7 @@ import java.util.Map; @NoArgsConstructor @AllArgsConstructor @SuperBuilder +@ToString(callSuper = true) public class EventReport extends AbstractAction { /** diff --git a/iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/up/PropertyReport.java b/iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/up/PropertyReport.java index d0d78619..d06a2a1b 100644 --- a/iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/up/PropertyReport.java +++ b/iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/up/PropertyReport.java @@ -3,10 +3,7 @@ package cc.iotkit.plugin.core.thing.actions.up; import cc.iotkit.plugin.core.thing.actions.AbstractAction; import cc.iotkit.plugin.core.thing.actions.ActionType; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; +import lombok.*; import lombok.experimental.SuperBuilder; import java.util.Map; @@ -21,6 +18,7 @@ import java.util.Map; @NoArgsConstructor @AllArgsConstructor @SuperBuilder +@ToString(callSuper = true) public class PropertyReport extends AbstractAction { /** diff --git a/iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/up/ServiceReply.java b/iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/up/ServiceReply.java index 07f4f5ae..a186b9b7 100644 --- a/iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/up/ServiceReply.java +++ b/iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/up/ServiceReply.java @@ -3,10 +3,7 @@ package cc.iotkit.plugin.core.thing.actions.up; import cc.iotkit.plugin.core.thing.actions.AbstractAction; import cc.iotkit.plugin.core.thing.actions.ActionType; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; +import lombok.*; import lombok.experimental.SuperBuilder; import java.util.Map; @@ -21,6 +18,7 @@ import java.util.Map; @NoArgsConstructor @AllArgsConstructor @SuperBuilder +@ToString(callSuper = true) public class ServiceReply extends AbstractAction { /** diff --git a/iot-module/iot-plugin/iot-plugin-main/src/main/java/cc/iotkit/plugin/main/ThingServiceImpl.java b/iot-module/iot-plugin/iot-plugin-main/src/main/java/cc/iotkit/plugin/main/ThingServiceImpl.java index 45fb3b36..f2864fec 100644 --- a/iot-module/iot-plugin/iot-plugin-main/src/main/java/cc/iotkit/plugin/main/ThingServiceImpl.java +++ b/iot-module/iot-plugin/iot-plugin-main/src/main/java/cc/iotkit/plugin/main/ThingServiceImpl.java @@ -50,10 +50,16 @@ public class ThingServiceImpl implements IThingService { @Override public ActionResult post(String pluginId, IDeviceAction action) { try { - //添加设备路由 - deviceRouter.putRouter(action.getDeviceName(), new PluginRouter(IPluginMain.MAIN_ID, pluginId)); + String deviceName = action.getDeviceName(); + + //添加设备路由 + deviceRouter.putRouter(deviceName, new PluginRouter(IPluginMain.MAIN_ID, pluginId)); + + DeviceInfo device = getDevice(deviceName); + if (device == null) { + log.warn("device:{} is not found.", deviceName); + } - DeviceInfo device = getDevice(action.getDeviceName()); ActionType type = action.getType(); switch (type) { case REGISTER: