Third_Dev_Dept/Migu2.0
18
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

新增 OTA WatchDog 编排与车队健康/报警后端。

Browse Source 
覆盖包库回传、任务下发、CDM 任务同步与报警采集，并为包/任务 ID 与上传文件名加上路径安全校验。

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
zhaowei.huang
2026-07-26 11:31:51 +08:00
co-authored by Cursor
parent f4f4cd1d1b
commit 4223a572c5
25 changed files with 3552 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MiGu.Server/Persistence/PlatformPersistence.cs
+102
View File
@@ -59,6 +59,8 @@ public static class PlatformPersistence
await EnsureUserDashboardShortcutsTableAsync(db);
await EnsureWmsTransportSchemaAsync(db);
await EnsureWmsStructureSchemaAsync(db);
await EnsureCdmTasksTableAsync(db);
await EnsureVehicleAlarmsTableAsync(db);
await MigrateWmsLegacyAsync(scope.ServiceProvider);
}
@@ -185,6 +187,83 @@ public static class PlatformPersistence
await EnsureSqliteColumnAsync(db, "wms_container_materials", "BoundAt", "TEXT NOT NULL DEFAULT ''");
}
/// <summary>为已存在的数据库补建 vehicle_alarms 表（车辆报警平台侧记录，幂等）。</summary>
private static async Task EnsureVehicleAlarmsTableAsync(PlatformDbContext db)
{
if (db.Database.IsSqlite())
{
await db.Database.ExecuteSqlRawAsync("""
CREATE TABLE IF NOT EXISTS vehicle_alarms (
id TEXT NOT NULL CONSTRAINT PK_vehicle_alarms PRIMARY KEY,
car_id INTEGER NOT NULL DEFAULT 0,
car_name TEXT NOT NULL DEFAULT '',
info TEXT NOT NULL DEFAULT '',
level INTEGER NOT NULL DEFAULT 0,
status TEXT NOT NULL DEFAULT 'active',
first_at TEXT NOT NULL,
last_at TEXT NOT NULL,
resolved_at TEXT,
duration_secs INTEGER,
acknowledged INTEGER NOT NULL DEFAULT 0,
acknowledged_at TEXT,
acknowledged_by TEXT
);
""");
await db.Database.ExecuteSqlRawAsync("CREATE INDEX IF NOT EXISTS IX_vehicle_alarms_car_status ON vehicle_alarms (car_id, status);");
await db.Database.ExecuteSqlRawAsync("CREATE INDEX IF NOT EXISTS IX_vehicle_alarms_status ON vehicle_alarms (status);");
await db.Database.ExecuteSqlRawAsync("CREATE INDEX IF NOT EXISTS IX_vehicle_alarms_first_at ON vehicle_alarms (first_at);");
return;
}
if (!await TableExistsAsync(db, "vehicle_alarms"))
{
var creator = db.GetService<Microsoft.EntityFrameworkCore.Storage.IRelationalDatabaseCreator>();
await creator.CreateTablesAsync();
}
}
/// <summary>为已存在的数据库补建 cdm_tasks 表（CDM 搬运任务平台侧快照，幂等）。</summary>
private static async Task EnsureCdmTasksTableAsync(PlatformDbContext db)
{
if (db.Database.IsSqlite())
{
await db.Database.ExecuteSqlRawAsync("""
CREATE TABLE IF NOT EXISTS cdm_tasks (
id TEXT NOT NULL CONSTRAINT PK_cdm_tasks PRIMARY KEY,
task_id TEXT,
mission_id INTEGER NOT NULL DEFAULT 0,
mission_name TEXT NOT NULL DEFAULT '',
mission_type TEXT NOT NULL DEFAULT '',
src_site_id INTEGER NOT NULL DEFAULT 0,
src_label TEXT NOT NULL DEFAULT '',
dst_site_id INTEGER NOT NULL DEFAULT 0,
dst_label TEXT NOT NULL DEFAULT '',
status TEXT NOT NULL DEFAULT '',
status_code TEXT NOT NULL DEFAULT '',
car_id INTEGER,
car_name TEXT,
priority INTEGER NOT NULL DEFAULT 0,
create_time TEXT,
start_time TEXT,
finish_time TEXT,
stuck_reason TEXT,
overdue INTEGER NOT NULL DEFAULT 0,
first_seen_at TEXT NOT NULL,
last_seen_at TEXT NOT NULL
);
""");
await db.Database.ExecuteSqlRawAsync("CREATE INDEX IF NOT EXISTS IX_cdm_tasks_status_code ON cdm_tasks (status_code);");
await db.Database.ExecuteSqlRawAsync("CREATE INDEX IF NOT EXISTS IX_cdm_tasks_create_time ON cdm_tasks (create_time);");
return;
}
if (!await TableExistsAsync(db, "cdm_tasks"))
{
var creator = db.GetService<Microsoft.EntityFrameworkCore.Storage.IRelationalDatabaseCreator>();
await creator.CreateTablesAsync();
}
}
/// <summary>为已存在的数据库补建 simple_fields 表（幂等）。</summary>
private static async Task EnsureSimpleFieldsTableAsync(PlatformDbContext db)
{
@@ -339,10 +418,33 @@ public static class PlatformPersistence
SnapshotJson TEXT NOT NULL
);
""");
// 库位占用唯一约束（幂等）；若库内已有重复占用会创建失败，不阻断启动
try
{
await db.Database.ExecuteSqlRawAsync("""
CREATE UNIQUE INDEX IF NOT EXISTS IX_wms_container_locations_StorageLocationId
ON wms_container_locations (LocationId)
WHERE LocationType = 'Storage' AND IsDeleted = 0;
""");
}
catch (Exception ex)
{
Console.Error.WriteLine(
$"[WMS] 无法创建库位占用唯一索引 IX_wms_container_locations_StorageLocationId（可能已有重复占用）: {ex.Message}");
}
}
private static async Task EnsureSqliteColumnAsync(PlatformDbContext db, string table, string column, string definition)
{
// 仅允许内部迁移调用方传入的标识符；拒绝注入用分隔符/空白。
static bool IsSafeIdent(string s) =>
!string.IsNullOrEmpty(s) && s.All(ch => char.IsAsciiLetterOrDigit(ch) || ch == '_');
if (!IsSafeIdent(table) || !IsSafeIdent(column)
|| definition.Contains(';') || definition.Contains("--")
|| !System.Text.RegularExpressions.Regex.IsMatch(definition, @"^[A-Za-z0-9_()'.,\s]+$"))
throw new ArgumentException("unsafe sqlite migration identifier");
var conn = db.Database.GetDbConnection();
if (conn.State != System.Data.ConnectionState.Open)
await conn.OpenAsync();