Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS

FrontendWebApi/ApiControllers/AlarmController.cs

@@ -0,0 +1,159 @@
+using FrontendWebApi.Models;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using Repository.FrontendRepository.Interface;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml;
+using System.Xml.Linq;
+
+namespace FrontendWebApi.ApiControllers
+{
+    /// <summary>
+    /// 告警紀錄
+    /// </summary>
+    public class AlarmController : MyBaseApiController<AlarmRecordController>
+    {
+        private readonly IFrontendRepository frontendRepository;
+
+        public AlarmController
+        (
+            IFrontendRepository frontendRepository
+        )
+        {
+            this.frontendRepository = frontendRepository;
+        }
+
+        [HttpPost]
+        [Route("api/Alarm/GetAlarmFromObix")]
+        public async Task<ActionResult<ApiResult<AlarmObj>>> GetAlarmFromObix()
+        {
+            ApiResult<AlarmObj> apiResult = new ApiResult<AlarmObj>(jwt_str);
+            if (!jwtlife)
+            {
+                apiResult.Code = "5000";
+                return BadRequest(apiResult);
+            }
+            try
+            {
+                var sqlString = $@"SELECT system_value FROM variable WHERE system_type = 'obixConfig' AND system_key = 'ApiBase' AND deleted = 0";
+                string baseApiUrl = await frontendRepository.GetOneAsync<string>(sqlString);
+
+                if (string.IsNullOrEmpty(baseApiUrl))
+                {
+                    apiResult.Code = "9998";
+                    apiResult.Msg = "未找到 obixConfig baseAPI，請聯絡管理者。";
+                    return BadRequest(apiResult);
+                }
+
+                string apiUrl = Path.Combine(baseApiUrl, "obix/config/Services/AlarmService/~alarmQuery/");
+
+                using (HttpClient client = new HttpClient())
+                {
+                    string username = "stanGG";
+                    string password = "St12345678";
+                    string encoded = Convert.ToBase64String(System.Text.Encoding.GetEncoding("ISO-8859-1").GetBytes(username + ":" + password));
+
+                    client.DefaultRequestHeaders.Add("Authorization", "Basic " + encoded);
+                    // 建構 XML 數據
+                    string xmlData = @$"<obj href='obix:AlarmFilter'> 
+                                          <abstime name='start' val='{DateTime.Now.AddDays(-1).ToString("yyyy-MM-ddTHH:mm:ss.fff")}+08:00' />
+                                          <abstime name='end' val='{DateTime.Now.ToString("yyyy-MM-ddTHH:mm:ss.fff")}+08:00'/>
+                                        </obj>";
+                    HttpContent content = new StringContent(xmlData, Encoding.UTF8, "application/xml");
+
+                    var response = await client.PostAsync(apiUrl, content);
+                    var resString = (await response.Content.ReadAsStringAsync()).ToString();
+
+                    XDocument xmlDoc = XDocument.Parse(resString);
+
+                    /*  回傳結果範例
+                    <?xml version="1.0" encoding="UTF-8"?>
+                    <?xml-stylesheet type='text/xsl' href='/obix/xsl'?>
+                    <obj is="obix:AlarmQueryOut" xmlns="http://obix.org/ns/schema/1.0" xsi:schemaLocation="http://obix.org/ns/schema/1.0 /obix/xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+                        <list name="data" of="obix:Alarm">
+                            <obj href="/obix/alarm/3378ed4a-94ff-4aca-b857-ff66083b9131" is="obix:Alarm obix:AckAlarm obix:PointAlarm obix:StatefulAlarm" display="">
+                            ....
+                                <str name="sourceName" val="H_E1_B1F_MVCB_MVCBH_ER"/>
+                                <abstime name="timestamp" val="2023-08-08T10:30:04.473+08:00" tz="Asia/Taipei"/>
+                            ....
+                            </obj>
+                            <obj href="/obix/alarm/f6116713-9830-4e7d-aa10-a28db29d0edc" is="obix:Alarm obix:AckAlarm obix:PointAlarm obix:StatefulAlarm" display="">
+                            ....
+                                <str name="sourceName" val="H_E1_B1F_MVCB_MVCBH_ER"/>
+                                <abstime name="timestamp" val="2023-08-08T10:50:00.953+08:00" tz="Asia/Taipei"/>
+                            ....
+                            </obj>
+                         </list>
+                    </obj>
+                    */
+
+                    var list = xmlDoc.Descendants().Where(d => d.Name?.LocalName == "list").FirstOrDefault();
+                    var objs = list.Descendants().Where(d => d.Name?.LocalName == "obj" && (d.Attribute("is")?.Value?.Contains("obix:Alarm") ?? false)).ToList();
+
+                    // 宣告要丟出去的資料容器
+                    AlarmObj alarmObj = new AlarmObj()
+                    {
+                        alarmorion = new List<AlarmorionString>(),
+                        buildingAlarmDeviceAmount = new List<BuildingAlarmDeviceAmount>()
+                    };
+
+                    // 篩選 toState != normal
+                    objs = objs.Where(d => d.Descendants().Any(dd => dd?.Name?.LocalName == "str" && dd?.Attribute("name")?.Value == "toState" && dd?.Attribute("val")?.Value != "normal")).ToList();
+                    // <str name="sourceName" val="H_E1_B1F_MVCB_MVCBH_ER"/>
+                    // <abstime name="timestamp" val="2023-08-08T10:30:04.473+08:00" tz="Asia/Taipei"/>
+                    alarmObj.alarmorion = objs.Select(obj => new AlarmorionString()
+                    {
+                        alarm_timestamp = obj.Descendants().Where(d => d.Name.LocalName == "abstime" && d.Attribute("name").Value == "timestamp")
+                        .Select(d =>
+                        {
+                            DateTime valid;
+                            if (DateTime.TryParse(d.Attribute("val").Value, out valid))
+                            {
+                                return DateTime.Parse(d.Attribute("val").Value).ToString("yyyy-MM-dd HH:mm:ss.fff");
+                            }
+                            else
+                            {
+                                return null;
+                            }
+                        }).FirstOrDefault(),
+                        device_number = obj.Descendants().Where(d => d.Name.LocalName == "str" && d.Attribute("name").Value == "sourceName")
+                        .Select(d => d.Attribute("val").Value).Select(d => string.Join("_", d.Split("_").Take(5))).FirstOrDefault(),
+                    }).ToList();
+
+                    // obix alarm 回傳 device_number + point 取出棟別分組
+                    // 20230920 - 佳豪表示棟別按鈕不顯示數量
+                    //alarmObj.buildingAlarmDeviceAmount = alarmObj.alarmorion.Where(a => a.device_number?.Contains("_") ?? false)
+                    //    .GroupBy(g => g.device_number.Split("_")[0]).Select(g => new BuildingAlarmDeviceAmount()
+                    //{
+                    //    building_tag = g.Key,
+                    //    device_amount = g.Count()
+                    //}).ToList();
+
+                    apiResult.Data = alarmObj;
+
+                }
+
+                apiResult.Msg = "讀取成功";
+                apiResult.Code = "0000";
+            }
+            catch (Exception exception)
+            {
+                apiResult.Code = "9999";
+                apiResult.Msg = "系統內部錯誤，請聯絡管理者。";
+                Logger.LogError("【" + controllerName + "/" + actionName + "】" + exception.Message);
+                return Ok(apiResult);
+            }
+            return Ok(apiResult);
+        }
+    }
+}
+

FrontendWebApi/ApiControllers/EmergencyDeviceController.cs

@@ -135,7 +135,7 @@ namespace FrontendWebApi.ApiControllers
                                     d.device_guid,
                                     d.device_number,
                                     d.full_name AS device_name,
-                                    d.device_building_tag,
+                                    d.device_building_tag AS building_tag,
                                     b.full_name AS building_name,
                                     CONCAT(b.ip_address , ':', b.ip_port) AS ip_address,
                                     v.layer2,
@@ -163,7 +163,7 @@ namespace FrontendWebApi.ApiControllers
 								                from variable v 
 								                where v.system_type = 'device_system_category_layer3') v
 						                LEFT JOIN variable v2 ON v2.deleted = 0 AND v.system_parent_id = v2.id
-					                ) v on v.system_value = d.device_system_category_layer3
+					                ) v on v.system_value = d.device_name_tag
                                     left join device_disaster dd on dd.device_guid = d.device_guid
                                     left join (select * from variable v where v.system_type = 'disaster') ddd on ddd.system_value = dd.device_system_value
                                     LEFT JOIN building b ON b.deleted = 0 AND d.device_building_tag = b.building_tag

FrontendWebApi/ApiControllers/MyBaseApiController.cs

@@ -17,6 +17,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using System.IdentityModel.Tokens.Jwt;
 using System.Net;
+using Newtonsoft.Json;
 
 namespace FrontendWebApi.ApiControllers
 {
@@ -58,39 +59,29 @@ namespace FrontendWebApi.ApiControllers
                 userinfo_guid = User.Claims.Where(a => a.Type == "userinfo_guid").Select(e => e.Value).FirstOrDefault(),
             };
 
-            if (myUser.exp == 0)
+            Logger.LogError("MyBaseApi - 61 : " + JsonConvert.SerializeObject(myUser) + "---" + DateTime.Now.AddHours(-8).AddMinutes(10).Subtract(new DateTime(1970, 1, 1)).TotalSeconds);
+
+            //if (myUser.exp == 0)
+            //{
+            //    jwt_str = "Jwt Token不合法";
+            //    jwtlife = false;
+            //    filterContext.Result = new JsonResult(new { HttpStatusCode.Unauthorized });
+            //}
+           
+            //if (myUser.exp <= DateTime.Now.AddHours(-8).AddMinutes(10).Subtract(new DateTime(1970, 1, 1)).TotalSeconds)
+            //{
+            jwtlife = true;
+            JwtLogin jwtLoing = new JwtLogin()
             {
-                jwt_str = "Jwt Token不合法";
+                account = myUser.account,
-                jwtlife = false;
+                email = myUser.email,
-                filterContext.Result = new JsonResult(new { HttpStatusCode.Unauthorized });
+                full_name = myUser.full_name,
-            }
+                userinfo_guid = myUser.userinfo_guid
-            else
+            };
-            {
+            jwt_str = jwt.GenerateToken(jwtLoing).token;
-                if (myUser.exp <= DateTime.Now.AddHours(-8).AddMinutes(10).Subtract(new DateTime(1970, 1, 1)).TotalSeconds)
+            //}
-                {
+
-                    jwtlife = true;
+            Logger.LogError("MyBaseApi - 98 : " + JsonConvert.SerializeObject(myUser));
-                    JwtLogin jwtLoing = new JwtLogin()
-                    {
-                        account = myUser.account,
-                        email = myUser.email,
-                        full_name = myUser.full_name,
-                        userinfo_guid = myUser.userinfo_guid
-                    };
-                    jwt_str = jwt.GenerateToken(jwtLoing).token;
-                }
-            }
-            if (myUser.exp <= DateTime.Now.AddHours(-8).AddMinutes(10).Subtract(new DateTime(1970, 1, 1)).TotalSeconds)
-            {
-                jwtlife = true;
-                JwtLogin jwtLoing = new JwtLogin()
-                {
-                    account = "webUser",
-                    email = "webUser@gmail.com",
-                    full_name = "webUser",
-                    userinfo_guid = "6ac24708-3a40-4199-88c5-22df310cd1a8"
-                };
-                jwt_str = jwt.GenerateToken(jwtLoing).token;
-            }
             base.OnActionExecuting(filterContext);
         }
     }

FrontendWebApi/ApiControllers/WarningValueController.cs

@@ -93,7 +93,6 @@ namespace FrontendWebApi.ApiControllers
 
                         XDocument xmlDoc = XDocument.Parse(resString);
 
-                        Logger.LogError("【" + controllerName + "/" + actionName + "】" + JsonConvert.SerializeXNode(xmlDoc));
                         if (xmlDoc?.Root?.Name?.LocalName == "str")
                         {
                             result.targetValue = xmlDoc.Root.Attribute("val").Value;

FrontendWebApi/Controllers/MyBaseController.cs

@@ -83,7 +83,6 @@ namespace FrontendWebApi.Controllers
                 myUserInfo.ShowView = showview.Result;
                 ViewBag.myUserInfo = myUserInfo;
                 ViewBag.role = showview.Result;
-                ViewBag.WarningValuePxPath = GetWarningValuePxPath().Result;
 
 
                 //var showviewt = new List<string>()
@@ -165,15 +164,5 @@ namespace FrontendWebApi.Controllers
             base.OnActionExecuting(filterContext);
         }
 
-        public async Task<string> GetWarningValuePxPath() {
-            var pxPath = await frontendRepository.GetOneAsync<string>($@"
-                    SELECT system_value FROM `variable` where system_type = 'pxPath' and system_key = 'warningValue' and deleted = '0'");
-            var frontendPath = await frontendRepository.GetOneAsync<string>($@"
-                    SELECT system_value FROM `variable` where system_type = 'obixConfig' and system_key = 'ApiBase' and deleted = '0'");
-            pxPath = frontendPath + pxPath;
-
-            return pxPath;
-        }
-
     }
 }

FrontendWebApi/Jwt/JwtHelpers.cs

@@ -61,8 +61,8 @@ namespace FrontendWebApi.Jwt
             // https://stackoverflow.com/questions/47279947/idx10603-the-algorithm-hs256-requires-the-securitykey-keysize-to-be-greater
             var signingCredentials = new SigningCredentials(securityKey, SecurityAlgorithms.HmacSha256Signature);
 
-            var now = DateTime.Now;
+            var now = DateTime.UtcNow;
-            var expires = DateTime.Now.AddSeconds(lifeseconds);
+            var expires = DateTime.UtcNow.AddSeconds(lifeseconds);
 
             // 產出所需要的 JWT securityToken 物件，並取得序列化後的 Token 結果(字串格式)
             var tokenHandler = new JwtSecurityTokenHandler();

FrontendWebApi/Models/Alarm.cs

@@ -0,0 +1,17 @@
+using NPOI.Util;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace FrontendWebApi.Models
+{
+    public class AlarmObixResult
+    {
+        public string alarm_timestamp { get; set; }
+        public string device_number { get; set; }
+
+        public List<BuildingAlarmDeviceAmount> buildingAlarmDeviceAmount { get; set; } = new List<BuildingAlarmDeviceAmount>();
+    }
+    
+}

FrontendWebApi/Models/EmergencyDevice.cs

@@ -199,7 +199,7 @@ namespace FrontendWebApi.Models
 
     public class BuildingAlarmDeviceAmount
     {
-        public string building_guid { get; set; }
+        public string building_tag { get; set; }
         public int device_amount { get; set; }
     }
 

FrontendWebApi/Views/EmergencyDeviceMenu/Index.cshtml

@@ -365,26 +365,15 @@
                 if (!enable_alarm_timer) {
                     return;
                 }
-                var url = "/api/Device/Getalarm";
-                $.post(url, null, function (rel) {
-                    if (rel.code != "0000") {
-                        if (rel.code == "9999") {
-                            toast_error(rel.msg);
-                        }
-                        else {
-                            toast_warning(rel.msg);
-                        }
-                        return;
-                    }
-                    else {
 
-                        var is_diff = false;
+                GetAlarmFromObix((data) => {
-                        if (Object.keys(temp_alarm_device).length == Object.keys(rel.data.alarmorion).length) {
+                       var is_diff = false;
+                        if (Object.keys(temp_alarm_device).length == Object.keys(data.alarmorion).length) {
 
-                            for (var i = 0; i < Object.keys(rel.data.alarmorion).length; i++) {
+                            for (var i = 0; i < Object.keys(data.alarmorion).length; i++) {
 
-                                var index = temp_alarm_device.findIndex(x => x.alarm_timestamp == rel.data.alarmorion[i].alarm_timestamp
+                                var index = temp_alarm_device.findIndex(x => x.alarm_timestamp == data.alarmorion[i].alarm_timestamp
-                                    && x.device_number == rel.data.alarmorion[i].device_number)
+                                    && x.device_number == data.alarmorion[i].device_number)
 
                                 if (index > -1) {
                                     is_diff = false;
@@ -397,19 +386,20 @@
                             is_diff = true;
                         }
 
-                        temp_alarm_device = rel.data.alarmorion;
+                        temp_alarm_device = data.alarmorion;
 
                         if (show_mode == "alarm" && (is_need_reload || is_diff)) {
                             enable_alarm_timer = false; //關閉查詢異常設備，避免重複呼叫
 
-                            $("#building").find(".building_device_amount").html(0);
+                            //$("#building").find(".building_device_amount").html(0);
-                            rel.data.buildingAlarmDeviceAmount.forEach(function (item) {
+                            //data.buildingAlarmDeviceAmount.forEach(function (item) {
-                                $(`#${item.building_tag}_device_amount`).html(item.device_amount);
+                            //    $(`#${item.building_tag}_device_amount`).html(item.device_amount);
-                            });
+                            //});
                             ResetDeviceTable();
                         }
-                    }
+                })
-                }, 'json');
+
+
             }, 3000);
             //#endregion
 
@@ -643,91 +633,100 @@
 
                         data = rel.data;
 
-                        if (data == null || data.length == 0) {
+                        try {
-                            this.data = [];
+                            if (data == null || data.length == 0) {
-                            is_need_reload = true;
+                                this.data = [];
-                        }
+                                is_need_reload = true;
+                            }
 
+                            $(`button[id^=buildingBtn]`).removeClass("btn-danger").addClass("btn-secondary");
 
-                        enable_alarm_timer = true;
+                            enable_alarm_timer = true;
-                        is_need_reload = false;
+                            is_need_reload = false;
 
-                        if (show_mode == 'alarm') {
+                            if (show_mode == 'alarm') {
-                            backfill_building_alarm_device_amount = [];
+                                backfill_building_alarm_device_amount = [];
-                            backfill_layer2_alarm_device_amount = [];
+                                backfill_layer2_alarm_device_amount = [];
-                            backfill_layer3_alarm_device_amount = [];
+                                backfill_layer3_alarm_device_amount = [];
 
-                            var alarm_data = [];
+                                var alarm_data = [];
-                            temp_alarm_device.forEach(function (alarm_device) {
+                                temp_alarm_device.forEach(function (alarm_device) {
-                                var temp_device = data.filter(x => x.device_number == alarm_device.device_number)[0];
+                                    var temp_device = data.filter(x => x.device_number == alarm_device.device_number)[0];
 
-                                if (temp_device != undefined && temp_device != null) {
+                                    if (temp_device != undefined && temp_device != null) {
-                                    var obj = {
+                                        var obj = {
-                                        device_guid: temp_device.device_guid,
+                                            device_guid: temp_device.device_guid,
-                                        device_number: temp_device.device_number,
+                                            device_number: temp_device.device_number,
-                                        device_name: temp_device.device_name,
+                                            device_name: temp_device.device_name,
-                                        building_name: temp_device.building_name,
+                                            building_name: temp_device.building_name,
-                                        building_tag: temp_device.building_tag,
-                                        ip_address: temp_device.ip_address,
-                                        disaster: temp_device.disaster,
-                                        disaster_name: temp_device.disaster_name,
-                                        layer2: temp_device.layer2,
-                                        layer2_name: temp_device.layer2_name,
-                                        layer3: temp_device.layer3,
-                                        layer3_name: temp_device.layer3_name,
-                                        floorname: temp_device.floorname,
-                                        floorguid: temp_device.floorguid,
-                                        alarm_timestamp: alarm_device.alarm_timestamp,
-                                    }
-
-                                    var temp_building_index = backfill_building_alarm_device_amount.findIndex(x => x.building_tag == temp_device.building_tag);
-                                    if (temp_building_index < 0) {
-                                        var building_obj = {
-                                            building_tag: temp_device.building_tag,
-                                            device_amount: 1
-                                        }
-
-                                        backfill_building_alarm_device_amount.push(building_obj);
-                                    } else {
-                                        backfill_building_alarm_device_amount[temp_building_index].device_amount += 1;
-                                    }
-
-                                    var temp_layer2_index = backfill_layer2_alarm_device_amount.findIndex(x => x.value == temp_device.layer2 && x.building_tag == temp_device.building_tag)
-                                    if (temp_layer2_index < 0) {
-                                        var layer2_obj = {
-                                            building_tag: temp_device.building_tag,
-                                            value: temp_device.layer2,
-                                            device_amount: 1
-                                        }
-
-                                        backfill_layer2_alarm_device_amount.push(layer2_obj);
-                                    } else {
-                                        backfill_layer2_alarm_device_amount[temp_layer2_index].device_amount += 1;
-                                    }
-
-                                    var temp_layer3_index = backfill_layer3_alarm_device_amount.findIndex(x => x.layer3 == temp_device.layer3 && x.layer2 == temp_device.layer2 && x.building_tag == temp_device.building_tag)
-                                    if (temp_layer3_index < 0) {
-                                        var layer3_obj = {
                                             building_tag: temp_device.building_tag,
+                                            ip_address: temp_device.ip_address,
+                                            disaster: temp_device.disaster,
+                                            disaster_name: temp_device.disaster_name,
                                             layer2: temp_device.layer2,
+                                            layer2_name: temp_device.layer2_name,
                                             layer3: temp_device.layer3,
-                                            device_amount: 1
+                                            layer3_name: temp_device.layer3_name,
+                                            floorname: temp_device.floorname,
+                                            floorguid: temp_device.floorguid,
+                                            alarm_timestamp: alarm_device.alarm_timestamp,
                                         }
 
-                                        backfill_layer3_alarm_device_amount.push(layer3_obj);
+                                        var temp_building_index = backfill_building_alarm_device_amount.findIndex(x => x.building_tag == temp_device.building_tag);
-                                    } else {
+                                        if (temp_building_index < 0) {
-                                        backfill_layer3_alarm_device_amount[temp_layer3_index].device_amount += 1;
+                                            var building_obj = {
+                                                building_tag: temp_device.building_tag,
+                                                device_amount: 1
+                                            }
+
+                                            backfill_building_alarm_device_amount.push(building_obj);
+                                        } else {
+                                            backfill_building_alarm_device_amount[temp_building_index].device_amount += 1;
+                                        }
+
+                                        var temp_layer2_index = backfill_layer2_alarm_device_amount.findIndex(x => x.value == temp_device.layer2 && x.building_tag == temp_device.building_tag)
+                                        if (temp_layer2_index < 0) {
+                                            var layer2_obj = {
+                                                building_tag: temp_device.building_tag,
+                                                value: temp_device.layer2,
+                                                device_amount: 1
+                                            }
+
+                                            backfill_layer2_alarm_device_amount.push(layer2_obj);
+                                        } else {
+                                            backfill_layer2_alarm_device_amount[temp_layer2_index].device_amount += 1;
+                                        }
+
+                                        var temp_layer3_index = backfill_layer3_alarm_device_amount.findIndex(x => x.layer3 == temp_device.layer3 && x.layer2 == temp_device.layer2 && x.building_tag == temp_device.building_tag)
+                                        if (temp_layer3_index < 0) {
+                                            var layer3_obj = {
+                                                building_tag: temp_device.building_tag,
+                                                layer2: temp_device.layer2,
+                                                layer3: temp_device.layer3,
+                                                device_amount: 1
+                                            }
+
+                                            backfill_layer3_alarm_device_amount.push(layer3_obj);
+                                        } else {
+                                            backfill_layer3_alarm_device_amount[temp_layer3_index].device_amount += 1;
+                                        }
+
+                                        $(`#buildingBtn${temp_device.building_tag}`).removeClass("btn-secondary").addClass("btn-danger");
+                                        alarm_data.push(obj);
                                     }
+                                });
 
+                                UpdateDeviceAmount();
 
-                                    alarm_data.push(obj);
+                                data = alarm_data;
-                                }
+                            }
-                            });
-
-                            UpdateDeviceAmount();
-
-                            data = alarm_data;
                         } 
+                        catch(e) {
+                            console.error(e);
+                            return [];
+                        }
+
+                        
 
                         return data;
                     }
@@ -849,6 +848,27 @@
         });
         //#endregion
 
+        function GetAlarmFromObix(callback = null){
+            let url = "/api/Alarm/GetAlarmFromObix"
+            $.ajax({
+                url: url,
+                data: null,
+                type: 'POST',
+                dataType: 'json',
+                success: function (rel) {
+                    if(rel && rel.code == "0000") {
+                        console.log(rel);
+                        callback ? callback(rel.data ?? []) : "";
+                    } else {
+                        toast_error(rel?.msg || "取得警報發生錯誤，請通知資訊相關人員。");
+                    }
+                },
+            });
+
+
+
+        }
+
         //#region 變更查詢內容
         function ChangeMode(mode, e) {
             $('#show-mode').find('button').removeClass('btn-success').addClass('btn-secondary');
@@ -930,8 +950,7 @@
                             </div>`;*@
 
                     html += `<div class="btn-group ml-2" onclick="SelectBuilding('${building.tag}',this)">
-                                <button type="button" class="btn btn-secondary" data-tag="${building.tag}" >${building.name}</button>
+                                <button id="buildingBtn${building.tag}" type="button" class="btn btn-secondary" data-tag="${building.tag}" >${building.name}</button>
-                                <button type="button" class="btn btn-secondary building_device_amount" data-tag="${building.tag}" id="${building.tag}_device_amount">0</button>
                             </div>`;
                 });
                 $('#building').append(`<button type="button" class="btn btn-secondary waves-effect waves-themed d-inline-block ml-2" onclick="AllBuilding()">  全選 </button>`);

FrontendWebApi/Views/Login/Index.cshtml

@@ -78,7 +78,10 @@
                 async: false,
                 dataType: 'json',
                 success: function (rel) {
+                    
                     window.location = "/EmergencyDeviceMenu";
+                    
+                    
                 },
                 error: function (xhr, textStatus, thrownError) {
                     alert(textStatus);

FrontendWebApi/Views/Shared/_Layout.cshtml

@@ -883,7 +883,7 @@
                            </tr>
                            <tr>
                                
-                               <td colspan="2">24小時累積雨量達80毫米以上，或時雨量達40毫米以上之降雨現象</td>
+                               <td colspan="2" id="rainDesc">24小時累積雨量達80毫米以上，或時雨量達40毫米以上之降雨現象</td>
                            </tr>
                             <tr class="disaster-title-bar">
                                 <td rowspan="3" class="disaster-icon"><i class="fa-solid fa-house-chimney-crack"></i></td>
@@ -915,7 +915,7 @@
                                </td>
                            </tr>
                            <tr>
-                               <td colspan="2">幾乎所有家俱都大幅移動或翻倒，部分耐震較強建築物可能損壞或倒塌。</td>
+                               <td colspan="2" id="eqDesc">幾乎所有家俱都大幅移動或翻倒，部分耐震較強建築物可能損壞或倒塌。</td>
                            </tr>
                        </tbody>
                    </table>
@@ -936,6 +936,7 @@
     <script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
     <script src="~/lib/jquery-validation/dist/additional-methods.min.js"></script>
     <script src="~/lib/jquery-validation/dist/localization/messages_zh_TW.js"></script>
+
     <!-- dataTables -->
     <script src="~/js/datagrid/datatables/datatables.bundle.js"></script>
     <!-- SweetAlert -->
@@ -981,6 +982,32 @@
 
         $("body").on("show.bs.modal","#warning-value-modal",getWarningValue);
 
+        $("body").on("change","input[name=rainRadio]",onRainRadioChange);
+        $("body").on("change","input[name=eqRadio]",onEqRadioChange);
+
+        function onRainRadioChange(e) {
+            let rainDecDict = {
+                1:"24小時累積雨量達80毫米以上，或時雨量達40毫米以上之降雨現象。",
+                2:"24小時累積雨量達200毫米以上，或3小時累積雨量達100毫米以上之降雨現象。",
+                3:"24小時累積雨量達350毫米以上之降雨現象。",
+                4:"24小時累積雨量達500毫米以上之降雨現象。",
+            };
+
+            $("#rainDesc").text(rainDecDict[e.target.value] || "");
+        }
+
+        function onEqRadioChange(){
+            let eqDecDict = {
+                3:"房屋震動，碗盤門窗發出聲音，懸掛物搖擺。",
+                4:"房屋搖動甚烈，少數未固定物品可能傾倒掉落，少數傢俱移動，可能有輕微災害。",
+                5:"部分未固定物品傾倒掉落，少數傢俱可能移動或翻倒，少數門窗可能變形，部分牆壁產生裂痕。",
+                6:"大量傢俱大幅移動或翻倒，門窗扭曲變形，部分耐震能力較差房屋可能損壞或倒塌。",
+                7:"幾乎所有傢俱都大幅移動或翻倒，部分耐震較強建築物可能損壞或倒塌。",
+            }
+
+            $("#eqDesc").text(eqDecDict[e.target.value] || "");
+        }
+
         function getWarningValue(){
             let url = "api/WarningValue/GetWarningValue";