From 8d9a2d656e4ae007590c622e5f7c228adacdca49 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 14 Jun 2024 10:11:36 +0800
Subject: [PATCH] 统一风格

---
 src/main/java/com/dji/sample/manage/model/dto/DeviceDTO.java |   47 +++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 39 insertions(+), 8 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..2d87bbf 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,12 @@
 package com.dji.sample.manage.model.dto;
 
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
-import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import com.dji.sample.wayline.model.entity.WaylineJobEntity;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -18,7 +18,6 @@
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class)
 public class DeviceDTO {
 
     private String deviceSn;
@@ -27,21 +26,53 @@
 
     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;
-}
\ No newline at end of file
+
+    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;
+
+    private WaylineJobEntity latestWaylineJob;
+
+    private String reserveId;
+
+    private Boolean onlineStatus;
+
+    private Double latitude;
+
+    private Double longitude;
+}

--
Gitblit v1.9.3