1
This commit is contained in:
@@ -59,9 +59,8 @@ class TaskQueue {
|
||||
order: [['priority', 'DESC'], ['id', 'ASC']]
|
||||
});
|
||||
|
||||
// 获取所有启用的账号和设备在线状态
|
||||
// 获取所有启用的账号(移除 device_status 依赖,不再检查在线状态)
|
||||
const pla_account = db.getModel('pla_account');
|
||||
const device_status = db.getModel('device_status');
|
||||
|
||||
const enabledAccounts = await pla_account.findAll({
|
||||
where: {
|
||||
@@ -72,21 +71,9 @@ class TaskQueue {
|
||||
});
|
||||
const enabledSnCodes = new Set(enabledAccounts.map(acc => acc.sn_code));
|
||||
|
||||
// 检查设备在线状态(需要同时满足:isOnline = true 且心跳未超时)
|
||||
const heartbeatTimeout = require('./config.js').monitoring.heartbeatTimeout; // 默认5分钟
|
||||
const now = new Date();
|
||||
const heartbeatThreshold = new Date(now.getTime() - heartbeatTimeout);
|
||||
|
||||
const onlineDevices = await device_status.findAll({
|
||||
where: {
|
||||
isOnline: true,
|
||||
lastHeartbeatTime: {
|
||||
[Sequelize.Op.gte]: heartbeatThreshold // 心跳时间在阈值内
|
||||
}
|
||||
},
|
||||
attributes: ['sn_code', 'lastHeartbeatTime']
|
||||
});
|
||||
const onlineSnCodes = new Set(onlineDevices.map(dev => dev.sn_code));
|
||||
// 移除 device_status 依赖,不再检查设备在线状态
|
||||
// 如果需要在线状态检查,可以在 pla_account 表中添加相应字段
|
||||
const onlineSnCodes = new Set(); // 暂时设为空,表示不再检查在线状态
|
||||
|
||||
|
||||
let restoredCount = 0;
|
||||
|
||||
Reference in New Issue
Block a user