From a5dd6e6b7d026d9944905409f3aa3c8ccbbd756c Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Wed, 2 Apr 2025 19:16:15 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E5=91=8A=E8=AD=A6?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=97=A8=E9=99=90=E7=9A=84=E5=8D=95=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 readme.txt                                                 | 6 +++++-
 .../src/main/java/com/imdroid/secapi/dto/WarningCfg.java   | 1 +
 sec-beidou/src/main/resources/db/schema.sql                | 1 +
 .../main/resources/templates/page/table/warning_add.html   | 7 +++++++
 .../src/main/resources/templates/page/warning_cfg.html     | 1 +
 5 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index 833a3bbf..ae460e46 100644
--- a/readme.txt
+++ b/readme.txt
@@ -48,4 +48,8 @@ beidou-ehm      9912                            健康检查、SIM卡检查
 优化推送策略：
 1）解算数据表增加一个字段：是否稳定。每次滤波时检查滤波窗口内的原始数据时间，当前时间距离最后一条时间超过滤波窗口的2/3时，稳定字段设为true，否则false
 2）每次推送只推送稳定字段为true的结果
-例如滤波窗口是24小时，最近一次上线时间是0点，13点上线，则将开始上线时间置为13点，第二天13点开始推送
\ No newline at end of file
+例如滤波窗口是24小时，最近一次上线时间是0点，13点上线，则将开始上线时间置为13点，第二天13点开始推送
+
+2025-04
+1）告警参数配置增加一个字段：单位
+2）健康检查增加连续无有效解的时长之和统计
\ No newline at end of file
diff --git a/sec-api/src/main/java/com/imdroid/secapi/dto/WarningCfg.java b/sec-api/src/main/java/com/imdroid/secapi/dto/WarningCfg.java
index 93ffa9b0..15212512 100644
--- a/sec-api/src/main/java/com/imdroid/secapi/dto/WarningCfg.java
+++ b/sec-api/src/main/java/com/imdroid/secapi/dto/WarningCfg.java
@@ -65,6 +65,7 @@ public class WarningCfg {
     String typename;
     Integer value;
     Short level;
+    String unitname;
 
     public static List<String> parseCode(int code){
         List<String> warningInfo = new ArrayList<>();
diff --git a/sec-beidou/src/main/resources/db/schema.sql b/sec-beidou/src/main/resources/db/schema.sql
index a074463b..60d020fe 100644
--- a/sec-beidou/src/main/resources/db/schema.sql
+++ b/sec-beidou/src/main/resources/db/schema.sql
@@ -251,6 +251,7 @@ CREATE TABLE IF NOT EXISTS `warningcfg` (
     `level` smallint DEFAULT 0,
     `typename` varchar(50) NOT NULL,
     `value` int NOT NULL,
+    `unitname` varchar(32) NOT NULL,
     PRIMARY KEY (`id`)
     ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
diff --git a/sec-beidou/src/main/resources/templates/page/table/warning_add.html b/sec-beidou/src/main/resources/templates/page/table/warning_add.html
index 5f978842..ea780d42 100644
--- a/sec-beidou/src/main/resources/templates/page/table/warning_add.html
+++ b/sec-beidou/src/main/resources/templates/page/table/warning_add.html
@@ -41,6 +41,12 @@
                 <input type="number" name="value" id="value" placeholder="请输入门限值" value="" class="layui-input">
             </div>
         </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label required">单位</label>
+            <div class="layui-input-block">
+                <input type="text" name="unitname" id="unitname" value="" class="layui-input">
+            </div>
+        </div>
         <div class="layui-form-item">
             <label class="layui-form-label required">告警等级</label>
             <div class="layui-input-inline">
@@ -98,6 +104,7 @@
             warning_type.attr('readonly',true);
             $('#value').val(data.value);
             $('#level').val(data.level);
+            $('#unitname').val(data.unitname);
             form.render();
         }
     </script>
diff --git a/sec-beidou/src/main/resources/templates/page/warning_cfg.html b/sec-beidou/src/main/resources/templates/page/warning_cfg.html
index da30cfcf..8efd1c65 100644
--- a/sec-beidou/src/main/resources/templates/page/warning_cfg.html
+++ b/sec-beidou/src/main/resources/templates/page/warning_cfg.html
@@ -46,6 +46,7 @@
                 {field: 'type', title: '告警类型'},
                 {field: 'typename', title: '类型描述'},
                 {field: 'value', title: '告警门限'},
+                {field: 'unitname', title: '单位'},
                 {field: 'level', title: '告警级别'},
                 {title: '操作', toolbar: '#currentTableBar', align: "center", minWidth: 120}
             ]],