11

api/middleware/schedule/scheduledJobs.js

@@ -572,7 +572,35 @@ class ScheduledJobs {
                     
                     if (elapsedTime < interval_ms) {
                         const remainingMinutes = Math.ceil((interval_ms - elapsedTime) / (60 * 1000));
-                        console.log(`[自动投递] 设备 ${userData.sn_code} 距离上次投递仅 ${Math.round(elapsedTime / (60 * 1000))} 分钟，还需等待 ${remainingMinutes} 分钟（间隔: ${deliver_interval} 分钟）`);
+                        const elapsedMinutes = Math.round(elapsedTime / (60 * 1000));
+                        const message = `距离上次投递仅 ${elapsedMinutes} 分钟，还需等待 ${remainingMinutes} 分钟（间隔: ${deliver_interval} 分钟）`;
+                        console.log(`[自动投递] 设备 ${userData.sn_code} ${message}`);
+
+                        // 推送等待状态到客户端
+                        try {
+                            const deviceWorkStatusNotifier = require('./deviceWorkStatusNotifier');
+
+                            // 获取当前任务状态摘要
+                            const taskStatusSummary = this.taskQueue ? this.taskQueue.getTaskStatusSummary(userData.sn_code) : {
+                                sn_code: userData.sn_code,
+                                pendingCount: 0,
+                                totalPendingCount: 0,
+                                pendingTasks: []
+                            };
+
+                            // 添加等待消息到工作状态
+                            await deviceWorkStatusNotifier.sendDeviceWorkStatus(userData.sn_code, taskStatusSummary, {
+                                waitingMessage: {
+                                    type: 'deliver_interval',
+                                    message: message,
+                                    remainingMinutes: remainingMinutes,
+                                    nextDeliverTime: new Date(lastDeliverTime.getTime() + interval_ms).toISOString()
+                                }
+                            });
+                        } catch (pushError) {
+                            console.warn(`[自动投递] 推送等待消息失败:`, pushError.message);
+                        }
+
                         continue;
                     }
                 }