on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev

Browse Source
This commit is contained in:
Фролов 2021-10-05 09:24:40 +05:00
commit 3a8e985113
2 changed files with 84 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AsbCloudDbDemoData/ControllerLoadTester.cs
View File

@ -40,7 +40,7 @@ namespace AsbCloudDevOperations
Console.WriteLine($"Sending telemetry info with uid: {uid}"); Console.WriteLine($"Sending telemetry info with uid: {uid}");
var tInfoUri = new Uri($"http://localhost:5000/api/telemetry/{uid}/info"); var tInfoUri = new Uri($"http://localhost:5000/api/telemetry/{uid}/info");
var infoResponse = await client.PostAsync(tInfoUri, MakeTelemetryInfoContent(), token); var infoResponse = await httpClient.PostAsync(tInfoUri, MakeTelemetryInfoContent(), token);
Console.WriteLine($"Передана telemetry info с: {infoResponse.StatusCode}"); Console.WriteLine($"Передана telemetry info с: {infoResponse.StatusCode}");
@ -48,7 +48,7 @@ namespace AsbCloudDevOperations
{ {
await Task.Delay(rand.Next(1000, 5000), token); await Task.Delay(rand.Next(1000, 5000), token);
var dataSaubUri = new Uri($"http://localhost:5000/api/telemetryDataSaub/{uid}"); var dataSaubUri = new Uri($"http://localhost:5000/api/telemetryDataSaub/{uid}");
var saubResponse = await client.PostAsync(dataSaubUri, MakeDataSaubContent(), token); var saubResponse = await httpClient.PostAsync(dataSaubUri, MakeDataSaubContent(), token);
Console.WriteLine(saubResponse.StatusCode); Console.WriteLine(saubResponse.StatusCode);
} }

85
AsbCloudDbDemoData/DbDemoDataFiller.cs
View File

@ -38,7 +38,7 @@ namespace AsbCloudDevOperations
demoContext.Measures.AddRange( demoContext.Measures.AddRange(
new Measure { Id = 1, IdCategory = 1, IdWell = 1, Timestamp = DateTime.Now.AddHours(1), new Measure { Id = 1, IdCategory = 1, IdWell = 1, Timestamp = DateTime.Now.AddHours(1),
Data = new Dictionary<string, object> { Data = new Dictionary<string, object> {
{ "name", "Наименование" }, { "name", "Some name 1" },
{ "temperature", "35" }, { "temperature", "35" },
{ "density", "113" }, { "density", "113" },
{ "conditionalViscosity", "354" }, { "conditionalViscosity", "354" },
@ -68,7 +68,39 @@ namespace AsbCloudDevOperations
{ "calciumCarbonate", "23424" } { "calciumCarbonate", "23424" }
} }
}, },
new Measure { Id = 2, IdCategory = 2, IdWell = 1, Timestamp = DateTime.Now.AddHours(2), new Measure { Id = 2, IdCategory = 1, IdWell = 1, Timestamp = DateTime.Now.AddHours(2),
Data = new Dictionary<string, object> {
{ "name", "Some name 2" },
{ "temperature", "3453" },
{ "density", "123" },
{ "conditionalViscosity", "4564" },
{ "r300", "231234" },
{ "r600", "1123" },
{ "r3r6", "456" },
{ "dnsDpa", "234" },
{ "plasticViscocity", "678" },
{ "snsDpa", "345" },
{ "r3r649С", "678" },
{ "dns49Cdpa", "3453" },
{ "plasticViscocity49c", "612786" },
{ "sns49Cdpa", "657" },
{ "mbt", "234" },
{ "sand", "289" },
{ "filtering", "234" },
{ "crust", "567" },
{ "ktk", "234" },
{ "ph", "567" },
{ "hardness", "45" },
{ "chlorides", "5687" },
{ "pf", "4567" },
{ "mf", "234" },
{ "pm", "870" },
{ "fluidSolidPhase", "780" },
{ "grease", "456" },
{ "calciumCarbonate", "7809" }
}
},
new Measure { Id = 3, IdCategory = 2, IdWell = 1, Timestamp = DateTime.Now.AddHours(1),
Data = new Dictionary<string, object> { Data = new Dictionary<string, object> {
{ "probeNumber", "345345" }, { "probeNumber", "345345" },
{ "probeExtractionDepth", "345" }, { "probeExtractionDepth", "345" },
@ -94,7 +126,33 @@ namespace AsbCloudDevOperations
{ "preliminaryConclusion", "Заключение" } { "preliminaryConclusion", "Заключение" }
} }
}, },
new Measure { Id = 3, IdCategory = 3, IdWell = 1, Timestamp = DateTime.Now.AddHours(3), new Measure { Id = 4, IdCategory = 2, IdWell = 1, Timestamp = DateTime.Now.AddHours(2),
Data = new Dictionary<string, object> {
{ "probeNumber", "5675" },
{ "probeExtractionDepth", "234" },
{ "sandstone", "789" },
{ "siltstone", "345" },
{ "argillit", "698" },
{ "brokenArgillit", "345" },
{ "coal", "567" },
{ "sand", "234" },
{ "clay", "7890" },
{ "camstone", "234" },
{ "cement", "657567" },
{ "summary", "234234" },
{ "drillingMud", "3453" },
{ "sludge", "890890" },
{ "maxSum", "234" },
{ "methane", "5476" },
{ "ethane", "789" },
{ "propane", "345" },
{ "butane", "232" },
{ "pentane", "5678" },
{ "mechanicalSpeed", "4568678567" },
{ "preliminaryConclusion", "Заключение 2" }
}
},
new Measure { Id = 5, IdCategory = 3, IdWell = 1, Timestamp = DateTime.Now.AddHours(1),
Data = new Dictionary<string, object> { Data = new Dictionary<string, object> {
{ "depth", "345345" }, { "depth", "345345" },
{ "zenithAngle", "35" }, { "zenithAngle", "35" },
@ -114,6 +172,27 @@ namespace AsbCloudDevOperations
{ "depthPlanFactDifference", "234" }, { "depthPlanFactDifference", "234" },
{ "distancePlanFactDifference", "5675" } { "distancePlanFactDifference", "5675" }
} }
},
new Measure { Id = 6, IdCategory = 3, IdWell = 1, Timestamp = DateTime.Now.AddHours(2),
Data = new Dictionary<string, object> {
{ "depth", "678678" },
{ "zenithAngle", "453" },
{ "magneticAzimuth", "568" },
{ "trueAzimuth", "5675" },
{ "directAzimuth", "234" },
{ "verticalDepth", "567567" },
{ "absoluteMark", "234234" },
{ "localNorthOffset", "4564" },
{ "localEastOffset", "789" },
{ "outFallOffset", "678" },
{ "offsetAzimuth", "456" },
{ "areaIntensity", "90890" },
{ "offsetStopAngle", "456456" },
{ "zenithIntensity", "678" },
{ "comment", "Some comment 2" },
{ "depthPlanFactDifference", "4567" },
{ "distancePlanFactDifference", "7809" }
}
} }
); );