异常率低于设置值则不推

2 years ago · f050679c6d
1 changed files with 10 additions and 4 deletions
--- a/api/app/lib/schedule/alarms_push.js
+++ b/api/app/lib/schedule/alarms_push.js
@ -120,7 +120,8 @@ module.exports = function (app, opts) {
                           return s.id
                        })

-                        searchStrucIds = searchStrucIds.concat([991, 1052, 700])
+                        // 开发测试用的数据
+                        // searchStrucIds = searchStrucIds.concat([991, 1052, 700])

                        if (searchStrucIds.length) {
                           searchStrucIds.unshift(-1)
@ -377,7 +378,7 @@ module.exports = function (app, opts) {
                           dataAlarms = await clickHouse.dataAlarm.query(`
                              SELECT * FROM alarms
                                 WHERE 
-                                    ${`'State NOT IN (3, 4) AND '`}
+                                    ${`State NOT IN (3, 4) AND `}
                                    StructureId IN (${searchStrucIds.join(',')})
                                    ${dataAlarmOption.length ? ' AND ' + dataAlarmOption.join(' AND ') : ''}
                                 ORDER BY StartTime DESC
@ -602,8 +603,13 @@ module.exports = function (app, opts) {
                           deviceStatistic.add(d.SourceId)
                        }
                        if (c.tactics == 'abnormal_rate') {
-                           let a = ((deviceStatistic.size + videoAlarms.length) / (parseInt(deviceCount) + parseInt(cameraCount))).toFixed(1) + '%'
-                           emailSubTitle = emailSubTitle.replace('--%', ((deviceStatistic.size + videoAlarms.length) / (parseInt(deviceCount) + parseInt(cameraCount))).toFixed(1) + '%')
+                           let rate = ((deviceStatistic.size + videoAlarms.length) / (parseInt(deviceCount) + parseInt(cameraCount)));
+
+                           if (rate < parseFloat(deviceProportion)) {
+                              continue
+                           }
+
+                           emailSubTitle = emailSubTitle.replace('--%', rate.toFixed(1) + '%')
                        }
                        let html = `
                           <html>