opensource/iot-dc3
3
0
Fork 0
mirror of https://gitee.com/pnoker/iot-dc3.git synced 2026-11-03 03:32:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(driver): remove stale fields from DeviceEvent and PointValue, fix mqtt driver init

Browse Source
This commit is contained in:
pnoker
2020-10-28 22:28:39 +08:00
parent 4de7e8d6f1
commit 2c417afd0c
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dc3-common/dc3-base/src/main/java/com/dc3/common/bean/driver/DeviceEvent.java
-2
View File
@@ -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;
dc3-common/dc3-base/src/main/java/com/dc3/common/bean/driver/PointValue.java
-3
View File
@@ -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<PointValue> children;
@Transient
@JsonIgnore
private int timeOut = 15;
@Transient
@JsonIgnore
private TimeUnit timeUnit = TimeUnit.MINUTES;
private Boolean multi;
dc3-driver/dc3-driver-virtual/src/main/java/com/dc3/driver/service/impl/CustomDriverServiceImpl.java
+2 -1
View File
@@ -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));
}
}