radio param change
This commit is contained in:
@@ -70,6 +70,47 @@ namespace Service.MeterProcessState.Controllers
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Get Radio Configuration from database matching the PcbID
|
||||
/// </summary>
|
||||
/// <param name="PcbID">PcbID from Meter</param>
|
||||
/// <returns></returns>
|
||||
[Route("GetEncryptionKey"), HttpGet]
|
||||
public async Task<HttpResponseMessage> GetEncryptionKey(string PcbID)
|
||||
{
|
||||
try
|
||||
{
|
||||
return await Task.Run(() =>
|
||||
{
|
||||
var builder = new StringBuilder();
|
||||
var ret = OrderProgrammingParameters.GetProgrammingParameters(PcbID, GlobalConfig.connectionString.Value);
|
||||
|
||||
var key = ret.FirstOrDefault(r => r.RegisterName == "SENSUSRADIO_EncryptionKey" && r.Source == ProgrammingSource.Csd);
|
||||
|
||||
if (key == null)
|
||||
{
|
||||
key = ret.FirstOrDefault(r => r.RegisterName == "SENSUSRADIO_EncryptionKey" && r.Source == ProgrammingSource.Vako);
|
||||
}
|
||||
|
||||
|
||||
foreach (var t in key.RegisterValue)
|
||||
{
|
||||
builder.Append(t.ToString("x2"));
|
||||
}
|
||||
|
||||
|
||||
|
||||
return Request.CreateResponse(HttpStatusCode.OK, builder.ToString());
|
||||
|
||||
});
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return Request.CreateResponse(HttpStatusCode.InternalServerError, ex);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Get Radio Configuration from database matching the PcbID
|
||||
/// </summary>
|
||||
@@ -631,7 +672,7 @@ namespace Service.MeterProcessState.Controllers
|
||||
else
|
||||
{
|
||||
//keien radioparameter für 270 aber 270 ist identisch mit 200 werten
|
||||
if (dnString == "50" && LengthString == "270")
|
||||
if (dnString == "50" && (LengthString == "270" || LengthString == "300"))
|
||||
{
|
||||
hitAmbi = findMatchingTestResult(ref lastProdDate, "200", dnString, radioTestResult);
|
||||
}
|
||||
|
||||
@@ -388,7 +388,7 @@ namespace Xylem.Common.Service.MeterProcessState.Controllers
|
||||
sbQuery.AppendLine($" ,[Vergabe_am] ");
|
||||
sbQuery.AppendLine($" ,passwordtbl.KeySetId ");
|
||||
sbQuery.AppendLine($" ,passwordtbl.orderNumber ");
|
||||
sbQuery.AppendLine($" ,passwordtbl.Password as Skeleton ");
|
||||
sbQuery.AppendLine($" ,passwordtbl.KitronSkeletonKey as Skeleton ");
|
||||
sbQuery.AppendLine($" ,passwordtbl.ProcessorID as ProcessorUid ");
|
||||
sbQuery.AppendLine($" FROM [Auftrag].[dbo].[Genesis_Meter] meter ");
|
||||
sbQuery.AppendLine($" inner join MapPcbIdToSerialNumber mps" +
|
||||
|
||||
Reference in New Issue
Block a user