Viacheslav Klimov
1 year ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
3 additions and
1 deletions
-
application/src/main/java/org/thingsboard/server/service/ws/telemetry/sub/TelemetrySubscriptionUpdate.java
-
msa/black-box-tests/src/test/java/org/thingsboard/server/msa/WsClient.java
|
|
@ -15,6 +15,7 @@ |
|
|
*/ |
|
|
*/ |
|
|
package org.thingsboard.server.service.ws.telemetry.sub; |
|
|
package org.thingsboard.server.service.ws.telemetry.sub; |
|
|
|
|
|
|
|
|
|
|
|
import com.fasterxml.jackson.annotation.JsonIgnore; |
|
|
import lombok.AllArgsConstructor; |
|
|
import lombok.AllArgsConstructor; |
|
|
import lombok.Getter; |
|
|
import lombok.Getter; |
|
|
import lombok.With; |
|
|
import lombok.With; |
|
|
@ -73,6 +74,7 @@ public class TelemetrySubscriptionUpdate { |
|
|
this.errorMsg = errorMsg != null ? errorMsg : errorCode.getDefaultMsg(); |
|
|
this.errorMsg = errorMsg != null ? errorMsg : errorCode.getDefaultMsg(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@JsonIgnore |
|
|
public Map<String, List<TsValue>> getValues() { |
|
|
public Map<String, List<TsValue>> getValues() { |
|
|
if (data == null || data.isEmpty()) { |
|
|
if (data == null || data.isEmpty()) { |
|
|
return Collections.emptyMap(); |
|
|
return Collections.emptyMap(); |
|
|
|
|
|
@ -61,7 +61,7 @@ public class WsClient extends WebSocketClient { |
|
|
latch.countDown(); |
|
|
latch.countDown(); |
|
|
} |
|
|
} |
|
|
} catch (IOException e) { |
|
|
} catch (IOException e) { |
|
|
log.error("ws message can't be read"); |
|
|
log.error("ws message can't be read", e); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|