“全量发布”

.env

@@ -1,4 +1,5 @@
 #Production
 #Development
 #Staging
-DEV_ENVIRONMENT=Development 
+DEV_ENVIRONMENT=Development 
+version=1.3.6

Core.RabbitMQBus.Common/Properties/launchSettings.json

@@ -0,0 +1,12 @@
+{
+  "profiles": {
+    "Core.RabbitMQBus.Common": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:2237;http://localhost:2238"
+    }
+  }
+}

Core.RabbitMQBus/Properties/launchSettings.json

@@ -0,0 +1,12 @@
+{
+  "profiles": {
+    "Core.RabbitMQBus": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:2235;http://localhost:2236"
+    }
+  }
+}

Ropin.Inspection.Api/Controllers/MTN/TmtnAlarmOrderController.cs

@@ -26,6 +26,8 @@ using ICSharpCode.SharpZipLib.Zip;
 using Ropin.Inspection.Common.Helper;
 using NPOI.SS.Formula;
 using Ropin.Inspection.Repository;
+using Ropin.Inspection.Common;
+using ICSharpCode.SharpZipLib.Core;
 
 namespace Ropin.Inspection.Api.Controllers.MTN
 {
@@ -671,25 +673,126 @@ namespace Ropin.Inspection.Api.Controllers.MTN
                 }
                 AlarmOrderSearchModel orderSearchModel = new AlarmOrderSearchModel();
                 orderSearchModel.IsPagination = false;
-                orderSearchModel.C_PushMsgResultCode = searchModel.C_MessageCode;
-                var recordItems = await _repository.GetAlarmOrderRecordList(orderSearchModel);
+                orderSearchModel.C_MessageCode = searchModel.C_MessageCode;
+                ////var recordItems = await _repository.GetAlarmOrderRecordList(orderSearchModel);
+                var MsgData = await _repository.GetByMessageCodeAsync(searchModel.C_MessageCode);
                 string zip = @"wwwroot\\ZipFile";
                 if (!System.IO.Directory.Exists(zip))
                 {
                     Directory.CreateDirectory(zip);
                 }
                 string zipPaht = zip + $"\\{searchModel.C_MessageCode}报警详情下载.zip";
-                if (recordItems.Count() > 0)
+                List<string> FileDel =new List<string>();
+                if (MsgData!=null)
                 {
+                    var msgEntity = JsonConvert.DeserializeObject<TpushMsgModel>(MsgData.C_Content);
+                    string msgTypeName= DataDictionaryHelper.GetValNameByCode(msgEntity.C_MsgTypeCode);
                     XWPFDocument doc = new XWPFDocument();
                     var paragraph = doc.CreateParagraph();
                     var run1 = paragraph.CreateRun();
                     run1.FontSize = 18;
-                    run1.AppendText("报警时间：" + searchModel.AlarmTime);
+                    run1.AppendText("报警主题：" + msgEntity.Subject);
                     run1.AddCarriageReturn();
-                    run1.AppendText("报警内容：" + searchModel.AlarmContent);
+                    run1.AppendText("报警设备：" + msgEntity.DevName);
+                    run1.AddCarriageReturn();
+                    run1.AppendText("报警来源：" + msgEntity.UserName);
+                    run1.AddCarriageReturn();
+                    run1.AppendText("报警时间：" + msgEntity.CreateOn);
+                    run1.AddCarriageReturn();
+                    run1.AppendText("报警内容：" + msgEntity.Msg);
+                    run1.AddCarriageReturn();
+                    run1.AppendText("报警类型：" + msgTypeName);
+                    #region 消息图片信息
+                    if (MsgData.messageFile != null&& MsgData.messageFile.Count>0)
+                    {
+                        foreach (var files in MsgData.messageFile)
+                        {
+                            if (files != null)
+                            {
+                                if (files.C_Type== "FILE_TYP_006")
+                                {
+                                    try
+                                    {
+                                        var fileText = JsonConvert.DeserializeObject<AlmImage>(files.C_Text);
+                                        string images = AIConst.AIImageUrl+fileText.PanoramaUrl;
+                                        var imgArray= fileText.PanoramaUrl.Split('/');
+                                        string AiAlmFile = @"wwwroot\\AiAlm";// + fileText.PanoramaUrl;
+                                        string imgName = "";int fI = 0;
+                                        foreach (var img in imgArray)
+                                        {
+                                            if (fI>0)
+                                            {
+                                                if (!img.Contains("."))
+                                                {
+                                                    AiAlmFile = AiAlmFile + "/" + img;
+                                                }
+                                                else
+                                                {
+                                                    imgName = img;
+                                                }
+                                            }
+                                            fI++;
+                                        }
+                                        if (!System.IO.Directory.Exists(AiAlmFile))
+                                        {
+                                            Directory.CreateDirectory(AiAlmFile);
+                                        }
+                                        string pathFile = AiAlmFile + "/" + imgName;
+                                        bool IsDown = true;
+                                        if (!System.IO.File.Exists(pathFile))
+                                        {
+                                            IsDown = FileHelp.FilesDown(images, pathFile);
+                                        }
+                                        if (IsDown)
+                                        {
+                                            if (!string.IsNullOrEmpty(pathFile))
+                                            {
+                                                if (pathFile[0].ToString() == @"/")
+                                                {
+                                                    pathFile = pathFile.Substring(1);
+                                                }
+                                                if (System.IO.File.Exists(pathFile))
+                                                {
+                                                    FileStream fileStream = new FileStream(pathFile, FileMode.Open, FileAccess.Read);
+                                                    run1.AddCarriageReturn();
+                                                    run1.AddPicture(fileStream, 6, pathFile, Units.ToEMU(400), Units.ToEMU(300));
+                                                    FileDel.Add(pathFile);
+                                                }
+                                            }
+                                        }
+                                    }
+                                    catch (Exception)
+                                    {
+                                    }
+                                }
+                                else if (files.C_Type == "FILE_TYP_003")
+                                {
+                                    string pathFile = files.C_Url;
+                                    if (!string.IsNullOrEmpty(pathFile))
+                                    {
+                                        if (pathFile[0].ToString() == @"/")
+                                        {
+                                            pathFile = pathFile.Substring(1);
+                                        }
+                                        if (!System.IO.File.Exists(pathFile))
+                                        {
+                                            pathFile = @"wwwroot/error.png";
+                                        }
+                                        FileStream fileStream = new FileStream(pathFile, FileMode.Open, FileAccess.Read);
+                                        run1.AddCarriageReturn();
+                                        run1.AddPicture(fileStream, 6, pathFile, Units.ToEMU(100), Units.ToEMU(100));
+                                    }
+                                }
+                                else
+                                {
+
+                                }
+                            }
+                        }
+                    }
+                    #endregion
                     int serialNum = 1;
-                    foreach (var recordItem in recordItems)
+                    foreach (var recordItem in MsgData.historyRecord)
                     {
                         if (recordItem == null) { continue; }
                         var p0 = doc.CreateParagraph();
@@ -767,6 +870,13 @@ namespace Ropin.Inspection.Api.Controllers.MTN
                     });
                 }
                 System.IO.File.Delete(zipPaht);
+                //foreach (var item in FileDel)
+                //{
+                //    if (System.IO.File.Exists(item))
+                //    {
+                //        System.IO.File.Delete(item);
+                //    };
+                //}
                 return new ApiResult(ReturnCode.Success);
             }
             catch (Exception ex)

Ropin.Inspection.Api/TmtnPushMsgResultController.cs

@@ -352,23 +352,23 @@ namespace Ropin.Inspection.Api
         /// </summary>
         /// <param name="searchModel"></param>
         /// <returns></returns>
-        //[HttpPost("GetPushMsgResultContentAsync")]
-        //public async Task<ApiResult> GetPushMsgResultContentAsync(TmtnPushMsgResultSearchModel searchModel)
-        //{
-        //    if (searchModel == null)
-        //    {
-        //        return new ApiResult(ReturnCode.GeneralError);
-        //    }
-        //    try
-        //    {
-        //        DevAlarmCount data = await _TmtnPushMsgResultService.GetPushMsgResultContentAsync(searchModel);
-        //        return new ApiResult<DevAlarmCount>(data);
-        //    }
-        //    catch (Exception ex)
-        //    {
-        //        return new ApiResult(ReturnCode.GeneralError, ex.Message);
-        //    }
-        //}
+        [HttpPost("GetPushMsgResultContentAsync")]
+        public async Task<ApiResult> GetPushMsgResultContentAsync(TmtnPushMsgResultSearchModel searchModel)
+        {
+            if (searchModel == null)
+            {
+                return new ApiResult(ReturnCode.GeneralError);
+            }
+            try
+            {
+                DevAlarmCount data=await _TmtnPushMsgResultService.GetPushMsgResultContentAsync(searchModel);
+                return new ApiResult<DevAlarmCount>(data);
+            }
+            catch (Exception ex)
+            {
+                return new ApiResult(ReturnCode.GeneralError, ex.Message);
+            }
+        }
 
         /// <summary>
         ///根据消息ID和推送人员修改状态

Ropin.Inspection.Api/bin/Debug/net5.0/Ropin.Inspection.Api.xml

@@ -4754,6 +4754,13 @@
             <param name="searchModel"></param>
             <returns></returns>
         </member>
+        <member name="M:Ropin.Inspection.Api.TmtnPushMsgResultController.GetPushMsgResultContentAsync(Ropin.Inspection.Model.TmtnPushMsgResultSearchModel)">
+             <summary>
+            消息报警天数计量
+             </summary>
+             <param name="searchModel"></param>
+             <returns></returns>
+        </member>
         <member name="M:Ropin.Inspection.Api.TmtnPushMsgResultController.UpdateStatusAsync(System.String,System.String,System.String)">
              <summary>
             根据消息ID和推送人员修改状态

Ropin.Inspection.Api/bin/Debug/net5.0/log4net.config

@@ -64,7 +64,7 @@
 		</layout>
 	</appender>
 	<root>
-		<level value="TRACE" />
+		<level value="OFF" />
 		<appender-ref ref="RollingFileError" />
 		<appender-ref ref="RollingFileAll" />
 		<appender-ref ref="TraceAppender" />

Ropin.Inspection.Api/obj/Debug/net5.0/Ropin.Inspection.Api.xml

@@ -4754,6 +4754,13 @@
             <param name="searchModel"></param>
             <returns></returns>
         </member>
+        <member name="M:Ropin.Inspection.Api.TmtnPushMsgResultController.GetPushMsgResultContentAsync(Ropin.Inspection.Model.TmtnPushMsgResultSearchModel)">
+             <summary>
+            消息报警天数计量
+             </summary>
+             <param name="searchModel"></param>
+             <returns></returns>
+        </member>
         <member name="M:Ropin.Inspection.Api.TmtnPushMsgResultController.UpdateStatusAsync(System.String,System.String,System.String)">
              <summary>
             根据消息ID和推送人员修改状态

Ropin.Inspection.Common/DataDictionaryHelper.cs

@@ -9,7 +9,7 @@ namespace Ropin.Inspection.Common
     public static class DataDictionaryHelper
     {
         /// <summary>
-        /// 根据编号获取消息名称
+        /// 根据编号获取消息名称+消息
         /// </summary>
         /// <param name="code"></param>
         /// <returns></returns>
@@ -43,7 +43,7 @@ namespace Ropin.Inspection.Common
                     case "MSG_TYPE_021": val = "报警确认消息"; break;
                     case "MSG_TYPE_022": val = "报警完成消息"; break;
                     case "MSG_TYPE_023": val = "手动报警消息"; break;
-                    case "MSG_TYPE_024": val = "AI报警消息"; break;
+                    case "MSG_TYPE_024": val = "AI设备报警消息"; break;
                     default: val = "未知类型"; break;
                 }
             }
@@ -53,6 +53,52 @@ namespace Ropin.Inspection.Common
             }
             return val;
         }
+
+        /// <summary>
+        /// 根据编号获取消息名称
+        /// </summary>
+        /// <param name="code"></param>
+        /// <returns></returns>
+        public static string GetValNameByCode(string code)
+        {
+            string val = "";
+            try
+            {
+                switch (code)
+                {
+                    case "MSG_TYPE_001": val = "通知维修"; break;
+                    case "MSG_TYPE_002": val = "通知运维"; break;
+                    case "MSG_TYPE_003": val = "通知巡检"; break;
+                    case "MSG_TYPE_004": val = "巡检异常"; break;
+                    case "MSG_TYPE_005": val = "异常消除"; break;
+                    case "MSG_TYPE_006": val = "维修确认"; break;
+                    case "MSG_TYPE_007": val = "维修取消"; break;
+                    case "MSG_TYPE_008": val = "维修完成"; break;
+                    case "MSG_TYPE_009": val = "运维审核"; break;
+                    case "MSG_TYPE_010": val = "异常确认"; break;
+                    case "MSG_TYPE_011": val = "设备启停"; break;
+                    case "MSG_TYPE_012": val = "设备点报警"; break;
+                    case "MSG_TYPE_013": val = "设备点报警消除"; break;
+                    case "MSG_TYPE_014": val = "正在维修"; break;
+                    case "MSG_TYPE_015": val = "维修返工"; break;
+                    case "MSG_TYPE_016": val = "维修完成确认"; break;
+                    case "MSG_TYPE_017": val = "设备点预警"; break;
+                    case "MSG_TYPE_018": val = "设备点预警消除"; break;
+                    case "MSG_TYPE_019": val = "报警上报"; break;
+                    case "MSG_TYPE_020": val = "报警取消"; break;
+                    case "MSG_TYPE_021": val = "报警确认"; break;
+                    case "MSG_TYPE_022": val = "报警完成"; break;
+                    case "MSG_TYPE_023": val = "手动报警"; break;
+                    case "MSG_TYPE_024": val = "AI设备报警"; break;
+                    default: val = "未知类型"; break;
+                }
+            }
+            catch (Exception ex)
+            {
+                val = "异常";
+            }
+            return val;
+        }
         /// <summary>
         /// 根据消息类型获取是普通报警还是报警消息
         /// 【0=普通消息；1=报警，待确认；4=设备启停报警】

Ropin.Inspection.Common/Helper/AIProjectHelper.cs

@@ -652,6 +652,31 @@ namespace Ropin.Inspection.Common.Helper
         /// </summary>
         public bool HasNextPage { get; set; }
     }
+  
+    public class AlmImage
+    {
+        /// <summary>
+        /// 全景图ID
+        /// </summary>
+        public string? PanoramaId { get; set; }
+        /// <summary>
+        /// 全景图Url
+        /// </summary>
+        public string? PanoramaUrl { get; set; }
+        /// <summary>
+        /// Roi框
+        /// </summary>
+        public string? RoiJson { get; set; }
+        /// <summary>
+        /// NonRoi框
+        /// </summary>
+        public string? NonRoiJson { get; set; }
+        /// <summary>
+        /// 检测框
+        /// </summary>
+        public string? DetectionFrameJson { get; set; }
+    }
+
     public static class AIConst
     {
         /// <summary>
@@ -680,6 +705,7 @@ namespace Ropin.Inspection.Common.Helper
         public const string userPwd = "cfa965675d4efbbb0d4a8d5fadf08bad0f780759ab55a414564b87652a015ba44cd8a9ab79dbde503995f7fbffa6a3b1f6322e3d94a4309bed578d8c262e4a3702a4574d20d00d6d54194c7c09b7f4d54cd9d347640de197b1a8f35663c89019b6054415ec7bbb33ef458ecb";
         public const long AIEntityId = 40124884581189;
         public const string ApiUrl = "https://ropiniot.com/prod-api/api";
+        public const string AIImageUrl = "https://www.ropintech.cn/ai_service";
         public const string ApiUrl1 = "http://localhost:5005/api";
         public const string loginUrl = "/sysAuth/loginNoCode";
         public const string HistoricAlmrecord = "/AlmRecord/HistoryPage";

Ropin.Inspection.Repository/SYS/Interface/ITsysMessageRepository.cs

@@ -12,5 +12,6 @@ namespace Ropin.Inspection.Repository
     {
         Task<bool> UpdateMsgStatus(string id, int? msgStatus);
         Task<IEnumerable<TsysMessageViewModel>> GetList(TsysMessageSearchModel searchModel);
+        Task<DevAlarmCount> GetMsgDevRunTimeAsync(TsysMessageSearchModel searchModel);
     }
 }

Ropin.Inspection.Repository/SYS/TsysMessageRepository.cs

@@ -1,4 +1,5 @@
-using Ropin.Inspection.Model;
+using Newtonsoft.Json;
+using Ropin.Inspection.Model;
 using Ropin.Inspection.Model.Common;
 using Ropin.Inspection.Model.Entities;
 using Ropin.Inspection.Model.SearchModel.MTN;
@@ -126,5 +127,112 @@ from TSYS_MessageFile group by C_MessageCode) f on (m.C_ID=f.C_MessageCode)
             return Task.FromResult(searchModel.IsPagination ? recordItemlist.Skip((searchModel.PageIndex - 1) * searchModel.PageSize).Take(searchModel.PageSize) : recordItemlist);
         }
 
+        /// <summary>
+        /// 获取设备运行时长
+        /// </summary>
+        /// <param name="searchModel"></param>
+        /// <returns></returns>
+        public Task<DevAlarmCount> GetMsgDevRunTimeAsync(TsysMessageSearchModel searchModel)
+        {
+
+            MySqlConnector.MySqlParameter[] parameters = new[] {
+                new MySqlConnector.MySqlParameter("devStoreCode", searchModel.C_DevCode),
+                new MySqlConnector.MySqlParameter("time", searchModel.BeginTime),
+            };
+            StringBuilder sql = new StringBuilder();
+            sql.Append($"select C_Content,D_MsgCreateOn from TSYS_Message where C_Status='1' and C_MsgTypeCode='MSG_TYPE_011' ");
+            if (!string.IsNullOrEmpty(searchModel.C_DevCode))
+            {
+                sql.Append(" and C_DevStoreCode=@devStoreCode");
+            }
+            if (searchModel.BeginTime != null)
+            {
+                sql.Append("  and D_MsgCreateOn> @time  ");
+            }
+            sql.Append(" order by D_MsgCreateOn asc ");
+
+            IEnumerable<TSYS_Message> recordItemlist = EntityFrameworkCoreExtensions.GetList<TSYS_Message>(DbContext.Database, sql.ToString(), parameters);
+            DateTime? time1 = null, time2 = null;
+            int day = 0; int Hour = 0; int minutes = 0;
+            int dayTotal = 0; int HourTotal = 0; int minutesTotal = 0;
+
+            int dayStop = 0; int HourStop = 0; int minutesStop = 0;
+            int dayStopTotal = 0; int HourStopTotal = 0; int minutesStopTotal = 0;
+            string FistTime = null, LastTime = null;
+            foreach (var item in recordItemlist)
+            {
+                try
+                {
+                    var msgMode = JsonConvert.DeserializeObject<TpushMsgModel>(item.C_Content);
+                    if (msgMode.Msg == "开启")
+                    {
+                        time1 = string.IsNullOrEmpty(msgMode.CreateOn) ? null : Convert.ToDateTime(msgMode.CreateOn);
+                        if (time2 != null && time1 != null)
+                        {
+                            int dateCompare = DateTime.Compare(time1.Value, time2.Value);
+                            if (dateCompare > 0)//time2小于time1
+                            {
+                                TimeSpan diff = (time1.Value).Subtract(time2.Value);
+                                dayStop = diff.Days;
+                                HourStop = diff.Hours;
+                                minutesStop = diff.Minutes;
+                                minutesStopTotal = minutesStopTotal + minutesStop;
+                                if (minutesStopTotal >= 60)
+                                {
+                                    HourStopTotal++;
+                                    minutesStopTotal = minutesStopTotal - 60;
+                                }
+                                HourStopTotal = HourStopTotal + HourStop;
+                                if (HourStopTotal >= 24)
+                                {
+                                    dayStopTotal++;
+                                    HourStopTotal = HourStopTotal - 24;
+                                }
+                                dayStopTotal = dayStopTotal + dayStop;
+                            }
+                        }
+                        time2 = null;
+                        if (FistTime == null)
+                        {
+                            FistTime = msgMode.CreateOn;
+                        }
+                    }
+                    else if (msgMode.Msg == "关闭" && time1 != null)
+                    {
+                        LastTime = msgMode.CreateOn;
+                        time2 = string.IsNullOrEmpty(msgMode.CreateOn) ? null : Convert.ToDateTime(msgMode.CreateOn);
+                        TimeSpan timeDiff = (time2.Value).Subtract(time1.Value);
+                        day = timeDiff.Days;
+                        Hour = timeDiff.Hours;
+                        minutes = timeDiff.Minutes;
+                        minutesTotal = minutesTotal + minutes;
+                        if (minutesTotal >= 60)
+                        {
+                            HourTotal++;
+                            minutesTotal = minutesTotal - 60;
+                        }
+                        HourTotal = HourTotal + Hour;
+                        if (HourTotal >= 24)
+                        {
+                            dayTotal++;
+                            HourTotal = HourTotal - 24;
+                        }
+                        dayTotal = dayTotal + day;
+                    }
+                }
+                catch (Exception ex)
+                {
+
+                }
+            }
+            DevAlarmCount alarmCount = new DevAlarmCount();
+            alarmCount.FiratOnDate = FistTime;
+            alarmCount.LastOffDate = LastTime;
+            alarmCount.nowTime = day + "." + Hour + "." + minutes;
+            alarmCount.TotalTime = dayTotal + "." + HourTotal + "." + minutesTotal;
+            alarmCount.nowSpotTime = dayStop + "." + HourStop + "." + minutesStop;
+            alarmCount.TotalSpotTime = dayStopTotal + "." + HourStopTotal + "." + minutesStopTotal;
+            return Task.FromResult(alarmCount);
+        }
     }
 }

Ropin.Inspection.Repository/TmtnPushMsgResultRepository.cs

@@ -149,63 +149,68 @@ namespace Ropin.Inspection.Repository
             string FistTime=null,LastTime=null;
             foreach (var item in recordItemlist)
             {
-                if (item == null)
-                    continue;
-               var msgMode= JsonConvert.DeserializeObject<TpushMsgModel>(item.C_Content);
-                if (msgMode.Msg== "开启")
+                try
                 {
-                    time1 = string.IsNullOrEmpty(msgMode.CreateOn)?null:Convert.ToDateTime(msgMode.CreateOn);
-                    if (time2!=null&& time1!=null)
+                    var msgMode = JsonConvert.DeserializeObject<TpushMsgModel>(item.C_Content);
+                    if (msgMode.Msg == "开启")
                     {
-                        int dateCompare = DateTime.Compare(time1.Value, time2.Value);
-                        if (dateCompare > 0)//time2小于time1
+                        time1 = string.IsNullOrEmpty(msgMode.CreateOn) ? null : Convert.ToDateTime(msgMode.CreateOn);
+                        if (time2 != null && time1 != null)
                         {
-                            TimeSpan diff = (time1.Value).Subtract(time2.Value);
-                            dayStop = diff.Days;
-                            HourStop= diff.Hours;
-                            minutesStop= diff.Minutes;
-                            minutesStopTotal = minutesStopTotal + minutesStop;
-                            if (minutesStopTotal>=60)
+                            int dateCompare = DateTime.Compare(time1.Value, time2.Value);
+                            if (dateCompare > 0)//time2小于time1
                             {
-                                HourStopTotal++;
-                                minutesStopTotal = minutesStopTotal - 60;
+                                TimeSpan diff = (time1.Value).Subtract(time2.Value);
+                                dayStop = diff.Days;
+                                HourStop = diff.Hours;
+                                minutesStop = diff.Minutes;
+                                minutesStopTotal = minutesStopTotal + minutesStop;
+                                if (minutesStopTotal >= 60)
+                                {
+                                    HourStopTotal++;
+                                    minutesStopTotal = minutesStopTotal - 60;
+                                }
+                                HourStopTotal = HourStopTotal + HourStop;
+                                if (HourStopTotal >= 24)
+                                {
+                                    dayStopTotal++;
+                                    HourStopTotal = HourStopTotal - 24;
+                                }
+                                dayStopTotal = dayStopTotal + dayStop;
                             }
-                            HourStopTotal = HourStopTotal + HourStop;
-                            if (HourStopTotal>=24)
-                            {
-                                dayStopTotal++;
-                                HourStopTotal = HourStopTotal - 24;
-                            }
-                            dayStopTotal = dayStopTotal + dayStop;
+                        }
+                        time2 = null;
+                        if (FistTime == null)
+                        {
+                            FistTime = msgMode.CreateOn;
                         }
                     }
-                    time2 = null;
-                    if (FistTime==null)
+                    else if (msgMode.Msg == "关闭" && time1 != null)
                     {
-                        FistTime = msgMode.CreateOn;
+                        LastTime = msgMode.CreateOn;
+                        time2 = string.IsNullOrEmpty(msgMode.CreateOn) ? null : Convert.ToDateTime(msgMode.CreateOn);
+                        TimeSpan timeDiff = (time2.Value).Subtract(time1.Value);
+                        day = timeDiff.Days;
+                        Hour = timeDiff.Hours;
+                        minutes = timeDiff.Minutes;
+                        minutesTotal = minutesTotal + minutes;
+                        if (minutesTotal >= 60)
+                        {
+                            HourTotal++;
+                            minutesTotal = minutesTotal - 60;
+                        }
+                        HourTotal = HourTotal + Hour;
+                        if (HourTotal >= 24)
+                        {
+                            dayTotal++;
+                            HourTotal = HourTotal - 24;
+                        }
+                        dayTotal = dayTotal + day;
                     }
                 }
-                else if (msgMode.Msg == "关闭"&& time1!=null)
+                catch (Exception ex)
                 {
-                    LastTime = msgMode.CreateOn;
-                    time2 = string.IsNullOrEmpty(msgMode.CreateOn) ? null : Convert.ToDateTime(msgMode.CreateOn);
-                    TimeSpan timeDiff = (time2.Value).Subtract(time1.Value);
-                    day = timeDiff.Days;
-                    Hour=timeDiff.Hours;
-                    minutes=timeDiff.Minutes;
-                    minutesTotal = minutesTotal + minutes;
-                    if (minutesTotal>=60)
-                    {
-                        HourTotal++;
-                        minutesTotal = minutesTotal - 60;
-                    }
-                    HourTotal = HourTotal + Hour;
-                    if (HourTotal>=24)
-                    {
-                        dayTotal++;
-                        HourTotal = HourTotal - 24;
-                    }
-                    dayTotal = dayTotal + day;
+
                 }
             }
             DevAlarmCount alarmCount = new DevAlarmCount();