From faedd5d2f0ee850464f0507da93c37459bd5e3bb Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 26 Sep 2023 16:30:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
src/main/java/com/dji/sample/manage/model/dto/DeviceDTO.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/dji/sample/manage/model/dto/DeviceDTO.java b/src/main/java/com/dji/sample/manage/model/dto/DeviceDTO.java
index 2571dff..d4c7399 100644
--- a/src/main/java/com/dji/sample/manage/model/dto/DeviceDTO.java
+++ b/src/main/java/com/dji/sample/manage/model/dto/DeviceDTO.java
@@ -1,12 +1,11 @@
package com.dji.sample.manage.model.dto;
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
-import com.fasterxml.jackson.databind.annotation.JsonNaming;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
+import java.time.LocalDateTime;
import java.util.List;
/**
@@ -18,7 +17,6 @@
@AllArgsConstructor
@NoArgsConstructor
@Builder
-@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
public class DeviceDTO {
private String deviceSn;
@@ -27,21 +25,43 @@
private String workspaceId;
- private String deviceIndex;
+ private String controlSource;
private String deviceDesc;
private String childDeviceSn;
- private String domain;
+ private Integer domain;
private Integer type;
private Integer subType;
- private List<DeviceDTO> gatewaysList;
-
private List<DevicePayloadDTO> payloadsList;
private IconUrlDTO iconUrl;
+
+ private Boolean status;
+
+ private Boolean boundStatus;
+
+ private LocalDateTime loginTime;
+
+ private LocalDateTime boundTime;
+
+ private String nickname;
+
+ private String userId;
+
+ private String firmwareVersion;
+
+ private String workspaceName;
+
+ private DeviceDTO children;
+
+ private Integer firmwareStatus;
+
+ private Integer firmwareProgress;
+
+ private String parentSn;
}
\ No newline at end of file
--
Gitblit v1.9.3