Browse Source

注释 DeviceStatus

dev
巴林闲侠 3 years ago
parent
commit
8c4adc1def
  1. 8
      api/app/lib/controllers/alarm/data.js

8
api/app/lib/controllers/alarm/data.js

@ -90,8 +90,9 @@ async function list (ctx) {
let alarmQueryOptionStr = ` let alarmQueryOptionStr = `
FROM FROM
alarms alarms
LEFT JOIN DeviceStatus ${//LEFT JOIN DeviceStatus
ON DeviceStatus.DeviceId = alarms.SourceId //ON DeviceStatus.DeviceId = alarms.SourceId
''}
LEFT JOIN ${anxinyun}.t_structure LEFT JOIN ${anxinyun}.t_structure
ON ${anxinyun}.t_structure.id = alarms.StructureId ON ${anxinyun}.t_structure.id = alarms.StructureId
LEFT JOIN ${anxinyun}.t_alarm_code LEFT JOIN ${anxinyun}.t_alarm_code
@ -109,7 +110,8 @@ async function list (ctx) {
SourceTypeId, SourceTypeId,
AlarmAdviceProblem, AlarmGroup, AlarmGroupUnit, AlarmAdviceProblem, AlarmAdviceProblem, AlarmGroup, AlarmGroupUnit, AlarmAdviceProblem,
alarms.StructureId AS StructureId, alarms.StructureId AS StructureId,
DeviceStatus.Status AS DeviceStatus, ${//`DeviceStatus.Status AS DeviceStatus,`
''}
${anxinyun}.t_structure.name AS StructureName, ${anxinyun}.t_structure.name AS StructureName,
${anxinyun}.t_structure.longitude AS StructureLongitude, ${anxinyun}.t_structure.longitude AS StructureLongitude,
${anxinyun}.t_structure.latitude AS StructureLatitude, ${anxinyun}.t_structure.latitude AS StructureLatitude,

Loading…
Cancel
Save