From 83e243f03e45400cac2bcf18afb04eacae41a222 Mon Sep 17 00:00:00 2001 From: iven Date: Tue, 28 Apr 2026 19:24:32 +0800 Subject: [PATCH] =?UTF-8?q?feat(db):=20device=5Freadings=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=20metric=20=E5=AD=97=E6=AE=B5=E7=94=A8=E4=BA=8E?= =?UTF-8?q?=E5=A4=9A=E8=A1=8C=E6=8B=86=E5=88=86=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp-health/src/entity/device_readings.rs | 2 + .../src/service/device_reading_service.rs | 1 + crates/erp-server/migration/src/lib.rs | 2 + ...m20260429_000092_device_readings_metric.rs | 48 +++++++++++++++++++ 4 files changed, 53 insertions(+) create mode 100644 crates/erp-server/migration/src/m20260429_000092_device_readings_metric.rs diff --git a/crates/erp-health/src/entity/device_readings.rs b/crates/erp-health/src/entity/device_readings.rs index f680f59..c5c3043 100644 --- a/crates/erp-health/src/entity/device_readings.rs +++ b/crates/erp-health/src/entity/device_readings.rs @@ -11,6 +11,8 @@ pub struct Model { #[sea_orm(skip_serializing_if = "Option::is_none")] pub device_id: Option, pub device_type: String, + #[sea_orm(nullable)] + pub metric: Option, #[sea_orm(skip_serializing_if = "Option::is_none")] pub device_model: Option, pub raw_value: serde_json::Value, diff --git a/crates/erp-health/src/service/device_reading_service.rs b/crates/erp-health/src/service/device_reading_service.rs index d3c41f8..8bfdb40 100644 --- a/crates/erp-health/src/service/device_reading_service.rs +++ b/crates/erp-health/src/service/device_reading_service.rs @@ -207,6 +207,7 @@ async fn batch_insert_readings( patient_id: Set(patient_id), device_id: Set(Some(device_id.to_string())), device_type: Set(r.device_type.clone()), + metric: Set(r.values.get("metric").and_then(|v| v.as_str()).map(String::from)), device_model: Set(device_model.map(String::from)), raw_value: Set(r.values.clone()), measured_at: Set(*measured_at), diff --git a/crates/erp-server/migration/src/lib.rs b/crates/erp-server/migration/src/lib.rs index 6d65f6e..8ed0077 100644 --- a/crates/erp-server/migration/src/lib.rs +++ b/crates/erp-server/migration/src/lib.rs @@ -91,6 +91,7 @@ mod m20260428_000088_rls_policy_strict; mod m20260428_000089_blind_indexes; mod m20260428_000090_critical_alerts; mod m20260428_000091_dead_letter_events; +mod m20260429_000092_device_readings_metric; pub struct Migrator; @@ -189,6 +190,7 @@ impl MigratorTrait for Migrator { Box::new(m20260428_000089_blind_indexes::Migration), Box::new(m20260428_000090_critical_alerts::Migration), Box::new(m20260428_000091_dead_letter_events::Migration), + Box::new(m20260429_000092_device_readings_metric::Migration), ] } } diff --git a/crates/erp-server/migration/src/m20260429_000092_device_readings_metric.rs b/crates/erp-server/migration/src/m20260429_000092_device_readings_metric.rs new file mode 100644 index 0000000..720646d --- /dev/null +++ b/crates/erp-server/migration/src/m20260429_000092_device_readings_metric.rs @@ -0,0 +1,48 @@ +use sea_orm_migration::prelude::*; + +#[derive(DeriveMigrationName)] +pub struct Migration; + +#[async_trait::async_trait] +impl MigrationTrait for Migration { + async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> { + manager + .alter_table( + Table::alter() + .table(Alias::new("device_readings")) + .add_column(ColumnDef::new(Alias::new("metric")).string().null()) + .to_owned(), + ) + .await?; + + manager + .create_index( + Index::create() + .name("idx_dr_metric") + .table(Alias::new("device_readings")) + .col(Alias::new("tenant_id")) + .col(Alias::new("patient_id")) + .col(Alias::new("metric")) + .col(Alias::new("measured_at")) + .to_owned(), + ) + .await?; + + Ok(()) + } + + async fn down(&self, manager: &SchemaManager) -> Result<(), DbErr> { + manager + .drop_index(Index::drop().name("idx_dr_metric").to_owned()) + .await?; + + manager + .alter_table( + Table::alter() + .table(Alias::new("device_readings")) + .drop_column(Alias::new("metric")) + .to_owned(), + ) + .await + } +}