From 8333c02b42f0ae5625cade49abd93acf062ba6c3 Mon Sep 17 00:00:00 2001 From: AnboevDD Date: Thu, 30 Jan 2025 16:22:00 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B8=20=D1=80=D1=83=D0=BA?= =?UTF-8?q?=D0=BE=D0=B2=D0=BE=D0=B4=D0=B8=D1=82=D0=B5=D0=BB=D1=8F=20=D0=B8?= =?UTF-8?q?=20=D0=B1=D1=83=D1=85=D0=B3=D0=B0=D0=BB=D1=82=D0=B5=D1=80=D0=B0?= =?UTF-8?q?=20=D0=9E=D1=80=D0=B3=D0=B0=D0=BD=D0=B8=D0=B7=D0=B0=D1=86=D0=B8?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- JSONParser/Program.cs | 2 +- JSONParser/QDocWrapper/ODataAccess.cs | 12 ++++++------ JSONParser/Structure/BusinessUnit.cs | 7 +++++++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/JSONParser/Program.cs b/JSONParser/Program.cs index fe5a916..e2f598a 100644 --- a/JSONParser/Program.cs +++ b/JSONParser/Program.cs @@ -19,7 +19,7 @@ var odataClient = odata.Client; // .Filter("Department/BusinessUnit/Name eq 'Бакырчикское горнодобывающее предприятие ТОО' and Status eq 'Active'") // .FindEntriesAsync(); -//var responsePath = @"C:\ОШС_logs_backup\2025_01_22\2025_01_22_03_03_08_response.json"; +//var responsePath = @"C:\Users\anboevdd\Desktop\other\test_response.json"; //var resp = File.ReadAllText(responsePath); //var arr = JArray.Parse(resp); diff --git a/JSONParser/QDocWrapper/ODataAccess.cs b/JSONParser/QDocWrapper/ODataAccess.cs index 5708a93..e37a3fe 100644 --- a/JSONParser/QDocWrapper/ODataAccess.cs +++ b/JSONParser/QDocWrapper/ODataAccess.cs @@ -15,13 +15,13 @@ namespace JSONParser.QDocWrapper //private const string Login = "Administrator"; //private const string Password = "11111"; - //private const string IntegrationServiceUrl = "https://astsrvqtest.solidcore-resources.com/Integration/odata/"; - //private const string Login = "Administrator"; - //private const string Password = "D3cTXol8Se"; - - private const string IntegrationServiceUrl = "https://qdoc.solidcore-resources.com/Integration/odata/"; + private const string IntegrationServiceUrl = "https://astsrvqtest.solidcore-resources.com/Integration/odata/"; private const string Login = "Administrator"; - private const string Password = "MQVuEw9avO"; + private const string Password = "D3cTXol8Se"; + + //private const string IntegrationServiceUrl = "https://qdoc.solidcore-resources.com/Integration/odata/"; + //private const string Login = "Administrator"; + //private const string Password = "MQVuEw9avO"; #endif #if RELEASE diff --git a/JSONParser/Structure/BusinessUnit.cs b/JSONParser/Structure/BusinessUnit.cs index 3561349..3d39e5d 100644 --- a/JSONParser/Structure/BusinessUnit.cs +++ b/JSONParser/Structure/BusinessUnit.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.ConstrainedExecution; using System.Text; using System.Threading.Tasks; @@ -106,8 +107,11 @@ namespace JSONParser.Structure dynamic bu = await client .For("IBusinessUnits") .Filter($"ExternalId eq '{Sid}'") + .Expand($"CEO") .FindEntryAsync(); + string ceo = bu["CEO"]["ExternalId"]; + if (emp != null && ceo.Equals(NCEO.Sid)) return bu["Id"]; if (emp != null && bu != null) { @@ -139,8 +143,11 @@ namespace JSONParser.Structure dynamic bu = await client .For("IBusinessUnits") .Filter($"ExternalId eq '{Sid}'") + .Expand("CAO") .FindEntryAsync(); + string account = bu["CAO"]["ExternalId"]; + if (emp != null && account.Equals(Account.Sid)) return bu["Id"]; if (emp != null && bu != null) {