From 3311823800dccf4991fc99ae706bde1bc8db88de Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 4 Mar 2026 12:41:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE=E5=BA=8F?=
 =?UTF-8?q?=E5=88=97=E5=8C=96=EF=BC=9A=E6=97=B6=E9=97=B4=E6=88=B3=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E6=9C=AC=E5=9C=B0=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=EF=BC=8C=E7=AE=80=E5=8C=96=20DataValue=20=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/telemetry.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/telemetry.rs b/src/telemetry.rs
index fc1f211..0968fd7 100644
--- a/src/telemetry.rs
+++ b/src/telemetry.rs
@@ -41,9 +41,8 @@ impl PointQuality {
     }
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize)]
-#[serde(tag = "kind", content = "value", rename_all = "snake_case")]
-#[derive(PartialEq)]
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+#[serde(untagged)]
 pub enum DataValue {
     Null,
     Bool(bool),
@@ -81,12 +80,14 @@ pub struct PointMonitorInfo {
     pub point_id: Uuid,
     pub client_handle: u32,
     pub scan_mode: ScanMode,
+    #[serde(serialize_with = "crate::util::datetime::option_utc_to_local_str")]
     pub timestamp: Option<DateTime<Utc>>,
     pub quality: PointQuality,
     pub value: Option<DataValue>,
     pub value_type: Option<ValueType>,
     pub value_text: Option<String>,
     pub old_value: Option<DataValue>,
+    #[serde(serialize_with = "crate::util::datetime::option_utc_to_local_str")]
     pub old_timestamp: Option<DateTime<Utc>>,
     pub value_changed: bool,
 }