diff --git a/api/app/lib/schedule/alarms_push.js b/api/app/lib/schedule/alarms_push.js index 35d6a71..a3d4955 100644 --- a/api/app/lib/schedule/alarms_push.js +++ b/api/app/lib/schedule/alarms_push.js @@ -1,7 +1,7 @@ const moment = require('moment') let isDev = false -// isDev = true +isDev = true let proDebug = false proDebug = true @@ -1179,7 +1179,7 @@ module.exports = function (app, opts) { LEFT JOIN t_factor ON t_factor.id = t_structure_factor.factor WHERE - t_structure_factor.structure IN (${[...dataAlarmG1StructureId,-1].join(',')}) + t_structure_factor.structure IN (${[...dataAlarmG1StructureId, -1].join(',')}) ` ).toPromise() || [] : [] //查询结构物的监测因素(本地化项目) @@ -1188,14 +1188,14 @@ module.exports = function (app, opts) { StructId AS structureId,SafetyFactorTypeName AS name,SafetyFactorTypeId AS id FROM sensors - WHERE sensors.StructId in (${[...dataAlarmStructureId,-1].join(',')})` + WHERE sensors.StructId in (${[...dataAlarmStructureId, -1].join(',')})` ).toPromise() || [] pLog('安心云项目监测因素', factorData.length) pLog('本地化项目监测因素', factorDataLocal) //安心云的factorId let factorId = factorData.map(f => f.id) //本地化的factorId - let factorIdLocal=factorDataLocal.map(f => f.id) + let factorIdLocal = factorDataLocal.map(f => f.id) pLog('安心云+本地监测因素', factorData.length) //查询结构物对应的测点(安心云) let equipment = await clickHouse.anxinyun.query( @@ -1210,9 +1210,9 @@ module.exports = function (app, opts) { LEFT JOIN t_device_sensor ON t_device_sensor.sensor = t_sensor.id WHERE - t_sensor.structure IN (${[...dataAlarmG1StructureId,-1].join(',')}) + t_sensor.structure IN (${[...dataAlarmG1StructureId, -1].join(',')}) AND - t_sensor.factor IN (${[...factorId,-1].join(',')}) + t_sensor.factor IN (${[...factorId, -1].join(',')}) ` ).toPromise() || [] //查询结构物对应的测点(本地化) @@ -1223,8 +1223,8 @@ module.exports = function (app, opts) { SafetyFactorTypeId AS factorId, SensorId AS iotaDeviceId FROM sensors - WHERE sensors.StructId IN (${[...dataAlarmStructureId,-1].join(',')}) - AND sensors.SafetyFactorTypeId IN (${[...factorIdLocal,-1].join(',')}) + WHERE sensors.StructId IN (${[...dataAlarmStructureId, -1].join(',')}) + AND sensors.SafetyFactorTypeId IN (${[...factorIdLocal, -1].join(',')}) ` ).toPromise() || [] pLog('安心云项目测点', equipment.length) @@ -1248,7 +1248,7 @@ module.exports = function (app, opts) { FROM alarms WHERE - alarms.StructureId In (${[...dataAlarmG1StructureId, ...dataAlarmStructureId,-1].join(',')}) + alarms.StructureId In (${[...dataAlarmG1StructureId, ...dataAlarmStructureId, -1].join(',')}) AND alarms.AlarmGroup = 1 AND @@ -1307,7 +1307,7 @@ module.exports = function (app, opts) { } } - if (projectList.length) { + if (true || projectList.length) { pepProject_name.map(s => { s.projects = [] projectList.map(f => {