Przeglądaj źródła

fix:action增加toString调用父类

xiwa 1 rok temu
rodzic
commit
20116e47ac

+ 2 - 0
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;

+ 2 - 4
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 {
 
     /**

+ 2 - 4
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;

+ 2 - 4
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 {
 
     /**

+ 2 - 4
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 {
 
     /**

+ 2 - 4
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 {
 
     /**

+ 2 - 4
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 {
 
     /**

+ 8 - 2
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 {
+            String deviceName = action.getDeviceName();
+
             //添加设备路由
-            deviceRouter.putRouter(action.getDeviceName(), new PluginRouter(IPluginMain.MAIN_ID, pluginId));
+            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: