应用告警自动恢复

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

@@ -140,13 +140,33 @@ async function apiError (ctx) {
          throw '请标明告警类型 type'
       }
 
+      const isRestore = statusCode == 200 || statusCode == 204
+      if (isRestore) {
+         const existRes = await models.AppAlarm.findAll({
+            where: {
+               projectAppId, router,
+               confirmTime: null, type
+            }
+         })
+         if (existRes.length) {
+            await models.AppAlarm.update({
+               updateTime: now,
+               confirmTime: now,
+               confirmAuto: true,
+            }, {
+               where: {
+                  id: { $in: existRes.map(e => e.id) }
+               }
+            })
+         }
+      } else {
          let storageData = {
             projectAppId, alarmContent, router, statusCode, type
          }
          const existRes = await models.AppAlarm.findOne({
             where: {
                projectAppId, alarmContent, router, statusCode,
-            confirm: null, type
+               confirmTime: null, type,
             }
          })
          if (existRes) {
@@ -169,6 +189,8 @@ async function apiError (ctx) {
             await models.AppAlarm.create(storageData)
          }
 
+      }
+
       ctx.status = 200;
    } catch (error) {
       ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);

api/app/lib/controllers/alarm/video.js

@@ -83,6 +83,7 @@ async function alarmList (ctx) {
                cameraAlarm.platform AS platform,
                cameraAlarm.confirmContent AS confirmContent,
                cameraAlarm.confirmTime AS confirmTime,
+               cameraAlarm.autoRestore AS autoRestore,
                camera_status_resolve.id AS resolveId,
                camera_status.describe AS statusDescribe,
                camera_status_resolve.resolve AS resolve,
@@ -109,7 +110,8 @@ async function alarmList (ctx) {
                         camera_status_alarm.serial_no AS cameraSerialNo,
                         camera_status_alarm.channel_no AS cameraChannelNo,
                         camera_status_alarm.confirm AS confirmContent,
-                        camera_status_alarm.confirm_time AS confirmTime
+                        camera_status_alarm.confirm_time AS confirmTime,
+                        camera_status_alarm.auto_restore AS autoRestore
                      FROM camera_status_alarm
                      LEFT JOIN camera
                         ON camera.serial_no = camera_status_alarm.serial_no