diff --git a/api/app/lib/schedule/alarms_push.js b/api/app/lib/schedule/alarms_push.js index 86bbae6..032e7ee 100644 --- a/api/app/lib/schedule/alarms_push.js +++ b/api/app/lib/schedule/alarms_push.js @@ -1192,11 +1192,11 @@ module.exports = function (app, opts) { ).toPromise() || [] pLog('安心云项目监测因素', factorData.length) pLog('本地化项目监测因素', factorDataLocal) - //合并(安心云+本地化项目) - factorData = [...factorDataLocal, ...factorData] - pLog('安心云+本地监测因素', factorData.length) + //安心云的factorId let factorId = factorData.map(f => f.id) - let factorIdLocal = factorIdLocal.map(f => f.id) + //本地化的factorId + let factorIdLocal=factorDataLocal.map(f => f.id) + pLog('安心云+本地监测因素', factorData.length) //查询结构物对应的测点(安心云) let equipment = await clickHouse.dataAlarm.query( `