phares3757/oi-metrology
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ready to test - B

Browse Source
This commit is contained in:
Mike Phares
2023-11-09 10:34:53 -07:00
parent 81a0ef2adc
commit 5cccb6609f
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Server/Data/Tests/InfinityQSV3-GetEpiProTempVerification.html Normal file
View File

@ -0,0 +1 @@
<tr><td>44</td><td class='Productive'>Productive</td><td class='LoadedRDSCount1'>616747</td><td>0</td><td>0</td><td>1/1/0001 12:00:00 AM</td></tr><tr><td>50</td><td class='Productive'>Productive</td><td class='LoadedRDSCount0'></td><td>0</td><td>0</td><td>1/1/0001 12:00:00 AM</td></tr><tr><td>48</td><td class='Unscheduled Down'>Unscheduled Down</td><td class='LoadedRDSCount0'></td><td>0</td><td>0</td><td>1/1/0001 12:00:00 AM</td></tr><tr><td>42</td><td class='Scheduled Down'>Scheduled Down</td><td class='LoadedRDSCount1'>616741</td><td>0</td><td>0</td><td>1/1/0001 12:00:00 AM</td></tr><tr><td>40</td><td class='Unscheduled Down'>Unscheduled Down</td><td class='LoadedRDSCount1'>616740</td><td>0</td><td>0</td><td>1/1/0001 12:00:00 AM</td></tr><tr><td>46</td><td class='Productive'>Productive</td><td class='LoadedRDSCount0'></td><td>0</td><td>0</td><td>1/1/0001 12:00:00 AM</td></tr><tr><td>54</td><td class='Non-Scheduled'>Non-Scheduled</td><td class='LoadedRDSCount0'></td><td>0</td><td>0</td><td>1/1/0001 12:00:00 AM</td></tr>

13
Server/Repositories/InfinityQSV3Repository.cs
View File

@ -428,7 +428,10 @@ public class InfinityQSV3Repository : IInfinityQSV3Repository
else else
{ {
result = new(); result = new();
int loadedCount;
Reactor? reactor; Reactor? reactor;
string loadedRDS;
int reactorNumber;
IInfinityQSV3Repository infinityQSV3Repository = this; IInfinityQSV3Repository infinityQSV3Repository = this;
string commandText = infinityQSV3Repository.GetCommandText(eppReactorNumbers); string commandText = infinityQSV3Repository.GetCommandText(eppReactorNumbers);
StringBuilder stringBuilder = GetForJsonPath(_DBConnectionFactory, commandText); StringBuilder stringBuilder = GetForJsonPath(_DBConnectionFactory, commandText);
@ -437,12 +440,18 @@ public class InfinityQSV3Repository : IInfinityQSV3Repository
throw new NullReferenceException(nameof(results)); throw new NullReferenceException(nameof(results));
foreach (InfinityQS1090FullLoad infinityQS1090FullLoad in results) foreach (InfinityQS1090FullLoad infinityQS1090FullLoad in results)
{ {
if (infinityQS1090FullLoad.Reactor is null || !eppReactors.TryGetValue(infinityQS1090FullLoad.Reactor.Value, out reactor)) if (infinityQS1090FullLoad.Reactor is null)
continue; continue;
if (!int.TryParse(infinityQS1090FullLoad.Reactor, out reactorNumber))
continue;
if (!eppReactors.TryGetValue(reactorNumber, out reactor))
continue;
loadedCount = reactor.LoadedRDS is null ? 0 : reactor.LoadedRDS.Count;
loadedRDS = reactor.LoadedRDS is null ? "" : reactor.LoadedRDS[0].ToString();
_ = result.Append("<tr>"). _ = result.Append("<tr>").
Append("<td>").Append(reactor.ReactorNo).Append("</td>"). Append("<td>").Append(reactor.ReactorNo).Append("</td>").
Append("<td class='").Append(reactor.E10State).Append("'>").Append(reactor.E10State).Append("</td>"). Append("<td class='").Append(reactor.E10State).Append("'>").Append(reactor.E10State).Append("</td>").
Append("<td class='LoadedRDSCount").Append(reactor.LoadedRDS.Count).Append("'>").Append(reactor.LoadedRDS.Count == 0 ? "" : reactor.LoadedRDS[0]).Append("</td>"). Append("<td class='LoadedRDSCount").Append(loadedCount).Append("'>").Append(loadedRDS).Append("</td>").
Append("<td>").Append(infinityQS1090FullLoad.Value).Append("</td>"). Append("<td>").Append(infinityQS1090FullLoad.Value).Append("</td>").
Append("<td>").Append(infinityQS1090FullLoad.TemperatureOffsetPercentage).Append("</td>"). Append("<td>").Append(infinityQS1090FullLoad.TemperatureOffsetPercentage).Append("</td>").
Append("<td>").Append(infinityQS1090FullLoad.SubGroupIdFormated).Append("</td>"). Append("<td>").Append(infinityQS1090FullLoad.SubGroupIdFormated).Append("</td>").

8
Shared/DataModels/InfinityQSEpp.cs → Shared/DataModels/InfinityQS1090FullLoad.cs
View File

@ -4,10 +4,10 @@ namespace OI.Metrology.Shared.DataModels;
public record InfinityQS1090FullLoad([property: JsonPropertyName("se_sgrp")] int SubGroupId, public record InfinityQS1090FullLoad([property: JsonPropertyName("se_sgrp")] int SubGroupId,
[property: JsonPropertyName("se_date_time")] DateTime SubGroupIdFormated, [property: JsonPropertyName("se_date_time")] DateTime SubGroupIdFormated,
[property: JsonPropertyName("pr_name")] int? Reactor, [property: JsonPropertyName("pr_name")] string Reactor,
[property: JsonPropertyName("pd_name")] int? Part, [property: JsonPropertyName("pd_name")] string Part,
[property: JsonPropertyName("se_value")] int Value, [property: JsonPropertyName("se_value")] float Value,
[property: JsonPropertyName("se_temp_offset_percent")] int TemperatureOffsetPercentage); [property: JsonPropertyName("se_temp_offset_percent")] float TemperatureOffsetPercentage);
[JsonSourceGenerationOptions(WriteIndented = true, DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)] [JsonSourceGenerationOptions(WriteIndented = true, DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)]
[JsonSerializable(typeof(InfinityQS1090FullLoad))] [JsonSerializable(typeof(InfinityQS1090FullLoad))]