ready to test
This commit is contained in:
parent
03bd20fc8c
commit
81a0ef2adc
@ -52,4 +52,11 @@ public class InfinityQSV3Controller : Controller, IInfinityQSV3Controller<IActio
|
|||||||
return Content(result, "application/json", System.Text.Encoding.UTF8);
|
return Content(result, "application/json", System.Text.Encoding.UTF8);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[HttpGet("epi-pro-temp-verification")]
|
||||||
|
public IActionResult GetEpiProTempVerification()
|
||||||
|
{
|
||||||
|
string result = _InfinityQSRepositoryV3.GetEpiProTempVerification();
|
||||||
|
return Content(result, "text/html", System.Text.Encoding.UTF8);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
@ -19,6 +19,7 @@ public record AppSettings(string ApiExportPath,
|
|||||||
string MonAResource,
|
string MonAResource,
|
||||||
string MonASite,
|
string MonASite,
|
||||||
string OI2SqlConnectionString,
|
string OI2SqlConnectionString,
|
||||||
|
string OpenInsightApplicationProgrammingInterface,
|
||||||
Dictionary<string, string> TableToPath,
|
Dictionary<string, string> TableToPath,
|
||||||
string URLs,
|
string URLs,
|
||||||
string WorkingDirectoryName)
|
string WorkingDirectoryName)
|
||||||
|
@ -23,6 +23,7 @@ public class AppSettings
|
|||||||
public string? MonAResource { get; set; }
|
public string? MonAResource { get; set; }
|
||||||
public string? MonASite { get; set; }
|
public string? MonASite { get; set; }
|
||||||
public string? Oi2SqlConnectionString { get; set; }
|
public string? Oi2SqlConnectionString { get; set; }
|
||||||
|
public string? OpenInsightApplicationProgrammingInterface { get; set; }
|
||||||
public Dictionary<string, string>? TableToPath { get; set; }
|
public Dictionary<string, string>? TableToPath { get; set; }
|
||||||
public string? URLs { get; set; }
|
public string? URLs { get; set; }
|
||||||
public string? WorkingDirectoryName { get; set; }
|
public string? WorkingDirectoryName { get; set; }
|
||||||
@ -54,6 +55,7 @@ public class AppSettings
|
|||||||
if (appSettings.MonAResource is null) throw new NullReferenceException(nameof(MonAResource));
|
if (appSettings.MonAResource is null) throw new NullReferenceException(nameof(MonAResource));
|
||||||
if (appSettings.MonASite is null) throw new NullReferenceException(nameof(MonASite));
|
if (appSettings.MonASite is null) throw new NullReferenceException(nameof(MonASite));
|
||||||
if (appSettings.Oi2SqlConnectionString is null) throw new NullReferenceException(nameof(Oi2SqlConnectionString));
|
if (appSettings.Oi2SqlConnectionString is null) throw new NullReferenceException(nameof(Oi2SqlConnectionString));
|
||||||
|
if (appSettings.OpenInsightApplicationProgrammingInterface is null) throw new NullReferenceException(nameof(OpenInsightApplicationProgrammingInterface));
|
||||||
if (appSettings.URLs is null) throw new NullReferenceException(nameof(URLs));
|
if (appSettings.URLs is null) throw new NullReferenceException(nameof(URLs));
|
||||||
if (appSettings.TableToPath is null) throw new NullReferenceException(nameof(TableToPath));
|
if (appSettings.TableToPath is null) throw new NullReferenceException(nameof(TableToPath));
|
||||||
if (appSettings.WorkingDirectoryName is null) throw new NullReferenceException(nameof(WorkingDirectoryName));
|
if (appSettings.WorkingDirectoryName is null) throw new NullReferenceException(nameof(WorkingDirectoryName));
|
||||||
@ -75,6 +77,7 @@ public class AppSettings
|
|||||||
appSettings.MonAResource,
|
appSettings.MonAResource,
|
||||||
appSettings.MonASite,
|
appSettings.MonASite,
|
||||||
appSettings.Oi2SqlConnectionString,
|
appSettings.Oi2SqlConnectionString,
|
||||||
|
appSettings.OpenInsightApplicationProgrammingInterface,
|
||||||
appSettings.TableToPath,
|
appSettings.TableToPath,
|
||||||
appSettings.URLs,
|
appSettings.URLs,
|
||||||
appSettings.WorkingDirectoryName);
|
appSettings.WorkingDirectoryName);
|
||||||
|
@ -62,26 +62,26 @@ public class Program
|
|||||||
SQLDbConnectionFactory sqlDbConnectionFactory = new(appSettings);
|
SQLDbConnectionFactory sqlDbConnectionFactory = new(appSettings);
|
||||||
ClientSettingsRepository clientSettingsRepository = new(appSettings);
|
ClientSettingsRepository clientSettingsRepository = new(appSettings);
|
||||||
|
|
||||||
|
_ = webApplicationBuilder.Services.AddHttpClient();
|
||||||
_ = webApplicationBuilder.Services.AddSingleton(_ => appSettings);
|
_ = webApplicationBuilder.Services.AddSingleton(_ => appSettings);
|
||||||
_ = webApplicationBuilder.Services.AddSingleton<IInboundRepository, InboundRepository>();
|
_ = webApplicationBuilder.Services.AddSingleton<IPinRepository, PinRepository>();
|
||||||
_ = webApplicationBuilder.Services.AddSingleton<IReactorsRepository, ReactorsRepository>();
|
|
||||||
_ = webApplicationBuilder.Services.AddSingleton<IClientSettingsRepository>(_ => clientSettingsRepository);
|
|
||||||
_ = webApplicationBuilder.Services.AddSingleton<IServiceShopOrderRepository, ServiceShopOrderRepository>();
|
|
||||||
_ = webApplicationBuilder.Services.AddSingleton<IPinRepository, PinRepository>(_ => new(appSettings.MockRoot));
|
|
||||||
_ = webApplicationBuilder.Services.AddSingleton<IDbConnectionFactory, SQLDbConnectionFactory>(_ => sqlDbConnectionFactory);
|
|
||||||
_ = webApplicationBuilder.Services.AddSingleton<IToolTypesRepository, ToolTypesRepository>(_ => new(appSettings.MockRoot));
|
|
||||||
_ = webApplicationBuilder.Services.AddSingleton<ISpreadingResistanceProfileService, SpreadingResistanceProfileService>();
|
|
||||||
_ = webApplicationBuilder.Services.AddSingleton<IAppSettingsRepository<Models.Binder.AppSettings>>(_ => appSettingsRepository);
|
|
||||||
_ = webApplicationBuilder.Services.AddSingleton<IInfinityQSRepository, InfinityQSRepository>(_ => new(appSettings.MockRoot, sqlDbConnectionFactory));
|
|
||||||
_ = webApplicationBuilder.Services.AddSingleton<IInfinityQSV2Repository, InfinityQSV2Repository>(_ => new(appSettings.MockRoot, sqlDbConnectionFactory));
|
|
||||||
_ = webApplicationBuilder.Services.AddSingleton<IInfinityQSV3Repository, InfinityQSV3Repository>(_ => new(appSettings.MockRoot, sqlDbConnectionFactory));
|
|
||||||
_ = webApplicationBuilder.Services.AddSingleton<IWorkMaterialRepository, WorkMaterialRepository>(_ => new(appSettings.MockRoot, sqlDbConnectionFactory));
|
|
||||||
|
|
||||||
_ = webApplicationBuilder.Services.AddScoped<IExportRepository, ExportRepository>();
|
_ = webApplicationBuilder.Services.AddScoped<IExportRepository, ExportRepository>();
|
||||||
_ = webApplicationBuilder.Services.AddScoped<IAttachmentsService, AttachmentsService>();
|
_ = webApplicationBuilder.Services.AddScoped<IAttachmentsService, AttachmentsService>();
|
||||||
_ = webApplicationBuilder.Services.AddScoped<IInboundDataService, InboundDataService>();
|
_ = webApplicationBuilder.Services.AddScoped<IInboundDataService, InboundDataService>();
|
||||||
|
_ = webApplicationBuilder.Services.AddSingleton<IInboundRepository, InboundRepository>();
|
||||||
_ = webApplicationBuilder.Services.AddScoped<IMetrologyRepository, MetrologyRepository>();
|
_ = webApplicationBuilder.Services.AddScoped<IMetrologyRepository, MetrologyRepository>();
|
||||||
|
_ = webApplicationBuilder.Services.AddSingleton<IReactorsRepository, ReactorsRepository>();
|
||||||
|
_ = webApplicationBuilder.Services.AddSingleton<IToolTypesRepository, ToolTypesRepository>();
|
||||||
|
_ = webApplicationBuilder.Services.AddSingleton<IInfinityQSRepository, InfinityQSRepository>();
|
||||||
_ = webApplicationBuilder.Services.AddScoped<IOpenInsightV1Repository, OpenInsightV1Repository>();
|
_ = webApplicationBuilder.Services.AddScoped<IOpenInsightV1Repository, OpenInsightV1Repository>();
|
||||||
|
_ = webApplicationBuilder.Services.AddSingleton<IInfinityQSV2Repository, InfinityQSV2Repository>();
|
||||||
|
_ = webApplicationBuilder.Services.AddSingleton<IInfinityQSV3Repository, InfinityQSV3Repository>();
|
||||||
|
_ = webApplicationBuilder.Services.AddSingleton<IWorkMaterialRepository, WorkMaterialRepository>();
|
||||||
|
_ = webApplicationBuilder.Services.AddSingleton<IClientSettingsRepository>(_ => clientSettingsRepository);
|
||||||
|
_ = webApplicationBuilder.Services.AddSingleton<IServiceShopOrderRepository, ServiceShopOrderRepository>();
|
||||||
|
_ = webApplicationBuilder.Services.AddSingleton<ISpreadingResistanceProfileService, SpreadingResistanceProfileService>();
|
||||||
|
_ = webApplicationBuilder.Services.AddSingleton<IDbConnectionFactory, SQLDbConnectionFactory>(_ => sqlDbConnectionFactory);
|
||||||
|
_ = webApplicationBuilder.Services.AddSingleton<IAppSettingsRepository<Models.Binder.AppSettings>>(_ => appSettingsRepository);
|
||||||
|
|
||||||
_ = webApplicationBuilder.Services.AddSwaggerGen();
|
_ = webApplicationBuilder.Services.AddSwaggerGen();
|
||||||
_ = webApplicationBuilder.Services.AddSession(sessionOptions =>
|
_ = webApplicationBuilder.Services.AddSession(sessionOptions =>
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
using OI.Metrology.Server.Models;
|
||||||
using OI.Metrology.Shared.DataModels;
|
using OI.Metrology.Shared.DataModels;
|
||||||
using OI.Metrology.Shared.Models.Stateless;
|
using OI.Metrology.Shared.Models.Stateless;
|
||||||
using OI.Metrology.Shared.Repositories;
|
using OI.Metrology.Shared.Repositories;
|
||||||
@ -15,9 +16,9 @@ public class InfinityQSRepository : IInfinityQSRepository
|
|||||||
private readonly string _RepositoryName;
|
private readonly string _RepositoryName;
|
||||||
private readonly IDbConnectionFactory _DBConnectionFactory;
|
private readonly IDbConnectionFactory _DBConnectionFactory;
|
||||||
|
|
||||||
public InfinityQSRepository(string mockRoot, IDbConnectionFactory dbConnectionFactory)
|
public InfinityQSRepository(AppSettings appSettings, IDbConnectionFactory dbConnectionFactory)
|
||||||
{
|
{
|
||||||
_MockRoot = mockRoot;
|
_MockRoot = appSettings.MockRoot;
|
||||||
_DBConnectionFactory = dbConnectionFactory;
|
_DBConnectionFactory = dbConnectionFactory;
|
||||||
_RepositoryName = nameof(InfinityQSRepository)[..^10];
|
_RepositoryName = nameof(InfinityQSRepository)[..^10];
|
||||||
}
|
}
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
using OI.Metrology.Server.Models;
|
||||||
using OI.Metrology.Shared.DataModels;
|
using OI.Metrology.Shared.DataModels;
|
||||||
using OI.Metrology.Shared.Models.Stateless;
|
using OI.Metrology.Shared.Models.Stateless;
|
||||||
using OI.Metrology.Shared.Repositories;
|
using OI.Metrology.Shared.Repositories;
|
||||||
@ -15,9 +16,9 @@ public class InfinityQSV2Repository : IInfinityQSV2Repository
|
|||||||
private readonly string _RepositoryName;
|
private readonly string _RepositoryName;
|
||||||
private readonly IDbConnectionFactory _DBConnectionFactory;
|
private readonly IDbConnectionFactory _DBConnectionFactory;
|
||||||
|
|
||||||
public InfinityQSV2Repository(string mockRoot, IDbConnectionFactory dbConnectionFactory)
|
public InfinityQSV2Repository(AppSettings appSettings, IDbConnectionFactory dbConnectionFactory)
|
||||||
{
|
{
|
||||||
_MockRoot = mockRoot;
|
_MockRoot = appSettings.MockRoot;
|
||||||
_DBConnectionFactory = dbConnectionFactory;
|
_DBConnectionFactory = dbConnectionFactory;
|
||||||
_RepositoryName = nameof(InfinityQSV2Repository)[..^10];
|
_RepositoryName = nameof(InfinityQSV2Repository)[..^10];
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,9 @@
|
|||||||
|
using OI.Metrology.Server.Models;
|
||||||
using OI.Metrology.Shared.DataModels;
|
using OI.Metrology.Shared.DataModels;
|
||||||
|
using OI.Metrology.Shared.Models;
|
||||||
using OI.Metrology.Shared.Models.Stateless;
|
using OI.Metrology.Shared.Models.Stateless;
|
||||||
using OI.Metrology.Shared.Repositories;
|
using OI.Metrology.Shared.Repositories;
|
||||||
|
using System.Collections.ObjectModel;
|
||||||
using System.Data;
|
using System.Data;
|
||||||
using System.Data.Common;
|
using System.Data.Common;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
@ -13,13 +16,17 @@ public class InfinityQSV3Repository : IInfinityQSV3Repository
|
|||||||
|
|
||||||
private readonly string _MockRoot;
|
private readonly string _MockRoot;
|
||||||
private readonly string _RepositoryName;
|
private readonly string _RepositoryName;
|
||||||
|
private readonly IHttpClientFactory _HttpClientFactory;
|
||||||
private readonly IDbConnectionFactory _DBConnectionFactory;
|
private readonly IDbConnectionFactory _DBConnectionFactory;
|
||||||
|
private readonly string _OpenInsightApplicationProgrammingInterface;
|
||||||
|
|
||||||
public InfinityQSV3Repository(string mockRoot, IDbConnectionFactory dbConnectionFactory)
|
public InfinityQSV3Repository(AppSettings appSettings, IDbConnectionFactory dbConnectionFactory, IHttpClientFactory httpClientFactory)
|
||||||
{
|
{
|
||||||
_MockRoot = mockRoot;
|
_MockRoot = appSettings.MockRoot;
|
||||||
|
_HttpClientFactory = httpClientFactory;
|
||||||
_DBConnectionFactory = dbConnectionFactory;
|
_DBConnectionFactory = dbConnectionFactory;
|
||||||
_RepositoryName = nameof(InfinityQSV3Repository)[..^10];
|
_RepositoryName = nameof(InfinityQSV3Repository)[..^10];
|
||||||
|
_OpenInsightApplicationProgrammingInterface = appSettings.OpenInsightApplicationProgrammingInterface;
|
||||||
}
|
}
|
||||||
|
|
||||||
string IInfinityQSV3Repository.GetCommandText(string subGroupId)
|
string IInfinityQSV3Repository.GetCommandText(string subGroupId)
|
||||||
@ -318,4 +325,131 @@ public class InfinityQSV3Repository : IInfinityQSV3Repository
|
|||||||
return result.ToString();
|
return result.ToString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private JsonElement[] GetAllReactorsAsJsonElementElement()
|
||||||
|
{
|
||||||
|
JsonElement[]? results;
|
||||||
|
HttpClient httpClient = _HttpClientFactory.CreateClient();
|
||||||
|
Task<string> task = httpClient.GetStringAsync($"{_OpenInsightApplicationProgrammingInterface}/reactors");
|
||||||
|
task.Wait();
|
||||||
|
JsonElement? jsonElement = JsonSerializer.Deserialize<JsonElement>(task.Result);
|
||||||
|
if (jsonElement is null)
|
||||||
|
throw new NullReferenceException(nameof(jsonElement));
|
||||||
|
string json = jsonElement.Value.EnumerateObject().First().Value.ToString();
|
||||||
|
results = JsonSerializer.Deserialize<JsonElement[]>(json);
|
||||||
|
if (results is null)
|
||||||
|
throw new NullReferenceException(nameof(results));
|
||||||
|
return results;
|
||||||
|
}
|
||||||
|
|
||||||
|
private ReadOnlyDictionary<int, Reactor> GetReactorsMatchingType(string? reactTypeFilter)
|
||||||
|
{
|
||||||
|
Dictionary<int, Reactor> results = new();
|
||||||
|
string json;
|
||||||
|
Reactor? reactor;
|
||||||
|
JsonElement[]? jsonElements = GetAllReactorsAsJsonElementElement();
|
||||||
|
foreach (JsonElement jsonElement in jsonElements)
|
||||||
|
{
|
||||||
|
json = jsonElement.EnumerateObject().First().Value.ToString();
|
||||||
|
if (reactTypeFilter is not null && !json.Contains(reactTypeFilter))
|
||||||
|
continue;
|
||||||
|
try
|
||||||
|
{ reactor = JsonSerializer.Deserialize(json, ReactorSourceGenerationContext.Default.Reactor); }
|
||||||
|
catch (Exception) { reactor = null; }
|
||||||
|
if (reactor is null || reactor.ReactType != reactTypeFilter)
|
||||||
|
continue;
|
||||||
|
results.Add(reactor.ReactorNo, reactor);
|
||||||
|
}
|
||||||
|
return new(results);
|
||||||
|
}
|
||||||
|
|
||||||
|
string IInfinityQSV3Repository.GetCommandText(List<string> eppReactorNumbers)
|
||||||
|
{
|
||||||
|
StringBuilder result = new();
|
||||||
|
_ = result
|
||||||
|
.AppendLine(" select se.f_sgrp, ")
|
||||||
|
.AppendLine(" dateadd(HH, -7, (dateadd(SS, convert(bigint, se.f_sgrp), '19700101'))) date_time, ")
|
||||||
|
.AppendLine(" iq.pr_name, ")
|
||||||
|
.AppendLine(" iq.pd_name, ")
|
||||||
|
.AppendLine(" max(case ")
|
||||||
|
.AppendLine(" when td.f_test = 1104769646 ")
|
||||||
|
.AppendLine(" then se.f_val ")
|
||||||
|
.AppendLine(" else null ")
|
||||||
|
.AppendLine(" end) as iq_value, ")
|
||||||
|
.AppendLine(" max(case ")
|
||||||
|
.AppendLine(" when td.f_test = 1312288843 ")
|
||||||
|
.AppendLine(" then se.f_val else null ")
|
||||||
|
.AppendLine(" end) as iq_temp_offset_percent ")
|
||||||
|
.AppendLine(" from ( ")
|
||||||
|
.AppendLine(" select ")
|
||||||
|
.AppendLine(" max(se.f_sgrp) se_max_sgrp, ")
|
||||||
|
.AppendLine(" se.f_test se_test, ")
|
||||||
|
.AppendLine(" pr.f_name pr_name, ")
|
||||||
|
.AppendLine(" pd.f_name pd_name ")
|
||||||
|
.AppendLine(" from [spcepiworld].[dbo].[sgrp_ext] se ")
|
||||||
|
.AppendLine(" join [spcepiworld].[dbo].[prcs_dat] pr ")
|
||||||
|
.AppendLine(" on se.f_prcs = pr.f_prcs ")
|
||||||
|
.AppendLine(" join [spcepiworld].[dbo].[part_dat] pd ")
|
||||||
|
.AppendLine(" on se.f_part = pd.f_part ")
|
||||||
|
.AppendLine(" where se.f_flag = 0 ")
|
||||||
|
.Append(" and pr.f_name in (").Append(string.Join(',', eppReactorNumbers)).AppendLine(") ")
|
||||||
|
.AppendLine(" and pd.f_name = '1090 - Full Load' ")
|
||||||
|
.AppendLine(" and se.f_test in (1104769646, 1312288843) ")
|
||||||
|
.AppendLine(" group by se.f_test, ")
|
||||||
|
.AppendLine(" pr.f_name, ")
|
||||||
|
.AppendLine(" pd.f_name ")
|
||||||
|
.AppendLine(" ) as iq ")
|
||||||
|
.AppendLine(" join [spcepiworld].[dbo].[sgrp_ext] se ")
|
||||||
|
.AppendLine(" on iq.se_max_sgrp = se.f_sgrp ")
|
||||||
|
.AppendLine(" join [spcepiworld].[dbo].[test_dat] td ")
|
||||||
|
.AppendLine(" on iq.se_test = td.f_test ")
|
||||||
|
.AppendLine(" and se.f_test = td.f_test ")
|
||||||
|
.AppendLine(" where se.f_flag = 0 ")
|
||||||
|
.AppendLine(" and td.f_test in (1104769646, 1312288843) ")
|
||||||
|
.AppendLine(" group by se.f_sgrp, ")
|
||||||
|
.AppendLine(" iq.pr_name, ")
|
||||||
|
.AppendLine(" iq.pd_name ")
|
||||||
|
.AppendLine(" order by se.f_sgrp desc ")
|
||||||
|
.AppendLine(" for json path; ");
|
||||||
|
return result.ToString();
|
||||||
|
}
|
||||||
|
|
||||||
|
string IInfinityQSV3Repository.GetEpiProTempVerification()
|
||||||
|
{
|
||||||
|
StringBuilder result;
|
||||||
|
List<string> eppReactorNumbers = new();
|
||||||
|
ReadOnlyDictionary<int, Reactor> eppReactors = GetReactorsMatchingType("EPP");
|
||||||
|
foreach (KeyValuePair<int, Reactor> keyValuePair in eppReactors)
|
||||||
|
eppReactorNumbers.Add($"'{keyValuePair.Key}'");
|
||||||
|
if (!string.IsNullOrEmpty(_MockRoot))
|
||||||
|
{
|
||||||
|
string html = File.ReadAllText(Path.Combine(string.Concat(AppContext.BaseDirectory, _MockRoot), $"{_RepositoryName}-{nameof(IInfinityQSV3Repository.GetEpiProTempVerification)}.html"));
|
||||||
|
result = new(html);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
result = new();
|
||||||
|
Reactor? reactor;
|
||||||
|
IInfinityQSV3Repository infinityQSV3Repository = this;
|
||||||
|
string commandText = infinityQSV3Repository.GetCommandText(eppReactorNumbers);
|
||||||
|
StringBuilder stringBuilder = GetForJsonPath(_DBConnectionFactory, commandText);
|
||||||
|
InfinityQS1090FullLoad[]? results = stringBuilder.Length == 0 ? Array.Empty<InfinityQS1090FullLoad>() : JsonSerializer.Deserialize(stringBuilder.ToString(), InfinityQS1090FullLoadArraySourceGenerationContext.Default.InfinityQS1090FullLoadArray);
|
||||||
|
if (results is null)
|
||||||
|
throw new NullReferenceException(nameof(results));
|
||||||
|
foreach (InfinityQS1090FullLoad infinityQS1090FullLoad in results)
|
||||||
|
{
|
||||||
|
if (infinityQS1090FullLoad.Reactor is null || !eppReactors.TryGetValue(infinityQS1090FullLoad.Reactor.Value, out reactor))
|
||||||
|
continue;
|
||||||
|
_ = result.Append("<tr>").
|
||||||
|
Append("<td>").Append(reactor.ReactorNo).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>").Append(infinityQS1090FullLoad.Value).Append("</td>").
|
||||||
|
Append("<td>").Append(infinityQS1090FullLoad.TemperatureOffsetPercentage).Append("</td>").
|
||||||
|
Append("<td>").Append(infinityQS1090FullLoad.SubGroupIdFormated).Append("</td>").
|
||||||
|
Append("</tr>");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result.ToString();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
@ -1,3 +1,4 @@
|
|||||||
|
using OI.Metrology.Server.Models;
|
||||||
using OI.Metrology.Shared.DataModels;
|
using OI.Metrology.Shared.DataModels;
|
||||||
using OI.Metrology.Shared.Models.Stateless;
|
using OI.Metrology.Shared.Models.Stateless;
|
||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
@ -11,9 +12,9 @@ public class PinRepository : IPinRepository
|
|||||||
private readonly string _RepositoryName;
|
private readonly string _RepositoryName;
|
||||||
private readonly Dictionary<string, Dictionary<long, HeaderCommon>> _RdsToHeaderCommonCollection;
|
private readonly Dictionary<string, Dictionary<long, HeaderCommon>> _RdsToHeaderCommonCollection;
|
||||||
|
|
||||||
public PinRepository(string mockRoot)
|
public PinRepository(AppSettings appSettings)
|
||||||
{
|
{
|
||||||
_MockRoot = mockRoot;
|
_MockRoot = appSettings.MockRoot;
|
||||||
_RdsToHeaderCommonCollection = new();
|
_RdsToHeaderCommonCollection = new();
|
||||||
_RepositoryName = nameof(PinRepository)[..^10];
|
_RepositoryName = nameof(PinRepository)[..^10];
|
||||||
}
|
}
|
||||||
|
@ -7,11 +7,6 @@ namespace OI.Metrology.Server.Repository;
|
|||||||
public class ServiceShopOrderRepository : IServiceShopOrderRepository
|
public class ServiceShopOrderRepository : IServiceShopOrderRepository
|
||||||
{
|
{
|
||||||
|
|
||||||
private readonly ILogger<ServiceShopOrderRepository> _Logger;
|
|
||||||
|
|
||||||
public ServiceShopOrderRepository(ILogger<ServiceShopOrderRepository> logger) =>
|
|
||||||
_Logger = logger;
|
|
||||||
|
|
||||||
private static ServiceShopOrder[] GetServiceShopOrders(Shared.Models.ServiceShop? serviceShop)
|
private static ServiceShopOrder[] GetServiceShopOrders(Shared.Models.ServiceShop? serviceShop)
|
||||||
{
|
{
|
||||||
ServiceShopOrder[] result = IServiceShopOrder.GetServiceShopOrders(serviceShop);
|
ServiceShopOrder[] result = IServiceShopOrder.GetServiceShopOrders(serviceShop);
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
using OI.Metrology.Server.Models;
|
||||||
using OI.Metrology.Shared.DataModels;
|
using OI.Metrology.Shared.DataModels;
|
||||||
using OI.Metrology.Shared.Models.Stateless;
|
using OI.Metrology.Shared.Models.Stateless;
|
||||||
using OI.Metrology.Shared.Services;
|
using OI.Metrology.Shared.Services;
|
||||||
@ -13,9 +14,9 @@ public class ToolTypesRepository : IToolTypesRepository
|
|||||||
private readonly string _MockRoot;
|
private readonly string _MockRoot;
|
||||||
private readonly string _RepositoryName;
|
private readonly string _RepositoryName;
|
||||||
|
|
||||||
public ToolTypesRepository(string mockRoot)
|
public ToolTypesRepository(AppSettings appSettings)
|
||||||
{
|
{
|
||||||
_MockRoot = mockRoot;
|
_MockRoot = appSettings.MockRoot;
|
||||||
_RepositoryName = nameof(ToolTypesRepository)[..^10];
|
_RepositoryName = nameof(ToolTypesRepository)[..^10];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
|
using OI.Metrology.Server.Models;
|
||||||
using OI.Metrology.Shared.DataModels;
|
using OI.Metrology.Shared.DataModels;
|
||||||
using OI.Metrology.Shared.Models.Stateless;
|
using OI.Metrology.Shared.Models.Stateless;
|
||||||
using OI.Metrology.Shared.Repositories;
|
using OI.Metrology.Shared.Repositories;
|
||||||
@ -16,9 +17,9 @@ public class WorkMaterialRepository : IWorkMaterialRepository
|
|||||||
private readonly string _RepositoryName;
|
private readonly string _RepositoryName;
|
||||||
private readonly IDbConnectionFactory _DBConnectionFactory;
|
private readonly IDbConnectionFactory _DBConnectionFactory;
|
||||||
|
|
||||||
public WorkMaterialRepository(string mockRoot, IDbConnectionFactory dbConnectionFactory)
|
public WorkMaterialRepository(AppSettings appSettings, IDbConnectionFactory dbConnectionFactory)
|
||||||
{
|
{
|
||||||
_MockRoot = mockRoot;
|
_MockRoot = appSettings.MockRoot;
|
||||||
_DBConnectionFactory = dbConnectionFactory;
|
_DBConnectionFactory = dbConnectionFactory;
|
||||||
_RepositoryName = nameof(WorkMaterialRepository)[..^10];
|
_RepositoryName = nameof(WorkMaterialRepository)[..^10];
|
||||||
}
|
}
|
||||||
|
22
Shared/DataModels/InfinityQSEpp.cs
Normal file
22
Shared/DataModels/InfinityQSEpp.cs
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
|
namespace OI.Metrology.Shared.DataModels;
|
||||||
|
|
||||||
|
public record InfinityQS1090FullLoad([property: JsonPropertyName("se_sgrp")] int SubGroupId,
|
||||||
|
[property: JsonPropertyName("se_date_time")] DateTime SubGroupIdFormated,
|
||||||
|
[property: JsonPropertyName("pr_name")] int? Reactor,
|
||||||
|
[property: JsonPropertyName("pd_name")] int? Part,
|
||||||
|
[property: JsonPropertyName("se_value")] int Value,
|
||||||
|
[property: JsonPropertyName("se_temp_offset_percent")] int TemperatureOffsetPercentage);
|
||||||
|
|
||||||
|
[JsonSourceGenerationOptions(WriteIndented = true, DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)]
|
||||||
|
[JsonSerializable(typeof(InfinityQS1090FullLoad))]
|
||||||
|
public partial class InfinityQS1090FullLoadSourceGenerationContext : JsonSerializerContext
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
[JsonSourceGenerationOptions(WriteIndented = true, DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull)]
|
||||||
|
[JsonSerializable(typeof(Result<InfinityQS1090FullLoad[]>))]
|
||||||
|
public partial class InfinityQS1090FullLoadArraySourceGenerationContext : JsonSerializerContext
|
||||||
|
{
|
||||||
|
}
|
43
Shared/Models/Reactor.cs
Normal file
43
Shared/Models/Reactor.cs
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
using System.Text.Json;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
|
namespace OI.Metrology.Shared.Models;
|
||||||
|
|
||||||
|
public record Reactor(
|
||||||
|
[property: JsonPropertyName("reactorNo")] int ReactorNo,
|
||||||
|
[property: JsonPropertyName("reactType")] string ReactType,
|
||||||
|
[property: JsonPropertyName("reactAssignment")] string ReactAssignment,
|
||||||
|
[property: JsonPropertyName("pickPlace")] bool PickPlace,
|
||||||
|
[property: JsonPropertyName("loadLockDown")] string LoadLockDown,
|
||||||
|
[property: JsonPropertyName("0311Active")] bool _0311Active,
|
||||||
|
[property: JsonPropertyName("loadedRDS")] IReadOnlyList<int> LoadedRDS,
|
||||||
|
[property: JsonPropertyName("isRunning")] bool IsRunning,
|
||||||
|
[property: JsonPropertyName("outOfProdDTM")] string OutOfProdDTM,
|
||||||
|
[property: JsonPropertyName("workOrder")] int? WorkOrder,
|
||||||
|
[property: JsonPropertyName("workOrderCustomer")] string WorkOrderCustomer,
|
||||||
|
[property: JsonPropertyName("currMode")] string CurrMode,
|
||||||
|
[property: JsonPropertyName("serviceDesc")] string ServiceDesc,
|
||||||
|
[property: JsonPropertyName("e10State")] string E10State
|
||||||
|
)
|
||||||
|
{
|
||||||
|
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
string result = JsonSerializer.Serialize(this, new JsonSerializerOptions() { WriteIndented = true });
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
[JsonSourceGenerationOptions(WriteIndented = true)]
|
||||||
|
[JsonSerializable(typeof(Reactor))]
|
||||||
|
public partial class ReactorSourceGenerationContext : JsonSerializerContext
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
[JsonSourceGenerationOptions(WriteIndented = true)]
|
||||||
|
[JsonSerializable(typeof(Reactor[]))]
|
||||||
|
public partial class ReactorCollectionSourceGenerationContext : JsonSerializerContext
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
@ -10,8 +10,11 @@ public interface IInfinityQSV3Controller<T>
|
|||||||
}
|
}
|
||||||
|
|
||||||
static string GetRouteName() => nameof(IInfinityQSV3Controller<T>)[1..^10];
|
static string GetRouteName() => nameof(IInfinityQSV3Controller<T>)[1..^10];
|
||||||
T GetCommandText(string sub_group_id, string process, string job, string part, string lot, string date_time);
|
T GetEpiProTempVerification();
|
||||||
T GetData(string sub_group_id);
|
T GetData(string sub_group_id);
|
||||||
T GetHeader(string sub_group_id);
|
T GetHeader(string sub_group_id);
|
||||||
|
T GetDescriptors(string sub_group_id);
|
||||||
|
T GetProductDataAverageSumOfDefectsProcessMeanProcessSigma(string process, string? recipe);
|
||||||
|
T GetCommandText(string sub_group_id, string process, string job, string part, string lot, string date_time);
|
||||||
|
|
||||||
}
|
}
|
@ -5,13 +5,15 @@ namespace OI.Metrology.Shared.Models.Stateless;
|
|||||||
public interface IInfinityQSV3Repository
|
public interface IInfinityQSV3Repository
|
||||||
{
|
{
|
||||||
|
|
||||||
|
string GetEpiProTempVerification();
|
||||||
string GetCommandText(string subGroupId);
|
string GetCommandText(string subGroupId);
|
||||||
string GetCommandText(string process, string? part);
|
|
||||||
string GetCommandText(InfinityQSV3 infinityQSV2);
|
string GetCommandText(InfinityQSV3 infinityQSV2);
|
||||||
|
Result<InfinityQSV3[]> GetData(string subGroupId);
|
||||||
|
Result<InfinityQSV3[]> GetHeader(string subGroupId);
|
||||||
|
string GetCommandText(string process, string? part);
|
||||||
|
string GetCommandText(List<string> eppReactorNumbers);
|
||||||
|
Result<InfinityQSDescriptorV3[]> GetDescriptors(string subGroupId);
|
||||||
string GetProductDataAverageSumOfDefectsProcessMeanProcessSigma(string process, string? recipe);
|
string GetProductDataAverageSumOfDefectsProcessMeanProcessSigma(string process, string? recipe);
|
||||||
string GetCommandText(string? subGroupId, string? process, string? job, string? part, string? lot, string? dateTime);
|
string GetCommandText(string? subGroupId, string? process, string? job, string? part, string? lot, string? dateTime);
|
||||||
Result<InfinityQSV3[]> GetData(string subGroupId);
|
|
||||||
Result<InfinityQSDescriptorV3[]> GetDescriptors(string subGroupId);
|
|
||||||
Result<InfinityQSV3[]> GetHeader(string subGroupId);
|
|
||||||
|
|
||||||
}
|
}
|
@ -213,4 +213,35 @@ public class UnitTestInfinityQSV3Controller
|
|||||||
NonThrowTryCatch();
|
NonThrowTryCatch();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if (!DEBUG)
|
||||||
|
[Ignore]
|
||||||
|
#endif
|
||||||
|
[TestMethod]
|
||||||
|
public void GetEpiProTempVerification()
|
||||||
|
{
|
||||||
|
_Logger?.LogInformation("Starting Web Application");
|
||||||
|
IServiceProvider? serviceProvider = _WebApplicationFactory?.Services.CreateScope().ServiceProvider;
|
||||||
|
IInfinityQSV3Repository? infinityQSV3Repository = serviceProvider?.GetRequiredService<IInfinityQSV3Repository>();
|
||||||
|
string? result = infinityQSV3Repository?.GetEpiProTempVerification();
|
||||||
|
Assert.IsNotNull(result);
|
||||||
|
_Logger?.LogInformation("{TestName} completed", _TestContext?.TestName);
|
||||||
|
NonThrowTryCatch();
|
||||||
|
}
|
||||||
|
|
||||||
|
#if (!DEBUG)
|
||||||
|
[Ignore]
|
||||||
|
#endif
|
||||||
|
[TestMethod]
|
||||||
|
public async Task GetEpiProTempVerificationApi()
|
||||||
|
{
|
||||||
|
HttpClient? httpClient = _WebApplicationFactory?.CreateClient();
|
||||||
|
_Logger?.LogInformation("Starting Web Application");
|
||||||
|
Assert.IsTrue(httpClient is not null);
|
||||||
|
string? result = await httpClient.GetStringAsync($"api/{_ControllerName}/epi-pro-temp-verification");
|
||||||
|
File.WriteAllText(Path.Combine(AppContext.BaseDirectory, $"{_ControllerName}-{nameof(GetEpiProTempVerification)}.html"), result);
|
||||||
|
Assert.IsNotNull(result);
|
||||||
|
_Logger?.LogInformation("{TestName} completed", _TestContext?.TestName);
|
||||||
|
NonThrowTryCatch();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user