diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/1e0d793a-ea38-4f81-b159-e0634822069f.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/1e0d793a-ea38-4f81-b159-e0634822069f.vsidx new file mode 100644 index 0000000..336c18a Binary files /dev/null and b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/1e0d793a-ea38-4f81-b159-e0634822069f.vsidx differ diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/d9363fb1-b299-4b7d-8550-3fc808249bf6.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/568e026b-5244-4f8e-a3a7-5243abf6d971.vsidx similarity index 99% rename from .vs/LonglslandExhibitionCenterAPI/FileContentIndex/d9363fb1-b299-4b7d-8550-3fc808249bf6.vsidx rename to .vs/LonglslandExhibitionCenterAPI/FileContentIndex/568e026b-5244-4f8e-a3a7-5243abf6d971.vsidx index 814de28..5e90bcc 100644 Binary files a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/d9363fb1-b299-4b7d-8550-3fc808249bf6.vsidx and b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/568e026b-5244-4f8e-a3a7-5243abf6d971.vsidx differ diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/65ffa2a5-08b5-4de9-8ce6-75547ef2b855.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/65ffa2a5-08b5-4de9-8ce6-75547ef2b855.vsidx deleted file mode 100644 index c876bc0..0000000 Binary files a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/65ffa2a5-08b5-4de9-8ce6-75547ef2b855.vsidx and /dev/null differ diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/beb20321-0163-44e0-8f1d-2e3b3c70a243.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/beb20321-0163-44e0-8f1d-2e3b3c70a243.vsidx new file mode 100644 index 0000000..70e6b52 Binary files /dev/null and b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/beb20321-0163-44e0-8f1d-2e3b3c70a243.vsidx differ diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/c2a2c11d-c10b-42ae-b32c-de5a4f2b0958.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/c2a2c11d-c10b-42ae-b32c-de5a4f2b0958.vsidx deleted file mode 100644 index f66fd26..0000000 Binary files a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/c2a2c11d-c10b-42ae-b32c-de5a4f2b0958.vsidx and /dev/null differ diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/c8506c44-a92f-4782-a0a2-99d0df31aa64.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/c8506c44-a92f-4782-a0a2-99d0df31aa64.vsidx new file mode 100644 index 0000000..d7532e0 Binary files /dev/null and b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/c8506c44-a92f-4782-a0a2-99d0df31aa64.vsidx differ diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/cb9f9962-f8c0-4182-89de-8e22a10a2bb4.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/cb9f9962-f8c0-4182-89de-8e22a10a2bb4.vsidx deleted file mode 100644 index fa6223f..0000000 Binary files a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/cb9f9962-f8c0-4182-89de-8e22a10a2bb4.vsidx and /dev/null differ diff --git a/.vs/LonglslandExhibitionCenterAPI/v17/.suo b/.vs/LonglslandExhibitionCenterAPI/v17/.suo index 0624b69..cdf000a 100644 Binary files a/.vs/LonglslandExhibitionCenterAPI/v17/.suo and b/.vs/LonglslandExhibitionCenterAPI/v17/.suo differ diff --git a/.vs/LonglslandExhibitionCenterAPI/v17/HierarchyCache.v1.txt b/.vs/LonglslandExhibitionCenterAPI/v17/HierarchyCache.v1.txt index 0975177..b80a1ce 100644 Binary files a/.vs/LonglslandExhibitionCenterAPI/v17/HierarchyCache.v1.txt and b/.vs/LonglslandExhibitionCenterAPI/v17/HierarchyCache.v1.txt differ diff --git a/DataService/api/get_meteorological_station.cs b/DataService/api/get_meteorological_station.cs index 99d8782..4ea1bb9 100644 --- a/DataService/api/get_meteorological_station.cs +++ b/DataService/api/get_meteorological_station.cs @@ -15,6 +15,6 @@ namespace DataService.api public class meteorological_stationData { public string name { get; set; } - public string value { get; set; } + public int value { get; set; } } } diff --git a/DataService/bin/Debug/DataService.dll b/DataService/bin/Debug/DataService.dll index 6bced28..cfef322 100644 Binary files a/DataService/bin/Debug/DataService.dll and b/DataService/bin/Debug/DataService.dll differ diff --git a/DataService/bin/Debug/DataService.pdb b/DataService/bin/Debug/DataService.pdb index 75b8b12..73e68c0 100644 Binary files a/DataService/bin/Debug/DataService.pdb and b/DataService/bin/Debug/DataService.pdb differ diff --git a/DataService/obj/Debug/DataService.dll b/DataService/obj/Debug/DataService.dll index 6bced28..cfef322 100644 Binary files a/DataService/obj/Debug/DataService.dll and b/DataService/obj/Debug/DataService.dll differ diff --git a/DataService/obj/Debug/DataService.pdb b/DataService/obj/Debug/DataService.pdb index 75b8b12..73e68c0 100644 Binary files a/DataService/obj/Debug/DataService.pdb and b/DataService/obj/Debug/DataService.pdb differ diff --git a/LonglslandExhibitionCenter/Controllers/api/GetMeteorologicalStationController.cs b/LonglslandExhibitionCenter/Controllers/api/GetMeteorologicalStationController.cs index 29f17f5..e8fa7f3 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetMeteorologicalStationController.cs +++ b/LonglslandExhibitionCenter/Controllers/api/GetMeteorologicalStationController.cs @@ -27,14 +27,78 @@ namespace LonglslandExhibitionCenter.Controllers.api var data = new List(); var list = bll.GetModelList(""); var time=Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd HH:00:00")); - var alist=list.Where(x=>x.EntireTime==time).ToList(); - foreach (var item in alist) + var model1 = new meteorological_stationData(); + model1.name = "风速"; + var list1 = list.Where(x => x.MeteorologicalName == model1.name&&x.EntireTime==time).FirstOrDefault(); + if (list1 == null) { - var model = new meteorological_stationData(); - model.name = item.MeteorologicalName; - model.value = Convert.ToString(item.MeteorologicalValue); - data.Add(model); + model1.value = 0; } + else + { + model1.value = Convert.ToInt32(list1.MeteorologicalValue); + } + data.Add(model1); + var model2=new meteorological_stationData(); + model2.name = "雨量"; + var list2=list.Where(x=>x.MeteorologicalName==model2.name&&x.EntireTime==time).FirstOrDefault(); + if (list2 == null) + { + model2.value = 0; + } + else + { + model2.value = Convert.ToInt32(list2.MeteorologicalValue); + } + data.Add(model2); + var model3 = new meteorological_stationData(); + model3.name = "光照度"; + var list3 = list.Where(x => x.MeteorologicalName == model3.name && x.EntireTime == time).FirstOrDefault(); + if(list3 == null) + { + model3.value = 0; + } + else + { + model3.value = Convert.ToInt32(list3.MeteorologicalValue); + } + data.Add(model3); + var model4 = new meteorological_stationData(); + model4.name = "雨雪状态"; + var list4 = list.Where(x => x.MeteorologicalName == model4.name && x.EntireTime == time).FirstOrDefault(); + if(list4 == null) + { + model4.value = 0; + } + else + { + model4.value = Convert.ToInt32(list4.MeteorologicalValue); + } + data.Add(model4); + var model5 = new meteorological_stationData(); + model5.name = "风向"; + var list5 = list.Where(x => x.MeteorologicalName == model5.name && x.EntireTime == time).FirstOrDefault(); + if(list5 == null) + { + model5.value = 0; + } + else + { + model5.value = Convert.ToInt32(list5.MeteorologicalValue); + } + data.Add(model5); + var model6 = new meteorological_stationData(); + model6.name = "空气质量"; + var list6 = list.Where(x => x.MeteorologicalName == model6.name && x.EntireTime == time).FirstOrDefault(); + if(list6 == null) + { + model6.value = 0; + } + else + { + model6.value = Convert.ToInt32(list6.MeteorologicalValue); + } + data.Add(model6); res.code = 200; res.msg = "成功"; res.data = data; diff --git a/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj.user b/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj.user index b1dae8e..16c8208 100644 --- a/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj.user +++ b/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj.user @@ -8,7 +8,7 @@ - Release|Any CPU + Debug|Any CPU E:\林谷项目\长岛展览馆项目\后端\LonglslandExhibitionCenter\LonglslandExhibitionCenter\Properties\PublishProfiles\FolderProfile.pubxml diff --git a/LonglslandExhibitionCenter/bin/DataService.dll b/LonglslandExhibitionCenter/bin/DataService.dll index 6bced28..cfef322 100644 Binary files a/LonglslandExhibitionCenter/bin/DataService.dll and b/LonglslandExhibitionCenter/bin/DataService.dll differ diff --git a/LonglslandExhibitionCenter/bin/DataService.pdb b/LonglslandExhibitionCenter/bin/DataService.pdb index 75b8b12..73e68c0 100644 Binary files a/LonglslandExhibitionCenter/bin/DataService.pdb and b/LonglslandExhibitionCenter/bin/DataService.pdb differ diff --git a/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.dll b/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.dll index 4181377..36aa112 100644 Binary files a/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.dll and b/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.dll differ diff --git a/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.pdb b/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.pdb index dd22102..8d427a3 100644 Binary files a/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.pdb and b/LonglslandExhibitionCenter/bin/LonglslandExhibitionCenter.pdb differ diff --git a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.csproj.AssemblyReference.cache b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.csproj.AssemblyReference.cache index f9ebf44..c8376c0 100644 Binary files a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.csproj.AssemblyReference.cache and b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.csproj.AssemblyReference.cache differ diff --git a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.dll b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.dll index c6669b9..36aa112 100644 Binary files a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.dll and b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.dll differ diff --git a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.pdb b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.pdb index 386a7af..8d427a3 100644 Binary files a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.pdb and b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.pdb differ diff --git a/Security/ServiceSecurity.cs b/Security/ServiceSecurity.cs index 81b6e3d..7e97b46 100644 --- a/Security/ServiceSecurity.cs +++ b/Security/ServiceSecurity.cs @@ -191,15 +191,21 @@ namespace Security } var now = DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00"); var ddate=Convert.ToDateTime(now); + var dtime =DateTime.Now.AddMonths(-1).ToString("yyyyMM"); + var sddate=Convert.ToDateTime(ddate.AddHours(-1)); var list = bll.GetModelListDate("", date).Where(x => x.EntireTime == ddate).ToList(); - if (list.Count < 83) + if (list.Count < 84) { - var list1= list.Select(x => x.DeviceName).ToList(); + var list1= list.Select(x => x.DeviceName).ToList(); var list2 = bll_info.GetModelLists(list1); var vlist = bll.GetModelListDate(" ", date); + if (vlist.Count == 0) + { + vlist = bll.GetModelListDate("", dtime); + } foreach (var aitem in list2) { - var svlist = vlist.FirstOrDefault(x => x.DeviceName == aitem.DeviceName); + var svlist = vlist.Where(x=>x.DeviceName==aitem.DeviceName).OrderByDescending(x=>x.EntireTime).FirstOrDefault(); var model = new DataService.Model.electricity_data(); model.ElectricityId = Guid.NewGuid().ToString("N"); model.DeviceName = aitem.DeviceName; @@ -357,7 +363,7 @@ namespace Security var now = DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00"); var ddate = Convert.ToDateTime(now); var list = bll.GetModelListDate("", date).Where(x => x.EntireTime == ddate).ToList(); - if (list.Count < 83) + if (list.Count < 84) { var list1 = list.Select(x => x.DeviceName).ToList(); var list2 = bll_info.GetModelLists(list1); @@ -511,16 +517,14 @@ namespace Security var name = ""; char delimiter = '.'; // 分隔符 int lastDotIndex = item.da.LastIndexOf(delimiter); // 查找最后一个分隔符的位置 - if (lastDotIndex != -1) // 如果找到分隔符 { name = item.da.Substring(lastDotIndex + 1); // 截取分隔符后面的子字符串 - } var now = DateTime.Now.AddHours(-1).ToString("yyyy-MM-dd HH:00:00"); var ddate = Convert.ToDateTime(now); var list = bll.GetModelListDate("", date).Where(x => x.EntireTime == ddate).ToList(); - if (list.Count < 83) + if (list.Count < 84) { var list1 = list.Select(x => x.DeviceName).ToList(); var list2 = bll_info.GetModelLists(list1); diff --git a/Security/bin/Debug/App_Data/Logs_20240320.txt b/Security/bin/Debug/App_Data/Logs_20240320.txt new file mode 100644 index 0000000..68a7e48 --- /dev/null +++ b/Security/bin/Debug/App_Data/Logs_20240320.txt @@ -0,0 +1,78 @@ + ------------------------------------------------ + ------------------------------------------------ + ------------------------------------------------ +2024-03-20 14:34:08,223 [3] INFO loginfo - ʼ +2024-03-20 14:34:08,252 [3] INFO loginfo - ʼ +2024-03-20 14:34:08,293 [3] INFO loginfo - ӳɹ +2024-03-20 14:34:08,293 [3] INFO loginfo - ʧ + ------------------------------------------------ + ------------------------------------------------ + ------------------------------------------------ +2024-03-20 14:44:23,824 [3] INFO loginfo - ʼ +2024-03-20 14:44:23,871 [3] INFO loginfo - ʼ +2024-03-20 14:44:23,928 [3] INFO loginfo - ӳɹ +2024-03-20 14:44:23,928 [3] INFO loginfo - ʧ +2024-03-20 14:45:07,764 [7] INFO loginfo - 뷽 +2024-03-20 14:45:07,764 [7] INFO loginfo - count0 +2024-03-20 14:45:08,029 [7] INFO loginfo - ҵѹmsgJ{"b":{"dvl":[{"da":"R.C1.370510043139","dl":{"01010001":249.300,"01010002":247.700,"01010003":204.000,"01020001":0.000,"01020002":0.000,"01020003":0.000,"01030004":0.000,"01030012":0.000,"01030016":0.000,"01040005":0.290}}],"ts":"2024-01-29 15:10:31"}} +2024-03-20 14:45:08,168 [7] INFO loginfo - ҵѹ:DataService.api.get_data +2024-03-20 14:45:27,663 [7] INFO loginfo - ʧܣݣJ{"b":{"dvl":[{"da":"R.C1.370510043139","dl":{"01010001":249.300,"01010002":247.700,"01010003":204.000,"01020001":0.000,"01020002":0.000,"01020003":0.000,"01030004":0.000,"01030012":0.000,"01030016":0.000,"01040005":0.290}}],"ts":"2024-01-29 15:10:31"}}ԭδõʵ +2024-03-20 14:45:27,672 [7] INFO loginfo - 뷽 +2024-03-20 14:45:27,672 [7] INFO loginfo - count0 +2024-03-20 14:45:27,674 [7] INFO loginfo - ҵѹmsgJ{"b":{"dvl":[{"da":"R.C1.370510043139","dl":{"01010001":249.300,"01010002":247.700,"01010003":204.000,"01020001":0.000,"01020002":0.000,"01020003":0.000,"01030004":0.000,"01030012":0.000,"01030016":0.000,"01040005":0.290}}],"ts":"2024-01-29 15:10:31"}} +2024-03-20 14:45:27,674 [7] INFO loginfo - ҵѹ:DataService.api.get_data +2024-03-20 14:45:27,991 [7] INFO loginfo - ʧܣݣJ{"b":{"dvl":[{"da":"R.C1.370510043139","dl":{"01010001":249.300,"01010002":247.700,"01010003":204.000,"01020001":0.000,"01020002":0.000,"01020003":0.000,"01030004":0.000,"01030012":0.000,"01030016":0.000,"01040005":0.290}}],"ts":"2024-01-29 15:10:31"}}ԭδõʵ +2024-03-20 14:45:32,407 [22] INFO loginfo - 뷽 +2024-03-20 14:45:32,407 [22] INFO loginfo - count0 +2024-03-20 14:45:32,408 [22] INFO loginfo - ҵѹmsgJ{"b":{"dvl":[{"da":"R.C1.370510043139","dl":{"01010001":249.300,"01010002":247.700,"01010003":204.000,"01020001":0.000,"01020002":0.000,"01020003":0.000,"01030004":0.000,"01030012":0.000,"01030016":0.000,"01040005":0.290}}],"ts":"2024-01-29 15:10:31"}} +2024-03-20 14:45:32,408 [22] INFO loginfo - ҵѹ:DataService.api.get_data + ------------------------------------------------ + ------------------------------------------------ + ------------------------------------------------ +2024-03-20 14:48:37,622 [3] INFO loginfo - ʼ +2024-03-20 14:48:37,653 [3] INFO loginfo - ʼ +2024-03-20 14:48:37,676 [3] INFO loginfo - ӳɹ +2024-03-20 14:48:37,676 [3] INFO loginfo - ʧ +2024-03-20 14:48:46,138 [5] INFO loginfo - 뷽 +2024-03-20 14:48:46,139 [5] INFO loginfo - count0 +2024-03-20 14:48:46,366 [5] INFO loginfo - ҵѹmsgJ{"b":{"dvl":[{"da":"R.C1.370510043139","dl":{"01010001":249.300,"01010002":247.700,"01010003":204.000,"01020001":0.000,"01020002":0.000,"01020003":0.000,"01030004":0.000,"01030012":0.000,"01030016":0.000,"01040005":0.290}}],"ts":"2024-01-29 15:10:31"}} +2024-03-20 14:48:46,513 [5] INFO loginfo - ҵѹ:DataService.api.get_data +2024-03-20 14:49:06,738 [5] INFO loginfo - ʧܣݣJ{"b":{"dvl":[{"da":"R.C1.370510043139","dl":{"01010001":249.300,"01010002":247.700,"01010003":204.000,"01020001":0.000,"01020002":0.000,"01020003":0.000,"01030004":0.000,"01030012":0.000,"01030016":0.000,"01040005":0.290}}],"ts":"2024-01-29 15:10:31"}}ԭδõʵ +2024-03-20 14:49:10,417 [17] INFO loginfo - 뷽 +2024-03-20 14:49:10,417 [17] INFO loginfo - count0 +2024-03-20 14:49:10,418 [17] INFO loginfo - ҵѹmsgJ{"b":{"dvl":[{"da":"R.C1.370510043139","dl":{"01010001":249.300,"01010002":247.700,"01010003":204.000,"01020001":0.000,"01020002":0.000,"01020003":0.000,"01030004":0.000,"01030012":0.000,"01030016":0.000,"01040005":0.290}}],"ts":"2024-01-29 15:10:31"}} +2024-03-20 14:49:10,418 [17] INFO loginfo - ҵѹ:DataService.api.get_data + ------------------------------------------------ + ------------------------------------------------ + ------------------------------------------------ +2024-03-20 14:50:02,648 [3] INFO loginfo - ʼ +2024-03-20 14:50:02,677 [3] INFO loginfo - ʼ +2024-03-20 14:50:02,700 [3] INFO loginfo - ӳɹ +2024-03-20 14:50:02,701 [3] INFO loginfo - ʧ +2024-03-20 14:50:05,292 [11] INFO loginfo - 뷽 +2024-03-20 14:50:05,293 [11] INFO loginfo - count0 +2024-03-20 14:50:05,535 [11] INFO loginfo - ҵѹmsgJ{"b":{"dvl":[{"da":"R.C1.370510043139","dl":{"01010001":249.300,"01010002":247.700,"01010003":204.000,"01020001":0.000,"01020002":0.000,"01020003":0.000,"01030004":0.000,"01030012":0.000,"01030016":0.000,"01040005":0.290}}],"ts":"2024-01-29 15:10:31"}} +2024-03-20 14:50:05,733 [11] INFO loginfo - ҵѹ:DataService.api.get_data +2024-03-20 14:50:08,693 [11] INFO loginfo - ʧܣݣJ{"b":{"dvl":[{"da":"R.C1.370510043139","dl":{"01010001":249.300,"01010002":247.700,"01010003":204.000,"01020001":0.000,"01020002":0.000,"01020003":0.000,"01030004":0.000,"01030012":0.000,"01030016":0.000,"01040005":0.290}}],"ts":"2024-01-29 15:10:31"}}ԭδõʵ +2024-03-20 14:50:14,736 [8] INFO loginfo - 뷽 +2024-03-20 14:50:14,736 [8] INFO loginfo - count0 +2024-03-20 14:50:14,738 [8] INFO loginfo - ҵѹmsgJ{"b":{"dvl":[{"da":"R.C1.370510043139","dl":{"01010001":249.300,"01010002":247.700,"01010003":204.000,"01020001":0.000,"01020002":0.000,"01020003":0.000,"01030004":0.000,"01030012":0.000,"01030016":0.000,"01040005":0.290}}],"ts":"2024-01-29 15:10:31"}} +2024-03-20 14:50:14,738 [8] INFO loginfo - ҵѹ:DataService.api.get_data + ------------------------------------------------ + ------------------------------------------------ + ------------------------------------------------ +2024-03-20 14:51:52,283 [3] INFO loginfo - ʼ +2024-03-20 14:51:52,305 [3] INFO loginfo - ʼ +2024-03-20 14:51:52,322 [3] INFO loginfo - ӳɹ +2024-03-20 14:51:52,322 [3] INFO loginfo - ʧ +2024-03-20 14:51:57,076 [8] INFO loginfo - 뷽 +2024-03-20 14:51:57,076 [8] INFO loginfo - count0 +2024-03-20 14:51:57,237 [8] INFO loginfo - ҵѹmsgJ{"b":{"dvl":[{"da":"R.C1.370510043139","dl":{"01010001":249.300,"01010002":247.700,"01010003":204.000,"01020001":0.000,"01020002":0.000,"01020003":0.000,"01030004":0.000,"01030012":0.000,"01030016":0.000,"01040005":0.290}}],"ts":"2024-01-29 15:10:31"}} +2024-03-20 14:51:57,375 [8] INFO loginfo - ҵѹ:DataService.api.get_data + ------------------------------------------------ + ------------------------------------------------ + ------------------------------------------------ +2024-03-20 14:54:47,018 [3] INFO loginfo - ʼ +2024-03-20 14:54:47,046 [3] INFO loginfo - ʼ +2024-03-20 14:54:47,071 [3] INFO loginfo - ӳɹ +2024-03-20 14:54:47,071 [3] INFO loginfo - ʧ diff --git a/Security/bin/Debug/DataService.dll b/Security/bin/Debug/DataService.dll index c56917e..cfef322 100644 Binary files a/Security/bin/Debug/DataService.dll and b/Security/bin/Debug/DataService.dll differ diff --git a/Security/bin/Debug/DataService.pdb b/Security/bin/Debug/DataService.pdb index 9f5ab39..73e68c0 100644 Binary files a/Security/bin/Debug/DataService.pdb and b/Security/bin/Debug/DataService.pdb differ diff --git a/Security/bin/Debug/ServiceSecurity.application b/Security/bin/Debug/ServiceSecurity.application index ecaca07..c3e849d 100644 --- a/Security/bin/Debug/ServiceSecurity.application +++ b/Security/bin/Debug/ServiceSecurity.application @@ -14,7 +14,7 @@ - ysT40iU2igpjZx6kj9cCT/Lt6BsLUnPOcZvNsro9iuE= + bcXn55NFL8EJhw0A9ivpI+YS2VJCWWH+VGpQA160YR4= diff --git a/Security/bin/Debug/ServiceSecurity.exe b/Security/bin/Debug/ServiceSecurity.exe index 2b4855f..87efebc 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 fce3630..6d48dc0 100644 --- a/Security/bin/Debug/ServiceSecurity.exe.manifest +++ b/Security/bin/Debug/ServiceSecurity.exe.manifest @@ -42,14 +42,14 @@ - + - lQLMjFJzajZHSOUSCvVbfOucJWf30Tx0kbX6cpFzI6I= + XpswRERzQVlk45kN8e/ojbzD5/2lpQtcPSGdMv655N4= @@ -138,14 +138,14 @@ - + - PjYy6ISYr4bq31n++DEc+IDHQiIXzrTgXBqwVLjbPCY= + vx0PPghT8a6/XULityhjI65QG+UBPR1c4+nbgpo4Pp0= diff --git a/Security/bin/Debug/ServiceSecurity.pdb b/Security/bin/Debug/ServiceSecurity.pdb index 3dbc2b2..d337ef9 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 6444bff..61b45e6 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 207c46e..b88c83f 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 ecaca07..c3e849d 100644 --- a/Security/obj/Debug/ServiceSecurity.application +++ b/Security/obj/Debug/ServiceSecurity.application @@ -14,7 +14,7 @@ - ysT40iU2igpjZx6kj9cCT/Lt6BsLUnPOcZvNsro9iuE= + bcXn55NFL8EJhw0A9ivpI+YS2VJCWWH+VGpQA160YR4= diff --git a/Security/obj/Debug/ServiceSecurity.exe b/Security/obj/Debug/ServiceSecurity.exe index 2b4855f..87efebc 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 fce3630..6d48dc0 100644 --- a/Security/obj/Debug/ServiceSecurity.exe.manifest +++ b/Security/obj/Debug/ServiceSecurity.exe.manifest @@ -42,14 +42,14 @@ - + - lQLMjFJzajZHSOUSCvVbfOucJWf30Tx0kbX6cpFzI6I= + XpswRERzQVlk45kN8e/ojbzD5/2lpQtcPSGdMv655N4= @@ -138,14 +138,14 @@ - + - PjYy6ISYr4bq31n++DEc+IDHQiIXzrTgXBqwVLjbPCY= + vx0PPghT8a6/XULityhjI65QG+UBPR1c4+nbgpo4Pp0= diff --git a/Security/obj/Debug/ServiceSecurity.pdb b/Security/obj/Debug/ServiceSecurity.pdb index 3dbc2b2..d337ef9 100644 Binary files a/Security/obj/Debug/ServiceSecurity.pdb and b/Security/obj/Debug/ServiceSecurity.pdb differ