diff --git a/dc3-common/dc3-base/src/main/java/com/dc3/common/bean/driver/DeviceEvent.java b/dc3-common/dc3-base/src/main/java/com/dc3/common/bean/driver/DeviceEvent.java index 8dd4d6ae5..f44e9a447 100644 --- a/dc3-common/dc3-base/src/main/java/com/dc3/common/bean/driver/DeviceEvent.java +++ b/dc3-common/dc3-base/src/main/java/com/dc3/common/bean/driver/DeviceEvent.java @@ -72,11 +72,9 @@ public class DeviceEvent implements Serializable { private Object content; @Transient - @JsonIgnore private int timeOut = 15; @Transient - @JsonIgnore private TimeUnit timeUnit = TimeUnit.MINUTES; private Long originTime; diff --git a/dc3-common/dc3-base/src/main/java/com/dc3/common/bean/driver/PointValue.java b/dc3-common/dc3-base/src/main/java/com/dc3/common/bean/driver/PointValue.java index 139ca90f4..c868ca8e6 100644 --- a/dc3-common/dc3-base/src/main/java/com/dc3/common/bean/driver/PointValue.java +++ b/dc3-common/dc3-base/src/main/java/com/dc3/common/bean/driver/PointValue.java @@ -16,7 +16,6 @@ package com.dc3.common.bean.driver; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.AllArgsConstructor; import lombok.Data; @@ -80,11 +79,9 @@ public class PointValue implements Serializable { private List children; @Transient - @JsonIgnore private int timeOut = 15; @Transient - @JsonIgnore private TimeUnit timeUnit = TimeUnit.MINUTES; private Boolean multi; diff --git a/dc3-driver/dc3-driver-virtual/src/main/java/com/dc3/driver/service/impl/CustomDriverServiceImpl.java b/dc3-driver/dc3-driver-virtual/src/main/java/com/dc3/driver/service/impl/CustomDriverServiceImpl.java index 7e80bf674..140568dfe 100644 --- a/dc3-driver/dc3-driver-virtual/src/main/java/com/dc3/driver/service/impl/CustomDriverServiceImpl.java +++ b/dc3-driver/dc3-driver-virtual/src/main/java/com/dc3/driver/service/impl/CustomDriverServiceImpl.java @@ -30,6 +30,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Map; +import java.util.concurrent.TimeUnit; /** * @author pnoker @@ -72,7 +73,7 @@ public class CustomDriverServiceImpl implements CustomDriverService { MAINTAIN:维护 FAULT:故障 */ - driverContext.getDeviceMap().keySet().forEach(id -> driverService.deviceStatusSender(id, Common.Device.Status.ONLINE)); + driverContext.getDeviceMap().keySet().forEach(id -> driverService.deviceStatusSender(id, Common.Device.Status.ONLINE, 25, TimeUnit.SECONDS)); } }