Commit d5cb2cbaa06cd89ae43a5571bef50c5bff9feca1
Merge branch '20230424' into 'master_dev'
fix: json对象反序列化异常问题修复 See merge request yunteng/thingskit!182
Showing
3 changed files
with
7 additions
and
0 deletions
| 1 | package org.thingsboard.server.transport.tcp.adaptors; | 1 | package org.thingsboard.server.transport.tcp.adaptors; |
| 2 | 2 | ||
| 3 | +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | ||
| 3 | import lombok.Data; | 4 | import lombok.Data; |
| 4 | 5 | ||
| 5 | import java.io.Serializable; | 6 | import java.io.Serializable; |
| 6 | 7 | ||
| 7 | @Data | 8 | @Data |
| 9 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 8 | public class TcpAuthEntry implements Serializable { | 10 | public class TcpAuthEntry implements Serializable { |
| 9 | /** clientId： 设备鉴权客户端ID */ | 11 | /** clientId： 设备鉴权客户端ID */ |
| 10 | private String clientId; | 12 | private String clientId; |
| 1 | package org.thingsboard.server.transport.tcp.adaptors; | 1 | package org.thingsboard.server.transport.tcp.adaptors; |
| 2 | 2 | ||
| 3 | +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | ||
| 3 | import lombok.AllArgsConstructor; | 4 | import lombok.AllArgsConstructor; |
| 4 | import lombok.Data; | 5 | import lombok.Data; |
| 5 | import org.thingsboard.server.common.data.yunteng.enums.TcpDataTypeEnum; | 6 | import org.thingsboard.server.common.data.yunteng.enums.TcpDataTypeEnum; |
| @@ -11,6 +12,7 @@ import java.util.UUID; | @@ -11,6 +12,7 @@ import java.util.UUID; | ||
| 11 | * 下行脚本 | 12 | * 下行脚本 |
| 12 | */ | 13 | */ |
| 13 | @Data | 14 | @Data |
| 15 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 14 | public class TcpDownEntry implements Serializable { | 16 | public class TcpDownEntry implements Serializable { |
| 15 | 17 | ||
| 16 | /** | 18 | /** |
| 1 | package org.thingsboard.server.transport.tcp.adaptors; | 1 | package org.thingsboard.server.transport.tcp.adaptors; |
| 2 | 2 | ||
| 3 | +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | ||
| 3 | import lombok.AllArgsConstructor; | 4 | import lombok.AllArgsConstructor; |
| 4 | import lombok.Data; | 5 | import lombok.Data; |
| 6 | +import lombok.RequiredArgsConstructor; | ||
| 5 | 7 | ||
| 6 | import java.io.Serializable; | 8 | import java.io.Serializable; |
| 7 | import java.util.Map; | 9 | import java.util.Map; |
| @@ -13,6 +15,7 @@ import java.util.UUID; | @@ -13,6 +15,7 @@ import java.util.UUID; | ||
| 13 | */ | 15 | */ |
| 14 | @Data | 16 | @Data |
| 15 | @AllArgsConstructor | 17 | @AllArgsConstructor |
| 18 | +@JsonIgnoreProperties(ignoreUnknown = true) | ||
| 16 | public class TcpUpEntry implements Serializable { | 19 | public class TcpUpEntry implements Serializable { |
| 17 | 20 | ||
| 18 | /** | 21 | /** |