实现大屏相关功能和优化接口处理时长

DataService/BLL/viewing_screen.cs

@@ -6,7 +6,7 @@
 *
 * Ver    变更日期             负责人  变更内容
 * ───────────────────────────────────
-* V0.01  2024/3/26 14:24:53   N/A    初版
+* V0.01  2024/9/19 13:32:15   N/A    初版
 *
 * Copyright (c) 2012 Maticsoft Corporation. All rights reserved.
 *┌──────────────────────────────────┐

DataService/DAL/viewing_screen.cs

@@ -6,7 +6,7 @@
 *
 * Ver    变更日期             负责人  变更内容
 * ───────────────────────────────────
-* V0.01  2024/3/26 14:24:53   N/A    初版
+* V0.01  2024/9/19 13:32:15   N/A    初版
 *
 * Copyright (c) 2012 Maticsoft Corporation. All rights reserved.
 *┌──────────────────────────────────┐
@@ -53,32 +53,40 @@ namespace DataService.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into viewing_screen(");
-			strSql.Append("ScreenId,ScreenName,ScreenAlarm,ScreenState,CreateTime,EntireTime,Reserve1,Reserve2,Reserve3,Reserve4,Reserve5)");
+            strSql.Append("ScreenId,ScreenNumber,ScreenName,ScreenPosition,ScreenAlarm,ScreenState,PointerCode,ClientId,CreateTime,UpdateTime,Reserve1,Reserve2,Reserve3,Reserve4,Reserve5)");
             strSql.Append(" values (");
-			strSql.Append("@ScreenId,@ScreenName,@ScreenAlarm,@ScreenState,@CreateTime,@EntireTime,@Reserve1,@Reserve2,@Reserve3,@Reserve4,@Reserve5)");
+            strSql.Append("@ScreenId,@ScreenNumber,@ScreenName,@ScreenPosition,@ScreenAlarm,@ScreenState,@PointerCode,@ClientId,@CreateTime,@UpdateTime,@Reserve1,@Reserve2,@Reserve3,@Reserve4,@Reserve5)");
             MySqlParameter[] parameters = {
                     new MySqlParameter("@ScreenId", MySqlDbType.VarChar,255),
+                    new MySqlParameter("@ScreenNumber", MySqlDbType.VarChar,255),
                     new MySqlParameter("@ScreenName", MySqlDbType.VarChar,255),
+                    new MySqlParameter("@ScreenPosition", MySqlDbType.VarChar,255),
                     new MySqlParameter("@ScreenAlarm", MySqlDbType.VarChar,255),
                     new MySqlParameter("@ScreenState", MySqlDbType.VarChar,255),
+                    new MySqlParameter("@PointerCode", MySqlDbType.VarChar,255),
+                    new MySqlParameter("@ClientId", MySqlDbType.VarChar,255),
                     new MySqlParameter("@CreateTime", MySqlDbType.DateTime),
-					new MySqlParameter("@EntireTime", MySqlDbType.DateTime),
+                    new MySqlParameter("@UpdateTime", MySqlDbType.DateTime),
                     new MySqlParameter("@Reserve1", MySqlDbType.VarChar,255),
                     new MySqlParameter("@Reserve2", MySqlDbType.VarChar,255),
                     new MySqlParameter("@Reserve3", MySqlDbType.VarChar,255),
                     new MySqlParameter("@Reserve4", MySqlDbType.VarChar,255),
                     new MySqlParameter("@Reserve5", MySqlDbType.VarChar,255)};
             parameters[0].Value = model.ScreenId;
-			parameters[1].Value = model.ScreenName;
+            parameters[1].Value = model.ScreenNumber;
-			parameters[2].Value = model.ScreenAlarm;
+            parameters[2].Value = model.ScreenName;
-			parameters[3].Value = model.ScreenState;
+            parameters[3].Value = model.ScreenPosition;
-			parameters[4].Value = model.CreateTime;
+            parameters[4].Value = model.ScreenAlarm;
-			parameters[5].Value = model.EntireTime;
+            parameters[5].Value = model.ScreenState;
-			parameters[6].Value = model.Reserve1;
+            parameters[6].Value = model.PointerCode;
-			parameters[7].Value = model.Reserve2;
+            parameters[7].Value = model.ClientId;
-			parameters[8].Value = model.Reserve3;
+            parameters[8].Value = model.CreateTime;
-			parameters[9].Value = model.Reserve4;
+            parameters[9].Value = model.UpdateTime;
-			parameters[10].Value = model.Reserve5;
+            parameters[10].Value = model.Reserve1;
+            parameters[11].Value = model.Reserve2;
+            parameters[12].Value = model.Reserve3;
+            parameters[13].Value = model.Reserve4;
+            parameters[14].Value = model.Reserve5;
 
             int rows = DbHelperMySQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -97,11 +105,15 @@ namespace DataService.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("update viewing_screen set ");
+            strSql.Append("ScreenNumber=@ScreenNumber,");
             strSql.Append("ScreenName=@ScreenName,");
+            strSql.Append("ScreenPosition=@ScreenPosition,");
             strSql.Append("ScreenAlarm=@ScreenAlarm,");
             strSql.Append("ScreenState=@ScreenState,");
+            strSql.Append("PointerCode=@PointerCode,");
+            strSql.Append("ClientId=@ClientId,");
             strSql.Append("CreateTime=@CreateTime,");
-			strSql.Append("EntireTime=@EntireTime,");
+            strSql.Append("UpdateTime=@UpdateTime,");
             strSql.Append("Reserve1=@Reserve1,");
             strSql.Append("Reserve2=@Reserve2,");
             strSql.Append("Reserve3=@Reserve3,");
@@ -109,28 +121,36 @@ namespace DataService.DAL
             strSql.Append("Reserve5=@Reserve5");
             strSql.Append(" where ScreenId=@ScreenId ");
             MySqlParameter[] parameters = {
+                    new MySqlParameter("@ScreenNumber", MySqlDbType.VarChar,255),
                     new MySqlParameter("@ScreenName", MySqlDbType.VarChar,255),
+                    new MySqlParameter("@ScreenPosition", MySqlDbType.VarChar,255),
                     new MySqlParameter("@ScreenAlarm", MySqlDbType.VarChar,255),
                     new MySqlParameter("@ScreenState", MySqlDbType.VarChar,255),
+                    new MySqlParameter("@PointerCode", MySqlDbType.VarChar,255),
+                    new MySqlParameter("@ClientId", MySqlDbType.VarChar,255),
                     new MySqlParameter("@CreateTime", MySqlDbType.DateTime),
-					new MySqlParameter("@EntireTime", MySqlDbType.DateTime),
+                    new MySqlParameter("@UpdateTime", MySqlDbType.DateTime),
                     new MySqlParameter("@Reserve1", MySqlDbType.VarChar,255),
                     new MySqlParameter("@Reserve2", MySqlDbType.VarChar,255),
                     new MySqlParameter("@Reserve3", MySqlDbType.VarChar,255),
                     new MySqlParameter("@Reserve4", MySqlDbType.VarChar,255),
                     new MySqlParameter("@Reserve5", MySqlDbType.VarChar,255),
                     new MySqlParameter("@ScreenId", MySqlDbType.VarChar,255)};
-			parameters[0].Value = model.ScreenName;
+            parameters[0].Value = model.ScreenNumber;
-			parameters[1].Value = model.ScreenAlarm;
+            parameters[1].Value = model.ScreenName;
-			parameters[2].Value = model.ScreenState;
+            parameters[2].Value = model.ScreenPosition;
-			parameters[3].Value = model.CreateTime;
+            parameters[3].Value = model.ScreenAlarm;
-			parameters[4].Value = model.EntireTime;
+            parameters[4].Value = model.ScreenState;
-			parameters[5].Value = model.Reserve1;
+            parameters[5].Value = model.PointerCode;
-			parameters[6].Value = model.Reserve2;
+            parameters[6].Value = model.ClientId;
-			parameters[7].Value = model.Reserve3;
+            parameters[7].Value = model.CreateTime;
-			parameters[8].Value = model.Reserve4;
+            parameters[8].Value = model.UpdateTime;
-			parameters[9].Value = model.Reserve5;
+            parameters[9].Value = model.Reserve1;
-			parameters[10].Value = model.ScreenId;
+            parameters[10].Value = model.Reserve2;
+            parameters[11].Value = model.Reserve3;
+            parameters[12].Value = model.Reserve4;
+            parameters[13].Value = model.Reserve5;
+            parameters[14].Value = model.ScreenId;
 
             int rows = DbHelperMySQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -193,7 +213,7 @@ namespace DataService.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-			strSql.Append("select ScreenId,ScreenName,ScreenAlarm,ScreenState,CreateTime,EntireTime,Reserve1,Reserve2,Reserve3,Reserve4,Reserve5 from viewing_screen ");
+            strSql.Append("select ScreenId,ScreenNumber,ScreenName,ScreenPosition,ScreenAlarm,ScreenState,PointerCode,ClientId,CreateTime,UpdateTime,Reserve1,Reserve2,Reserve3,Reserve4,Reserve5 from viewing_screen ");
             strSql.Append(" where ScreenId=@ScreenId ");
             MySqlParameter[] parameters = {
                     new MySqlParameter("@ScreenId", MySqlDbType.VarChar,255)            };
@@ -224,10 +244,18 @@ namespace DataService.DAL
                 {
                     model.ScreenId = row["ScreenId"].ToString();
                 }
+                if (row["ScreenNumber"] != null)
+                {
+                    model.ScreenNumber = row["ScreenNumber"].ToString();
+                }
                 if (row["ScreenName"] != null)
                 {
                     model.ScreenName = row["ScreenName"].ToString();
                 }
+                if (row["ScreenPosition"] != null)
+                {
+                    model.ScreenPosition = row["ScreenPosition"].ToString();
+                }
                 if (row["ScreenAlarm"] != null)
                 {
                     model.ScreenAlarm = row["ScreenAlarm"].ToString();
@@ -236,13 +264,21 @@ namespace DataService.DAL
                 {
                     model.ScreenState = row["ScreenState"].ToString();
                 }
+                if (row["PointerCode"] != null)
+                {
+                    model.PointerCode = row["PointerCode"].ToString();
+                }
+                if (row["ClientId"] != null)
+                {
+                    model.ClientId = row["ClientId"].ToString();
+                }
                 if (row["CreateTime"] != null && row["CreateTime"].ToString() != "")
                 {
                     model.CreateTime = DateTime.Parse(row["CreateTime"].ToString());
                 }
-				if(row["EntireTime"]!=null && row["EntireTime"].ToString()!="")
+                if (row["UpdateTime"] != null && row["UpdateTime"].ToString() != "")
                 {
-					model.EntireTime=DateTime.Parse(row["EntireTime"].ToString());
+                    model.UpdateTime = DateTime.Parse(row["UpdateTime"].ToString());
                 }
                 if (row["Reserve1"] != null)
                 {
@@ -274,7 +310,7 @@ namespace DataService.DAL
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-			strSql.Append("select ScreenId,ScreenName,ScreenAlarm,ScreenState,CreateTime,EntireTime,Reserve1,Reserve2,Reserve3,Reserve4,Reserve5 ");
+            strSql.Append("select ScreenId,ScreenNumber,ScreenName,ScreenPosition,ScreenAlarm,ScreenState,PointerCode,ClientId,CreateTime,UpdateTime,Reserve1,Reserve2,Reserve3,Reserve4,Reserve5 ");
             strSql.Append(" FROM viewing_screen ");
             if (strWhere.Trim() != "")
             {
@@ -294,7 +330,7 @@ namespace DataService.DAL
             {
                 strSql.Append(" where " + strWhere);
             }
-			object obj = DbHelperSQL.GetSingle(strSql.ToString());
+            object obj = DbHelperMySQL.GetSingle(strSql.ToString());
             if (obj == null)
             {
                 return 0;

DataService/DataService.csproj

@@ -99,6 +99,7 @@
     <Compile Include="api\get_total_energy.cs" />
     <Compile Include="api\get_water_draining.cs" />
     <Compile Include="api\get_control_lighting.cs" />
+    <Compile Include="api\set_screen_state.cs" />
     <Compile Include="BLL\boot_strategy.cs" />
     <Compile Include="BLL\device_info.cs" />
     <Compile Include="BLL\electricity_data.cs" />

DataService/Model/viewing_screen.cs

@@ -6,7 +6,7 @@
 *
 * Ver    变更日期             负责人  变更内容
 * ───────────────────────────────────
-* V0.01  2024/3/26 14:24:53   N/A    初版
+* V0.01  2024/9/19 13:32:15   N/A    初版
 *
 * Copyright (c) 2012 Maticsoft Corporation. All rights reserved.
 *┌──────────────────────────────────┐
@@ -27,11 +27,15 @@ namespace DataService.Model
         { }
         #region Model
         private string _screenid;
+        private string _screennumber;
         private string _screenname;
+        private string _screenposition;
         private string _screenalarm;
         private string _screenstate;
+        private string _pointercode;
+        private string _clientid;
         private DateTime? _createtime;
-		private DateTime? _entiretime;
+        private DateTime? _updatetime;
         private string _reserve1;
         private string _reserve2;
         private string _reserve3;
@@ -48,6 +52,14 @@ namespace DataService.Model
         /// <summary>
         /// 
         /// </summary>
+        public string ScreenNumber
+        {
+            set { _screennumber = value; }
+            get { return _screennumber; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
         public string ScreenName
         {
             set { _screenname = value; }
@@ -56,6 +68,14 @@ namespace DataService.Model
         /// <summary>
         /// 
         /// </summary>
+        public string ScreenPosition
+        {
+            set { _screenposition = value; }
+            get { return _screenposition; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
         public string ScreenAlarm
         {
             set { _screenalarm = value; }
@@ -72,6 +92,22 @@ namespace DataService.Model
         /// <summary>
         /// 
         /// </summary>
+        public string PointerCode
+        {
+            set { _pointercode = value; }
+            get { return _pointercode; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string ClientId
+        {
+            set { _clientid = value; }
+            get { return _clientid; }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
         public DateTime? CreateTime
         {
             set { _createtime = value; }
@@ -80,10 +116,10 @@ namespace DataService.Model
         /// <summary>
         /// 
         /// </summary>
-		public DateTime? EntireTime
+        public DateTime? UpdateTime
         {
-			set{ _entiretime=value;}
+            set { _updatetime = value; }
-			get{return _entiretime;}
+            get { return _updatetime; }
         }
         /// <summary>
         /// 

DataService/api/set_screen_state.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DataService.api
+{
+    public class set_screen_state
+    {
+        public int code { get; set; }
+        public string msg { get; set; }
+    }
+}

DataService/obj/Debug/DataService.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-6017feb255b2d0674f29d5c15533bc86cfcc26f7
+708daddf2b6cff978475ddd74b909035c2aae67d

DataService/obj/Release/DataService.csproj.CoreCompileInputs.cache

@@ -0,0 +1 @@
+6856708d3b23b471238ffc7889866d00852f2dde

DataService/obj/Release/DataService.csproj.FileListAbsolute.txt

@@ -0,0 +1,10 @@
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\DataService\bin\Release\DataService.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\DataService\bin\Release\DataService.pdb
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\DataService\bin\Release\Maticsoft.Common.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\DataService\bin\Release\Maticsoft.DBUtility.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\DataService\bin\Release\MySql.Data.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\DataService\obj\Release\DataService.csproj.AssemblyReference.cache
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\DataService\obj\Release\DataService.csproj.CoreCompileInputs.cache
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\DataService\obj\Release\DataService.csproj.CopyComplete
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\DataService\obj\Release\DataService.dll
+F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\DataService\obj\Release\DataService.pdb

LonglslandExhibitionCenter/Controllers/api/GetElectricityRateController.cs

@@ -57,12 +57,35 @@ namespace LonglslandExhibitionCenter.Controllers.api
                 for (int i = 0; i < month_count; i++)
                 {
                     var month = startDate.AddMonths(i);
-                    var next_month = startDate.AddMonths(i + 1);
                     //当前月
                     if (month.ToString("yyyy-MM") == now.ToString("yyyy-MM"))
                     {
                         var queryData = bll.GetModelListDate(" Reserve1='配电室低压' ", month.ToString("yyyyMM"));
                         list.AddRange(queryData);
+                    }
+                    else
+                    {
+                        var month_model = month_list.Where(a => a.EntireTime == month).FirstOrDefault();
+                        if (month_model == null)
+                        {
+                            var queryData = bll.GetModelListDate(" Reserve1='配电室低压' ", month.ToString("yyyyMM"));
+                            list.AddRange(queryData);
+                        }
+                    }
+                }
+
+                // 创建一个字典来存储按日期分组的数据
+                var groupedData = list.GroupBy(x => x.EntireTime)
+                                         .ToDictionary(g => g.Key, g => g.ToList());
+
+
+                for (int i = 0; i < month_count; i++)
+                {
+                    var month = startDate.AddMonths(i);
+                    var next_month = startDate.AddMonths(i + 1);
+                    //当前月
+                    if (month.ToString("yyyy-MM") == now.ToString("yyyy-MM"))
+                    {
                         var data_model = new electricity_rateData();
                         data_model.time = month.ToString("MM月");
                         data_model.Electricity = 0;
@@ -98,8 +121,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
                                     break;
                                 }
                                 var end_hour = current_day.AddHours(hour + 1);
-                                var start_eh = list.Where(a => a.EntireTime == start_hour).Sum(a => a.EH);
+                                var start_eh = groupedData.ContainsKey(start_hour) ? groupedData[start_hour].Sum(a => a.EH) : 0;
-                                var end_eh = list.Where(a => a.EntireTime == end_hour).Sum(a => a.EH);
+                                var end_eh = groupedData.ContainsKey(end_hour) ? groupedData[end_hour].Sum(a => a.EH) : 0;
                                 var eh = end_eh - start_eh;
                                 var rate_model = rate_list.Where(a => a.Month == start_hour.Month && DateTime.Parse(a.StartPeriodTime).ToString("HH:mm:ss") == start_hour.ToString("HH:mm:ss")).FirstOrDefault();
                                 if (rate_model != null)
@@ -200,8 +223,6 @@ namespace LonglslandExhibitionCenter.Controllers.api
                         }
                         else
                         {
-                            var queryData = bll.GetModelListDate(" Reserve1='配电室低压' ", month.ToString("yyyyMM"));
-                            list.AddRange(queryData);
                             var data_model = new electricity_rateData();
                             data_model.time = month.ToString("MM月");
                             data_model.Electricity = 0;
@@ -229,8 +250,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
                                 {
                                     var start_hour = current_day.AddHours(hour);
                                     var end_hour = current_day.AddHours(hour + 1);
-                                    var start_eh = list.Where(a => a.EntireTime == start_hour).Sum(a => a.EH);
+                                    var start_eh = groupedData.ContainsKey(start_hour) ? groupedData[start_hour].Sum(a => a.EH) : 0;
-                                    var end_eh = list.Where(a => a.EntireTime == end_hour).Sum(a => a.EH);
+                                    var end_eh = groupedData.ContainsKey(end_hour) ? groupedData[end_hour].Sum(a => a.EH) : 0;
                                     var eh = end_eh - start_eh;
                                     var rate_model = rate_list.Where(a => a.Month == start_hour.Month && DateTime.Parse(a.StartPeriodTime).ToString("HH:mm:ss") == start_hour.ToString("HH:mm:ss")).FirstOrDefault();
                                     if (rate_model != null)

LonglslandExhibitionCenter/Controllers/api/GetEnergyCalendarController.cs

@@ -56,6 +56,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
                     {
                         list.AddRange(list2);
                     }
+
+                    // 创建一个字典来存储按日期分组的数据
+                    var groupedData = list.GroupBy(x => x.EntireTime.Value)
+                                         .ToDictionary(g => g.Key, g => g.ToList());
+
                     var time_count = Convert.ToInt32(stime.Day);
                     for (int i = 0; i < time_count; i++)
                     {
@@ -71,8 +76,11 @@ namespace LonglslandExhibitionCenter.Controllers.api
                             sdate = stime.AddDays(-i + 1).ToString("yyyy-MM-dd 00:00:00");
                         }
                         var edate = stime.AddDays(-i).ToString("yyyy-MM-dd 00:00:00");
-                        var alist = list.Where(x => x.EntireTime == Convert.ToDateTime(sdate)).ToList();
+                        //var alist = list.Where(x => x.EntireTime == Convert.ToDateTime(sdate)).ToList();
-                        var blist = list.Where(x => x.EntireTime == Convert.ToDateTime(edate)).ToList();
+                        //var blist = list.Where(x => x.EntireTime == Convert.ToDateTime(edate)).ToList();
+
+                        var alist = groupedData.ContainsKey(Convert.ToDateTime(sdate)) ? groupedData[Convert.ToDateTime(sdate)] : new List<DataService.Model.electricity_data>();
+                        var blist = groupedData.ContainsKey(Convert.ToDateTime(edate)) ? groupedData[Convert.ToDateTime(edate)] : new List<DataService.Model.electricity_data>();
                         decimal? anum = alist.Sum(x => x.EH);
                         decimal? bnum = blist.Sum(x => x.EH);
                         var model = new electricity_consumptionData()

LonglslandExhibitionCenter/Controllers/api/GetMultiRateController.cs

@@ -131,12 +131,34 @@ namespace LonglslandExhibitionCenter.Controllers.api
                         for (int i = 0; i < month_count; i++)
                         {
                             var month = startDate.AddMonths(i);
-                            var next_month = startDate.AddMonths(i + 1);
                             //当前月
                             if (month.ToString("yyyy-MM") == now.ToString("yyyy-MM"))
                             {
                                 var queryData = bll.GetModelListDate(" Reserve1='配电室低压' ", month.ToString("yyyyMM"));
                                 list.AddRange(queryData);
+                            }
+                            else
+                            {
+                                var month_model = month_list.Where(a => a.EntireTime == month).FirstOrDefault();
+                                if (month_model == null)
+                                {
+                                    var queryData = bll.GetModelListDate(" Reserve1='配电室低压' ", month.ToString("yyyyMM"));
+                                    list.AddRange(queryData);
+                                }
+                            }
+                        }
+
+                        // 创建一个字典来存储按日期分组的数据
+                        var groupedData = list.GroupBy(x => x.EntireTime)
+                                                 .ToDictionary(g => g.Key, g => g.ToList());
+
+                        for (int i = 0; i < month_count; i++)
+                        {
+                            var month = startDate.AddMonths(i);
+                            var next_month = startDate.AddMonths(i + 1);
+                            //当前月
+                            if (month.ToString("yyyy-MM") == now.ToString("yyyy-MM"))
+                            {
                                 var data_model = new multi_rateData();
                                 data_model.time = month.ToString("MM月");
                                 data_model.Needle = 0;
@@ -162,8 +184,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
                                             break;
                                         }
                                         var end_hour = current_day.AddHours(hour + 1);
-                                        var start_eh = list.Where(a => a.EntireTime == start_hour).Sum(a => a.EH);
+                                        var start_eh = groupedData.ContainsKey(start_hour) ? groupedData[start_hour].Sum(a => a.EH) : 0;
-                                        var end_eh = list.Where(a => a.EntireTime == end_hour).Sum(a => a.EH);
+                                        var end_eh = groupedData.ContainsKey(end_hour) ? groupedData[end_hour].Sum(a => a.EH) : 0;
                                         var eh = end_eh - start_eh;
                                         var rate_model = rate_list.Where(a => a.Month == start_hour.Month && DateTime.Parse(a.StartPeriodTime).ToString("HH:mm:ss") == start_hour.ToString("HH:mm:ss")).FirstOrDefault();
                                         if (rate_model != null)
@@ -211,8 +233,6 @@ namespace LonglslandExhibitionCenter.Controllers.api
                                 }
                                 else
                                 {
-                                    var queryData = bll.GetModelListDate(" Reserve1='配电室低压' ", month.ToString("yyyyMM"));
-                                    list.AddRange(queryData);
                                     var data_model = new multi_rateData();
                                     data_model.time = month.ToString("MM月");
                                     data_model.Needle = 0;
@@ -230,8 +250,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
                                         {
                                             var start_hour = current_day.AddHours(hour);
                                             var end_hour = current_day.AddHours(hour + 1);
-                                            var start_eh = list.Where(a => a.EntireTime == start_hour).Sum(a => a.EH);
+                                            var start_eh = groupedData.ContainsKey(start_hour) ? groupedData[start_hour].Sum(a => a.EH) : 0;
-                                            var end_eh = list.Where(a => a.EntireTime == end_hour).Sum(a => a.EH);
+                                            var end_eh = groupedData.ContainsKey(end_hour) ? groupedData[end_hour].Sum(a => a.EH) : 0;
                                             var eh = end_eh - start_eh;
                                             var rate_model = rate_list.Where(a => a.Month == start_hour.Month && DateTime.Parse(a.StartPeriodTime).ToString("HH:mm:ss") == start_hour.ToString("HH:mm:ss")).FirstOrDefault();
                                             if (rate_model != null)
@@ -297,6 +317,30 @@ namespace LonglslandExhibitionCenter.Controllers.api
                         //    }
                         //}
                         var year_count = Convert.ToInt32(now.Year) - 2023;
+                        for (int i = 0; i < year_count; i++)
+                        {
+                            var month = startDate.AddMonths(i);
+                            //当前月
+                            if (month.ToString("yyyy-MM") == now.ToString("yyyy-MM"))
+                            {
+                                var queryData = bll.GetModelListDate(" Reserve1='配电室低压' ", month.ToString("yyyyMM"));
+                                list.AddRange(queryData);
+                            }
+                            else
+                            {
+                                var month_model = month_list.Where(a => a.EntireTime == month).FirstOrDefault();
+                                if (month_model == null)
+                                {
+                                    var queryData = bll.GetModelListDate(" Reserve1='配电室低压' ", month.ToString("yyyyMM"));
+                                    list.AddRange(queryData);
+                                }
+                            }
+                        }
+
+                        // 创建一个字典来存储按日期分组的数据
+                        var groupedData = list.GroupBy(x => x.EntireTime)
+                                                 .ToDictionary(g => g.Key, g => g.ToList());
+
                         for (int j = 0; j < year_count; j++)
                         {
                             var year = startDate.AddYears(j);
@@ -319,8 +363,6 @@ namespace LonglslandExhibitionCenter.Controllers.api
                                 //当前月
                                 if (month.ToString("yyyy-MM") == now.ToString("yyyy-MM"))
                                 {
-                                    var queryData = bll.GetModelListDate(" Reserve1='配电室低压' ", month.ToString("yyyyMM"));
-                                    list.AddRange(queryData);
                                     var day_count = (next_month - month).TotalDays;
                                     //循环月里的每一天
                                     for (int day = 0; day < day_count; day++)
@@ -339,8 +381,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
                                                 break;
                                             }
                                             var end_hour = current_day.AddHours(hour + 1);
-                                            var start_eh = list.Where(a => a.EntireTime == start_hour).Sum(a => a.EH);
+                                            var start_eh = groupedData.ContainsKey(start_hour) ? groupedData[start_hour].Sum(a => a.EH) : 0;
-                                            var end_eh = list.Where(a => a.EntireTime == end_hour).Sum(a => a.EH);
+                                            var end_eh = groupedData.ContainsKey(end_hour) ? groupedData[end_hour].Sum(a => a.EH) : 0;
                                             var eh = end_eh - start_eh;
                                             var rate_model = rate_list.Where(a => a.Month == start_hour.Month && DateTime.Parse(a.StartPeriodTime).ToString("HH:mm:ss") == start_hour.ToString("HH:mm:ss")).FirstOrDefault();
                                             if (rate_model != null)
@@ -382,8 +424,6 @@ namespace LonglslandExhibitionCenter.Controllers.api
                                     }
                                     else
                                     {
-                                        var queryData = bll.GetModelListDate(" Reserve1='配电室低压' ", month.ToString("yyyyMM"));
-                                        list.AddRange(queryData);
                                         var day_count = (next_month - month).TotalDays;
                                         //循环月里的每一天
                                         for (int day = 0; day < day_count; day++)
@@ -394,8 +434,8 @@ namespace LonglslandExhibitionCenter.Controllers.api
                                             {
                                                 var start_hour = current_day.AddHours(hour);
                                                 var end_hour = current_day.AddHours(hour + 1);
-                                                var start_eh = list.Where(a => a.EntireTime == start_hour).Sum(a => a.EH);
+                                                var start_eh = groupedData.ContainsKey(start_hour) ? groupedData[start_hour].Sum(a => a.EH) : 0;
-                                                var end_eh = list.Where(a => a.EntireTime == end_hour).Sum(a => a.EH);
+                                                var end_eh = groupedData.ContainsKey(end_hour) ? groupedData[end_hour].Sum(a => a.EH) : 0;
                                                 var eh = end_eh - start_eh;
                                                 var rate_model = rate_list.Where(a => a.Month == start_hour.Month && DateTime.Parse(a.StartPeriodTime).ToString("HH:mm:ss") == start_hour.ToString("HH:mm:ss")).FirstOrDefault();
                                                 if (rate_model != null)

LonglslandExhibitionCenter/Controllers/api/GetOperatingStateController.cs

@@ -15,21 +15,20 @@ namespace LonglslandExhibitionCenter.Controllers.api
     /// </summary>
     public class GetOperatingStateController : ApiController
     {
+        DataService.BLL.viewing_screen bll = new DataService.BLL.viewing_screen();
+
         public HttpResponseMessage Get()
         {
-            DataService.BLL.viewing_screen bll = new DataService.BLL.viewing_screen();
             var res = new get_operating_state();
             try
             {
                 var data = new List<operating_stateData>();
-                var now = DateTime.Now;
+                var list = bll.GetModelList(" 1=1 order by CAST(ScreenName AS SIGNED) asc");
-                var time = now.ToString("yyyy-MM-dd HH:00:00");
-                var list = bll.GetModelList(" ");
                 foreach (var item in list)
                 {
                     var model = new operating_stateData()
                     {
-                        Name = item.ScreenName,
+                        Name = "led" + item.ScreenName,
                         State = item.ScreenState
                     };
                     data.Add(model);

LonglslandExhibitionCenter/Controllers/api/SetScreenStateController.cs

@@ -0,0 +1,66 @@
+using DataService.api;
+using Newtonsoft.Json;
+using QingHaiVisualizationAPI.Utils;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Web.Http;
+
+namespace LonglslandExhibitionCenter.Controllers.api
+{
+    public class SetScreenStateController : ApiController
+    {
+        DataService.BLL.viewing_screen bll = new DataService.BLL.viewing_screen();
+
+        public HttpResponseMessage Get(string type)
+        {
+            var res = new set_screen_state();
+            try
+            {
+                if (type == "全开" || type == "全关")
+                {
+                    var list = bll.GetModelList("");
+                    foreach (var item in list)
+                    {
+                        var mqqt = new MqttClientService();
+                        data controlData = new data();
+                        controlData.h = new HeaderData();
+                        controlData.h.rt = item.ScreenNumber;
+
+                        // 如果需要同时设置多个数据项，可以使用字典
+                        controlData.b = new BodyData();
+                        controlData.b.dl = new Dictionary<string, string>();
+                        if (type == "全开")
+                        {
+                            controlData.b.dl["" + item.PointerCode + ""] = "2";
+                        }
+                        if (type == "全关")
+                        {
+                            controlData.b.dl["" + item.PointerCode + ""] = "1";
+                        }
+                        mqqt.MqttClientStart();
+                        mqqt.Publish("/gc/data/" + item.ClientId, "J" + JsonConvert.SerializeObject(controlData));
+                    }
+                    res.code = 200;
+                    res.msg = "成功";
+                }
+                else
+                {
+                    res.code = 201;
+                    res.msg = "类型值不对";
+                }
+            }
+            catch (Exception ex)
+            {
+                res.code = 500;
+                res.msg = "失败，" + ex.Message;
+            }
+
+            HttpResponseMessage result = new HttpResponseMessage { Content = new StringContent(JsonConvert.SerializeObject(res), Encoding.GetEncoding("UTF-8"), "application/json") };
+            return result;
+        }
+    }
+}

LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj

@@ -48,9 +48,6 @@
     <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
       <HintPath>..\packages\BouncyCastle.Cryptography.2.3.1\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
     </Reference>
-    <Reference Include="DataService">
-      <HintPath>..\DataService\bin\Debug\DataService.dll</HintPath>
-    </Reference>
     <Reference Include="Enums.NET, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7ea1c1650d506225, processorArchitecture=MSIL">
       <HintPath>..\packages\Enums.NET.4.0.1\lib\net45\Enums.NET.dll</HintPath>
     </Reference>
@@ -275,6 +272,7 @@
     <Compile Include="Controllers\api\GetRealLoadController.cs" />
     <Compile Include="Controllers\api\GetRealtimeLoadController.cs" />
     <Compile Include="Controllers\api\GetSingleControlController.cs" />
+    <Compile Include="Controllers\api\SetScreenStateController.cs" />
     <Compile Include="Controllers\api\SetSingleSwitchController.cs" />
     <Compile Include="Controllers\api\GetSystemEnergyController.cs" />
     <Compile Include="Controllers\api\GetSystemPurgeController.cs" />
@@ -378,6 +376,12 @@
     <Content Include="Scripts\jquery-3.4.1.slim.min.map" />
     <Content Include="Scripts\jquery-3.4.1.min.map" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\DataService\DataService.csproj">
+      <Project>{9b5e12e8-b3b7-482d-a00b-af6bd0771284}</Project>
+      <Name>DataService</Name>
+    </ProjectReference>
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <_PublishTargetUrl>F:\项目\长岛展览馆\发布文件</_PublishTargetUrl>
-    <History>True|2024-09-19T01:42:19.8527457Z;True|2024-08-27T21:03:21.5928516+08:00;True|2024-08-21T11:09:27.6586574+08:00;True|2024-08-19T10:17:16.4446095+08:00;True|2024-08-15T13:20:14.7663530+08:00;True|2024-08-14T10:07:28.2388461+08:00;True|2024-08-14T10:07:03.3134871+08:00;True|2024-08-14T10:06:43.4199921+08:00;True|2024-08-14T10:05:39.6303984+08:00;True|2024-08-14T10:00:18.4168360+08:00;True|2024-08-14T09:50:15.7791885+08:00;True|2024-08-11T20:53:54.5556138+08:00;True|2024-08-10T16:00:18.6655642+08:00;True|2024-08-10T10:41:02.8962798+08:00;True|2024-08-10T10:31:34.0807175+08:00;True|2024-08-10T10:11:01.4518697+08:00;True|2024-08-09T17:46:23.3977253+08:00;True|2024-08-09T14:57:51.6409237+08:00;True|2024-08-09T14:12:02.8124286+08:00;True|2024-08-09T13:57:09.6566238+08:00;True|2024-08-09T13:55:09.1957591+08:00;True|2024-08-09T13:53:12.0978886+08:00;True|2024-08-09T10:21:25.5364378+08:00;True|2024-08-08T17:30:17.0495176+08:00;True|2024-08-08T14:01:01.6427032+08:00;True|2024-08-08T10:26:20.9380493+08:00;True|2024-08-06T16:16:42.4971554+08:00;True|2024-04-15T08:46:26.1708600+08:00;True|2024-04-15T08:43:47.1675051+08:00;True|2024-03-20T09:52:41.5444999+08:00;True|2024-03-20T09:52:28.9463180+08:00;True|2024-03-19T16:26:27.2407972+08:00;True|2024-03-19T15:50:07.1464827+08:00;True|2024-03-14T15:48:46.0852411+08:00;True|2024-03-12T11:15:35.2934238+08:00;True|2024-03-07T16:29:08.9381292+08:00;True|2024-03-05T14:31:05.6269677+08:00;True|2024-03-04T14:37:08.7040845+08:00;True|2024-02-28T11:11:35.8506164+08:00;</History>
+    <History>True|2024-09-19T06:04:55.6320188Z;True|2024-09-19T09:42:19.8527457+08:00;True|2024-08-27T21:03:21.5928516+08:00;True|2024-08-21T11:09:27.6586574+08:00;True|2024-08-19T10:17:16.4446095+08:00;True|2024-08-15T13:20:14.7663530+08:00;True|2024-08-14T10:07:28.2388461+08:00;True|2024-08-14T10:07:03.3134871+08:00;True|2024-08-14T10:06:43.4199921+08:00;True|2024-08-14T10:05:39.6303984+08:00;True|2024-08-14T10:00:18.4168360+08:00;True|2024-08-14T09:50:15.7791885+08:00;True|2024-08-11T20:53:54.5556138+08:00;True|2024-08-10T16:00:18.6655642+08:00;True|2024-08-10T10:41:02.8962798+08:00;True|2024-08-10T10:31:34.0807175+08:00;True|2024-08-10T10:11:01.4518697+08:00;True|2024-08-09T17:46:23.3977253+08:00;True|2024-08-09T14:57:51.6409237+08:00;True|2024-08-09T14:12:02.8124286+08:00;True|2024-08-09T13:57:09.6566238+08:00;True|2024-08-09T13:55:09.1957591+08:00;True|2024-08-09T13:53:12.0978886+08:00;True|2024-08-09T10:21:25.5364378+08:00;True|2024-08-08T17:30:17.0495176+08:00;True|2024-08-08T14:01:01.6427032+08:00;True|2024-08-08T10:26:20.9380493+08:00;True|2024-08-06T16:16:42.4971554+08:00;True|2024-04-15T08:46:26.1708600+08:00;True|2024-04-15T08:43:47.1675051+08:00;True|2024-03-20T09:52:41.5444999+08:00;True|2024-03-20T09:52:28.9463180+08:00;True|2024-03-19T16:26:27.2407972+08:00;True|2024-03-19T15:50:07.1464827+08:00;True|2024-03-14T15:48:46.0852411+08:00;True|2024-03-12T11:15:35.2934238+08:00;True|2024-03-07T16:29:08.9381292+08:00;True|2024-03-05T14:31:05.6269677+08:00;True|2024-03-04T14:37:08.7040845+08:00;True|2024-02-28T11:11:35.8506164+08:00;</History>
     <LastFailureDetails />
   </PropertyGroup>
   <ItemGroup>
@@ -82,10 +82,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
       <publishTime>05/08/2024 00:05:28</publishTime>
     </File>
     <File Include="bin/DataService.dll">
-      <publishTime>08/27/2024 16:21:01</publishTime>
+      <publishTime>09/20/2024 09:25:12</publishTime>
     </File>
     <File Include="bin/DataService.pdb">
-      <publishTime>08/27/2024 16:21:01</publishTime>
+      <publishTime>09/20/2024 09:25:12</publishTime>
     </File>
     <File Include="bin/Enums.NET.dll">
       <publishTime>11/19/2022 06:40:50</publishTime>
@@ -106,10 +106,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
       <publishTime>08/13/2024 17:44:43</publishTime>
     </File>
     <File Include="bin/LonglslandExhibitionCenter.dll">
-      <publishTime>09/19/2024 09:42:14</publishTime>
+      <publishTime>09/20/2024 09:47:14</publishTime>
     </File>
     <File Include="bin/LonglslandExhibitionCenter.pdb">
-      <publishTime>09/19/2024 09:42:14</publishTime>
+      <publishTime>09/20/2024 09:47:14</publishTime>
     </File>
     <File Include="bin/MathNet.Numerics.dll">
       <publishTime>04/03/2022 22:02:06</publishTime>

LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-dcca6df9edb39b80de334543423b2ffe45b3e4f9
+69907aa37a96372dcb12bfb694ab52e9df9babe1

LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-50b9a3ad61bd81ee30edc846430d43764af1d686
+de176748131523f4cf80f167a132c82f2e29332b

Security/ServiceSecurity.cs

@@ -33,12 +33,16 @@ namespace Security
         static MqttClient mqtt_client1;
         static MqttClient mqtt_client2;
         static MqttClient mqtt_client3;
+        static MqttClient mqtt_client4;
         static DataService.BLL.device_info bll_info = new DataService.BLL.device_info();
         static DataService.BLL.electricity_data bll = new DataService.BLL.electricity_data();
         static DataService.BLL.pollution_discharge bll_pollution = new DataService.BLL.pollution_discharge();
         static DataService.BLL.meteorological_station bll_meteorological = new DataService.BLL.meteorological_station();
 
         static DataService.BLL.lighting_info bll_lighting_info = new DataService.BLL.lighting_info();
+
+        static DataService.BLL.viewing_screen bll_viewing_screen = new DataService.BLL.viewing_screen();
+
         public ServiceSecurity()
         {
             InitializeComponent();
@@ -156,6 +160,33 @@ namespace Security
             {
                 log.Info("连接失败");
             }
+
+            MqttConnectionOptions options4 = new MqttConnectionOptions()
+            {
+                IpAddress = "127.0.0.1",
+                Port = 1883,
+                ClientId = "Service-" + Guid.NewGuid().ToString("N"),
+            };
+            options4.Credentials = new MqttCredential("dev", "12345");
+            mqtt_client4 = new MqttClient(options4);
+            // 接收到数据的时候进行触发
+            mqtt_client4.OnMqttMessageReceived += Client4_OnMqttMessageReceived;
+            // 订阅服务器的主题，在连接成功后就去订阅
+            mqtt_client4.OnClientConnected += m =>
+            {
+                Console.WriteLine("连接成功");
+                m.SubscribeMessage("/ge/data/66FFFA32A12145D5B773CF20D7AD9BD3");
+            };
+            mqtt_client4.OnNetworkError += MqttClient4_OnNetworkError; // 自己来控制异常及重连的操作
+            OperateResult result4 = mqtt_client4.ConnectServer();
+            if (result4.IsSuccess)
+            {
+                log.Info("连接成功");
+            }
+            else
+            {
+                log.Info("连接失败");
+            }
         }
 
         private static void MqttClient1_OnNetworkError(object sender, EventArgs e)
@@ -274,6 +305,40 @@ namespace Security
             }
         }
 
+        private static void MqttClient4_OnNetworkError(object sender, EventArgs e)
+        {
+            try
+            {
+                // 当网络异常的时候触发，可以在此处重连服务器
+                if (sender is MqttClient client)
+                {
+                    // 开始重连服务器，直到连接成功为止
+                    log.Info("网络异常，准备10秒后重新连接。");
+                    while (true)
+                    {
+                        // 每隔10秒重连
+                        System.Threading.Thread.Sleep(10_000);
+                        log.Info("准备重新连接服务器...");
+
+                        // 重连之前需要判断是否关闭了Client，自己重写的异常需要自己手动处理
+                        OperateResult connect = client.ConnectServer();
+                        if (connect.IsSuccess)
+                        {
+                            // 连接成功后，可以在下方break之前进行订阅，或是数据初始化操作
+                            log.Info("连接服务器成功！");
+                            client.SubscribeMessage("/ge/data/66FFFA32A12145D5B773CF20D7AD9BD3");
+                            break;
+                        }
+                        log.Info("连接失败，准备10秒后重新连接。");
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                log.Info("重连MQTT失败，失败原因：" + ex.Message);
+            }
+        }
+
         private static void Client1_OnMqttMessageReceived(MqttClient client, string topic, byte[] payload)
         {
             var msg = Encoding.UTF8.GetString(payload);
@@ -2864,6 +2929,82 @@ namespace Security
             }
         }
 
+        private static void Client4_OnMqttMessageReceived(MqttClient client, string topic, byte[] payload)
+        {
+            var msg = Encoding.UTF8.GetString(payload);
+            try
+            {
+                //LED屏
+                if (topic.Contains("/66FFFA32A12145D5B773CF20D7AD9BD3"))
+                {
+                    //log.Info("LED屏msg" + msg);
+                    var now = DateTime.Now;
+                    var ClientId = topic.Replace("/ge/data/", "");
+                    //LED屏
+
+                    var j = msg.Substring(1);
+                    var data = JsonConvert.DeserializeObject<DataService.api.get_data_state>(j);
+                    //log.Info("LED屏:" + data);
+                    if (data.b != null)
+                    {
+                        foreach (var item in data.b.dvl)
+                        {
+                            //var name = "";
+                            //char delimiter = '.'; // 分隔符
+                            //int lastDotIndex = item.da.LastIndexOf(delimiter); // 查找最后一个分隔符的位置
+                            //if (lastDotIndex != -1) // 如果找到分隔符
+                            //{
+                            //    name = item.da.Substring(lastDotIndex + 1); // 截取分隔符后面的子字符串
+                            //}
+                            if (!string.IsNullOrEmpty(item.da))
+                            {
+                                var list = bll_viewing_screen.GetModelList(" ScreenNumber='" + item.da + "' and ClientId='" + ClientId + "' ");
+                                foreach (var dl_item in item.dl)
+                                {
+                                    var model = list.Where(c => c.PointerCode == dl_item.Key).FirstOrDefault();
+                                    if (model != null)
+                                    {
+                                        var is_update = false;
+                                        if (model.ScreenState != dl_item.Value)
+                                        {
+                                            model.ScreenState = dl_item.Value;
+                                            is_update = true;
+                                        }
+                                        if (model.ScreenNumber != item.da)
+                                        {
+                                            model.ScreenNumber = item.da;
+                                            is_update = true;
+                                        }
+                                        if (model.UpdateTime == null)
+                                        {
+                                            model.UpdateTime = now;
+                                            is_update = true;
+                                        }
+                                        else
+                                        {
+                                            if ((now - model.UpdateTime.Value).TotalMinutes >= 1)
+                                            {
+                                                model.UpdateTime = now;
+                                                is_update = true;
+                                            }
+                                        }
+                                        if (is_update)
+                                        {
+                                            bll_viewing_screen.Update(model);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                log.Info("LED屏处理失败，数据：" + msg + "，原因：" + ex.Message);
+            }
+        }
+
         protected override void OnStop()
         {
             // TODO: 在此处添加代码以执行停止服务所需的关闭操作。

Security/bin/Debug/App_Data/Logs_20240920.txt

@@ -0,0 +1,30 @@
+ ------------------------------------------------
+ ------------------------------------------------
+ ------------------------------------------------
+2024-09-20 09:01:41,564 [3] INFO  loginfo - 服务开始
+2024-09-20 09:01:41,589 [3] INFO  loginfo - 开始
+2024-09-20 09:01:43,644 [3] INFO  loginfo - 连接失败
+2024-09-20 09:01:45,680 [3] INFO  loginfo - 连接失败
+2024-09-20 09:01:47,706 [3] INFO  loginfo - 连接失败
+2024-09-20 09:01:49,723 [3] INFO  loginfo - 连接失败
+ ------------------------------------------------
+ ------------------------------------------------
+ ------------------------------------------------
+2024-09-20 09:03:53,613 [3] INFO  loginfo - 服务开始
+2024-09-20 09:03:53,628 [3] INFO  loginfo - 开始
+2024-09-20 09:03:55,674 [3] INFO  loginfo - 连接失败
+2024-09-20 09:03:57,705 [3] INFO  loginfo - 连接失败
+2024-09-20 09:03:59,726 [3] INFO  loginfo - 连接失败
+2024-09-20 09:03:59,772 [3] INFO  loginfo - 连接成功
+2024-09-20 09:07:28,849 [14] INFO  loginfo - 网络异常，准备10秒后重新连接。
+2024-09-20 09:07:41,149 [14] INFO  loginfo - 准备重新连接服务器...
+2024-09-20 09:07:41,869 [14] INFO  loginfo - 连接服务器成功！
+ ------------------------------------------------
+ ------------------------------------------------
+ ------------------------------------------------
+2024-09-20 09:08:02,402 [3] INFO  loginfo - 服务开始
+2024-09-20 09:08:02,420 [3] INFO  loginfo - 开始
+2024-09-20 09:08:04,474 [3] INFO  loginfo - 连接失败
+2024-09-20 09:08:06,518 [3] INFO  loginfo - 连接失败
+2024-09-20 09:08:08,546 [3] INFO  loginfo - 连接失败
+2024-09-20 09:08:08,554 [3] INFO  loginfo - 连接成功

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>5YN1lTA96iVN+gVTv+oSqwWoS4QX/DppZpvXONMDZaQ=</dsig:DigestValue>
+        <dsig:DigestValue>ojcXQVGxbl28/mGCPZDTES/RzGkWzcwo04DuIOw1tWc=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

Security/bin/Debug/ServiceSecurity.exe.manifest

@@ -42,14 +42,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataService.dll" size="137728">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataService.dll" size="139776">
       <assemblyIdentity name="DataService" 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>a/nR4DV6YEQ/KwyHLMWEtpI6EpPcs7wguD1ag2UAtTg=</dsig:DigestValue>
+        <dsig:DigestValue>JTmwwJpvZ1c2OcIg95zi+iyyGuTEXJefUy1czqzCMJ8=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
@@ -138,14 +138,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ServiceSecurity.exe" size="61920">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ServiceSecurity.exe" size="63968">
       <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>Rgjm8G8WNGqXhelbzkcNskUVdQjHnXLQeEXzossMCiw=</dsig:DigestValue>
+        <dsig:DigestValue>sq0o+lr3ASyPvwv2ZJ2X/2ocrei6DNRk3K5ICnrceTE=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

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>5YN1lTA96iVN+gVTv+oSqwWoS4QX/DppZpvXONMDZaQ=</dsig:DigestValue>
+        <dsig:DigestValue>ojcXQVGxbl28/mGCPZDTES/RzGkWzcwo04DuIOw1tWc=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>

Security/obj/Debug/ServiceSecurity.exe.manifest

@@ -42,14 +42,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataService.dll" size="137728">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="DataService.dll" size="139776">
       <assemblyIdentity name="DataService" 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>a/nR4DV6YEQ/KwyHLMWEtpI6EpPcs7wguD1ag2UAtTg=</dsig:DigestValue>
+        <dsig:DigestValue>JTmwwJpvZ1c2OcIg95zi+iyyGuTEXJefUy1czqzCMJ8=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>
@@ -138,14 +138,14 @@
     </dependentAssembly>
   </dependency>
   <dependency>
-    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ServiceSecurity.exe" size="61920">
+    <dependentAssembly dependencyType="install" allowDelayedBinding="true" codebase="ServiceSecurity.exe" size="63968">
       <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>Rgjm8G8WNGqXhelbzkcNskUVdQjHnXLQeEXzossMCiw=</dsig:DigestValue>
+        <dsig:DigestValue>sq0o+lr3ASyPvwv2ZJ2X/2ocrei6DNRk3K5ICnrceTE=</dsig:DigestValue>
       </hash>
     </dependentAssembly>
   </dependency>