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

Merge branch 'test-size-of-message' into DEV

Browse Source
This commit is contained in:
semenov
2025-09-19 11:40:43 +03:00
parent d93e5e49c9 b00c5b8264
commit 205f60fd7d
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ServerLMS/Systems/processingsystem.cpp
View File

@@ -519,6 +519,8 @@ void ProcessingSystem::processingSendMessage(ClientMessage clientMessage)
void ProcessingSystem::processingClientNotify(ClientHandler *client, ClientNotify clientNotify) void ProcessingSystem::processingClientNotify(ClientHandler *client, ClientNotify clientNotify)
{ {
Client *clientData = client->getClient();
if(clientNotify.Code == commandReadyClient) if(clientNotify.Code == commandReadyClient)
{//Клиент готов принять задания {//Клиент готов принять задания
client->setReady(true); client->setReady(true);
@@ -528,7 +530,7 @@ void ProcessingSystem::processingClientNotify(ClientHandler *client, ClientNotif
else if(clientNotify.Code == commandStartTimerClient) else if(clientNotify.Code == commandStartTimerClient)
{ {
//Фиксируем время входа Юнити-клиента //Фиксируем время входа Юнити-клиента
if (client->getClient()->getClientType() == TypeClientAutorization::TYPE_UNITY_CLIENT) if (clientData->getClientType() == TypeClientAutorization::TYPE_UNITY_CLIENT)
{ {
processingEntryUnityClient(client); processingEntryUnityClient(client);
} }
@@ -538,7 +540,7 @@ void ProcessingSystem::processingClientNotify(ClientHandler *client, ClientNotif
qDebug() << "processing thread: " << QThread::currentThreadId(); qDebug() << "processing thread: " << QThread::currentThreadId();
//Фиксируем время выхода Юнити-клиента //Фиксируем время выхода Юнити-клиента
if (client->getClient()->getClientType() == TypeClientAutorization::TYPE_UNITY_CLIENT) if (clientData->getClientType() == TypeClientAutorization::TYPE_UNITY_CLIENT)
{ {
processingExitUnityClient(client); processingExitUnityClient(client);
} }
@@ -570,10 +572,10 @@ void ProcessingSystem::processingClientNotify(ClientHandler *client, ClientNotif
} }
else if (clientNotify.Code == commandeGetOfflineMessages) else if (clientNotify.Code == commandeGetOfflineMessages)
{ {
chatSystem->sendOldMessages(client->getClient()->getId()); chatSystem->sendOldMessages(clientData->getId());
} }
Logger::instance().log(client->getClient()->getLogin() + " notifyCode " + clientNotify.Code,LogLevel::DEBUG); Logger::instance().log(clientData->getLogin() + " notifyCode " + clientNotify.Code,LogLevel::DEBUG);
} }
void ProcessingSystem::setCurrentDataInfo(DataInfo *dataInfo) void ProcessingSystem::setCurrentDataInfo(DataInfo *dataInfo)

8
ServerLMS/Systems/recognizesystem.cpp
View File

@@ -27,7 +27,7 @@ void RecognizeSystem::initialize(UpdateController *updateController,DataParser*
connect(this,&RecognizeSystem::sigChangeVersion,updateController,&UpdateController::changeAssetVersion,Qt::AutoConnection); connect(this,&RecognizeSystem::sigChangeVersion,updateController,&UpdateController::changeAssetVersion,Qt::AutoConnection);
connect(this,&RecognizeSystem::sigDeleteVersion,updateController,&UpdateController::deleteAssetVersion,Qt::AutoConnection); connect(this,&RecognizeSystem::sigDeleteVersion,updateController,&UpdateController::deleteAssetVersion,Qt::AutoConnection);
connect(this,&RecognizeSystem::sigCopyVersion,updateController,&UpdateController::createCopyVersion,Qt::AutoConnection); connect(this,&RecognizeSystem::sigCopyVersion,updateController,&UpdateController::createCopyVersion,Qt::AutoConnection);
connect(this,&RecognizeSystem::sigXmlParser,dataParser->getProcessParser(),&ProcessParser::slot_read,Qt::DirectConnection); connect(this,&RecognizeSystem::sigXmlParser,dataParser->getProcessParser(),&ProcessParser::slot_read,Qt::AutoConnection);
qDebug() << "Recognize init thread ID " << QThread::currentThreadId(); qDebug() << "Recognize init thread ID " << QThread::currentThreadId();
} }
@@ -182,15 +182,15 @@ void RecognizeSystem::recognize()
Logger::instance().log("File loaded"); Logger::instance().log("File loaded");
emit sigXmlParser(clientHandler,data);
//ОЧИСТКА ПОСЛЕ ПЕРЕДАЧИ //ОЧИСТКА ПОСЛЕ ПЕРЕДАЧИ
fileSize = 0; fileSize = 0;
tmpBlock.clear(); tmpBlock.clear();
sizeReceiveData = 0; sizeReceiveData = 0;
countSend = 0; countSend = 0;
emit sigXmlParser(clientHandler,data);
packetType = PacketType::TYPE_NONE; packetType = PacketType::TYPE_NONE;
data.clear();
continue; continue;
} }