free-sun
/
OperationalService
15
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

feat:fix bugs

dev
zhaobing’ 1 year ago
parent
b6298cc7ce
commit
b07eb4bbb4
1 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      api/app/lib/schedule/alarms_push.js

14
api/app/lib/schedule/alarms_push.js
View File

@ -1179,7 +1179,7 @@ module.exports = function (app, opts) {
LEFT JOIN t_factor LEFT JOIN t_factor
ON t_factor.id = t_structure_factor.factor ON t_factor.id = t_structure_factor.factor
WHERE WHERE
t_structure_factor.structure IN (${[...dataAlarmG1StructureId].join(',')},-1) t_structure_factor.structure IN (${[...dataAlarmG1StructureId,-1].join(',')})
` `
).toPromise() || [] : [] ).toPromise() || [] : []
//查询结构物的监测因素(本地化项目) //查询结构物的监测因素(本地化项目)
@ -1188,7 +1188,7 @@ module.exports = function (app, opts) {
StructId AS structureId,SafetyFactorTypeName AS name,SafetyFactorTypeId AS id StructId AS structureId,SafetyFactorTypeName AS name,SafetyFactorTypeId AS id
FROM FROM
sensors sensors
WHERE sensors.StructId in (${[...dataAlarmStructureId].join(',')},-1)` WHERE sensors.StructId in (${[...dataAlarmStructureId,-1].join(',')})`
).toPromise() || [] ).toPromise() || []
pLog('安心云项目监测因素', factorData.length) pLog('安心云项目监测因素', factorData.length)
pLog('本地化项目监测因素', factorDataLocal) pLog('本地化项目监测因素', factorDataLocal)
@ -1210,9 +1210,9 @@ module.exports = function (app, opts) {
LEFT JOIN t_device_sensor LEFT JOIN t_device_sensor
ON t_device_sensor.sensor = t_sensor.id ON t_device_sensor.sensor = t_sensor.id
WHERE WHERE
t_sensor.structure IN (${[...dataAlarmG1StructureId].join(',')},-1) t_sensor.structure IN (${[...dataAlarmG1StructureId,-1].join(',')})
AND AND
t_sensor.factor IN (${factorId.join(',')}) t_sensor.factor IN (${[...factorId,-1].join(',')})
` `
).toPromise() || [] ).toPromise() || []
//查询结构物对应的测点(本地化) //查询结构物对应的测点(本地化)
@ -1223,8 +1223,8 @@ module.exports = function (app, opts) {
SafetyFactorTypeId AS factorId, SafetyFactorTypeId AS factorId,
SensorId AS iotaDeviceId SensorId AS iotaDeviceId
FROM sensors FROM sensors
WHERE sensors.StructId IN (${[...dataAlarmStructureId].join(',')},-1) WHERE sensors.StructId IN (${[...dataAlarmStructureId,-1].join(',')})
AND sensors.SafetyFactorTypeId IN (${factorIdLocal.join(',')},-1) AND sensors.SafetyFactorTypeId IN (${[...factorIdLocal,-1].join(',')})
` `
).toPromise() || [] ).toPromise() || []
pLog('安心云项目测点', equipment.length) pLog('安心云项目测点', equipment.length)
@ -1248,7 +1248,7 @@ module.exports = function (app, opts) {
FROM FROM
alarms alarms
WHERE WHERE
alarms.StructureId In (${[...dataAlarmG1StructureId, ...dataAlarmStructureId].join(',')},-1) alarms.StructureId In (${[...dataAlarmG1StructureId, ...dataAlarmStructureId,-1].join(',')})
AND AND
alarms.AlarmGroup = 1 alarms.AlarmGroup = 1
AND AND

Write Preview
Loading…
Cancel
Save