diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/0b7dc93c-dba8-41ba-82a1-5dec93f5d6ea.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/0b7dc93c-dba8-41ba-82a1-5dec93f5d6ea.vsidx deleted file mode 100644 index 8d0b03c..0000000 Binary files a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/0b7dc93c-dba8-41ba-82a1-5dec93f5d6ea.vsidx and /dev/null differ diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/0cd257b4-659d-4917-9bb8-e90ece31eaf9.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/0cd257b4-659d-4917-9bb8-e90ece31eaf9.vsidx deleted file mode 100644 index b8d17d8..0000000 Binary files a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/0cd257b4-659d-4917-9bb8-e90ece31eaf9.vsidx and /dev/null differ diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/42eb8d8c-72c9-4c54-9a09-182e00ecb645.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/42eb8d8c-72c9-4c54-9a09-182e00ecb645.vsidx new file mode 100644 index 0000000..4a7766a Binary files /dev/null and b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/42eb8d8c-72c9-4c54-9a09-182e00ecb645.vsidx differ diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/79e620d6-ce73-4877-8376-9ec2183930ea.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/79e620d6-ce73-4877-8376-9ec2183930ea.vsidx deleted file mode 100644 index 23fd4a8..0000000 Binary files a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/79e620d6-ce73-4877-8376-9ec2183930ea.vsidx and /dev/null differ diff --git a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/8a46121e-d258-43c3-bd93-1af54c1b9bec.vsidx b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/a5782467-900c-474b-b614-f22bd7dd2a92.vsidx similarity index 99% rename from .vs/LonglslandExhibitionCenterAPI/FileContentIndex/8a46121e-d258-43c3-bd93-1af54c1b9bec.vsidx rename to .vs/LonglslandExhibitionCenterAPI/FileContentIndex/a5782467-900c-474b-b614-f22bd7dd2a92.vsidx index 7332615..22cfcbb 100644 Binary files a/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/8a46121e-d258-43c3-bd93-1af54c1b9bec.vsidx and b/.vs/LonglslandExhibitionCenterAPI/FileContentIndex/a5782467-900c-474b-b614-f22bd7dd2a92.vsidx differ diff --git a/.vs/LonglslandExhibitionCenterAPI/v17/.suo b/.vs/LonglslandExhibitionCenterAPI/v17/.suo index db126b6..65d7403 100644 Binary files a/.vs/LonglslandExhibitionCenterAPI/v17/.suo and b/.vs/LonglslandExhibitionCenterAPI/v17/.suo differ diff --git a/DataService/api/get_aircondition.cs b/DataService/api/get_aircondition.cs index 0c8c515..e7f46ca 100644 --- a/DataService/api/get_aircondition.cs +++ b/DataService/api/get_aircondition.cs @@ -20,7 +20,7 @@ namespace DataService.api /// /// 机组设定模式 1=制热模式，2=制冷模式 /// - public int UnitMode { get; set; } + public string UnitMode { get; set; } /// /// 机组累计运行时间 单位：小时 diff --git a/DataService/api/get_maintenance_reminder.cs b/DataService/api/get_maintenance_reminder.cs index da7f745..4510ecb 100644 --- a/DataService/api/get_maintenance_reminder.cs +++ b/DataService/api/get_maintenance_reminder.cs @@ -15,6 +15,6 @@ namespace DataService.api public class maintenance_reminderData { public string DeviceName { get; set; } - public int Status { get; set; } + public string Status { get; set; } } } diff --git a/DataService/bin/Debug/DataService.dll b/DataService/bin/Debug/DataService.dll index d247856..f9e7231 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 5171b88..5ba2949 100644 Binary files a/DataService/bin/Debug/DataService.pdb and b/DataService/bin/Debug/DataService.pdb differ diff --git a/DataService/bin/Release/DataService.dll b/DataService/bin/Release/DataService.dll index abab551..291e20c 100644 Binary files a/DataService/bin/Release/DataService.dll and b/DataService/bin/Release/DataService.dll differ diff --git a/DataService/bin/Release/DataService.pdb b/DataService/bin/Release/DataService.pdb index e7ede87..b3114a7 100644 Binary files a/DataService/bin/Release/DataService.pdb and b/DataService/bin/Release/DataService.pdb differ diff --git a/DataService/obj/Debug/DataService.dll b/DataService/obj/Debug/DataService.dll index d247856..f9e7231 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 5171b88..5ba2949 100644 Binary files a/DataService/obj/Debug/DataService.pdb and b/DataService/obj/Debug/DataService.pdb differ diff --git a/DataService/obj/Release/DataService.dll b/DataService/obj/Release/DataService.dll index abab551..291e20c 100644 Binary files a/DataService/obj/Release/DataService.dll and b/DataService/obj/Release/DataService.dll differ diff --git a/DataService/obj/Release/DataService.pdb b/DataService/obj/Release/DataService.pdb index e7ede87..b3114a7 100644 Binary files a/DataService/obj/Release/DataService.pdb and b/DataService/obj/Release/DataService.pdb differ diff --git a/LonglslandExhibitionCenter/Controllers/api/GetAirconditionController.cs b/LonglslandExhibitionCenter/Controllers/api/GetAirconditionController.cs index 4f4da5f..e8c7f8e 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetAirconditionController.cs +++ b/LonglslandExhibitionCenter/Controllers/api/GetAirconditionController.cs @@ -32,7 +32,16 @@ namespace LonglslandExhibitionCenter.Controllers.api var attr_model1 = list.Where(a => a.UnitName == item.Key && a.DeviceName == "机组设定模式").FirstOrDefault(); if (attr_model1 != null) { - model.UnitMode = (int)decimal.Parse(attr_model1.Status); + //model.UnitMode = (int)decimal.Parse(attr_model1.Status); + decimal status; + if (decimal.TryParse(attr_model1.Status, out status)) + { + model.UnitMode = ((int)status).ToString(); + } + else + { + model.UnitMode = attr_model1.Status; + } } var attr_model2 = list.Where(a => a.UnitName == item.Key && a.DeviceName == "机组累计运行时间").FirstOrDefault(); if (attr_model2 != null) diff --git a/LonglslandExhibitionCenter/Controllers/api/GetGeneralSituationController.cs b/LonglslandExhibitionCenter/Controllers/api/GetGeneralSituationController.cs index 93def9e..0095b01 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetGeneralSituationController.cs +++ b/LonglslandExhibitionCenter/Controllers/api/GetGeneralSituationController.cs @@ -29,10 +29,13 @@ namespace LonglslandExhibitionCenter.Controllers.api var index = 0; foreach (var item in power_list) { - var status = (int)decimal.Parse(item.Status); - if (status == 1) + decimal status; + if (decimal.TryParse(item.Status, out status)) { - index++; + if ((int)status == 1) + { + index++; + } } } var model = new general_situationData() diff --git a/LonglslandExhibitionCenter/Controllers/api/GetMaintenanceReminderController.cs b/LonglslandExhibitionCenter/Controllers/api/GetMaintenanceReminderController.cs index 04710cb..73d2f6d 100644 --- a/LonglslandExhibitionCenter/Controllers/api/GetMaintenanceReminderController.cs +++ b/LonglslandExhibitionCenter/Controllers/api/GetMaintenanceReminderController.cs @@ -29,7 +29,15 @@ namespace LonglslandExhibitionCenter.Controllers.api { var model = new maintenance_reminderData(); model.DeviceName = item.UnitName; - model.Status = (int)decimal.Parse(item.Status); + decimal status; + if(decimal.TryParse(item.Status,out status)) + { + model.Status = ((int)status).ToString(); + } + else + { + model.Status = item.Status; + } data.Add(model); } res.code = 200; diff --git a/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj.user b/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj.user index 859cdbd..eb2f4f0 100644 --- a/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj.user +++ b/LonglslandExhibitionCenter/LonglslandExhibitionCenter.csproj.user @@ -8,7 +8,7 @@ - Debug|Any CPU + Release|Any CPU F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\Properties\PublishProfiles\FolderProfile.pubxml ApiControllerEmptyScaffolder root/Common/Web API diff --git a/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml.user b/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml.user index 3f3fd70..f1cc85d 100644 --- a/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/LonglslandExhibitionCenter/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -82,10 +82,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 05/08/2024 00:05:28 - 09/27/2024 15:24:04 + 09/27/2024 17:28:37 - 09/27/2024 15:24:04 + 09/27/2024 17:28:37 11/19/2022 06:40:50 @@ -106,10 +106,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121. 08/13/2024 17:44:43 - 09/27/2024 15:24:05 + 09/27/2024 17:51:35 - 09/27/2024 15:24:05 + 09/27/2024 17:51:35 04/03/2022 22:02:06 diff --git a/LonglslandExhibitionCenter/bin/DataService.dll b/LonglslandExhibitionCenter/bin/DataService.dll index d247856..291e20c 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 5171b88..b3114a7 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 ada9c28..eca2c28 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 b084d10..2eed8a0 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 0862e02..076e3d9 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 ada9c28..4ada59b 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 b084d10..fbd84c9 100644 Binary files a/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.pdb and b/LonglslandExhibitionCenter/obj/Debug/LonglslandExhibitionCenter.pdb differ diff --git a/LonglslandExhibitionCenter/obj/Debug/build.force b/LonglslandExhibitionCenter/obj/Debug/build.force new file mode 100644 index 0000000..e69de29 diff --git a/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.csproj.AssemblyReference.cache b/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.csproj.AssemblyReference.cache index 4281f4a..42f72f9 100644 Binary files a/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.csproj.AssemblyReference.cache and b/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.csproj.AssemblyReference.cache differ diff --git a/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.dll b/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.dll index 4713d01..eca2c28 100644 Binary files a/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.dll and b/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.dll differ diff --git a/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.pdb b/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.pdb index 605f4e6..2eed8a0 100644 Binary files a/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.pdb and b/LonglslandExhibitionCenter/obj/Release/LonglslandExhibitionCenter.pdb differ diff --git a/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/DataService.dll b/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/DataService.dll index abab551..291e20c 100644 Binary files a/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/DataService.dll and b/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/DataService.dll differ diff --git a/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/DataService.pdb b/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/DataService.pdb index e7ede87..b3114a7 100644 Binary files a/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/DataService.pdb and b/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/DataService.pdb differ diff --git a/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.dll b/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.dll index 4713d01..eca2c28 100644 Binary files a/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.dll and b/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.dll differ diff --git a/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.pdb b/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.pdb index 605f4e6..2eed8a0 100644 Binary files a/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.pdb and b/LonglslandExhibitionCenter/obj/Release/Package/PackageTmp/bin/LonglslandExhibitionCenter.pdb differ