Merge branch 'DEV' into CFI-Update

# Conflicts:
#	LibServer/serverlmswidget.cpp
This commit is contained in:
semenov
2026-01-28 17:06:20 +03:00
24 changed files with 694 additions and 39 deletions

View File

@@ -3,15 +3,17 @@
#include <clienthandler.h>
ProcessingSystem::ProcessingSystem(ProviderDBLMS* providerDBLMS, UpdateController* updateController, DocsUpdater* docsUpdater, QObject *parent):
ProcessingSystem::ProcessingSystem(ProviderDBLMS* providerDBLMS, UpdateController* updateController, DocsUpdater* docsUpdater, CfiController* cfiController, QObject *parent):
QObject(parent),
updateController(nullptr),
docsUpdater(nullptr),
cfiController(nullptr),
providerDBLMS(nullptr)
{
this->providerDBLMS = providerDBLMS;
this->updateController = updateController;
this->docsUpdater = docsUpdater;
this->cfiController = cfiController;
}
void ProcessingSystem::initialize(MultiThreadServer *server, DataParser *dataParser,
@@ -97,12 +99,12 @@ void ProcessingSystem::processingClientAutorization(ClientHandler *client, Clien
client->sendVersion();
//Отправляем состояние блокировки
/**/
/*
if(server->getStateBlockAutorization() == EStateBlockAutorization::blocked)
client->sendPacketType(PacketType::BUSY);
else
client->sendPacketType(PacketType::FREE);
*/
//client->sendPacketType(PacketType::BUSY);
//client->sendPacketType(PacketType::FREE);