From b2743edae503c9795371c26eb6e562410700734b Mon Sep 17 00:00:00 2001 From: AnboevDD Date: Mon, 5 Jan 2026 15:45:22 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BD=D1=91=D1=81=20?= =?UTF-8?q?=D0=B2=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=20=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=BE=D0=BA=D0=B8=20=D0=BF=D0=BE=D0=B4=D0=BA=D0=BB=D1=8E?= =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1CDataBus/Controllers/ContractsController.cs | 23 ------------------- 1CDataBus/RabbitMQ/RabbitConnection.cs | 24 +++++++++++--------- 1CDataBus/Structure/Contract.cs | 4 ++-- 1CDataBus/Structure/ODataAccess.cs | 5 +++- 1CDataBus/appsettings.json | 12 ++++++---- 5 files changed, 27 insertions(+), 41 deletions(-) diff --git a/1CDataBus/Controllers/ContractsController.cs b/1CDataBus/Controllers/ContractsController.cs index 820e330..a506a1c 100644 --- a/1CDataBus/Controllers/ContractsController.cs +++ b/1CDataBus/Controllers/ContractsController.cs @@ -44,29 +44,6 @@ namespace _1CDataBus.Controllers await SendContractTo1C(sendContract); } - //[HttpPost("Test")] - //public async Task TestDelete() - //{ - // var peoples = await _client - // .For("IPersons") - // .Filter("Name eq \'Маударбеков Азат Муратбекович\'") - // .FindEntriesAsync(); - // foreach (dynamic person in peoples) - // { - // try - // { - // long Id = person["Id"]; - // await _client - // .For("IPersons") - // .Key(Id) - // .DeleteEntryAsync(); - // } - // catch (Exception) - // { - // } - // } - //} - [HttpPost("SendContract")] public async Task SendContractTo1C([FromBody]Contract contract) { diff --git a/1CDataBus/RabbitMQ/RabbitConnection.cs b/1CDataBus/RabbitMQ/RabbitConnection.cs index 6ae7bc7..f4369d6 100644 --- a/1CDataBus/RabbitMQ/RabbitConnection.cs +++ b/1CDataBus/RabbitMQ/RabbitConnection.cs @@ -8,21 +8,23 @@ namespace _1CDataBus.RabbitMQ private readonly IConnection _connection; private readonly IChannel _channel; private IConfiguration _configuration; + private string _queueName; public RabbitConnection(IConfiguration configuration) { _configuration = configuration; + var section = _configuration.GetSection("RabbitMqSettings"); var factory = new ConnectionFactory { - HostName = _configuration.GetValue("RabbitMqSettings:HostName"), - //HostName = "astsrvrabbit1", - UserName = _configuration.GetValue("RabbitMqSettings:UserName"), - //UserName = "erp", - Password = _configuration.GetValue("RabbitMqSettings:Password"), - //Password = @"Z!1;Q5#GE4v", - VirtualHost = _configuration.GetValue("RabbitMqSettings:VirtualHost") - //VirtualHost = "erp" + HostName = section.GetValue("HostName"), + UserName = section.GetValue("UserName"), + Password = section.GetValue("Password"), + VirtualHost = section.GetValue("VirtualHost") }; - +#if DEBUG + _queueName = section.GetValue("TestQueueName"); +#else + _queueName = section.GetValue("QueueName"); +#endif _connection = factory.CreateConnectionAsync().Result; _channel = _connection.CreateChannelAsync().Result; } @@ -30,13 +32,13 @@ namespace _1CDataBus.RabbitMQ public async Task SendMessage(string body) { await _channel.QueueDeclareAsync( - queue: "erp_contracts", + queue: _queueName, durable: false, exclusive: false, autoDelete: false, arguments: null); var encoded = Encoding.UTF8.GetBytes(body); - await _channel.BasicPublishAsync(string.Empty, "erp_contracts", encoded); + await _channel.BasicPublishAsync(string.Empty, _queueName, encoded); } public void Dispose() diff --git a/1CDataBus/Structure/Contract.cs b/1CDataBus/Structure/Contract.cs index add49cf..4c09455 100644 --- a/1CDataBus/Structure/Contract.cs +++ b/1CDataBus/Structure/Contract.cs @@ -5,7 +5,7 @@ namespace _1CDataBus.Structure { public class Contract { - private Dictionary _contractKinds = new Dictionary () + private Dictionary _contractKinds = new Dictionary() { { 1, "Поставщик" }, { 2, "Покупатель" }, @@ -17,6 +17,7 @@ namespace _1CDataBus.Structure public Contract(dynamic contract) { //Name = contract["Name"]; + Name = GetName(); BusinessUnit = contract["BusinessUnit"]["ExternalId"]; BusinessUnitBIN = contract["BusinessUnit"]["BINArmadoc"]; Counterparty = contract["Counterparty"]["ExternalId"]; @@ -25,7 +26,6 @@ namespace _1CDataBus.Structure Date = contract["ContractDateSungero"].Date.ToString("yyyy-MM-dd"); Currency = contract["Currency"] == null ? "KZT" : contract["Currency"]["AlphaCode"]; QDocID = contract["Id"].ToString(); - Name = GetName(); string dealKind = contract["DealKindSungero"]["Name"]; if (dealKind != null && _orderDealKinds.Contains(dealKind)) Orders = true; diff --git a/1CDataBus/Structure/ODataAccess.cs b/1CDataBus/Structure/ODataAccess.cs index 79eee7d..25da726 100644 --- a/1CDataBus/Structure/ODataAccess.cs +++ b/1CDataBus/Structure/ODataAccess.cs @@ -11,8 +11,11 @@ namespace _1CDataBus.Structure public ODataAccess(IConfiguration configuration) { _configuration = configuration; +#if DEBUG + var section = _configuration.GetSection("QDocTestSettings"); +#else var section = _configuration.GetSection("QDocSettings"); - +#endif var IntegrationServiceUrl = section.GetValue("Url"); var Login = section.GetValue("Login"); var Password = section.GetValue("Password"); diff --git a/1CDataBus/appsettings.json b/1CDataBus/appsettings.json index 9b36e55..feee11a 100644 --- a/1CDataBus/appsettings.json +++ b/1CDataBus/appsettings.json @@ -10,16 +10,20 @@ "HostName": "astsrvrabbit1", "UserName": "erp", "Password": "Z!1;Q5#GE4v", - "VirtualHost": "erp" + "VirtualHost": "erp", + "QueueName": "erp_contracts", + //"QueueName": "erp_contract_test", + "TestQueueName": "erp_contract_test" }, - "QDocTestSettings": { + "QDocSettings": { "Url": "https://qdoc.solidcore-resources.com/Integration/odata/", "Login": "Administrator", "Password": "MQVuEw9avO" }, - "QDocSettings": { + "QDocTestSettings": { "Url": "https://astsrvqtest.solidcore-resources.com/Integration/odata/", "Login": "Administrator", "Password": "D3cTXol8Se" - } + }, + "LogPath": "C:\\log\\contract_exchange" }