Constanta-Design/RRJServer
4
0
Fork 0
mirror of https://gitea.msk.dinamika-avia.ru/Constanta-Design/RRJServer.git synced 2026-03-28 19:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

refact 1

Browse Source
This commit is contained in:
Кривошеин Андрей
2026-02-10 16:28:28 +03:00
parent 2cce331a67
commit ed7de8af4e
35 changed files with 418 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
LibServer/serverlmswidget.cpp
View File

@@ -120,6 +120,7 @@ ServerLMSWidget::~ServerLMSWidget()
//INTERFACE
void ServerLMSWidget::startInitialization()
{
startInitialization_step0();
@@ -342,7 +343,7 @@ void ServerLMSWidget::slot_ResultTryConnectDb(bool result)
if(result)
{
//Настройки БД
DataBaseSettings dbSettings = providerDBLMS->getDBSettings();
DataBaseSettings dbSettings = ProviderDBLMS::getDBSettings();
QString strDBsettings = QString("%1 (%2) %3 : %4").arg(dbSettings.dbName,
dbSettings.dbType,
dbSettings.dbHostName,
@@ -525,10 +526,10 @@ void ServerLMSWidget::startInitialization_step0()
chatSystem = new ChatSystem();
chatSystem->moveToThread(serverThread);
assetsManager = new AssetsManager;
assetsManager = new AssetsManager();
assetsManager->moveToThread(updateThread);
updateController = new UpdateController;
updateController = new UpdateController();
updateController->moveToThread(updateThread);
docsUpdater = new DocsUpdater(updateController);
@@ -542,10 +543,10 @@ void ServerLMSWidget::startInitialization_step0()
processingSystem = new ProcessingSystem(providerDBLMS, updateController, docsUpdater, cfiController);
processingSystem->moveToThread(serverThread);
dataParser = new DataParser(assetsManager, processingSystem);
dataParser = new DataParser(processingSystem);
dataParser->moveToThread(serverThread);
commonClientHandler = new CommonClientHandler;
commonClientHandler = new CommonClientHandler();
commonClientHandler->moveToThread(serverThread);
connect(docsUpdater, &DocsUpdater::signal_DocsChanged, commonClientHandler, &CommonClientHandler::slot_DocsChanged);
@@ -560,8 +561,8 @@ void ServerLMSWidget::startInitialization_step0()
connect(this, &ServerLMSWidget::signal_StopServer, server, &MultiThreadServer::slot_StopServer);
connect(server, &MultiThreadServer::signal_BlockAutorizationIndicate, this, &ServerLMSWidget::slot_BlockAutorizationIndicate);
connect(providerDBLMS, &ProviderDBLMS::signal_BlockAutorization, server, &MultiThreadServer::slot_BlockAutorization, Qt::DirectConnection /*Тут именно DirectConnection!*/);
connect(updateController, &UpdateController::signal_BlockAutorization, server, &MultiThreadServer::slot_BlockAutorization/*, Qt::DirectConnection*/);
connect(providerDBLMS, &ProviderDBLMS::signal_BlockAutorization, server, &MultiThreadServer::slot_BlockAutorization, Qt::DirectConnection /*Тут именно DirectConnection! Не менять!*/);
connect(updateController, &UpdateController::signal_BlockAutorization, server, &MultiThreadServer::slot_BlockAutorization, Qt::DirectConnection /*Тут именно DirectConnection! Не менять!*/);
connect(server, &MultiThreadServer::signal_sendPacketToAllClients, commonClientHandler, &CommonClientHandler::slot_sendPacketToAllClients);
loggerThread->start();
@@ -579,14 +580,14 @@ void ServerLMSWidget::startInitialization_step0()
connect(this, &ServerLMSWidget::signal_UpdateControllerInitialize, updateController, &UpdateController::initialize);
connect(updateController, &UpdateController::sigInitializeFinished, this, &ServerLMSWidget::slot_UpdateControllerInitializeFinished);
connect(updateController, &UpdateController::sigErrorRequired, this, &ServerLMSWidget::slot_SetError);
connect(updateController, &UpdateController::sigUpdateDocs, docsUpdater, &DocsUpdater::slot_updateDocsXML, Qt::AutoConnection);
connect(updateController, &UpdateController::sigUpdateDocsXML, docsUpdater, &DocsUpdater::slot_updateDocsXML);
connect(&Logger::instance(), &Logger::sigLogToWidget, this, &ServerLMSWidget::slot_AddMessageToLog, Qt::QueuedConnection);
connect(assetsManager, &AssetsManager::signal_setVersion, this, &ServerLMSWidget::slot_StateVersionMaterials);
connect(this, &ServerLMSWidget::signal_UpdateDocsXML, docsUpdater, &DocsUpdater::slot_updateDocsXML);
emit signal_UpdateControllerInitialize(commonClientHandler, dataParser, assetsManager);
emit signal_UpdateControllerInitialize(commonClientHandler, assetsManager);
}
void ServerLMSWidget::startInitialization_step1()