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

fix: big xml code

Browse Source
This commit is contained in:
semenov
2025-09-18 12:02:21 +03:00
parent bd1bcd4e71
commit a2375700b1
5 changed files with 141 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ServerLMS/Data/PacketType.h
View File

@@ -76,6 +76,16 @@ inline QString enumToString(PacketType value) {
case PacketType::FREE: return "FREE";
case PacketType::HASH_CALCULATE_START: return "HASH_CALCULATE_START";
case PacketType::HASH_READY: return "HASH_READY";
case PacketType::TYPE_XMLANSWER_MESSAGE_FOR_GUI: return "TYPE_XMLANSWER_MESSAGE_FOR_GUI";
case PacketType::TYPE_XMLANSWER_QUERY_DB__LIST_INSTRUCTORS: return "TYPE_XMLANSWER_QUERY_DB__LIST_INSTRUCTORS";
case PacketType::TYPE_XMLANSWER_QUERY_DB__LIST_GROUPS: return "TYPE_XMLANSWER_QUERY_DB__LIST_GROUPS";
case PacketType::TYPE_XMLANSWER_QUERY_DB__LIST_TRAINEES: return "TYPE_XMLANSWER_QUERY_DB__LIST_TRAINEES";
case PacketType::TYPE_XMLANSWER_QUERY_DB__LIST_COMPUTERS: return "TYPE_XMLANSWER_QUERY_DB__LIST_COMPUTERS";
case PacketType::TYPE_XMLANSWER_QUERY_DB__LIST_CLASSROOMS: return "TYPE_XMLANSWER_QUERY_DB__LIST_CLASSROOMS";
case PacketType::TYPE_XMLANSWER_QUERY_TASKS_AMM_OF_TRAINEE: return "TYPE_XMLANSWER_QUERY_TASKS_AMM_OF_TRAINEE";
case PacketType::TYPE_XMLANSWER_QUERY_TASKS_FIM_OF_TRAINEE: return "TYPE_XMLANSWER_QUERY_TASKS_FIM_OF_TRAINEE";
case PacketType::TYPE_XMLANSWER_QUERY_TASKS_XML_FIM: return "TYPE_XMLANSWER_QUERY_TASKS_XML_FIM";
case PacketType::TYPE_XMLANSWER_QUERY_TASKS_XML_AMM: return "TYPE_XMLANSWER_QUERY_TASKS_XML_AMM";
default: return "Unknown";
}

4
ServerLMS/Systems/processingsystem.cpp
View File

@@ -523,7 +523,7 @@ void ProcessingSystem::processingClientNotify(ClientHandler *client, ClientNotif
{//Клиент готов принять задания
client->setReady(true);
sendTaskListToUnity(client);
client->getSocket()->flush();
//client->getSocket()->flush();
}
else if(clientNotify.Code == commandStartTimerClient)
{
@@ -572,6 +572,8 @@ void ProcessingSystem::processingClientNotify(ClientHandler *client, ClientNotif
{
chatSystem->sendOldMessages(client->getClient()->getId());
}
Logger::instance().log(client->getClient()->getLogin() + clientNotify.Code,LogLevel::DEBUG);
}
void ProcessingSystem::setCurrentDataInfo(DataInfo *dataInfo)

34
ServerLMS/Systems/recognizesystem.cpp
View File

@@ -81,7 +81,34 @@ void RecognizeSystem::recognize()
}
if (packetType != PacketType::TYPE_NONE)
Logger::instance().log("C: " + client->getLogin() + " RECEIVE pack " + enumToString(packetType),LogLevel::DEBUG);
{
QString result = enumToString(packetType);
Logger::instance().log(client->getLogin() +
" RECEIVE pack " +
result ,LogLevel::DEBUG);
//секция на случай прихода неизвестного пакета
if(result == "Unknown")
{
qDebug() << " State:" << socket->state();
qDebug() << " Error:" << socket->error();
qDebug() << " Bytes to write:" << socket->bytesToWrite();
qDebug() << " Bytes available:" << socket->bytesAvailable();
if(client->getTypeClient() == TypeClientAutorization::TYPE_UNITY_CLIENT)
{
data = socket->readAll();
}
else
{
stream.startTransaction();
stream >> data;
}
QString dataText = QString::fromUtf8(data);
Logger::instance().log(QString::number(packetType) + " Unknown text " + dataText);
Logger::instance().log("Client error: " + client->getLogin(),LogLevel::ERROR);
clientHandler->sendDisable();
//mutex->unlock();
}
}
if (packetType == PacketType::TYPE_COMMAND) //TODO: надо переделать под какой то нормальный тип, который уже существует
{
@@ -138,12 +165,11 @@ void RecognizeSystem::recognize()
socket->read(readBuffer,4);
fileSize = *((int*)readBuffer);
stream.commitTransaction();
//if(!) continue;
//if(!stream.commitTransaction()) continue;
//ПОЛУЧЕНИЕ САМОГО ФАЙЛА
Logger::instance().log("AfterRead size and path BytesAvailable: " + QString::number(socket->bytesAvailable()));
qint64 readSize = 65535;
qint64 readSize = readFileBlockSize;
forever
{

75
ServerLMS/Systems/sendsystem.cpp
View File

@@ -61,7 +61,7 @@ void SendSystem::sendFileBlock(QString path)
{
while(!file.atEnd())
{
QByteArray data = file.read(1025*250);
QByteArray data = file.read(sendFileBlockSize);
stream << data;
//socket->waitForBytesWritten(10);
@@ -78,35 +78,86 @@ void SendSystem::sendFileBlock(QString path)
void SendSystem::sendFileBlockByteArray(QByteArray array, PacketType packetType)
{
qDebug() << "sendFileBlockByteArray thread: " << QThread::currentThreadId();
// qDebug() << "sendFileBlockByteArray thread: " << QThread::currentThreadId();
// if(client->getClientType() == TypeClientAutorization::TYPE_QT_CLIENT ||
// client->getClientType() == TypeClientAutorization::TYPE_GUI)
// {
// QDataStream stream(socket);
// stream.setVersion(QDataStream::Qt_DefaultCompiledVersion);
// fileSize = array.size();
// if(fileSize == 0){
// Logger::instance().log(" WARNING! Zero size ",LogLevel::ERROR);
// return;
// }
// stream << packetType; //Отправляем тип блока
// stream << fileSize;
// stream << array;
// }
// else
// {
// sendPacketType(packetType);
// QByteArray message;
// int size = array.length();
// message.append(reinterpret_cast<char*>(&size), sizeof(int));
// socket->write(message);
// socket->write(array);
// }
if(client->getClientType() == TypeClientAutorization::TYPE_QT_CLIENT ||
client->getClientType() == TypeClientAutorization::TYPE_GUI)
{
QDataStream stream(socket);
stream.setVersion(QDataStream::Qt_DefaultCompiledVersion);
fileSize = array.size();
quint64 size = array.size();
qint64 bytesSended = 0;
if(fileSize == 0){
if (size == 0)
{
Logger::instance().log(" WARNING! Zero size ",LogLevel::ERROR);
return;
}
stream << packetType; //Отправляем тип блока
stream << fileSize;
stream << array;
stream << size;
while (size > 0)
{
QByteArray chunk = array.mid(bytesSended,sendFileBlockSize);
stream << chunk;
bytesSended += chunk.length();
size -= bytesSended;
}
}
else
{
sendPacketType(packetType);
QByteArray message;
int size = array.length();
message.append(reinterpret_cast<char*>(&size), sizeof(int));
socket->write(message);
socket->write(array);
quint64 size = array.size();
qint64 bytesSended = 0;
if (size == 0)
{
Logger::instance().log(" WARNING! Zero size ",LogLevel::ERROR);
return;
}
QByteArray message;
message.append(reinterpret_cast<char*>(&size), sizeof(int));
socket->write(message);
while (size > 0)
{
QByteArray chunk = array.mid(bytesSended,sendFileBlockSize);
quint64 bytesSended = socket->write(chunk);
size -= bytesSended;
}
}
}
void SendSystem::sendVersion()
@@ -148,7 +199,7 @@ void SendSystem::sendFileBlockWithRename(QString path, QString newName)
if(file.open(QFile::ReadOnly)){
while(!file.atEnd()){
QByteArray data = file.read(1025*250);
QByteArray data = file.read(sendFileBlockSize);
stream << data;
socket->waitForBytesWritten();
countSend++;

5
ServerLMS/Systems/tools.h
View File

@@ -50,6 +50,11 @@ static const QString commandUpdateFilesClient = "update";
static const QString commandGetTasks = "GETTASKS";
static const QString commandeGetOfflineMessages = "GETOFFLINEMESSAGE";
//static quint64 fileBlockSize = 1460;
static quint64 sendFileBlockSize = 256000;
static quint64 readFileBlockSize = 65535;
//1025*250
class Tools {
public:
static void printTime();