Commit 040473ac80fc9d82aaa32e75563d35a89d390682
Committed by
Andrew Shvayka
1 parent
3d04d5b1
added edrxCycle to the Lwm2mDeviceTransportConfiguration
Showing
6 changed files
with
13 additions
and
2 deletions
@@ -462,9 +462,12 @@ public class DefaultTransportApiService implements TransportApiService { | @@ -462,9 +462,12 @@ public class DefaultTransportApiService implements TransportApiService { | ||
462 | 462 | ||
463 | private DeviceInfoProto getDeviceInfoProto(Device device) throws JsonProcessingException { | 463 | private DeviceInfoProto getDeviceInfoProto(Device device) throws JsonProcessingException { |
464 | PowerMode powerMode = null; | 464 | PowerMode powerMode = null; |
465 | + Long edrxCycle = null; | ||
465 | switch (device.getDeviceData().getTransportConfiguration().getType()) { | 466 | switch (device.getDeviceData().getTransportConfiguration().getType()) { |
466 | case LWM2M: | 467 | case LWM2M: |
467 | - powerMode = ((Lwm2mDeviceTransportConfiguration) device.getDeviceData().getTransportConfiguration()).getPowerMode(); | 468 | + Lwm2mDeviceTransportConfiguration transportConfiguration = (Lwm2mDeviceTransportConfiguration) device.getDeviceData().getTransportConfiguration(); |
469 | + powerMode = transportConfiguration.getPowerMode(); | ||
470 | + edrxCycle = transportConfiguration.getEdrxCycle(); | ||
468 | break; | 471 | break; |
469 | } | 472 | } |
470 | 473 | ||
@@ -482,6 +485,7 @@ public class DefaultTransportApiService implements TransportApiService { | @@ -482,6 +485,7 @@ public class DefaultTransportApiService implements TransportApiService { | ||
482 | .setAdditionalInfo(mapper.writeValueAsString(device.getAdditionalInfo())); | 485 | .setAdditionalInfo(mapper.writeValueAsString(device.getAdditionalInfo())); |
483 | if (powerMode != null) { | 486 | if (powerMode != null) { |
484 | builder.setPowerMode(powerMode.name()); | 487 | builder.setPowerMode(powerMode.name()); |
488 | + builder.setEdrxCycle(edrxCycle); | ||
485 | } | 489 | } |
486 | return builder.build(); | 490 | return builder.build(); |
487 | } | 491 | } |
@@ -29,6 +29,8 @@ public class Lwm2mDeviceTransportConfiguration implements DeviceTransportConfigu | @@ -29,6 +29,8 @@ public class Lwm2mDeviceTransportConfiguration implements DeviceTransportConfigu | ||
29 | 29 | ||
30 | private PowerMode powerMode; | 30 | private PowerMode powerMode; |
31 | 31 | ||
32 | + private Long edrxCycle; | ||
33 | + | ||
32 | @JsonIgnore | 34 | @JsonIgnore |
33 | private Map<String, Object> properties = new HashMap<>(); | 35 | private Map<String, Object> properties = new HashMap<>(); |
34 | 36 |
@@ -116,6 +116,7 @@ message DeviceInfoProto { | @@ -116,6 +116,7 @@ message DeviceInfoProto { | ||
116 | int64 customerIdMSB = 10; | 116 | int64 customerIdMSB = 10; |
117 | int64 customerIdLSB = 11; | 117 | int64 customerIdLSB = 11; |
118 | string powerMode = 12; | 118 | string powerMode = 12; |
119 | + int64 edrxCycle = 13; | ||
119 | } | 120 | } |
120 | 121 | ||
121 | /** | 122 | /** |
@@ -93,6 +93,8 @@ public class LwM2mClient implements Serializable { | @@ -93,6 +93,8 @@ public class LwM2mClient implements Serializable { | ||
93 | @Getter | 93 | @Getter |
94 | private PowerMode powerMode; | 94 | private PowerMode powerMode; |
95 | @Getter | 95 | @Getter |
96 | + private Long edrxCycle; | ||
97 | + @Getter | ||
96 | @Setter | 98 | @Setter |
97 | private Registration registration; | 99 | private Registration registration; |
98 | 100 | ||
@@ -115,6 +117,7 @@ public class LwM2mClient implements Serializable { | @@ -115,6 +117,7 @@ public class LwM2mClient implements Serializable { | ||
115 | this.deviceId = new UUID(session.getDeviceIdMSB(), session.getDeviceIdLSB()); | 117 | this.deviceId = new UUID(session.getDeviceIdMSB(), session.getDeviceIdLSB()); |
116 | this.profileId = new UUID(session.getDeviceProfileIdMSB(), session.getDeviceProfileIdLSB()); | 118 | this.profileId = new UUID(session.getDeviceProfileIdMSB(), session.getDeviceProfileIdLSB()); |
117 | this.powerMode = credentials.getDeviceInfo().getPowerMode(); | 119 | this.powerMode = credentials.getDeviceInfo().getPowerMode(); |
120 | + this.edrxCycle = credentials.getDeviceInfo().getEdrxCycle(); | ||
118 | } | 121 | } |
119 | 122 | ||
120 | public void lock() { | 123 | public void lock() { |
@@ -35,5 +35,5 @@ public class TransportDeviceInfo implements Serializable { | @@ -35,5 +35,5 @@ public class TransportDeviceInfo implements Serializable { | ||
35 | private String deviceType; | 35 | private String deviceType; |
36 | private PowerMode powerMode; | 36 | private PowerMode powerMode; |
37 | private String additionalInfo; | 37 | private String additionalInfo; |
38 | - | 38 | + private Long edrxCycle; |
39 | } | 39 | } |
@@ -443,6 +443,7 @@ public class DefaultTransportService implements TransportService { | @@ -443,6 +443,7 @@ public class DefaultTransportService implements TransportService { | ||
443 | tdi.setDeviceType(di.getDeviceType()); | 443 | tdi.setDeviceType(di.getDeviceType()); |
444 | if (StringUtils.isNotEmpty(di.getPowerMode())) { | 444 | if (StringUtils.isNotEmpty(di.getPowerMode())) { |
445 | tdi.setPowerMode(PowerMode.valueOf(di.getPowerMode())); | 445 | tdi.setPowerMode(PowerMode.valueOf(di.getPowerMode())); |
446 | + tdi.setEdrxCycle(di.getEdrxCycle()); | ||
446 | } | 447 | } |
447 | return tdi; | 448 | return tdi; |
448 | } | 449 | } |