增加对离线的处理

This commit is contained in:
曾艳 2024-09-27 17:55:30 +08:00
parent 301f8bcdf1
commit 21af4aae08
36 changed files with 32 additions and 12 deletions

View File

@ -20,7 +20,7 @@ namespace DataService.api
/// <summary> /// <summary>
/// 机组设定模式 1=制热模式2=制冷模式 /// 机组设定模式 1=制热模式2=制冷模式
/// </summary> /// </summary>
public int UnitMode { get; set; } public string UnitMode { get; set; }
/// <summary> /// <summary>
/// 机组累计运行时间 单位:小时 /// 机组累计运行时间 单位:小时

View File

@ -15,6 +15,6 @@ namespace DataService.api
public class maintenance_reminderData public class maintenance_reminderData
{ {
public string DeviceName { get; set; } public string DeviceName { get; set; }
public int Status { get; set; } public string Status { get; set; }
} }
} }

View File

@ -32,7 +32,16 @@ namespace LonglslandExhibitionCenter.Controllers.api
var attr_model1 = list.Where(a => a.UnitName == item.Key && a.DeviceName == "机组设定模式").FirstOrDefault(); var attr_model1 = list.Where(a => a.UnitName == item.Key && a.DeviceName == "机组设定模式").FirstOrDefault();
if (attr_model1 != null) 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(); var attr_model2 = list.Where(a => a.UnitName == item.Key && a.DeviceName == "机组累计运行时间").FirstOrDefault();
if (attr_model2 != null) if (attr_model2 != null)

View File

@ -29,10 +29,13 @@ namespace LonglslandExhibitionCenter.Controllers.api
var index = 0; var index = 0;
foreach (var item in power_list) foreach (var item in power_list)
{ {
var status = (int)decimal.Parse(item.Status); decimal status;
if (status == 1) if (decimal.TryParse(item.Status, out status))
{ {
index++; if ((int)status == 1)
{
index++;
}
} }
} }
var model = new general_situationData() var model = new general_situationData()

View File

@ -29,7 +29,15 @@ namespace LonglslandExhibitionCenter.Controllers.api
{ {
var model = new maintenance_reminderData(); var model = new maintenance_reminderData();
model.DeviceName = item.UnitName; 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); data.Add(model);
} }
res.code = 200; res.code = 200;

View File

@ -8,7 +8,7 @@
<IISExpressWindowsAuthentication /> <IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode /> <IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile /> <UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>F:\项目\长岛展览馆\项目\LonglslandExhibitionCenter\LonglslandExhibitionCenter\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID> <Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath> <Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>

View File

@ -82,10 +82,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>05/08/2024 00:05:28</publishTime> <publishTime>05/08/2024 00:05:28</publishTime>
</File> </File>
<File Include="bin/DataService.dll"> <File Include="bin/DataService.dll">
<publishTime>09/27/2024 15:24:04</publishTime> <publishTime>09/27/2024 17:28:37</publishTime>
</File> </File>
<File Include="bin/DataService.pdb"> <File Include="bin/DataService.pdb">
<publishTime>09/27/2024 15:24:04</publishTime> <publishTime>09/27/2024 17:28:37</publishTime>
</File> </File>
<File Include="bin/Enums.NET.dll"> <File Include="bin/Enums.NET.dll">
<publishTime>11/19/2022 06:40:50</publishTime> <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> <publishTime>08/13/2024 17:44:43</publishTime>
</File> </File>
<File Include="bin/LonglslandExhibitionCenter.dll"> <File Include="bin/LonglslandExhibitionCenter.dll">
<publishTime>09/27/2024 15:24:05</publishTime> <publishTime>09/27/2024 17:51:35</publishTime>
</File> </File>
<File Include="bin/LonglslandExhibitionCenter.pdb"> <File Include="bin/LonglslandExhibitionCenter.pdb">
<publishTime>09/27/2024 15:24:05</publishTime> <publishTime>09/27/2024 17:51:35</publishTime>
</File> </File>
<File Include="bin/MathNet.Numerics.dll"> <File Include="bin/MathNet.Numerics.dll">
<publishTime>04/03/2022 22:02:06</publishTime> <publishTime>04/03/2022 22:02:06</publishTime>