111111111

api/app/lib/schedule/alarms_push.js

@@ -844,7 +844,7 @@ module.exports = function (app, opts) {
                               const alarmDatas = await clickHouse.dataAlarm.query(
                                  `  
                                    SELECT 
-                                   alarms.id AS id,
+                                   alarms.AlarmId AS alarmId,
                                    alarms.State AS state, 
                                    alarms.AlarmGroup AS alarmGroup,
                                    alarms.SourceId AS sourceId
@@ -858,7 +858,7 @@ module.exports = function (app, opts) {
                                     alarms.State < 3
                                 `
                               ).toPromise() || []
-                              
+
                               equipment.map(r => {
                                  alarmDatas.map(u => {
                                     if (r.iotaDeviceId == u.sourceId) {