From 3b8a33c8eb5d895430a12748d4088fe03bc89539 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Thu, 4 Sep 2025 12:36:44 +0800
Subject: [PATCH] =?UTF-8?q?refactor(device):=20=E4=BC=98=E5=8C=96=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=A0=BC=E5=BC=8F=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除了 DeviceFactory 和 DeviceRepository 中将 LocalDateTime转换为 Date 的代码
- 更新了 DeviceConfigV2DTO 和 DeviceV2DTO，将 createTime 和 updateTime 字段从 LocalDateTime 改为 Date
- 现在使用 @JsonFormat 注解来处理日期格式的序列化和反序列化
---
 src/main/java/com/ycwl/basic/device/DeviceFactory.java     | 5 ++---
 .../integration/device/dto/config/DeviceConfigV2DTO.java   | 7 ++++---
 .../basic/integration/device/dto/device/DeviceV2DTO.java   | 6 +++---
 .../java/com/ycwl/basic/repository/DeviceRepository.java   | 5 ++---
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/ycwl/basic/device/DeviceFactory.java b/src/main/java/com/ycwl/basic/device/DeviceFactory.java
index 125739f..e37bf5a 100644
--- a/src/main/java/com/ycwl/basic/device/DeviceFactory.java
+++ b/src/main/java/com/ycwl/basic/device/DeviceFactory.java
@@ -56,12 +56,11 @@ public class DeviceFactory {
         entity.setNo(dto.getNo());
         entity.setScenicId(dto.getScenicId());
         entity.setStatus(dto.getIsActive());
-        // 转换时间格式：LocalDateTime -> Date
         if (dto.getCreateTime() != null) {
-            entity.setCreateAt(Date.from(dto.getCreateTime().atZone(ZoneId.systemDefault()).toInstant()));
+            entity.setCreateAt(dto.getCreateTime());
         }
         if (dto.getUpdateTime() != null) {
-            entity.setUpdateAt(Date.from(dto.getUpdateTime().atZone(ZoneId.systemDefault()).toInstant()));
+            entity.setUpdateAt(dto.getUpdateTime());
         }
         return entity;
     }
diff --git a/src/main/java/com/ycwl/basic/integration/device/dto/config/DeviceConfigV2DTO.java b/src/main/java/com/ycwl/basic/integration/device/dto/config/DeviceConfigV2DTO.java
index 5fd54a5..30485d5 100644
--- a/src/main/java/com/ycwl/basic/integration/device/dto/config/DeviceConfigV2DTO.java
+++ b/src/main/java/com/ycwl/basic/integration/device/dto/config/DeviceConfigV2DTO.java
@@ -4,7 +4,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
-import java.time.LocalDateTime;
+import java.util.Date;
+
 
 @Data
 public class DeviceConfigV2DTO {
@@ -31,9 +32,9 @@ public class DeviceConfigV2DTO {
     
     @JsonProperty("createTime")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime createTime;
+    private Date createTime;
     
     @JsonProperty("updateTime")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime updateTime;
+    private Date updateTime;
 }
\ No newline at end of file
diff --git a/src/main/java/com/ycwl/basic/integration/device/dto/device/DeviceV2DTO.java b/src/main/java/com/ycwl/basic/integration/device/dto/device/DeviceV2DTO.java
index 9ac6b8c..356d1a2 100644
--- a/src/main/java/com/ycwl/basic/integration/device/dto/device/DeviceV2DTO.java
+++ b/src/main/java/com/ycwl/basic/integration/device/dto/device/DeviceV2DTO.java
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
-import java.time.LocalDateTime;
+import java.util.Date;
 
 @Data
 public class DeviceV2DTO {
@@ -31,9 +31,9 @@ public class DeviceV2DTO {
     
     @JsonProperty("createTime")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime createTime;
+    private Date createTime;
     
     @JsonProperty("updateTime")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime updateTime;
+    private Date updateTime;
 }
\ No newline at end of file
diff --git a/src/main/java/com/ycwl/basic/repository/DeviceRepository.java b/src/main/java/com/ycwl/basic/repository/DeviceRepository.java
index dc1803c..846c310 100644
--- a/src/main/java/com/ycwl/basic/repository/DeviceRepository.java
+++ b/src/main/java/com/ycwl/basic/repository/DeviceRepository.java
@@ -46,12 +46,11 @@ public class DeviceRepository {
         entity.setScenicId(dto.getScenicId());
         // DeviceV2DTO中的isActive对应DeviceEntity中的status
         entity.setStatus(dto.getIsActive());
-        // 转换时间格式：LocalDateTime -> Date
         if (dto.getCreateTime() != null) {
-            entity.setCreateAt(Date.from(dto.getCreateTime().atZone(ZoneId.systemDefault()).toInstant()));
+            entity.setCreateAt(dto.getCreateTime());
         }
         if (dto.getUpdateTime() != null) {
-            entity.setUpdateAt(Date.from(dto.getUpdateTime().atZone(ZoneId.systemDefault()).toInstant()));
+            entity.setUpdateAt(dto.getUpdateTime());
         }
         return entity;
     }