Merge branch 'dev' of https://gitea.anxinyun.cn/gao.zhiyuan/OperationalService into dev

api/app/lib/schedule/alarms_push.js

@@ -671,6 +671,10 @@ module.exports = function (app, opts) {
                         n: '告警源',
                         k: 'SourceName'
                      },
+                     {
+                        n: '合理值',
+                        k: 'AlarmTypeCode'
+                     },
                      {
                         n: '中断时间',
                         k: '',
@@ -1102,7 +1106,8 @@ module.exports = function (app, opts) {
                                alarms.SourceId AS sourceId,
                                alarms.StartTime AS StartTime,
                                alarms.SourceName AS SourceName,
-                               alarms.AlarmCode AS AlarmCode
+                               alarms.AlarmCode AS AlarmCode,
+                               alarms.AlarmTypeCode AS AlarmTypeCode
                                FROM 
                                alarms
                                WHERE 
@@ -1283,6 +1288,9 @@ module.exports = function (app, opts) {
                                                                   case 'SourceName':
                                                                      tableData += `<td>${d[t.k] || ''}</td>`
                                                                      break;
+                                                                  case 'AlarmTypeCode':
+                                                                     tableData += `<td>${d[t.k] == 3018 ? "是" : '否'}</td>`
+                                                                     break
                                                                   default:
                                                                      break;
                                                                }

script/0.24/data/1.init_alarm_data_continuity_type.sql

@@ -0,0 +1,8 @@
+INSERT INTO "public"."alarm_data_continuity_type" VALUES (1, '03专项项目数据连续性监控', 001);
+INSERT INTO "public"."alarm_data_continuity_type" VALUES (2, '40结构物中断', 002);
+INSERT INTO "public"."alarm_data_continuity_type" VALUES (3, '地灾预警', 003);
+INSERT INTO "public"."alarm_data_continuity_type" VALUES (4, '安心妈妈', 004);
+INSERT INTO "public"."alarm_data_continuity_type" VALUES (5, '重点项目数据连续性监控', 005);
+INSERT INTO "public"."alarm_data_continuity_type" VALUES (6, '重点管控工地监控', 006);
+INSERT INTO "public"."alarm_data_continuity_type" VALUES (7, '工地数据连续性监控', 007);
+INSERT INTO "public"."alarm_data_continuity_type" VALUES (8, '差异化邮件推送监控', 008);