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; }