From dc327339be376ad45b927731a71dcf12da25c7d8 Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Mon, 10 Oct 2022 14:59:17 +0800 Subject: [PATCH] DeviceStatus --- api/app/lib/controllers/alarm/data.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/api/app/lib/controllers/alarm/data.js b/api/app/lib/controllers/alarm/data.js index bf2c435..43847cd 100644 --- a/api/app/lib/controllers/alarm/data.js +++ b/api/app/lib/controllers/alarm/data.js @@ -34,7 +34,7 @@ async function list (ctx) { const { utils: { judgeSuper, anxinStrucIdRange } } = ctx.app.fs const { database: anxinyun } = clickHouse.anxinyun.opts.config - const { pepProjectId, keywordTarget, keyword, groupId, groupUnitId, sustainTimeStart, sustainTimeEnd, limit, page, state } = ctx.query + const { pepProjectId, keywordTarget, keyword, groupId, groupUnitId, sustainTimeStart, sustainTimeEnd, limit, page, state, onlineState } = ctx.query let anxinStruc = await anxinStrucIdRange({ ctx, pepProjectId, keywordTarget, keyword @@ -79,10 +79,19 @@ async function list (ctx) { whereOption.push(`alarms.State >= 3`) } } + if(onlineState){ + if (onlineState == 'online') { + whereOption.push(`DeviceStatus.Status = ${1}`) + } else if (onlineState == 'offline') { + whereOption.push(`DeviceStatus.Status = ${0}`) + } + } let alarmQueryOptionStr = ` FROM alarms + LEFT JOIN DeviceStatus + ON DeviceStatus.DeviceId = alarms.SourceId LEFT JOIN ${anxinyun}.t_structure ON ${anxinyun}.t_structure.id = alarms.StructureId LEFT JOIN ${anxinyun}.t_alarm_code @@ -100,6 +109,7 @@ async function list (ctx) { SourceTypeId, AlarmAdviceProblem, AlarmGroup, AlarmGroupUnit, AlarmAdviceProblem, alarms.StructureId AS StructureId, + DeviceStatus.Status AS DeviceStatus ${anxinyun}.t_structure.name AS StructureName, ${anxinyun}.t_structure.longitude AS StructureLongitude, ${anxinyun}.t_structure.latitude AS StructureLatitude,