From 3c507a6916a5bfb98054a0b466a6ab8fa7d4ce36 Mon Sep 17 00:00:00 2001
From: wenlele <wen.lele@free-sun.com.cn>
Date: Tue, 30 May 2023 16:12:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=88=E7=90=86=E5=80=BC=E7=9A=84?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/app/lib/schedule/alarms_push.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/api/app/lib/schedule/alarms_push.js b/api/app/lib/schedule/alarms_push.js
index 96efb59..81925f6 100644
--- a/api/app/lib/schedule/alarms_push.js
+++ b/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;
                                                                }

From d3c492487fef0fac1a7ab0d0cd0b876388066ba5 Mon Sep 17 00:00:00 2001
From: wenlele <wen.lele@free-sun.com.cn>
Date: Tue, 30 May 2023 17:31:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 script/0.24/data/1.init_alarm_data_continuity_type.sql | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 script/0.24/data/1.init_alarm_data_continuity_type.sql

diff --git a/script/0.24/data/1.init_alarm_data_continuity_type.sql b/script/0.24/data/1.init_alarm_data_continuity_type.sql
new file mode 100644
index 0000000..4e612f5
--- /dev/null
+++ b/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);
\ No newline at end of file