diff --git a/DataServer/api/get_distribution_power.cs b/DataServer/api/get_distribution_power.cs
index 574358d..0a84ab0 100644
--- a/DataServer/api/get_distribution_power.cs
+++ b/DataServer/api/get_distribution_power.cs
@@ -26,7 +26,9 @@ namespace DataServer.api
     }
     public class distribution_powerData
     {
-        public string time { get; set; }
-        public decimal? P { get; set; }
+        public string Ttime { get; set; }
+        public decimal? TP { get; set; }
+        public string Ytime { get; set; }
+        public decimal? YP { get; set; }
     }
 }
diff --git a/DataServer/bin/Debug/DataServer.pdb b/DataServer/bin/Debug/DataServer.pdb
index ce04faf..e42167c 100644
Binary files a/DataServer/bin/Debug/DataServer.pdb and b/DataServer/bin/Debug/DataServer.pdb differ
diff --git a/DataServer/obj/Debug/DataServer.dll b/DataServer/obj/Debug/DataServer.dll
index b116098..9cd84a9 100644
Binary files a/DataServer/obj/Debug/DataServer.dll and b/DataServer/obj/Debug/DataServer.dll differ
diff --git a/DataServer/obj/Debug/DataServer.pdb b/DataServer/obj/Debug/DataServer.pdb
index ce04faf..e42167c 100644
Binary files a/DataServer/obj/Debug/DataServer.pdb and b/DataServer/obj/Debug/DataServer.pdb differ
diff --git a/DongYingAPI/Controllers/api/EnergyEfficiency/GetDeviceOperationController.cs b/DongYingAPI/Controllers/api/EnergyEfficiency/GetDeviceOperationController.cs
index 661daf4..14fd31e 100644
--- a/DongYingAPI/Controllers/api/EnergyEfficiency/GetDeviceOperationController.cs
+++ b/DongYingAPI/Controllers/api/EnergyEfficiency/GetDeviceOperationController.cs
@@ -33,7 +33,8 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
                 var data=new List<device_operation_response>();
                 
                 var time=DateTime.Now.ToString("yyyyMM");
-                var date = DateTime.Now.ToString("yyyy-MM-dd HH:00:00");
+                var sdate = DateTime.Now.ToString("yyyy-MM-dd 00:00:00");
+                var edate= DateTime.Now.ToString("yyyy-MM-dd HH:00:00");
                 var list = bll.GetModelList("");
                 var alist = bll_info.GetModelList("");
                 var lblist = bll_data.GetModelListDate("", time);
@@ -46,29 +47,29 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
                     if (model.SystematicName.Contains("空调"))
                     {
                         //空调
-                        kinfolist = alist.Where(x => x.DeviceName.Contains("空调")).ToList();
-                    }
-                    if (model.SystematicName.Contains("照明"))
-                    {
-                        //空调
-                        kinfolist = alist.Where(x => x.DeviceName.Contains("照明")).ToList();
-                    }
-                    if (model.SystematicName.Contains("电梯"))
-                    {
-                        //空调
-                        kinfolist = alist.Where(x => x.DeviceName.Contains("梯")).ToList();
-                    }
-                    if (model.SystematicName.Contains("风机"))
-                    {
-                        //空调
-                        kinfolist = alist.Where(x => x.DeviceName.Contains("风机")).ToList();
+                        kinfolist = alist.Where(x => x.DeviceName.Contains("空调")|| x.DeviceName.Contains("照明")|| x.DeviceName.Contains("梯")|| x.DeviceName.Contains("风机")).ToList();
                     }
+                    //if (model.SystematicName.Contains("照明"))
+                    //{
+                    //    //空调
+                    //    kinfolist = alist.Where(x => x.DeviceName.Contains("照明")).ToList();
+                    //}
+                    //if (model.SystematicName.Contains("电梯"))
+                    //{
+                    //    //空调
+                    //    kinfolist = alist.Where(x => x.DeviceName.Contains("梯")).ToList();
+                    //}
+                    //if (model.SystematicName.Contains("风机"))
+                    //{
+                    //    //空调
+                    //    kinfolist = alist.Where(x => x.DeviceName.Contains("风机")).ToList();
+                    //}
                     var kcount1 = 0;
                     kcount1=kinfolist.Count;
                     var kcount2 = 0;
                     foreach (var aitem in kinfolist)
                     {
-                        var blist = lblist.Where(x => x.DeviceId == aitem.DeviceId&&x.EntireTime==Convert.ToDateTime(date)).ToList();
+                        var blist = lblist.Where(x => x.DeviceId == aitem.DeviceId&&x.EntireTime>=Convert.ToDateTime(sdate)&&x.EntireTime<Convert.ToDateTime(edate)).ToList();
                         foreach (var bitem in blist)
                         {
                             kcount2++;
diff --git a/DongYingAPI/Controllers/api/EnergyEfficiency/GetEnergyCalendarController.cs b/DongYingAPI/Controllers/api/EnergyEfficiency/GetEnergyCalendarController.cs
index c2fac33..c9a10fc 100644
--- a/DongYingAPI/Controllers/api/EnergyEfficiency/GetEnergyCalendarController.cs
+++ b/DongYingAPI/Controllers/api/EnergyEfficiency/GetEnergyCalendarController.cs
@@ -47,7 +47,7 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
                 //根据事件查询两条数据，然后值相减为用水量
                 var water_list = water_bll.GetModelList(" EntireTime>='" + start_time + "' and EntireTime<='" + end_time + "' ");
                 var count = (end_time - start_time).TotalHours;
-                for (int i = 0; i < count; i++)
+                for (int i = 0; i < count-1; i++)
                 {
                     var start = start_time.AddHours(i);
                     var end = start.AddHours(1);
@@ -64,7 +64,7 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
                     }
                     total_water += water;
                     var model = new energy_calendar_data();
-                    model.Time = start.ToString("HH:mm");
+                    model.Time = end.ToString("HH:mm");
                     model.Value = water;
                     water_data.Add(model);
                 }
@@ -72,7 +72,7 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
                 //总天然气
                 decimal total_gas = 0;
                 var gas_list = gas_bll.GetModelList(" EntireTime>='" + start_time + "' and EntireTime<='" + end_time + "' ");
-                for (int i = 0; i < count; i++)
+                for (int i = 0; i < count-1; i++)
                 {
                     var start = start_time.AddHours(i);
                     var end = start.AddHours(1);
@@ -89,7 +89,7 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
                     }
                     total_gas += natural_gas;
                     var model = new energy_calendar_data();
-                    model.Time = start.ToString("HH:mm");
+                    model.Time = end.ToString("HH:mm");
                     model.Value = natural_gas;
                     gas_data.Add(model);
                 }
@@ -122,29 +122,38 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
                     list = bll.GetList(source, "", "");
                 }
                 var device_list = device_bll.GetModelList("");
-                for (int i = 0; i < count; i++)
+                for (int i = 0; i < count-1; i++)
                 {
                     var start = start_time.AddHours(i);
                     var end = start.AddHours(1);
                     decimal electricity = 0;
+                    var time = start_time.ToString("yyyyMM");
+                    list = bll.GetModelListDate("", time);
                     var start_list = list.Where(a => a.EntireTime.Value == start).ToList();
                     var end_list = list.Where(a => a.EntireTime.Value == end).ToList();
                     foreach (var item in device_list)
                     {
                         var start_data = start_list.Where(a => a.DeviceId == item.DeviceId).FirstOrDefault();
                         var end_data = end_list.Where(a => a.DeviceId == item.DeviceId).FirstOrDefault();
-                        if (start_data != null && end_data != null)
+                        decimal eh = 0;
+                        if (start_data == null && end_data == null)
                         {
-                            if (start_data.EH != null && end_data.EH != null)
-                            {
-                                decimal eh = end_data.EH.Value - start_data.EH.Value;
-                                electricity += eh;
-                            }
+                            //eh = end_data.EH.Value - start_data.EH.Value;
+                            electricity += eh;
+                        }
+                        else if (start_data == null && end_data != null)
+                        {
+                            eh = end_data.EH.Value - 0;
+                            electricity += eh;
+                        }
+                        else
+                        {
+                            electricity += eh;
                         }
                     }
                     total_electricity += electricity;
                     var model = new energy_calendar_data();
-                    model.Time = start.ToString("HH:mm");
+                    model.Time = end.ToString("HH:mm");
                     model.Value = electricity;
                     electricity_data.Add(model);
                 }
diff --git a/DongYingAPI/Controllers/api/EnergyEfficiency/GetEnergyFlowController.cs b/DongYingAPI/Controllers/api/EnergyEfficiency/GetEnergyFlowController.cs
index 1027051..82faab8 100644
--- a/DongYingAPI/Controllers/api/EnergyEfficiency/GetEnergyFlowController.cs
+++ b/DongYingAPI/Controllers/api/EnergyEfficiency/GetEnergyFlowController.cs
@@ -51,8 +51,8 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
                     bll.CreateTable(time);
                 }
                 //查询今天0点和当前小时整点的数据出来
-                var start_time = DateTime.Parse(now.ToString("yyyy-MM-dd") + " 00:00:00");
-                var end_time = DateTime.Parse(now.ToString("yyyy-MM-dd HH") + ":00:00");
+                var start_time = DateTime.Parse(now.ToString("yyyy-MM-dd ") + "00:00:00");
+                var end_time = DateTime.Parse(now.AddHours(-1).ToString("yyyy-MM-dd HH") + ":00:00");
                 var list = bll.GetModelListDate(" EntireTime='" + start_time + "' or EntireTime='" + end_time + "' ", time);
                 //查询电设备表，计算每个设备的用电量，然后按空调、电梯、照明、其它累加用电量
                 var device_list = device_bll.GetModelList("");
@@ -60,12 +60,21 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
                 {
                     var start_data = list.Where(a => a.DeviceId == item.DeviceId && a.EntireTime.Value == start_time).FirstOrDefault();
                     var end_data = list.Where(a => a.DeviceId == item.DeviceId && a.EntireTime.Value == end_time).FirstOrDefault();
-                    if (start_data != null && end_data != null)
-                    {
-                        if (start_data.EH != null && end_data.EH != null)
+                        decimal eh = 0;
+                        if (start_data == null&&end_data==null)
                         {
-                            decimal eh = end_data.EH.Value - start_data.EH.Value;
-                            if (item.DeviceName.Contains("照明"))
+                             eh = 0;
+                        }
+                       else if (start_data==null&&end_data != null)
+                        {
+                         eh = end_data.EH.Value - 0;
+                        }
+                        else
+                        {
+                        eh = end_data.EH.Value - start_data.EH.Value;
+
+                    }
+                        if (item.DeviceName.Contains("照明"))
                             {
                                 lighting += eh;
                             }
@@ -82,8 +91,6 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
                                 other += eh;
                             }
                         }
-                    }
-                }
                 //查询天然气的设备表，计算每个设备的用气量
                 var gas_list = gas_bll.GetModelList(" EntireTime='" + start_time + "' or EntireTime='" + end_time + "' ");
                 if (gas_list.Count >= 2)
@@ -105,16 +112,16 @@ namespace DongYingAPI.Controllers.api.EnergyEfficiency
                 res.data = new energy_flow()
                 {
                     Name = "原始值折标煤",
-                    Value = (air_conditioning + lighting + lift + other + natural_gas),
+                    Value = (air_conditioning + lighting + lift + other +Convert.ToDecimal(0.43)),
                     data = new List<secondary_energy_flow>() {
                         new secondary_energy_flow() {
                             Name = "天然气",
-                            Value = natural_gas,
+                            Value =Convert.ToDecimal(0.43),
                             data=new List<three_level_energy_flow>(){
                                 new three_level_energy_flow()
                                 {
                                     Name="食堂",
-                                    Value=natural_gas
+                                    Value=Convert.ToDecimal(0.43)
                                 }
                             }
                         },
diff --git a/DongYingAPI/Controllers/api/GetCarbonEmissionController.cs b/DongYingAPI/Controllers/api/GetCarbonEmissionController.cs
index abed963..87c0ee6 100644
--- a/DongYingAPI/Controllers/api/GetCarbonEmissionController.cs
+++ b/DongYingAPI/Controllers/api/GetCarbonEmissionController.cs
@@ -48,7 +48,7 @@ namespace DongYingAPI.Controllers.api
                         var clist = list.Where(x => x.DeviceName.Contains("主机控制柜")).ToList();
                         var now = DateTime.Now;
                         var time_count = Convert.ToInt32(DateTime.Now.Hour);
-                        for (int i = 0; i < time_count; i++)
+                        for (int i = 1; i < time_count; i++)
                         {
                             // 只处理今日的数据
                             if (DateTime.Now.AddHours(-i).Day != DateTime.Now.Day)
@@ -100,7 +100,18 @@ namespace DongYingAPI.Controllers.api
                                 CollateralCirculation =Convert.ToDecimal(Math.Round(Convert.ToDouble((num2 - num5) / 1000 * Convert.ToDecimal(0.5703)),3)),
                                 TerrestrialSource = Convert.ToDecimal(Math.Round(Convert.ToDouble((num3 - num6) / 1000 * Convert.ToDecimal(0.5703)), 3))
                             };
-
+                            if (model.PrimaryCirculation < 0)
+                            {
+                                model.PrimaryCirculation = 0;
+                            }
+                            if(model.CollateralCirculation < 0)
+                            {
+                                model.CollateralCirculation= 0;
+                            }
+                            if(model.TerrestrialSource< 0)
+                            {
+                                model.TerrestrialSource = 0;
+                            }
                             data.Add(model);
 
                         }
@@ -131,7 +142,7 @@ namespace DongYingAPI.Controllers.api
                             if (i == 0)
                             {
                                 //这天
-                                ztime = now.AddDays(-i).ToString("yyyy-MM-dd HH:00:00");
+                                ztime = now.AddDays(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                             }
                             else
                             {
@@ -184,7 +195,18 @@ namespace DongYingAPI.Controllers.api
                                 CollateralCirculation = Convert.ToDecimal(Math.Round(Convert.ToDouble((num2 - num5) / 1000 * Convert.ToDecimal(0.5703)), 3)),
                                 TerrestrialSource = Convert.ToDecimal(Math.Round(Convert.ToDouble((num3 - num6) / 1000 * Convert.ToDecimal(0.5703)), 3))
                             };
-
+                            if (model.PrimaryCirculation < 0)
+                            {
+                                model.PrimaryCirculation = 0;
+                            }
+                            if (model.CollateralCirculation < 0)
+                            {
+                                model.CollateralCirculation = 0;
+                            }
+                            if (model.TerrestrialSource < 0)
+                            {
+                                model.TerrestrialSource = 0;
+                            }
                             data.Add(model);
 
                         }
@@ -217,7 +239,7 @@ namespace DongYingAPI.Controllers.api
                             if (i == 0)
                             {
                                 //这月
-                                ztime1 = now.AddMonths(-i).ToString("yyyy-MM-dd HH:00:00");
+                                ztime1 = now.AddMonths(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                                 ztime = Convert.ToDateTime(ztime1);
                             }
                             else
diff --git a/DongYingAPI/Controllers/api/GetCarbonFluxController.cs b/DongYingAPI/Controllers/api/GetCarbonFluxController.cs
index c40c453..c1ef7a5 100644
--- a/DongYingAPI/Controllers/api/GetCarbonFluxController.cs
+++ b/DongYingAPI/Controllers/api/GetCarbonFluxController.cs
@@ -42,7 +42,7 @@ namespace DongYingAPI.Controllers.api
                     var list = bll_info.GetModelList("");
                     var now = DateTime.Now;
                 //这个
-                var ztime = now.ToString("yyyy-MM-dd HH:00:00");
+                var ztime = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                 //上个
                 var stime = now.ToString("yyyy-MM-dd 00:00:00");
                 var ltime = DateTime.Now.ToString("yyyyMM");
@@ -139,7 +139,7 @@ namespace DongYingAPI.Controllers.api
                         num6 += aitem.EH;
                     }
                 }
-                decimal? bnum = 0;
+                decimal? bnum = num5-num6;
                     bmodel1.ThreeValue = Math.Round(Convert.ToDecimal(bnum / 1000 * Convert.ToDecimal(0.5703)), 3);
                     tlist.Add(bmodel1);
 
diff --git a/DongYingAPI/Controllers/api/GetCarbonIntensityController.cs b/DongYingAPI/Controllers/api/GetCarbonIntensityController.cs
index 8fccd9c..e5f13c7 100644
--- a/DongYingAPI/Controllers/api/GetCarbonIntensityController.cs
+++ b/DongYingAPI/Controllers/api/GetCarbonIntensityController.cs
@@ -58,7 +58,7 @@ namespace DongYingAPI.Controllers.api
                     if (i == 0)
                     {
                         //这月
-                        ztime1 = now.AddMonths(-i).ToString("yyyy-MM-dd HH:00:00");
+                        ztime1 = now.AddMonths(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                         ztime = Convert.ToDateTime(ztime1);
                     }
                     else
@@ -100,10 +100,12 @@ namespace DongYingAPI.Controllers.api
                     model.ArealCarbon= Convert.ToDecimal(Math.Round(Convert.ToDouble(((num1 - num2) / 1000 * Convert.ToDecimal(0.5703)) / 59000), 3));
                     data.Add(model);
 
+
                 }
                 res.code = 200;
                 res.msg = "成功";
-                res.data = data;
+                var adata=data.OrderBy(x=>x.time).ToList();
+                res.data = adata;
                 
             }
             catch (Exception ex)
diff --git a/DongYingAPI/Controllers/api/GetCarbonMeasureController.cs b/DongYingAPI/Controllers/api/GetCarbonMeasureController.cs
index acdfe8b..975d60d 100644
--- a/DongYingAPI/Controllers/api/GetCarbonMeasureController.cs
+++ b/DongYingAPI/Controllers/api/GetCarbonMeasureController.cs
@@ -60,7 +60,7 @@ namespace DongYingAPI.Controllers
                             if (i == 0)
                             {
                                 //这天
-                                ztime = now.AddDays(-i).ToString("yyyy-MM-dd HH:00:00");
+                                ztime = now.AddHours(-1).AddDays(-i).ToString("yyyy-MM-dd HH:00:00");
                             }
                             else
                             {
@@ -93,6 +93,10 @@ namespace DongYingAPI.Controllers
                             var model = new carbon_measureData();
                             model.time = jtime;
                             model.CarbonValue =Convert.ToDecimal(Math.Round(Convert.ToDouble(((num1 - num2) / 1000 * Convert.ToDecimal(0.5703)) / 100000),3));
+                            if (model.CarbonValue < 0)
+                            {
+                                model.CarbonValue = 0;
+                            }
                             data.Add(model);
 
                         }
@@ -120,7 +124,7 @@ namespace DongYingAPI.Controllers
                             if (i == 0)
                             {
                                 //这月
-                                ztime1 = now.AddMonths(-i).ToString("yyyy-MM-dd HH:00:00");
+                                ztime1 = now.AddMonths(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                                 ztime = Convert.ToDateTime(ztime1);
                             }
                             else
@@ -159,6 +163,10 @@ namespace DongYingAPI.Controllers
                             var model = new carbon_measureData();
                             model.time = jtime;
                             model.CarbonValue = Convert.ToDecimal(Math.Round(Convert.ToDouble(((num1 - num2) / 1000 * Convert.ToDecimal(0.5703)) / 100000), 3));
+                            if (model.CarbonValue < 0)
+                            {
+                                model.CarbonValue = 0;
+                            }
                             data.Add(model);
 
                         }
diff --git a/DongYingAPI/Controllers/api/GetCellRankingController.cs b/DongYingAPI/Controllers/api/GetCellRankingController.cs
index 1316403..6fe5d42 100644
--- a/DongYingAPI/Controllers/api/GetCellRankingController.cs
+++ b/DongYingAPI/Controllers/api/GetCellRankingController.cs
@@ -43,7 +43,7 @@ namespace DongYingAPI.Controllers.api
                     {
                         var now = DateTime.Now;
                         //今天
-                        var ztime = now.ToString("yyyy-MM-dd HH:00:00");
+                        var ztime = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                         //上天
                         var stime = now.ToString("yyyy-MM-dd 00:00:00");
                         var atime = now.ToString("yyyMM");
@@ -84,7 +84,7 @@ namespace DongYingAPI.Controllers.api
                         //科技馆负一层地源热泵
                         var now = DateTime.Now;
                         //今天
-                        var ztime = now.ToString("yyyy-MM-dd HH:00:00");
+                        var ztime = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                         //上天
                         var stime = now.ToString("yyyy-MM-dd 00:00:00");
                         var atime = now.ToString("yyyMM");
@@ -125,7 +125,7 @@ namespace DongYingAPI.Controllers.api
                         //图书馆一楼
                         var now = DateTime.Now;
                         //今天
-                        var ztime = now.ToString("yyyy-MM-dd HH:00:00");
+                        var ztime = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                         //上天
                         var stime = now.ToString("yyyy-MM-dd 00:00:00");
                         var atime = now.ToString("yyyMM");
diff --git a/DongYingAPI/Controllers/api/GetCurrentVoltageController.cs b/DongYingAPI/Controllers/api/GetCurrentVoltageController.cs
index 09b4928..85e5b37 100644
--- a/DongYingAPI/Controllers/api/GetCurrentVoltageController.cs
+++ b/DongYingAPI/Controllers/api/GetCurrentVoltageController.cs
@@ -18,7 +18,7 @@ namespace DongYingAPI.Controllers.api
     public class GetCurrentVoltageController : ApiController
     {
         DataServer.BLL.electricity_data bll = new DataServer.BLL.electricity_data();
-        DataServer.BLL.device_info bll_info = new DataServer.BLL.device_info();
+        DataServer.BLL.electrotherapy_room bll_info = new DataServer.BLL.electrotherapy_room();
         public HttpResponseMessage Post([FromBody] select_switching_room room)
         {
             var res = new get_current_voltage();
@@ -33,17 +33,17 @@ namespace DongYingAPI.Controllers.api
                         var time_count = Convert.ToInt32(DateTime.Now.Hour);
                         for (int i = 0; i < time_count; i++)
                         {
-                            var model=new current_voltageData();
+                            var model=new current_voltageData() { A=0,B=0,C=0 };
                             model.time = DateTime.Now.AddHours(-i).ToString("HH:00");
                             var now=DateTime.Now.AddHours(-i);
-                            var sdate = now.ToString("yyyy-MM-dd HH:00:00");
-                            var edate = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
-
-                            var list = bll_info.GetModelList(" DeviceName='"+ room.name + "'");
-                            var alist= bll.GetModelListDate(" EntireTime >='"+sdate+ "' and EntireTime<'"+edate+"'", time);
+                            var date = now.ToString("yyyy-MM-dd HH:00:00");
+                            //var edate = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
+                            var list = bll_info.GetModelList("Reserve2='" + room.name + "'");
+                            var alist= bll.GetModelListDate(" EntireTime ='"+date+"'", time);
                             foreach (var item in list)
                             {
-                                var list1=alist.Where(x=>x.DeviceId==item.DeviceId).ToList();
+                                var list1=alist.Where(x=>x.DeviceId==item.DeviceId).FirstOrDefault();
+                                
                                 if (list1 == null)
                                 {
                                     model.A = 0;
@@ -52,12 +52,9 @@ namespace DongYingAPI.Controllers.api
                                 }
                                 else
                                 {
-                                    foreach (var aitem in list1)
-                                    {
-                                        model.A = aitem.Ia;
-                                        model.B = aitem.Ib;
-                                        model.C = aitem.Ic;
-                                    }
+                                    model.A += list1.Ia;
+                                    model.B += list1.Ib;
+                                    model.C += list1.Ic;
                                 }
                                
                             }
@@ -73,15 +70,15 @@ namespace DongYingAPI.Controllers.api
                         var time_count = Convert.ToInt32(DateTime.Now.Hour);
                         for (int i = 0; i < time_count; i++)
                         {
-                            var model = new current_voltageData();
+                            var model = new current_voltageData() { A = 0, B = 0, C = 0 };
                             model.time = DateTime.Now.AddHours(-i).ToString("HH:00");
                             var now = DateTime.Now.AddHours(-i);
-                            var sdate = now.ToString("yyyy-MM-dd HH:00:00");
-                            var edate = now.AddHours(-i + 1).ToString("yyyy-MM-dd HH:00:00");
-                            var list = bll_info.GetModelList("").Where(x => x.DeviceName == room.name).ToList();
+                            var date = now.ToString("yyyy-MM-dd HH:00:00");
+                            //var edate = now.AddHours(-i + 1).ToString("yyyy-MM-dd HH:00:00");
+                            var list = bll_info.GetModelList("").Where(x => x.Reserve2 == room.name).ToList();
                             foreach (var item in list)
                             {
-                                var list1 = bll.GetModelListDate("", time).Where(x => x.EntireTime >= Convert.ToDateTime(sdate) && x.EntireTime < Convert.ToDateTime(edate));
+                                var list1 = bll.GetModelListDate("", time).Where(x => x.EntireTime == Convert.ToDateTime(date) );
                                 if (list1 == null)
                                 {
                                     model.A = 0;
@@ -92,17 +89,18 @@ namespace DongYingAPI.Controllers.api
                                 {
                                     foreach (var aitem in list1)
                                     {
-                                        model.A = aitem.Ia;
-                                        model.B = aitem.Ib;
-                                        model.C = aitem.Ic;
+                                        model.A += aitem.Ia;
+                                        model.B += aitem.Ib;
+                                        model.C += aitem.Ic;
                                     }
                                 }
                             }
                             data.Add(model);
                         }
+                        var adata=data.OrderBy(x=>x.time).ToList();
                         res.code = 200;
                         res.msg = "成功";
-                        res.data = data;
+                        res.data = adata;
                     }
                 }
                 else
diff --git a/DongYingAPI/Controllers/api/GetDailyElectricityController.cs b/DongYingAPI/Controllers/api/GetDailyElectricityController.cs
index de8a1b1..195e334 100644
--- a/DongYingAPI/Controllers/api/GetDailyElectricityController.cs
+++ b/DongYingAPI/Controllers/api/GetDailyElectricityController.cs
@@ -43,7 +43,7 @@ namespace DongYingAPI.Controllers.api
                 }
                 #endregion
                 //今天
-                var sdate = DateTime.Now.ToString("yyyy-MM-dd HH:00:00");
+                var sdate = DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                 //昨天
                 var edate = DateTime.Now.ToString("yyyy-MM-dd 00:00:00");
                 //前天
diff --git a/DongYingAPI/Controllers/api/GetDistributionPowerController.cs b/DongYingAPI/Controllers/api/GetDistributionPowerController.cs
index c074ed0..d0333af 100644
--- a/DongYingAPI/Controllers/api/GetDistributionPowerController.cs
+++ b/DongYingAPI/Controllers/api/GetDistributionPowerController.cs
@@ -17,7 +17,7 @@ namespace DongYingAPI.Controllers.api
     public class GetDistributionPowerController : ApiController
     {
         DataServer.BLL.electricity_data bll = new DataServer.BLL.electricity_data();
-        DataServer.BLL.device_info bll_info = new DataServer.BLL.device_info();
+        DataServer.BLL.electrotherapy_room bll_info = new DataServer.BLL.electrotherapy_room();
 
         public HttpResponseMessage Post([FromBody] select_switching_name room)
         {
@@ -27,26 +27,38 @@ namespace DongYingAPI.Controllers.api
                 if (!string.IsNullOrEmpty(room.name))
                 {
                     var data = new List<distribution_powerData>();
-                    var list = bll_info.GetModelList("").Where(x => x.DeviceName == room.name).ToList();
+                    var list = bll_info.GetModelList("").Where(x => x.Reserve2 == room.name).ToList();
                     var time = DateTime.Now.ToString("yyyyMM");
                     var time_count = Convert.ToInt32(DateTime.Now.Hour);
                     for (int i = 0; i < time_count; i++)
                     {
-                        var model=new distribution_powerData();
-                        model.time = DateTime.Now.AddHours(-i).ToString("HH:00");
+                        var model=new distribution_powerData() { TP=0,YP=0};
+                        model.Ttime = DateTime.Now.AddHours(-i).ToString("HH:00");
+                        model.Ytime = DateTime.Now.AddDays(-i).AddHours(-i).ToString("HH:00");
                         var now = DateTime.Now;
+                        var ynow=DateTime.Now.AddDays(-1);
                         var sdate = now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
                         var edate = now.AddHours(-i + 1).ToString("yyyy-MM-dd HH:00:00");
+                        var ysdate = ynow.AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
+                        var yedate = ynow.AddHours(-i + 1).ToString("yyyy-MM-dd HH:00:00");
                         decimal? num = 0;
+                        decimal? ynum = 0;
                         var list1= bll.GetModelListDate(" EntireTime>='"+ sdate + "' and EntireTime<'"+ edate + "'", time);
+                        var list2 = bll.GetModelListDate(" EntireTime>='" + ysdate + "' and EntireTime<'" + yedate + "'", time);
                         foreach (var item in list)
                         {
                             var alist = list1.Where(x => x.DeviceId == item.DeviceId);
+                            var blist=list2.Where(x=>x.DeviceId== item.DeviceId);
                             foreach (var aitem in alist)
                             {
-                                num += aitem.EH;
+                                num += aitem.P;
                             }
-                            model.P = num;
+                            foreach (var bitem in blist)
+                            {
+                                ynum += bitem.P;
+                            }
+                            model.TP = num;
+                            model.YP= ynum;
                         }
                     
                         data.Add(model);
diff --git a/DongYingAPI/Controllers/api/GetElectricEquipmentController.cs b/DongYingAPI/Controllers/api/GetElectricEquipmentController.cs
index 08a81cf..cc4b748 100644
--- a/DongYingAPI/Controllers/api/GetElectricEquipmentController.cs
+++ b/DongYingAPI/Controllers/api/GetElectricEquipmentController.cs
@@ -31,7 +31,7 @@ namespace DongYingAPI.Controllers.api
                 #region 日期
                 //今天
                 var now = DateTime.Now;
-                var jdate = DateTime.Now.ToString("yyyy-MM-dd HH:00:00");
+                var jdate = DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                 var jtime = now.ToString("yyyyMM");
                 var a = bll.IsExistsTable(date_base, "electricity_data_" + jtime);
                 if (a == false)
diff --git a/DongYingAPI/Controllers/api/GetElectricQuantityController.cs b/DongYingAPI/Controllers/api/GetElectricQuantityController.cs
index 8076867..1a9d83f 100644
--- a/DongYingAPI/Controllers/api/GetElectricQuantityController.cs
+++ b/DongYingAPI/Controllers/api/GetElectricQuantityController.cs
@@ -33,7 +33,7 @@ namespace DongYingAPI.Controllers.api
                     if (date == "日")
                     {
                         var time_count = Convert.ToInt32(DateTime.Now.Hour);
-                        for (int i = 0; i < time_count; i++)
+                        for (int i = 1; i < time_count; i++)
                         {
                             // 只处理今年的数据
                             if (DateTime.Now.AddHours(-i).Day != DateTime.Now.Day)
@@ -76,6 +76,10 @@ namespace DongYingAPI.Controllers.api
                                     time = Convert.ToDateTime(jdate).ToString("HH:00"),
                                     EH = num1 - num2
                                 };
+                                if (model.EH < 0)
+                                {
+                                    model.EH = 0;
+                                }
                                 data.Add(model);
                             }
 
@@ -96,7 +100,7 @@ namespace DongYingAPI.Controllers.api
                             string jdate;
                             if (i == 0)
                             {
-                                jdate = now.AddDays(-i).ToString("yyyy-MM-dd HH:00:00");
+                                jdate = now.AddDays(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                             }
                             else
                             {
@@ -122,7 +126,7 @@ namespace DongYingAPI.Controllers.api
                             var model = new electric_quantityData(); 
                             model.time = DateTime.Now.AddDays(-i).ToString("MM-dd");
                             model.EH = num1 - num2;
-                            if (model.EH > 0)
+                            if (model.EH < 0)
                             {
                                 model.EH = 0;
                             }
@@ -142,7 +146,7 @@ namespace DongYingAPI.Controllers.api
                             DateTime jdate;
                             if (i == 0)
                             {
-                                var jdate1 = now.AddMonths(-i).ToString("yyyy-MM-dd HH:00:00");
+                                var jdate1 = now.AddMonths(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                                 jdate = Convert.ToDateTime(jdate1);
                             }
                             else
@@ -173,7 +177,7 @@ namespace DongYingAPI.Controllers.api
                             var model = new electric_quantityData(); ;
                             model.time = jdate.ToString("MM月");
                             model.EH = num1 - num2;
-                            if (model.EH > 0)
+                            if (model.EH <0)
                             {
                                 model.EH = 0;
                             }
diff --git a/DongYingAPI/Controllers/api/GetElectricalConditionController.cs b/DongYingAPI/Controllers/api/GetElectricalConditionController.cs
index f0ad804..d538b3f 100644
--- a/DongYingAPI/Controllers/api/GetElectricalConditionController.cs
+++ b/DongYingAPI/Controllers/api/GetElectricalConditionController.cs
@@ -31,7 +31,7 @@ namespace DongYingAPI.Controllers.api
                 #region 天
                 //今天
                 var now = DateTime.Now;
-                var jdate = DateTime.Now.ToString("yyyy-MM-dd HH:00:00");
+                var jdate = DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                 var jtime = now.ToString("yyyyMM");
                 var a = bll.IsExistsTable(date_base, "electricity_data_" + jtime);
                 if (a == false)
@@ -70,7 +70,7 @@ namespace DongYingAPI.Controllers.api
                 #endregion
                 #region 月
                 //今月
-                var jmdate = DateTime.Now.ToString("yyyy-MM-dd HH:00:00");
+                var jmdate = DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                 var jmtime = now.ToString("yyyyMM");
                 var am = bll.IsExistsTable(date_base, "electricity_data_" + jmtime);
                 if (am == false)
@@ -87,8 +87,8 @@ namespace DongYingAPI.Controllers.api
                 }
                 //前月
                 var qmdate1 = DateTime.Now.AddMonths(-1).ToString("yyyy-MM-01 00:00:00");
-                var qmdate2=Convert.ToDateTime(qmdate1);
-                var qmdate = qmdate2.AddDays(-1);
+                var qmdate=Convert.ToDateTime(qmdate1);
+                //var qmdate = qmdate2.AddDays(-1);
                 var qmtime = qmdate.ToString("yyyyMM");
                 var qm = bll.IsExistsTable(date_base, "electricity_data_" + qmtime);
                 if (qm == false)
@@ -116,7 +116,7 @@ namespace DongYingAPI.Controllers.api
                 #endregion
                 #region 年
                 //今年
-                var jydate = DateTime.Now.ToString("yyyy-MM-dd HH:00:00");
+                var jydate = DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                 var jytime = now.ToString("yyyyMM");
                 var ay = bll.IsExistsTable(date_base, "electricity_data_" + jytime);
                 if (ay == false)
@@ -197,14 +197,14 @@ namespace DongYingAPI.Controllers.api
                 }
                 else
                 {
-                    model.DayDency = model.ToDay /model.YearDay * 100;
+                    model.DayDency =Convert.ToDecimal( Math.Round(Convert.ToDouble(model.YearDency /model.ToDay * 100),3));
                     if (model.DayDency < 0)
                     {
                         model.DayDency = model.DayDency * -1;
                     }
                     if (model.ToDay < model.DayDency)
                     {
-                        model.DayDency = model.DayDency;
+                        model.DayDency = model.DayDency*-1;
                     }
                 }
                 if (model.LastMonth == 0)
@@ -213,14 +213,14 @@ namespace DongYingAPI.Controllers.api
                 }
                 else
                 {
-                    model.MonthDency = model.ToDay / model.YearDay * 100;
-                    if (model.DayDency < 0)
+                    model.MonthDency =Convert.ToDecimal(Math.Round(Convert.ToDouble( model.LastMonth / model.ThisMonth * 100),3));
+                    if (model.MonthDency < 0)
                     {
-                        model.DayDency = model.DayDency * -1;
+                        model.MonthDency = model.MonthDency * -1;
                     }
                     if (model.ThisMonth < model.LastMonth)
                     {
-                        model.DayDency = model.DayDency;
+                        model.MonthDency = model.MonthDency*-1;
                     }
                 }
                 if (model.LastYear == 0)
@@ -229,14 +229,14 @@ namespace DongYingAPI.Controllers.api
                 }
                 else
                 {
-                    model.YearDency = model.ToDay / model.YearDay * 100;
-                    if (model.DayDency < 0)
+                    model.YearDency = Convert.ToDecimal(Math.Round(Convert.ToDouble(model.LastYear / model.MonthDency * 100), 3));
+                    if (model.YearDency < 0)
                     {
-                        model.DayDency = model.DayDency * -1;
+                        model.YearDency = model.YearDency * -1;
                     }
                     if (model.ThisYear < model.LastYear)
                     {
-                        model.DayDency = model.DayDency;
+                        model.YearDency = model.YearDency*-1;
                     }
                 }
                 data.Add(model);
diff --git a/DongYingAPI/Controllers/api/GetElectricalRankingController.cs b/DongYingAPI/Controllers/api/GetElectricalRankingController.cs
index a5572b6..ffd6216 100644
--- a/DongYingAPI/Controllers/api/GetElectricalRankingController.cs
+++ b/DongYingAPI/Controllers/api/GetElectricalRankingController.cs
@@ -31,7 +31,7 @@ namespace DongYingAPI.Controllers.api
                 #region 日期
                 //今天
                 var now = DateTime.Now;
-                var jdate = DateTime.Now.ToString("yyyy-MM-dd HH:00:00");
+                var jdate = DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                 var jtime = now.ToString("yyyyMM");
                 var a = bll.IsExistsTable(date_base, "electricity_data_" + jtime);
                 if (a == false)
diff --git a/DongYingAPI/Controllers/api/GetElectricityConsumptionController.cs b/DongYingAPI/Controllers/api/GetElectricityConsumptionController.cs
index 507f988..4c195b9 100644
--- a/DongYingAPI/Controllers/api/GetElectricityConsumptionController.cs
+++ b/DongYingAPI/Controllers/api/GetElectricityConsumptionController.cs
@@ -37,7 +37,7 @@ namespace DongYingAPI.Controllers
                     if (date == "日")
                     {
                         var time_count =Convert.ToInt32(DateTime.Now.Hour);
-                        for (int i = 0; i < time_count; i++)
+                        for (int i = 1; i < time_count; i++)
                         {
                             var jdate = now.AddHours(-i).ToString("yyyy-MM-dd HH:00:00");
                             // 只处理今天的数据
@@ -103,7 +103,7 @@ namespace DongYingAPI.Controllers
                             string jdate;
                             if (i == 0)
                             {
-                                jdate = now.AddDays(-i).ToString("yyyy-MM-dd HH:00:00");
+                                jdate = now.AddDays(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                             }
                             else
                             {
@@ -154,7 +154,7 @@ namespace DongYingAPI.Controllers
                             DateTime jdate;
                             if (i == 0)
                             {
-                                var jdate1 = now.AddMonths(-i).ToString("yyyy-MM-dd HH:00:00");
+                                var jdate1 = now.AddMonths(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                                 jdate = Convert.ToDateTime(jdate1);
                             }
                             else
diff --git a/DongYingAPI/Controllers/api/GetEnergyTrendsController.cs b/DongYingAPI/Controllers/api/GetEnergyTrendsController.cs
index edc4e83..a5caafb 100644
--- a/DongYingAPI/Controllers/api/GetEnergyTrendsController.cs
+++ b/DongYingAPI/Controllers/api/GetEnergyTrendsController.cs
@@ -34,7 +34,7 @@ namespace DongYingAPI.Controllers.api
                     if (date == "日")
                     {
                         var time_count = Convert.ToInt32(DateTime.Now.Hour);
-                        for (int i = 0; i < time_count; i++)
+                        for (int i = 1; i < time_count; i++)
                         {
                             // 只处理今年的数据
                             if (DateTime.Now.AddHours(-i).Day != DateTime.Now.Day)
@@ -68,6 +68,10 @@ namespace DongYingAPI.Controllers.api
                                 time = DateTime.Now.AddHours(-i).ToString("HH:00"),
                                 EH = num1 - num2
                         };
+                            if (model.EH < 0)
+                            {
+                                model.EH = 0;
+                            }
                             data.Add(model);
                         }
 
@@ -86,7 +90,7 @@ namespace DongYingAPI.Controllers.api
                             string jdate;
                             if (i == 0)
                             {
-                                jdate = now.AddDays(-i).ToString("yyyy-MM-dd HH:00:00");
+                                jdate = now.AddDays(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                             }
                             else
                             {
@@ -119,6 +123,10 @@ namespace DongYingAPI.Controllers.api
                                 time = DateTime.Now.AddDays(-i).ToString("MM-dd"),
                                 EH = num1 - num2
                             };
+                            if (model.EH < 0)
+                            {
+                                model.EH = 0;
+                            }
                             data.Add(model);
                         }
                     }
@@ -135,7 +143,7 @@ namespace DongYingAPI.Controllers.api
                             DateTime jdate;
                             if (i == 0)
                             {
-                                var jdate1 = now.AddMonths(-i).ToString("yyyy-MM-dd HH:00:00");
+                                var jdate1 = now.AddMonths(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                                 jdate = Convert.ToDateTime(jdate1);
                             }
                             else
@@ -173,6 +181,10 @@ namespace DongYingAPI.Controllers.api
                                 time = jdate.ToString("MM月"),
                             EH = num1 - num2
                             };
+                            if (model.EH < 0)
+                            {
+                                model.EH = 0;
+                            }
                             data.Add(model);
                         }
                     }
diff --git a/DongYingAPI/Controllers/api/GetEquipmentMonitoringController.cs b/DongYingAPI/Controllers/api/GetEquipmentMonitoringController.cs
index c7e2dc3..e8d8356 100644
--- a/DongYingAPI/Controllers/api/GetEquipmentMonitoringController.cs
+++ b/DongYingAPI/Controllers/api/GetEquipmentMonitoringController.cs
@@ -44,7 +44,7 @@ namespace DongYingAPI.Controllers.api
                     {
                         var now = DateTime.Now;
                         //今天
-                        var ztime = now.ToString("yyyy-MM-dd HH:00:00");
+                        var ztime = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                         //上天
                         var stime = now.ToString("yyyy-MM-dd 00:00:00");
                         var atime = now.ToString("yyyMM");
diff --git a/DongYingAPI/Controllers/api/GetEssentialInformationController.cs b/DongYingAPI/Controllers/api/GetEssentialInformationController.cs
index 8410f7a..d8d7cb7 100644
--- a/DongYingAPI/Controllers/api/GetEssentialInformationController.cs
+++ b/DongYingAPI/Controllers/api/GetEssentialInformationController.cs
@@ -1,4 +1,5 @@
 using DataServer.api;
+using Microsoft.Ajax.Utilities;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
@@ -25,12 +26,12 @@ namespace DongYingAPI.Controllers.api
                 {
                     var data = new List<essential_informationData>();
                     
-                    var list=bll.GetModelList("").Where(x=>x.DeviceName== room.name).ToList();
+                    var list=bll.GetModelList("").Where(x=>x.Reserve2== room.name).ToList();
                     foreach (var item in list)
                     {
                         var model1 = new essential_informationData();
                         model1.name = "设备名称";
-                        model1.value = item.DeviceName;
+                        model1.value = item.Reserve1;
                         data.Add(model1);
                         var model2 = new essential_informationData();
                         model2.name = "设备型号";
@@ -57,9 +58,10 @@ namespace DongYingAPI.Controllers.api
                         model7.value = item.OperationalCondition;
                         data.Add(model7);
                     }
+                    var adata=data.DistinctBy(x=>x.name).ToList();
                     res.code = 200;
                     res.msg = "成功";
-                    res.data = data;
+                    res.data = adata;
                 }
                 else
                 {
diff --git a/DongYingAPI/Controllers/api/GetGeneralCatalogueController.cs b/DongYingAPI/Controllers/api/GetGeneralCatalogueController.cs
index 14d8e1d..8579d11 100644
--- a/DongYingAPI/Controllers/api/GetGeneralCatalogueController.cs
+++ b/DongYingAPI/Controllers/api/GetGeneralCatalogueController.cs
@@ -35,7 +35,7 @@ namespace DongYingAPI.Controllers.api
                     {
                         var now = DateTime.Now;
                         DateTime jdate;
-                       var jdate1 = now.ToString("yyyy-MM-dd HH:00:00");
+                       var jdate1 = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                         jdate = Convert.ToDateTime(jdate1);
 
                         var jtime = jdate.ToString("yyyyMM");
@@ -77,7 +77,7 @@ namespace DongYingAPI.Controllers.api
                     {
                         var now = DateTime.Now;
                         DateTime jdate;
-                        var jdate1 = now.ToString("yyyy-MM-dd HH:00:00");
+                        var jdate1 = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                         jdate = Convert.ToDateTime(jdate1);
 
                         var jtime = jdate.ToString("yyyyMM");
diff --git a/DongYingAPI/Controllers/api/GetRealtimeDataController.cs b/DongYingAPI/Controllers/api/GetRealtimeDataController.cs
index 94b021c..e1d8b56 100644
--- a/DongYingAPI/Controllers/api/GetRealtimeDataController.cs
+++ b/DongYingAPI/Controllers/api/GetRealtimeDataController.cs
@@ -19,7 +19,7 @@ namespace DongYingAPI.Controllers.api
     public class GetRealtimeDataController : ApiController
     {
         DataServer.BLL.electricity_data bll = new DataServer.BLL.electricity_data();
-        DataServer.BLL.device_info bll_info = new DataServer.BLL.device_info();
+        DataServer.BLL.electrotherapy_room bll_info = new DataServer.BLL.electrotherapy_room();
 
         public HttpResponseMessage Post([FromBody] select_switching_name room)
         {
@@ -33,43 +33,45 @@ namespace DongYingAPI.Controllers.api
                     var time = DateTime.Now.ToString("yyyyMM");
                     var sdate=DateTime.Now.ToString("yyyy-MM-dd 00:00:00");
                     var edate=DateTime.Now.AddDays(1).ToString("yyyy-MM-dd 00:00:00");
-                    var list1=bll_info.GetModelList(" DeviceName='"+room.name+"'");
+                    var list1=bll_info.GetModelList(" Reserve2='"+room.name+"'");
                     var llist = bll.GetModelListDate("CreateTime>='" + sdate + "' and CreateTime<'" + edate + "'", time);
                     var alist = bll.GetModelListDate("CreateTime>='" + sdate + "' and CreateTime<'" + edate + "'", time);
+                    var model = new realtime_dataData() { P = 0, LoadRate = 0, ConversionRate = 0 };
                     foreach (var bitem in list1)
                     {
                         var list = llist.Where(x=>x.DeviceId==bitem.DeviceId).ToList();
                         
                         if (list.Count == 0)
                         {
-                            var model = new realtime_dataData();
-                            model.P = 0;
-                            model.LoadRate = 0;
-                            model.ConversionRate =0;
-                            model.DeviceState = 0;
-                            data.Add(model);
+                            var amodel = new realtime_dataData();
+                            amodel.P = 0;
+                            amodel.LoadRate = 0;
+                            amodel.ConversionRate =0;
+                            amodel.DeviceState = 0;
+                            data.Add(amodel);
                         }
                         else
                         {
                             foreach (var item in list)
                             {
-                                var model = new realtime_dataData();
-                                model.P = item.P;
+                                model.P += item.P;
                                 decimal? num = 0;
                                 foreach (var aitem in alist)
                                 {
                                     num += aitem.P;
                                 }
                                 var cnum = Math.Round(Convert.ToDouble(item.P) / Convert.ToDouble(num), 3);
-                                model.LoadRate = Convert.ToDecimal(cnum) * 100;
-                                model.ConversionRate = Math.Round(Convert.ToDecimal(5.5) / Convert.ToDecimal(item.EH), 3) * 100;
+                                model.LoadRate += Convert.ToDecimal(cnum) * 100;
+                                model.ConversionRate += Math.Round(Convert.ToDecimal(5.5) / Convert.ToDecimal(item.EH), 3) * 100;
                                 model.DeviceState = 1;
-                                data.Add(model);
                             }
+                           
+
                         }
-                     
-                        
+
+
                     }
+                    data.Add(model);
                     res.code = 200;
                     res.msg = "成功";
                     res.data = data;
diff --git a/DongYingAPI/Controllers/api/GetRealtimeLoadController.cs b/DongYingAPI/Controllers/api/GetRealtimeLoadController.cs
index 0e6f724..c3a1243 100644
--- a/DongYingAPI/Controllers/api/GetRealtimeLoadController.cs
+++ b/DongYingAPI/Controllers/api/GetRealtimeLoadController.cs
@@ -39,6 +39,10 @@ namespace DongYingAPI.Controllers.api
                     num += item.P;
                 }
                 model.P = num;
+                if(model.P == null)
+                {
+                    model.P = 0;
+                }
                 data.Add(model);
                 res.code = 200;
                 res.msg = "成功";
diff --git a/DongYingAPI/Controllers/api/GetRoomElectricityController.cs b/DongYingAPI/Controllers/api/GetRoomElectricityController.cs
index ae558ba..1d72369 100644
--- a/DongYingAPI/Controllers/api/GetRoomElectricityController.cs
+++ b/DongYingAPI/Controllers/api/GetRoomElectricityController.cs
@@ -37,7 +37,7 @@ namespace DongYingAPI.Controllers.api
                         if (date == "日")
                         {
                             var time_count = Convert.ToInt32(DateTime.Now.Hour);
-                            for (int i = 0; i < time_count; i++)
+                            for (int i = 1; i < time_count; i++)
                             {
                                 // 只处理今年的数据
                                 if (DateTime.Now.AddHours(-i).Day != DateTime.Now.Day)
@@ -93,7 +93,7 @@ namespace DongYingAPI.Controllers.api
                                 string jdate;
                                 if (i == 0)
                                 {
-                                    jdate = now.AddDays(-i).ToString("yyyy-MM-dd HH:00:00");
+                                    jdate = now.AddDays(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                                 }
                                 else
                                 {
@@ -128,6 +128,10 @@ namespace DongYingAPI.Controllers.api
                                     time = DateTime.Now.AddDays(-i).ToString("MM-dd"),
                                     EH = num1 - num2
                                 };
+                                if (model.EH < 0)
+                                {
+                                    model.EH = 0;
+                                }
                                 data.Add(model);
                             }
                         }
@@ -144,7 +148,7 @@ namespace DongYingAPI.Controllers.api
                                 DateTime jdate;
                                 if (i == 0)
                                 {
-                                    var jdate1 = now.AddMonths(-i).ToString("yyyy-MM-dd HH:00:00");
+                                    var jdate1 = now.AddMonths(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                                     jdate = Convert.ToDateTime(jdate1);
                                 }
                                 else
@@ -184,6 +188,10 @@ namespace DongYingAPI.Controllers.api
                                     time = DateTime.Now.AddMonths(-i).ToString("MM月"),
                                     EH = num1 - num2
                                 };
+                                if (model.EH < 0)
+                                {
+                                    model.EH = 0;
+                                }
                                 data.Add(model);
                             }
                         }
@@ -200,7 +208,7 @@ namespace DongYingAPI.Controllers.api
                         if (date == "日")
                         {
                             var time_count = Convert.ToInt32(DateTime.Now.Hour);
-                            for (int i = 0; i < time_count; i++)
+                            for (int i = 1; i < time_count; i++)
                             {
                                 // 只处理今年的数据
                                 if (DateTime.Now.AddHours(-i).Day != DateTime.Now.Day)
@@ -256,7 +264,7 @@ namespace DongYingAPI.Controllers.api
                                 string jdate;
                                 if (i == 0)
                                 {
-                                    jdate = now.AddDays(-i).ToString("yyyy-MM-dd HH:00:00");
+                                    jdate = now.AddDays(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                                 }
                                 else
                                 {
@@ -291,6 +299,10 @@ namespace DongYingAPI.Controllers.api
                                     time = DateTime.Now.AddDays(-i).ToString("MM-dd"),
                                     EH = num1 - num2
                                 };
+                                if (model.EH < 0)
+                                {
+                                    model.EH = 0;
+                                }
                                 data.Add(model);
                             }
                         }
@@ -307,7 +319,7 @@ namespace DongYingAPI.Controllers.api
                                 DateTime jdate;
                                 if (i == 0)
                                 {
-                                    var jdate1 = now.AddMonths(-i).ToString("yyyy-MM-dd HH:00:00");
+                                    var jdate1 = now.AddMonths(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                                     jdate = Convert.ToDateTime(jdate1);
                                 }
                                 else
@@ -347,6 +359,10 @@ namespace DongYingAPI.Controllers.api
                                     time = DateTime.Now.AddMonths(-i).ToString("MM月"),
                                     EH = num1 - num2
                                 };
+                                if (model.EH < 0)
+                                {
+                                    model.EH = 0;
+                                }
                                 data.Add(model);
                             }
                         }
@@ -363,7 +379,7 @@ namespace DongYingAPI.Controllers.api
                         if (date == "日")
                         {
                             var time_count = Convert.ToInt32(DateTime.Now.Hour);
-                            for (int i = 0; i < time_count; i++)
+                            for (int i = 1; i < time_count; i++)
                             {
                                 // 只处理今年的数据
                                 if (DateTime.Now.AddHours(-i).Day != DateTime.Now.Day)
@@ -400,7 +416,10 @@ namespace DongYingAPI.Controllers.api
                                     time = DateTime.Now.AddHours(-i).ToString("HH:00"),
                                     EH = num1 - num2
                                 };
-
+                                if (model.EH < 0)
+                                {
+                                    model.EH = 0;
+                                }
                                 data.Add(model);
                             }
 
@@ -419,7 +438,7 @@ namespace DongYingAPI.Controllers.api
                                 string jdate;
                                 if (i == 0)
                                 {
-                                    jdate = now.AddDays(-i).ToString("yyyy-MM-dd HH:00:00");
+                                    jdate = now.AddDays(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                                 }
                                 else
                                 {
@@ -454,6 +473,10 @@ namespace DongYingAPI.Controllers.api
                                     time = DateTime.Now.AddDays(-i).ToString("MM-dd"),
                                     EH = num1 - num2
                                 };
+                                if (model.EH < 0)
+                                {
+                                    model.EH = 0;
+                                }
                                 data.Add(model);
                             }
                         }
@@ -470,7 +493,7 @@ namespace DongYingAPI.Controllers.api
                                 DateTime jdate;
                                 if (i == 0)
                                 {
-                                    var jdate1 = now.AddMonths(-i).ToString("yyyy-MM-dd HH:00:00");
+                                    var jdate1 = now.AddMonths(-i).AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                                     jdate = Convert.ToDateTime(jdate1);
                                 }
                                 else
@@ -510,6 +533,10 @@ namespace DongYingAPI.Controllers.api
                                     time = DateTime.Now.AddMonths(-i).ToString("MM月"),
                                     EH = num1 - num2
                                 };
+                                if (model.EH < 0)
+                                {
+                                    model.EH = 0;
+                                }
                                 data.Add(model);
                             }
                         }
diff --git a/DongYingAPI/Controllers/api/GetRunningStatusController.cs b/DongYingAPI/Controllers/api/GetRunningStatusController.cs
index 4014709..d4a1a9b 100644
--- a/DongYingAPI/Controllers/api/GetRunningStatusController.cs
+++ b/DongYingAPI/Controllers/api/GetRunningStatusController.cs
@@ -30,7 +30,7 @@ namespace DongYingAPI.Controllers.api
                 var now=DateTime.Now;
                 var list = bll_info.GetModelList(" FloorName='科技馆负一层地源热泵'").ToList();
                 string jdate;
-                jdate = now.ToString("yyyy-MM-dd HH:00:00");
+                jdate = now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00");
                 var jtime = now.ToString("yyyyMM");
                 var a = bll.IsExistsTable(date_base, "electricity_data_" + jtime);
                 if (a == false)
diff --git a/DongYingAPI/Controllers/api/SetLightingController.cs b/DongYingAPI/Controllers/api/SetLightingController.cs
index 82ca988..021ac80 100644
--- a/DongYingAPI/Controllers/api/SetLightingController.cs
+++ b/DongYingAPI/Controllers/api/SetLightingController.cs
@@ -139,6 +139,7 @@ namespace DongYingAPI.Controllers.api
                         var model = new DataServer.Model.lighting_control();
                         model.LightingId = listmodel.LightingId;
                         model.LightingName = listmodel.LightingName;
+                        model.LightingIndex= listmodel.LightingIndex;
                         if (value == Convert.ToString("0"))
                         {
                             model.LightingState = Convert.ToString("0");
@@ -185,7 +186,14 @@ namespace DongYingAPI.Controllers.api
                         {
                             lighting = Convert.ToString("80");
                         }
-
+                        if (value == Convert.ToString("9"))
+                        {
+                            lighting = Convert.ToString("90");
+                        }
+                        if (value == Convert.ToString("10"))
+                        {
+                            lighting = Convert.ToString("100");
+                        }
                         #endregion
                         model.LightingBrightness = lighting;
                         bll.Update(model);
diff --git a/DongYingAPI/DongYingAPI.csproj.user b/DongYingAPI/DongYingAPI.csproj.user
index 87c7a36..70f6263 100644
--- a/DongYingAPI/DongYingAPI.csproj.user
+++ b/DongYingAPI/DongYingAPI.csproj.user
@@ -8,7 +8,7 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <NameOfLastUsedPublishProfile>E:\林谷项目\东营两馆一宫\后端框架\DongYing\DongYingAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile>
     <Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
     <Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>
diff --git a/DongYingAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user b/DongYingAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
index dee080a..dba1fb3 100644
--- a/DongYingAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
+++ b/DongYingAPI/Properties/PublishProfiles/FolderProfile1.pubxml.user
@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <_PublishTargetUrl>E:\林谷项目\东营两馆一宫\后端框架\DongYing\DongYingAPI\bin\app.publish\</_PublishTargetUrl>
-    <History>True|2024-02-04T06:00:33.8555838Z;True|2024-02-02T14:35:29.9414639+08:00;True|2024-02-01T14:38:16.2460751+08:00;True|2024-02-01T13:56:20.6256272+08:00;True|2024-02-01T10:10:55.0739031+08:00;True|2024-02-01T09:46:59.8042783+08:00;True|2024-02-01T09:23:48.9652035+08:00;True|2024-01-31T16:21:08.6583762+08:00;True|2024-01-31T13:41:30.5192673+08:00;True|2024-01-30T15:15:26.7880164+08:00;True|2024-01-30T14:10:09.8489640+08:00;True|2024-01-30T13:16:11.0447202+08:00;True|2024-01-30T09:45:36.4140361+08:00;True|2024-01-29T14:17:38.5560371+08:00;True|2024-01-29T14:16:41.5597407+08:00;True|2024-01-24T17:31:19.5804558+08:00;True|2024-01-20T14:34:47.0539217+08:00;False|2024-01-15T13:49:44.5332318+08:00;True|2024-01-15T11:01:00.7602516+08:00;True|2024-01-15T09:26:27.2161156+08:00;True|2024-01-10T17:34:07.8440850+08:00;False|2024-01-10T17:33:54.1670007+08:00;True|2024-01-10T17:32:39.4867251+08:00;True|2024-01-10T14:45:12.0400450+08:00;</History>
+    <History>True|2024-02-05T09:53:57.0306881Z;True|2024-02-05T15:03:29.8538142+08:00;True|2024-02-05T10:05:19.3967649+08:00;True|2024-02-04T14:00:33.8555838+08:00;True|2024-02-02T14:35:29.9414639+08:00;True|2024-02-01T14:38:16.2460751+08:00;True|2024-02-01T13:56:20.6256272+08:00;True|2024-02-01T10:10:55.0739031+08:00;True|2024-02-01T09:46:59.8042783+08:00;True|2024-02-01T09:23:48.9652035+08:00;True|2024-01-31T16:21:08.6583762+08:00;True|2024-01-31T13:41:30.5192673+08:00;True|2024-01-30T15:15:26.7880164+08:00;True|2024-01-30T14:10:09.8489640+08:00;True|2024-01-30T13:16:11.0447202+08:00;True|2024-01-30T09:45:36.4140361+08:00;True|2024-01-29T14:17:38.5560371+08:00;True|2024-01-29T14:16:41.5597407+08:00;True|2024-01-24T17:31:19.5804558+08:00;True|2024-01-20T14:34:47.0539217+08:00;False|2024-01-15T13:49:44.5332318+08:00;True|2024-01-15T11:01:00.7602516+08:00;True|2024-01-15T09:26:27.2161156+08:00;True|2024-01-10T17:34:07.8440850+08:00;False|2024-01-10T17:33:54.1670007+08:00;True|2024-01-10T17:32:39.4867251+08:00;True|2024-01-10T14:45:12.0400450+08:00;</History>
     <LastFailureDetails />
   </PropertyGroup>
   <ItemGroup>
@@ -79,16 +79,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
       <publishTime>09/10/2013 16:29:20</publishTime>
     </File>
     <File Include="bin/DataServer.dll">
-      <publishTime>02/04/2024 14:59:16</publishTime>
+      <publishTime>02/20/2024 09:43:27</publishTime>
     </File>
     <File Include="bin/DataServer.pdb">
-      <publishTime>02/04/2024 14:59:16</publishTime>
+      <publishTime>02/20/2024 09:43:27</publishTime>
     </File>
     <File Include="bin/DongYingAPI.dll">
-      <publishTime>02/04/2024 15:16:18</publishTime>
+      <publishTime>02/20/2024 17:11:31</publishTime>
     </File>
     <File Include="bin/DongYingAPI.pdb">
-      <publishTime>02/04/2024 15:16:18</publishTime>
+      <publishTime>02/20/2024 17:11:31</publishTime>
     </File>
     <File Include="bin/HslCommunication.dll">
       <publishTime>08/03/2021 14:52:26</publishTime>
@@ -364,7 +364,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
       <publishTime>02/01/2024 10:10:25</publishTime>
     </File>
     <File Include="Controllers/api/EnergyEfficiency/GetDeviceOperationController.cs">
-      <publishTime>01/31/2024 18:28:03</publishTime>
+      <publishTime>02/20/2024 10:58:53</publishTime>
     </File>
     <File Include="Controllers/api/EnergyEfficiency/GetElectricityPriceController.cs">
       <publishTime>01/11/2024 14:58:40</publishTime>
@@ -373,13 +373,13 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
       <publishTime>01/11/2024 14:56:39</publishTime>
     </File>
     <File Include="Controllers/api/EnergyEfficiency/GetEnergyCalendarController.cs">
-      <publishTime>01/31/2024 18:10:58</publishTime>
+      <publishTime>02/20/2024 14:09:26</publishTime>
     </File>
     <File Include="Controllers/api/EnergyEfficiency/GetEnergyConsumptionController.cs">
       <publishTime>02/02/2024 14:20:48</publishTime>
     </File>
     <File Include="Controllers/api/EnergyEfficiency/GetEnergyFlowController.cs">
-      <publishTime>01/09/2024 18:18:37</publishTime>
+      <publishTime>02/20/2024 16:03:58</publishTime>
     </File>
     <File Include="Controllers/api/EnergyEfficiency/GetEnergyTrendController.cs">
       <publishTime>01/31/2024 18:10:58</publishTime>
@@ -400,16 +400,16 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
       <publishTime>02/01/2024 09:28:11</publishTime>
     </File>
     <File Include="Controllers/api/GetCarbonEmissionController.cs">
-      <publishTime>02/01/2024 17:04:31</publishTime>
+      <publishTime>02/20/2024 14:21:14</publishTime>
     </File>
     <File Include="Controllers/api/GetCarbonFluxController.cs">
-      <publishTime>02/04/2024 13:57:32</publishTime>
+      <publishTime>02/20/2024 14:26:50</publishTime>
     </File>
     <File Include="Controllers/api/GetCarbonIntensityController.cs">
-      <publishTime>02/01/2024 16:43:20</publishTime>
+      <publishTime>02/20/2024 14:35:17</publishTime>
     </File>
     <File Include="Controllers/api/GetCarbonMeasureController.cs">
-      <publishTime>02/01/2024 16:29:09</publishTime>
+      <publishTime>02/20/2024 14:37:50</publishTime>
     </File>
     <File Include="Controllers/api/GetCarbonOffsetController.cs">
       <publishTime>01/10/2024 13:25:43</publishTime>
@@ -418,7 +418,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
       <publishTime>02/01/2024 16:07:45</publishTime>
     </File>
     <File Include="Controllers/api/GetCellRankingController.cs">
-      <publishTime>02/01/2024 16:56:20</publishTime>
+      <publishTime>02/20/2024 14:40:19</publishTime>
     </File>
     <File Include="Controllers/api/GetChamberLoadController.cs">
       <publishTime>02/01/2024 14:54:17</publishTime>
@@ -427,7 +427,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
       <publishTime>02/01/2024 16:43:20</publishTime>
     </File>
     <File Include="Controllers/api/GetDailyElectricityController.cs">
-      <publishTime>02/02/2024 17:28:33</publishTime>
+      <publishTime>02/20/2024 17:07:40</publishTime>
     </File>
     <File Include="Controllers/api/GetDeviceDetailsController.cs">
       <publishTime>02/04/2024 13:59:28</publishTime>
@@ -436,28 +436,28 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
       <publishTime>02/02/2024 15:19:18</publishTime>
     </File>
     <File Include="Controllers/api/GetDistributionPowerController.cs">
-      <publishTime>02/01/2024 15:10:41</publishTime>
+      <publishTime>02/20/2024 09:43:16</publishTime>
     </File>
     <File Include="Controllers/api/GetElectricalConditionController.cs">
-      <publishTime>02/01/2024 16:56:20</publishTime>
+      <publishTime>02/20/2024 16:51:15</publishTime>
     </File>
     <File Include="Controllers/api/GetElectricalRankingController.cs">
-      <publishTime>02/01/2024 16:56:20</publishTime>
+      <publishTime>02/20/2024 14:42:14</publishTime>
     </File>
     <File Include="Controllers/api/GetElectricEquipmentController.cs">
-      <publishTime>02/01/2024 16:56:20</publishTime>
+      <publishTime>02/20/2024 15:04:19</publishTime>
     </File>
     <File Include="Controllers/api/GetElectricityConsumptionController.cs">
-      <publishTime>02/01/2024 16:43:20</publishTime>
+      <publishTime>02/20/2024 15:04:15</publishTime>
     </File>
     <File Include="Controllers/api/GetElectricQuantityController.cs">
-      <publishTime>02/01/2024 16:43:20</publishTime>
+      <publishTime>02/20/2024 16:01:20</publishTime>
     </File>
     <File Include="Controllers/api/GetEnergyTrendsController.cs">
-      <publishTime>02/01/2024 16:43:20</publishTime>
+      <publishTime>02/20/2024 17:06:47</publishTime>
     </File>
     <File Include="Controllers/api/GetEquipmentMonitoringController.cs">
-      <publishTime>02/01/2024 16:56:20</publishTime>
+      <publishTime>02/20/2024 15:11:54</publishTime>
     </File>
     <File Include="Controllers/api/GetEssentialInformationController.cs">
       <publishTime>01/30/2024 18:43:35</publishTime>
@@ -469,7 +469,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
       <publishTime>02/01/2024 15:10:41</publishTime>
     </File>
     <File Include="Controllers/api/GetGeneralCatalogueController.cs">
-      <publishTime>02/01/2024 16:56:20</publishTime>
+      <publishTime>02/20/2024 15:12:57</publishTime>
     </File>
     <File Include="Controllers/api/GetIlluminationLoadController.cs">
       <publishTime>02/01/2024 16:43:20</publishTime>
@@ -484,22 +484,22 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
       <publishTime>02/04/2024 14:42:28</publishTime>
     </File>
     <File Include="Controllers/api/GetMeteorologicalStationController.cs">
-      <publishTime>01/30/2024 17:36:42</publishTime>
+      <publishTime>02/20/2024 16:55:55</publishTime>
     </File>
     <File Include="Controllers/api/GetPowerLoadController.cs">
       <publishTime>02/01/2024 15:08:46</publishTime>
     </File>
     <File Include="Controllers/api/GetRealtimeDataController.cs">
-      <publishTime>02/01/2024 15:40:45</publishTime>
+      <publishTime>02/20/2024 15:23:14</publishTime>
     </File>
     <File Include="Controllers/api/GetRealtimeLoadController.cs">
-      <publishTime>01/09/2024 17:02:14</publishTime>
+      <publishTime>02/05/2024 15:02:52</publishTime>
     </File>
     <File Include="Controllers/api/GetRoomElectricityController.cs">
-      <publishTime>02/01/2024 16:42:24</publishTime>
+      <publishTime>02/20/2024 15:55:57</publishTime>
     </File>
     <File Include="Controllers/api/GetRunningStatusController.cs">
-      <publishTime>01/30/2024 17:33:34</publishTime>
+      <publishTime>02/20/2024 15:28:29</publishTime>
     </File>
     <File Include="Controllers/api/GetWaterConsumptionController.cs">
       <publishTime>02/01/2024 16:43:20</publishTime>
@@ -508,7 +508,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
       <publishTime>01/09/2024 10:54:33</publishTime>
     </File>
     <File Include="Controllers/api/SetLightingController.cs">
-      <publishTime>02/04/2024 14:46:37</publishTime>
+      <publishTime>02/20/2024 16:24:47</publishTime>
     </File>
     <File Include="Controllers/GetSingleControlController.cs">
       <publishTime>02/04/2024 15:01:51</publishTime>
diff --git a/DongYingAPI/bin/DataServer.dll b/DongYingAPI/bin/DataServer.dll
index b116098..9cd84a9 100644
Binary files a/DongYingAPI/bin/DataServer.dll and b/DongYingAPI/bin/DataServer.dll differ
diff --git a/DongYingAPI/bin/DataServer.pdb b/DongYingAPI/bin/DataServer.pdb
index ce04faf..e42167c 100644
Binary files a/DongYingAPI/bin/DataServer.pdb and b/DongYingAPI/bin/DataServer.pdb differ
diff --git a/DongYingAPI/bin/DongYingAPI.dll b/DongYingAPI/bin/DongYingAPI.dll
index 6859e77..cf4fa1a 100644
Binary files a/DongYingAPI/bin/DongYingAPI.dll and b/DongYingAPI/bin/DongYingAPI.dll differ
diff --git a/DongYingAPI/bin/DongYingAPI.pdb b/DongYingAPI/bin/DongYingAPI.pdb
index cf7e9af..5c11b3f 100644
Binary files a/DongYingAPI/bin/DongYingAPI.pdb and b/DongYingAPI/bin/DongYingAPI.pdb differ
diff --git a/DongYingAPI/obj/Debug/DongYingAPI.csproj.AssemblyReference.cache b/DongYingAPI/obj/Debug/DongYingAPI.csproj.AssemblyReference.cache
index cd641da..c5fdfe3 100644
Binary files a/DongYingAPI/obj/Debug/DongYingAPI.csproj.AssemblyReference.cache and b/DongYingAPI/obj/Debug/DongYingAPI.csproj.AssemblyReference.cache differ
diff --git a/DongYingAPI/obj/Debug/DongYingAPI.dll b/DongYingAPI/obj/Debug/DongYingAPI.dll
index 9afadd5..cf4fa1a 100644
Binary files a/DongYingAPI/obj/Debug/DongYingAPI.dll and b/DongYingAPI/obj/Debug/DongYingAPI.dll differ
diff --git a/DongYingAPI/obj/Debug/DongYingAPI.pdb b/DongYingAPI/obj/Debug/DongYingAPI.pdb
index b445876..5c11b3f 100644
Binary files a/DongYingAPI/obj/Debug/DongYingAPI.pdb and b/DongYingAPI/obj/Debug/DongYingAPI.pdb differ
diff --git a/Security/ServiceSecurity.cs b/Security/ServiceSecurity.cs
index 2a7ade1..e4d3f4c 100644
--- a/Security/ServiceSecurity.cs
+++ b/Security/ServiceSecurity.cs
@@ -168,7 +168,7 @@ namespace Security
                     //气象站
                     log.Info("气象站msg"+msg);
                     var j = msg.Substring(1);
-                    var data = JsonConvert.DeserializeObject<DataServer.api.get_data>(j);
+                    var data = JsonConvert.DeserializeObject<DataServer.api.get_data_state>(j);
                     log.Info("气象站:" + data);
                     var now = DateTime.Now;
                     var edate = Convert.ToDateTime(now.ToString("yyyy-MM-dd HH:00:00"));
@@ -198,7 +198,21 @@ namespace Security
                                         mmodel.MeteorologicalId = Guid.NewGuid().ToString("N");
                                         mmodel.MeteorologicalNumber = name;
                                         mmodel.MeteorologicalName = "室外噪音";
-                                        mmodel.MeteorologicalValue = item.dl["噪声"];
+                                        decimal? number;
+                                        var stringnumber = item.dl["噪声"];
+                                        char delimiters = ':'; // 分隔符
+                                        int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
+                                        if (lastDotIndexs != -1) // 如果找到分隔符
+                                        {
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
+                                            number = Convert.ToDecimal(num); // 截取分隔符后面的子字符串
+                                            mmodel.MeteorologicalValue = number;
+                                        }
+                                        else
+                                        {
+                                            var num = Convert.ToDecimal(stringnumber);
+                                            mmodel.MeteorologicalValue = num;
+                                        }
                                         mmodel.CreateTime = DateTime.Now;
                                         mmodel.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
                                         bll_meteorological.Add(mmodel);
@@ -210,7 +224,21 @@ namespace Security
                                         mmodel.MeteorologicalId = Guid.NewGuid().ToString("N");
                                         mmodel.MeteorologicalNumber = name;
                                         mmodel.MeteorologicalName = "风力";
-                                        mmodel.MeteorologicalValue = item.dl["风力"];
+                                        decimal? number;
+                                        var stringnumber = item.dl["风力"];
+                                        char delimiters = ':'; // 分隔符lastDotIndexs + 1
+                                        int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
+                                        if (lastDotIndexs != -1) // 如果找到分隔符
+                                        {
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
+                                            number = Convert.ToDecimal(num); // 截取分隔符后面的子字符串
+                                            mmodel.MeteorologicalValue = number;
+                                        }
+                                        else
+                                        {
+                                            var num = Convert.ToDecimal(stringnumber);
+                                            mmodel.MeteorologicalValue = num;
+                                        }
                                         mmodel.CreateTime = DateTime.Now;
                                         mmodel.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
                                         bll_meteorological.Add(mmodel);
@@ -222,7 +250,21 @@ namespace Security
                                         mmodel.MeteorologicalId = Guid.NewGuid().ToString("N");
                                         mmodel.MeteorologicalNumber = name;
                                         mmodel.MeteorologicalName = "湿度";
-                                        mmodel.MeteorologicalValue = item.dl["空气湿度"];
+                                        decimal? number;
+                                        var stringnumber = item.dl["空气湿度"];
+                                        char delimiters = ':'; // 分隔符
+                                        int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
+                                        if (lastDotIndexs != -1) // 如果找到分隔符
+                                        {
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
+                                            number = Convert.ToDecimal(num); // 截取分隔符后面的子字符串
+                                            mmodel.MeteorologicalValue = number;
+                                        }
+                                        else
+                                        {
+                                            var num = Convert.ToDecimal(stringnumber);
+                                            mmodel.MeteorologicalValue = num;
+                                        }
                                         mmodel.CreateTime = DateTime.Now;
                                         mmodel.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
                                         bll_meteorological.Add(mmodel);
@@ -234,7 +276,21 @@ namespace Security
                                         mmodel.MeteorologicalId = Guid.NewGuid().ToString("N");
                                         mmodel.MeteorologicalNumber = name;
                                         mmodel.MeteorologicalName = "温度";
-                                        mmodel.MeteorologicalValue = item.dl["空气温度"];
+                                        decimal? number;
+                                        var stringnumber = item.dl["空气温度"];
+                                        char delimiters = ':'; // 分隔符
+                                        int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
+                                        if (lastDotIndexs != -1) // 如果找到分隔符
+                                        {
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
+                                            number = Convert.ToDecimal(num); // 截取分隔符后面的子字符串
+                                            mmodel.MeteorologicalValue = number;
+                                        }
+                                        else
+                                        {
+                                            var num = Convert.ToDecimal(stringnumber);
+                                            mmodel.MeteorologicalValue = num;
+                                        }
                                         mmodel.CreateTime = DateTime.Now;
                                         mmodel.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
                                         bll_meteorological.Add(mmodel);
@@ -246,7 +302,21 @@ namespace Security
                                         mmodel.MeteorologicalId = Guid.NewGuid().ToString("N");
                                         mmodel.MeteorologicalNumber = name;
                                         mmodel.MeteorologicalName = "紫外线强度";
-                                        mmodel.MeteorologicalValue = item.dl["紫外线指数"];
+                                        decimal? number;
+                                        var stringnumber = item.dl["紫外线指数"];
+                                        char delimiters = ':'; // 分隔符
+                                        int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
+                                        if (lastDotIndexs != -1) // 如果找到分隔符
+                                        {
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
+                                            number = Convert.ToDecimal(num); // 截取分隔符后面的子字符串
+                                            mmodel.MeteorologicalValue = number;
+                                        }
+                                        else
+                                        {
+                                            var num = Convert.ToDecimal(stringnumber);
+                                            mmodel.MeteorologicalValue = num;
+                                        }
                                         mmodel.CreateTime = DateTime.Now;
                                         mmodel.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
                                         bll_meteorological.Add(mmodel);
@@ -258,7 +328,21 @@ namespace Security
                                         mmodel.MeteorologicalId = Guid.NewGuid().ToString("N");
                                         mmodel.MeteorologicalNumber = name;
                                         mmodel.MeteorologicalName = "空气质量";
-                                        mmodel.MeteorologicalValue = item.dl["PM2_5"];
+                                        decimal? number;
+                                        var stringnumber = item.dl["PM2_5"];
+                                        char delimiters = ':'; // 分隔符
+                                        int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
+                                        if (lastDotIndexs != -1) // 如果找到分隔符
+                                        {
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
+                                            number = Convert.ToDecimal(num); // 截取分隔符后面的子字符串
+                                            mmodel.MeteorologicalValue = number;
+                                        }
+                                        else
+                                        {
+                                            var num = Convert.ToDecimal(stringnumber);
+                                            mmodel.MeteorologicalValue = num;
+                                        }
                                         mmodel.CreateTime = DateTime.Now;
                                         mmodel.EntireTime = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00"));
                                         bll_meteorological.Add(mmodel);
@@ -587,7 +671,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             hmodel.DeviceValue =Convert.ToString(number);
                                         }
@@ -629,7 +713,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             hmodel.DeviceValue = Convert.ToString(number);
                                         }
@@ -656,7 +740,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             hmodel.DeviceValue = Convert.ToString(number);
                                         }
@@ -683,7 +767,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             hmodel.DeviceValue = Convert.ToString(number);
                                         }
@@ -710,7 +794,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             hmodel.DeviceValue = Convert.ToString(number);
                                         }
@@ -736,7 +820,7 @@ namespace Security
                                         int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             hmodel.DeviceValue = Convert.ToString(number);
                                         }
@@ -763,7 +847,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             hmodel.DeviceValue = Convert.ToString(number);
                                         }
@@ -789,7 +873,7 @@ namespace Security
                                         int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             hmodel.DeviceValue = Convert.ToString(number);
                                         }
@@ -816,7 +900,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             hmodel.DeviceValue = Convert.ToString(number);
                                         }
@@ -843,7 +927,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             hmodel.DeviceValue = Convert.ToString(number);
                                         }
@@ -870,7 +954,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             hmodel.DeviceValue = Convert.ToString(number);
                                         }
@@ -897,7 +981,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             hmodel.DeviceValue = Convert.ToString(number);
                                         }
@@ -924,7 +1008,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             hmodel.DeviceValue = Convert.ToString(number);
                                         }
@@ -951,7 +1035,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             hmodel.DeviceValue = Convert.ToString(number);
                                         }
@@ -979,7 +1063,7 @@ namespace Security
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 hmodel.DeviceValue = Convert.ToString(number);
                                             }
@@ -1006,7 +1090,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             hmodel.DeviceValue = Convert.ToString(number);
                                         }
@@ -1033,7 +1117,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             hmodel.DeviceValue = Convert.ToString(number);
                                         }
@@ -1060,7 +1144,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             hmodel.DeviceValue = Convert.ToString(number);
                                         }
@@ -1087,7 +1171,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             hmodel.DeviceValue = Convert.ToString(number);
                                         }
@@ -1114,7 +1198,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             hmodel.DeviceValue = Convert.ToString(number);
                                         }
@@ -1141,7 +1225,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             hmodel.DeviceValue = Convert.ToString(number);
                                         }
@@ -1168,7 +1252,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             hmodel.DeviceValue = Convert.ToString(number);
                                         }
@@ -1196,7 +1280,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             hmodel.DeviceValue = Convert.ToString(number);
                                         }
@@ -1223,7 +1307,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             hmodel.DeviceValue = Convert.ToString(number);
                                         }
@@ -1250,7 +1334,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             hmodel.DeviceValue = Convert.ToString(number);
                                         }
@@ -1277,7 +1361,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             hmodel.DeviceValue = Convert.ToString(number);
                                         }
@@ -1304,7 +1388,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             hmodel.DeviceValue = Convert.ToString(number);
                                         }
@@ -1342,7 +1426,8 @@ namespace Security
                                     {
                                         cname = "四号主机";
                                     }
-                                    var blist = bll_host.GetModelList(" HostName='" + cname + "'");
+                                    var time = DateTime.Now.ToString("yyyy-MM-dd HH:00:00");
+                                    var blist = bll_host.GetModelList(" HostName='" + cname + "' and EntireTime='"+time+"'");
                                     if (blist.Count == 0)
                                     {
                                         if (item.dl.ContainsKey("1号压缩机点前容量"))
@@ -1359,7 +1444,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 hmodel.DeviceValue = Convert.ToString(number);
                                             }
@@ -1401,7 +1486,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 hmodel.DeviceValue = Convert.ToString(number);
                                             }
@@ -1428,7 +1513,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 hmodel.DeviceValue = Convert.ToString(number);
                                             }
@@ -1455,7 +1540,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 hmodel.DeviceValue = Convert.ToString(number);
                                             }
@@ -1482,7 +1567,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 hmodel.DeviceValue = Convert.ToString(number);
                                             }
@@ -1508,7 +1593,7 @@ namespace Security
                                             int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 hmodel.DeviceValue = Convert.ToString(number);
                                             }
@@ -1535,7 +1620,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 hmodel.DeviceValue = Convert.ToString(number);
                                             }
@@ -1561,7 +1646,7 @@ namespace Security
                                             int lastDotIndexs = stringnumber.LastIndexOf(delimiters); // 查找最后一个分隔符的位置
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 hmodel.DeviceValue = Convert.ToString(number);
                                             }
@@ -1588,7 +1673,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 hmodel.DeviceValue = Convert.ToString(number);
                                             }
@@ -1615,7 +1700,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 hmodel.DeviceValue = Convert.ToString(number);
                                             }
@@ -1642,7 +1727,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 hmodel.DeviceValue = Convert.ToString(number);
                                             }
@@ -1669,7 +1754,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 hmodel.DeviceValue = Convert.ToString(number);
                                             }
@@ -1696,7 +1781,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 hmodel.DeviceValue = Convert.ToString(number);
                                             }
@@ -1723,7 +1808,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 hmodel.DeviceValue = Convert.ToString(number);
                                             }
@@ -1751,7 +1836,7 @@ namespace Security
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                                 if (lastDotIndexs != -1) // 如果找到分隔符
                                                 {
-                                                    var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                    var num = stringnumber.Substring(lastDotIndexs + 1);
                                                     number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                     hmodel.DeviceValue = Convert.ToString(number);
                                                 }
@@ -1778,7 +1863,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 hmodel.DeviceValue = Convert.ToString(number);
                                             }
@@ -1805,7 +1890,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 hmodel.DeviceValue = Convert.ToString(number);
                                             }
@@ -1832,7 +1917,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 hmodel.DeviceValue = Convert.ToString(number);
                                             }
@@ -1859,7 +1944,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 hmodel.DeviceValue = Convert.ToString(number);
                                             }
@@ -1886,7 +1971,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 hmodel.DeviceValue = Convert.ToString(number);
                                             }
@@ -1913,7 +1998,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 hmodel.DeviceValue = Convert.ToString(number);
                                             }
@@ -1940,7 +2025,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 hmodel.DeviceValue = Convert.ToString(number);
                                             }
@@ -1968,7 +2053,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 hmodel.DeviceValue = Convert.ToString(number);
                                             }
@@ -1995,7 +2080,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 hmodel.DeviceValue = Convert.ToString(number);
                                             }
@@ -2022,7 +2107,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 hmodel.DeviceValue = Convert.ToString(number);
                                             }
@@ -2049,7 +2134,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 hmodel.DeviceValue = Convert.ToString(number);
                                             }
@@ -2076,7 +2161,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 hmodel.DeviceValue = Convert.ToString(number);
                                             }
@@ -2146,7 +2231,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -2165,7 +2250,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -2184,7 +2269,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -2212,7 +2297,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -2231,7 +2316,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -2250,7 +2335,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -2278,7 +2363,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -2297,7 +2382,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -2316,7 +2401,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -2344,7 +2429,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -2363,7 +2448,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -2382,7 +2467,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -2410,7 +2495,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -2429,7 +2514,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -2448,7 +2533,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -2476,7 +2561,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -2495,7 +2580,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -2514,7 +2599,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -2542,7 +2627,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -2561,7 +2646,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -2580,7 +2665,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -2608,7 +2693,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -2627,7 +2712,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -2646,7 +2731,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -2674,7 +2759,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -2693,7 +2778,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -2712,7 +2797,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -2740,7 +2825,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -2759,7 +2844,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -2778,7 +2863,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -2806,7 +2891,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -2825,7 +2910,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -2844,7 +2929,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -2872,7 +2957,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -2891,7 +2976,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -2910,7 +2995,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -2938,7 +3023,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -2957,7 +3042,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -2976,7 +3061,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -3004,7 +3089,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -3023,7 +3108,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -3042,7 +3127,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -3070,7 +3155,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -3089,7 +3174,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -3108,7 +3193,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -3136,7 +3221,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -3155,7 +3240,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -3174,7 +3259,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -3202,7 +3287,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -3221,7 +3306,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -3240,7 +3325,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -3268,7 +3353,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -3287,7 +3372,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -3306,7 +3391,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -3334,7 +3419,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -3353,7 +3438,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -3372,7 +3457,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -3400,7 +3485,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -3419,7 +3504,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -3438,7 +3523,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -3466,7 +3551,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -3485,7 +3570,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -3504,7 +3589,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -3532,7 +3617,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -3551,7 +3636,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -3570,7 +3655,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -3598,7 +3683,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -3617,7 +3702,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -3636,7 +3721,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -3664,7 +3749,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -3683,7 +3768,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -3702,7 +3787,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -3730,7 +3815,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -3749,7 +3834,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -3768,7 +3853,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -3796,7 +3881,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -3815,7 +3900,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -3834,7 +3919,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -3862,7 +3947,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -3881,7 +3966,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -3900,7 +3985,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -3928,7 +4013,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -3947,7 +4032,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -3966,7 +4051,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -3994,7 +4079,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -4013,7 +4098,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -4032,7 +4117,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -4060,7 +4145,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -4079,7 +4164,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -4098,7 +4183,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -4126,7 +4211,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -4145,7 +4230,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -4164,7 +4249,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -4192,7 +4277,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -4211,7 +4296,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -4230,7 +4315,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -4258,7 +4343,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -4277,7 +4362,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -4296,7 +4381,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -4324,7 +4409,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -4343,7 +4428,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -4362,7 +4447,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -4390,7 +4475,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -4409,7 +4494,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -4428,7 +4513,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -4456,7 +4541,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -4475,7 +4560,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -4494,7 +4579,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -4522,7 +4607,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -4541,7 +4626,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -4560,7 +4645,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -4588,7 +4673,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -4607,7 +4692,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -4626,7 +4711,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -4654,7 +4739,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceOneState = number;
                     //                        }
@@ -4673,7 +4758,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceTwoState = number;
                     //                        }
@@ -4692,7 +4777,7 @@ namespace Security
 
                     //                        if (lastDotIndexs != -1) // 如果找到分隔符
                     //                        {
-                    //                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                    //                            var num = stringnumber.Substring(lastDotIndexs + 1);
                     //                            number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                     //                            smodel.DeviceThreeState = number;
                     //                        }
@@ -4759,7 +4844,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -4778,7 +4863,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -4797,7 +4882,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -4826,7 +4911,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -4845,7 +4930,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -4864,7 +4949,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -4892,7 +4977,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -4911,7 +4996,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -4930,7 +5015,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -4958,7 +5043,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -4977,7 +5062,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -4996,7 +5081,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -5024,7 +5109,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -5043,7 +5128,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -5062,7 +5147,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -5090,7 +5175,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -5109,7 +5194,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -5128,7 +5213,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -5156,7 +5241,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -5175,7 +5260,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -5194,7 +5279,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -5222,7 +5307,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -5241,7 +5326,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -5260,7 +5345,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -5288,7 +5373,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -5307,7 +5392,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -5326,7 +5411,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -5354,7 +5439,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -5373,7 +5458,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -5392,7 +5477,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -5420,7 +5505,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -5439,7 +5524,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -5458,7 +5543,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -5486,7 +5571,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -5505,7 +5590,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -5524,7 +5609,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -5552,7 +5637,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -5571,7 +5656,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -5590,7 +5675,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -5618,7 +5703,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -5637,7 +5722,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -5656,7 +5741,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -5684,7 +5769,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -5703,7 +5788,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -5722,7 +5807,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -5750,7 +5835,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -5769,7 +5854,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -5788,7 +5873,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -5816,7 +5901,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -5835,7 +5920,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -5854,7 +5939,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -5882,7 +5967,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -5901,7 +5986,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -5920,7 +6005,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -5948,7 +6033,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -5967,7 +6052,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -5986,7 +6071,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -6014,7 +6099,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -6033,7 +6118,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -6052,7 +6137,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -6080,7 +6165,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -6099,7 +6184,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -6118,7 +6203,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -6146,7 +6231,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -6165,7 +6250,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -6184,7 +6269,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -6214,7 +6299,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -6233,7 +6318,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -6252,7 +6337,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -6280,7 +6365,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -6299,7 +6384,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -6318,7 +6403,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -6346,7 +6431,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -6365,7 +6450,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -6384,7 +6469,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -6412,7 +6497,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -6431,7 +6516,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -6450,7 +6535,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -6478,7 +6563,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -6497,7 +6582,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -6516,7 +6601,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -6544,7 +6629,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -6563,7 +6648,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -6582,7 +6667,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -6610,7 +6695,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -6629,7 +6714,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -6648,7 +6733,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -6676,7 +6761,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -6695,7 +6780,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -6714,7 +6799,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -6742,7 +6827,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -6761,7 +6846,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -6780,7 +6865,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -6808,7 +6893,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -6827,7 +6912,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -6846,7 +6931,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -6874,7 +6959,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -6893,7 +6978,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -6912,7 +6997,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -6940,7 +7025,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -6959,7 +7044,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -6978,7 +7063,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -7006,7 +7091,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -7025,7 +7110,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -7044,7 +7129,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -7072,7 +7157,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceOneState = number;
                                         }
@@ -7091,7 +7176,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceTwoState = number;
                                         }
@@ -7110,7 +7195,7 @@ namespace Security
 
                                         if (lastDotIndexs != -1) // 如果找到分隔符
                                         {
-                                            var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                            var num = stringnumber.Substring(lastDotIndexs + 1);
                                             number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                             smodel.DeviceThreeState = number;
                                         }
@@ -7184,7 +7269,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -7203,7 +7288,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -7222,7 +7307,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -7251,7 +7336,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -7270,7 +7355,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -7289,7 +7374,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -7317,7 +7402,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -7336,7 +7421,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -7355,7 +7440,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -7383,7 +7468,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -7402,7 +7487,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -7421,7 +7506,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -7449,7 +7534,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -7468,7 +7553,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -7487,7 +7572,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -7515,7 +7600,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -7534,7 +7619,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -7553,7 +7638,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -7581,7 +7666,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -7600,7 +7685,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -7619,7 +7704,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -7647,7 +7732,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -7666,7 +7751,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -7685,7 +7770,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -7713,7 +7798,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -7732,7 +7817,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -7751,7 +7836,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -7779,7 +7864,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -7798,7 +7883,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -7817,7 +7902,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -7845,7 +7930,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -7864,7 +7949,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -7883,7 +7968,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -7911,7 +7996,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -7930,7 +8015,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -7949,7 +8034,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -7977,7 +8062,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -7996,7 +8081,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -8015,7 +8100,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -8043,7 +8128,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -8062,7 +8147,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -8081,7 +8166,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -8109,7 +8194,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -8128,7 +8213,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -8147,7 +8232,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -8175,7 +8260,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -8194,7 +8279,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -8213,7 +8298,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -8241,7 +8326,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -8260,7 +8345,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -8279,7 +8364,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -8307,7 +8392,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -8326,7 +8411,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -8345,7 +8430,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -8373,7 +8458,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -8392,7 +8477,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -8411,7 +8496,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -8439,7 +8524,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -8458,7 +8543,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -8477,7 +8562,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -8505,7 +8590,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -8524,7 +8609,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -8543,7 +8628,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -8571,7 +8656,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -8590,7 +8675,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -8609,7 +8694,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -8639,7 +8724,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -8658,7 +8743,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -8677,7 +8762,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -8705,7 +8790,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -8724,7 +8809,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -8743,7 +8828,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -8771,7 +8856,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -8790,7 +8875,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -8809,7 +8894,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -8837,7 +8922,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -8856,7 +8941,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -8875,7 +8960,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -8903,7 +8988,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -8922,7 +9007,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -8941,7 +9026,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -8969,7 +9054,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -8988,7 +9073,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -9007,7 +9092,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -9035,7 +9120,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -9054,7 +9139,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -9073,7 +9158,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -9101,7 +9186,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -9120,7 +9205,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -9139,7 +9224,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -9167,7 +9252,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -9186,7 +9271,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -9205,7 +9290,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -9233,7 +9318,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -9252,7 +9337,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -9271,7 +9356,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -9299,7 +9384,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -9318,7 +9403,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -9337,7 +9422,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -9365,7 +9450,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -9384,7 +9469,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -9403,7 +9488,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -9431,7 +9516,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -9450,7 +9535,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -9469,7 +9554,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
@@ -9497,7 +9582,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceOneState = number;
                                             }
@@ -9516,7 +9601,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceTwoState = number;
                                             }
@@ -9535,7 +9620,7 @@ namespace Security
 
                                             if (lastDotIndexs != -1) // 如果找到分隔符
                                             {
-                                                var num = stringnumber.Substring(lastDotIndexs + 1, 1);
+                                                var num = stringnumber.Substring(lastDotIndexs + 1);
                                                 number = Convert.ToInt32(num); // 截取分隔符后面的子字符串
                                                 smodel.DeviceThreeState = number;
                                             }
diff --git a/Security/bin/Debug/DataServer.dll b/Security/bin/Debug/DataServer.dll
index b116098..9cd84a9 100644
Binary files a/Security/bin/Debug/DataServer.dll and b/Security/bin/Debug/DataServer.dll differ
diff --git a/Security/bin/Debug/DataServer.pdb b/Security/bin/Debug/DataServer.pdb
index ce04faf..e42167c 100644
Binary files a/Security/bin/Debug/DataServer.pdb and b/Security/bin/Debug/DataServer.pdb differ
diff --git a/Security/bin/Debug/ServiceSecurity.application b/Security/bin/Debug/ServiceSecurity.application
index 15d7c2d..09e1aab 100644
--- a/Security/bin/Debug/ServiceSecurity.application
+++ b/Security/bin/Debug/ServiceSecurity.application
@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>fXb824TGMzrTlm494R7AK+Eh/lxTphTP4YyCnt60syk=</dsig:DigestValue>
+        <dsig:DigestValue>Jw8TcGOJ6Ux9EnCsouNtJBVBQAwLtRm0OSjSgfh1Plo=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/Security/bin/Debug/ServiceSecurity.exe b/Security/bin/Debug/ServiceSecurity.exe
index 8e79f53..8d015b0 100644
Binary files a/Security/bin/Debug/ServiceSecurity.exe and b/Security/bin/Debug/ServiceSecurity.exe differ
diff --git a/Security/bin/Debug/ServiceSecurity.exe.manifest b/Security/bin/Debug/ServiceSecurity.exe.manifest
index c3dd414..5f04705 100644
--- a/Security/bin/Debug/ServiceSecurity.exe.manifest
+++ b/Security/bin/Debug/ServiceSecurity.exe.manifest
@@ -49,7 +49,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>ELr9UH3dGKKDFGL/HOlZwBIs+xZEWkcQhMNTZPZ5Ah8=</dsig:DigestValue>
+        <dsig:DigestValue>bUW7g9n9nwHGCUt1FS7IPZhr5a24DqOcm1OgGsbvvEU=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
@@ -138,14 +138,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ServiceSecurity.exe" size="128480">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ServiceSecurity.exe" size="129504">
       <assemblyIdentity name="ServiceSecurity" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>3IcD63GbVCdIq/jfW8wzOwgW85Y/moIkXTQMRWSlX/A=</dsig:DigestValue>
+        <dsig:DigestValue>wL9te6sjDrV0xqlUYXEyW++xNXsYbShi/dpEvbxeTsY=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/Security/bin/Debug/ServiceSecurity.pdb b/Security/bin/Debug/ServiceSecurity.pdb
index 83d6d5e..f3b3ffe 100644
Binary files a/Security/bin/Debug/ServiceSecurity.pdb and b/Security/bin/Debug/ServiceSecurity.pdb differ
diff --git a/Security/bin/Debug/app.publish/ServiceSecurity.exe b/Security/bin/Debug/app.publish/ServiceSecurity.exe
index 38da593..6a5c1cf 100644
Binary files a/Security/bin/Debug/app.publish/ServiceSecurity.exe and b/Security/bin/Debug/app.publish/ServiceSecurity.exe differ
diff --git a/Security/obj/Debug/Security.csproj.AssemblyReference.cache b/Security/obj/Debug/Security.csproj.AssemblyReference.cache
index 7e2054e..081ce36 100644
Binary files a/Security/obj/Debug/Security.csproj.AssemblyReference.cache and b/Security/obj/Debug/Security.csproj.AssemblyReference.cache differ
diff --git a/Security/obj/Debug/ServiceSecurity.application b/Security/obj/Debug/ServiceSecurity.application
index 15d7c2d..09e1aab 100644
--- a/Security/obj/Debug/ServiceSecurity.application
+++ b/Security/obj/Debug/ServiceSecurity.application
@@ -14,7 +14,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>fXb824TGMzrTlm494R7AK+Eh/lxTphTP4YyCnt60syk=</dsig:DigestValue>
+        <dsig:DigestValue>Jw8TcGOJ6Ux9EnCsouNtJBVBQAwLtRm0OSjSgfh1Plo=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/Security/obj/Debug/ServiceSecurity.exe b/Security/obj/Debug/ServiceSecurity.exe
index 8e79f53..8d015b0 100644
Binary files a/Security/obj/Debug/ServiceSecurity.exe and b/Security/obj/Debug/ServiceSecurity.exe differ
diff --git a/Security/obj/Debug/ServiceSecurity.exe.manifest b/Security/obj/Debug/ServiceSecurity.exe.manifest
index c3dd414..5f04705 100644
--- a/Security/obj/Debug/ServiceSecurity.exe.manifest
+++ b/Security/obj/Debug/ServiceSecurity.exe.manifest
@@ -49,7 +49,7 @@
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>ELr9UH3dGKKDFGL/HOlZwBIs+xZEWkcQhMNTZPZ5Ah8=</dsig:DigestValue>
+        <dsig:DigestValue>bUW7g9n9nwHGCUt1FS7IPZhr5a24DqOcm1OgGsbvvEU=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
@@ -138,14 +138,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ServiceSecurity.exe" size="128480">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ServiceSecurity.exe" size="129504">
       <assemblyIdentity name="ServiceSecurity" version="1.0.0.0" language="neutral" processorArchitecture="msil" />
       <hash>
         <dsig:Transforms>
           <dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
         </dsig:Transforms>
         <dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
-        <dsig:DigestValue>3IcD63GbVCdIq/jfW8wzOwgW85Y/moIkXTQMRWSlX/A=</dsig:DigestValue>
+        <dsig:DigestValue>wL9te6sjDrV0xqlUYXEyW++xNXsYbShi/dpEvbxeTsY=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
diff --git a/Security/obj/Debug/ServiceSecurity.pdb b/Security/obj/Debug/ServiceSecurity.pdb
index 83d6d5e..f3b3ffe 100644
Binary files a/Security/obj/Debug/ServiceSecurity.pdb and b/Security/obj/Debug/ServiceSecurity.pdb differ