dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added edrxCycle to the Lwm2mDeviceTransportConfiguration

Browse Source
This commit is contained in:
YevhenBondarenko 2021-07-12 08:46:52 +03:00 committed by Andrew Shvayka
parent 3d04d5b11c
commit 040473ac80
6 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/src/main/java/org/thingsboard/server/service/transport/DefaultTransportApiService.java
View File

@ -462,9 +462,12 @@ public class DefaultTransportApiService implements TransportApiService {
private DeviceInfoProto getDeviceInfoProto(Device device) throws JsonProcessingException { private DeviceInfoProto getDeviceInfoProto(Device device) throws JsonProcessingException {
PowerMode powerMode = null; PowerMode powerMode = null;
Long edrxCycle = null;
switch (device.getDeviceData().getTransportConfiguration().getType()) { switch (device.getDeviceData().getTransportConfiguration().getType()) {
case LWM2M: case LWM2M:
powerMode = ((Lwm2mDeviceTransportConfiguration) device.getDeviceData().getTransportConfiguration()).getPowerMode(); Lwm2mDeviceTransportConfiguration transportConfiguration = (Lwm2mDeviceTransportConfiguration) device.getDeviceData().getTransportConfiguration();
powerMode = transportConfiguration.getPowerMode();
edrxCycle = transportConfiguration.getEdrxCycle();
break; break;
} }
@ -482,6 +485,7 @@ public class DefaultTransportApiService implements TransportApiService {
.setAdditionalInfo(mapper.writeValueAsString(device.getAdditionalInfo())); .setAdditionalInfo(mapper.writeValueAsString(device.getAdditionalInfo()));
if (powerMode != null) { if (powerMode != null) {
builder.setPowerMode(powerMode.name()); builder.setPowerMode(powerMode.name());
builder.setEdrxCycle(edrxCycle);
} }
return builder.build(); return builder.build();
} }

2
common/data/src/main/java/org/thingsboard/server/common/data/device/data/Lwm2mDeviceTransportConfiguration.java
View File

@ -29,6 +29,8 @@ public class Lwm2mDeviceTransportConfiguration implements DeviceTransportConfigu
private PowerMode powerMode; private PowerMode powerMode;
private Long edrxCycle;
@JsonIgnore @JsonIgnore
private Map<String, Object> properties = new HashMap<>(); private Map<String, Object> properties = new HashMap<>();

1
common/queue/src/main/proto/queue.proto
View File

@ -116,6 +116,7 @@ message DeviceInfoProto {
int64 customerIdMSB = 10; int64 customerIdMSB = 10;
int64 customerIdLSB = 11; int64 customerIdLSB = 11;
string powerMode = 12; string powerMode = 12;
int64 edrxCycle = 13;
} }
/** /**

3
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java
View File

@ -93,6 +93,8 @@ public class LwM2mClient implements Serializable {
@Getter @Getter
private PowerMode powerMode; private PowerMode powerMode;
@Getter @Getter
private Long edrxCycle;
@Getter
@Setter @Setter
private Registration registration; private Registration registration;
@ -115,6 +117,7 @@ public class LwM2mClient implements Serializable {
this.deviceId = new UUID(session.getDeviceIdMSB(), session.getDeviceIdLSB()); this.deviceId = new UUID(session.getDeviceIdMSB(), session.getDeviceIdLSB());
this.profileId = new UUID(session.getDeviceProfileIdMSB(), session.getDeviceProfileIdLSB()); this.profileId = new UUID(session.getDeviceProfileIdMSB(), session.getDeviceProfileIdLSB());
this.powerMode = credentials.getDeviceInfo().getPowerMode(); this.powerMode = credentials.getDeviceInfo().getPowerMode();
this.edrxCycle = credentials.getDeviceInfo().getEdrxCycle();
} }
public void lock() { public void lock() {

2
common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/auth/TransportDeviceInfo.java
View File

@ -35,5 +35,5 @@ public class TransportDeviceInfo implements Serializable {
private String deviceType; private String deviceType;
private PowerMode powerMode; private PowerMode powerMode;
private String additionalInfo; private String additionalInfo;
private Long edrxCycle;
} }

1
common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
View File

@ -443,6 +443,7 @@ public class DefaultTransportService implements TransportService {
tdi.setDeviceType(di.getDeviceType()); tdi.setDeviceType(di.getDeviceType());
if (StringUtils.isNotEmpty(di.getPowerMode())) { if (StringUtils.isNotEmpty(di.getPowerMode())) {
tdi.setPowerMode(PowerMode.valueOf(di.getPowerMode())); tdi.setPowerMode(PowerMode.valueOf(di.getPowerMode()));
tdi.setEdrxCycle(di.getEdrxCycle());
} }
return tdi; return tdi;
} }