|
@ -105,9 +105,9 @@ module.exports = function (app, opts) { |
|
|
pLog(`curMinOfYear / ${curMinOfYear}`) |
|
|
pLog(`curMinOfYear / ${curMinOfYear}`) |
|
|
for (let { dataValues: c } of configListRes) { |
|
|
for (let { dataValues: c } of configListRes) { |
|
|
|
|
|
|
|
|
// if (isDev && c.id != 94) {
|
|
|
if (isDev && c.id != 94) { |
|
|
// continue
|
|
|
continue |
|
|
// }
|
|
|
} |
|
|
|
|
|
|
|
|
if (c.tacticsParams && c.tactics) { |
|
|
if (c.tacticsParams && c.tactics) { |
|
|
pLog(`当前运行EM配置:id=${c.id} name=${c.name}`); |
|
|
pLog(`当前运行EM配置:id=${c.id} name=${c.name}`); |
|
@ -1310,9 +1310,9 @@ module.exports = function (app, opts) { |
|
|
let matchedAlarmIds = [] |
|
|
let matchedAlarmIds = [] |
|
|
// 这一步能被分配的告警应该也能最终体现在邮件中
|
|
|
// 这一步能被分配的告警应该也能最终体现在邮件中
|
|
|
|
|
|
|
|
|
|
|
|
let deviceRepeatMap = {} |
|
|
equipment.map(f => { |
|
|
equipment.map(f => { |
|
|
f.alarmDatas = [] |
|
|
f.alarmDatas = [] |
|
|
let deviceRepeatMap = {} |
|
|
|
|
|
alarmDatas.map(r => { |
|
|
alarmDatas.map(r => { |
|
|
if (r.sourceId == f.iotaDeviceId) { |
|
|
if (r.sourceId == f.iotaDeviceId) { |
|
|
if (!deviceRepeatMap[r.sourceId]) { |
|
|
if (!deviceRepeatMap[r.sourceId]) { |
|
|