zcy
/
iotkit-parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:action增加toString调用父类

V0.5.x
xiwa 2023-11-08 00:20:47 +08:00
parent 1934b743c2
commit 20116e47ac
8 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/AbstractAction.java
View File

@ -1,6 +1,7 @@
package cc.iotkit.plugin.core.thing.actions; package cc.iotkit.plugin.core.thing.actions;
import lombok.Data; import lombok.Data;
import lombok.ToString;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
/** /**
@ -8,6 +9,7 @@ import lombok.experimental.SuperBuilder;
*/ */
@Data @Data
@SuperBuilder @SuperBuilder
@ToString(callSuper = true)
public abstract class AbstractAction implements IDeviceAction { public abstract class AbstractAction implements IDeviceAction {
protected String id; protected String id;

6
iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/up/DeviceRegister.java
View File

@ -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.AbstractAction;
import cc.iotkit.plugin.core.thing.actions.ActionType; import cc.iotkit.plugin.core.thing.actions.ActionType;
import lombok.AllArgsConstructor; import lombok.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
/** /**
@ -19,6 +16,7 @@ import lombok.experimental.SuperBuilder;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@SuperBuilder @SuperBuilder
@ToString(callSuper = true)
public class DeviceRegister extends AbstractAction { public class DeviceRegister extends AbstractAction {
/** /**

6
iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/up/DeviceStateChange.java
View File

@ -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.AbstractAction;
import cc.iotkit.plugin.core.thing.actions.ActionType; import cc.iotkit.plugin.core.thing.actions.ActionType;
import cc.iotkit.plugin.core.thing.actions.DeviceState; import cc.iotkit.plugin.core.thing.actions.DeviceState;
import lombok.AllArgsConstructor; import lombok.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
/** /**
@ -20,6 +17,7 @@ import lombok.experimental.SuperBuilder;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@SuperBuilder @SuperBuilder
@ToString(callSuper = true)
public class DeviceStateChange extends AbstractAction { public class DeviceStateChange extends AbstractAction {
private DeviceState state; private DeviceState state;

6
iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/up/DeviceTopology.java
View File

@ -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.AbstractAction;
import cc.iotkit.plugin.core.thing.actions.ActionType; import cc.iotkit.plugin.core.thing.actions.ActionType;
import lombok.AllArgsConstructor; import lombok.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
import java.util.List; import java.util.List;
@ -21,6 +18,7 @@ import java.util.List;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@SuperBuilder @SuperBuilder
@ToString(callSuper = true)
public class DeviceTopology extends AbstractAction { public class DeviceTopology extends AbstractAction {
/** /**

6
iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/up/EventReport.java
View File

@ -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.AbstractAction;
import cc.iotkit.plugin.core.thing.actions.ActionType; import cc.iotkit.plugin.core.thing.actions.ActionType;
import cc.iotkit.plugin.core.thing.actions.EventLevel; import cc.iotkit.plugin.core.thing.actions.EventLevel;
import lombok.AllArgsConstructor; import lombok.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
import java.util.Map; import java.util.Map;
@ -22,6 +19,7 @@ import java.util.Map;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@SuperBuilder @SuperBuilder
@ToString(callSuper = true)
public class EventReport extends AbstractAction { public class EventReport extends AbstractAction {
/** /**

6
iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/up/PropertyReport.java
View File

@ -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.AbstractAction;
import cc.iotkit.plugin.core.thing.actions.ActionType; import cc.iotkit.plugin.core.thing.actions.ActionType;
import lombok.AllArgsConstructor; import lombok.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
import java.util.Map; import java.util.Map;
@ -21,6 +18,7 @@ import java.util.Map;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@SuperBuilder @SuperBuilder
@ToString(callSuper = true)
public class PropertyReport extends AbstractAction { public class PropertyReport extends AbstractAction {
/** /**

6
iot-module/iot-plugin/iot-plugin-core/src/main/java/cc/iotkit/plugin/core/thing/actions/up/ServiceReply.java
View File

@ -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.AbstractAction;
import cc.iotkit.plugin.core.thing.actions.ActionType; import cc.iotkit.plugin.core.thing.actions.ActionType;
import lombok.AllArgsConstructor; import lombok.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
import java.util.Map; import java.util.Map;
@ -21,6 +18,7 @@ import java.util.Map;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@SuperBuilder @SuperBuilder
@ToString(callSuper = true)
public class ServiceReply extends AbstractAction { public class ServiceReply extends AbstractAction {
/** /**

12
iot-module/iot-plugin/iot-plugin-main/src/main/java/cc/iotkit/plugin/main/ThingServiceImpl.java
View File

@ -50,10 +50,16 @@ public class ThingServiceImpl implements IThingService {
@Override @Override
public ActionResult post(String pluginId, IDeviceAction action) { public ActionResult post(String pluginId, IDeviceAction action) {
try { 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(); ActionType type = action.getType();
switch (type) { switch (type) {
case REGISTER: case REGISTER: