From ce92acf5ea9d8bc74065d9616823ccd56045fbe8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=88=90?= Date: Thu, 18 Dec 2025 13:30:14 +0800 Subject: [PATCH] 1 --- .../schedule/deviceWorkStatusNotifier.js | 5 +++-- api/middleware/schedule/taskQueue.js | 21 +++++++++++++++---- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/api/middleware/schedule/deviceWorkStatusNotifier.js b/api/middleware/schedule/deviceWorkStatusNotifier.js index a6a8e89..9454783 100644 --- a/api/middleware/schedule/deviceWorkStatusNotifier.js +++ b/api/middleware/schedule/deviceWorkStatusNotifier.js @@ -89,8 +89,9 @@ class DeviceWorkStatusNotifier { description: this._formatCommandDescription(cmd), status: 'running', progress: cmd.progress || 0, - currentStep: cmd.currentStep || cmd.current_step || '', - startTime: cmd.startTime || cmd.start_time || new Date().toISOString() + startTime: cmd.startTime || cmd.start_time || new Date().toISOString(), + commandType: cmd.command_type || cmd.type || '', + commandParams: cmd.command_params || cmd.params || {} }; } // 如果有当前执行的任务，显示任务状态 diff --git a/api/middleware/schedule/taskQueue.js b/api/middleware/schedule/taskQueue.js index 8ab59f9..ba5845b 100644 --- a/api/middleware/schedule/taskQueue.js +++ b/api/middleware/schedule/taskQueue.js @@ -1180,19 +1180,32 @@ class TaskQueue { task_id: currentTask.taskId, status: 'running' }, - order: [['id', 'DESC']] + order: [['sequence', 'ASC'], ['id', 'ASC']] // 按执行顺序排序 }); if (runningCommand) { const cmdData = runningCommand.toJSON(); + + // 解析命令参数 + let commandParams = {}; + if (cmdData.command_params) { + try { + commandParams = typeof cmdData.command_params === 'string' + ? JSON.parse(cmdData.command_params) + : cmdData.command_params; + } catch (e) { + // 解析失败，忽略 + } + } + currentCommand = { command_id: cmdData.id, command_name: cmdData.command_name || '执行指令', command_type: cmdData.command_type || '', - command_params: cmdData.command_params || cmdData.params || {}, + command_params: commandParams, + params: commandParams, // 兼容字段名 progress: cmdData.progress || 0, - currentStep: cmdData.current_step || '', - startTime: cmdData.start_time || cmdData.created_time || new Date().toISOString() + startTime: cmdData.start_time ? new Date(cmdData.start_time).toISOString() : new Date().toISOString() }; } }