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

bugFix refact 0

Browse Source
This commit is contained in:
Кривошеин Андрей
2026-02-03 17:57:45 +03:00
parent 60534ebef4
commit 34799c5814
5 changed files with 13 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
LibInstructorsAndTrainees/connectorToServer/Core/recognizesystem.cpp
View File

@@ -154,7 +154,7 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
continue;
}
quint64 toFile = file.write(tmpBlock);
qint64 toFile = file.write(tmpBlock);
emit sigSendDebugLog(Tools::getTime() + "CLIENT: toFile :" + toFile);
sizeReceiveData += toFile;
@@ -278,12 +278,8 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
emit signal_AnswerDocsChanged();
}
//if(packetType == PacketType::TYPE_XMLANSWER_QUERY_LIST_SUB_PROC_AMM)
//{
//}
//А)xml-ответы на запросы к БД
//А)xml-ответы на запросы к БД (или автоматическая рассылка)
//B)перечни Подпроцедур
switch(packetType)
{
@@ -304,15 +300,16 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
stream.startTransaction();
stream >> fileSize;
if(!stream.commitTransaction()){
if(!stream.commitTransaction())
{
emit sigSendDebugLog(Tools::getTime() + "CLIENT: fileSize - FAIL commitTransaction");
if (!socket->waitForReadyRead(TCP_READ_TIMEOUT)) {
if (!socket->waitForReadyRead(TCP_READ_TIMEOUT))
{
emit sigSendDebugLog(Tools::getTime() + "CLIENT: ERROR! readyRead timeout - fileSize!!!");
return;
}
continue;
}
emit sigSendDebugLog("CLIENT: filesize: " + QString::number(fileSize));
@@ -332,13 +329,16 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
stream.startTransaction();
stream >> tmpBlock;
if(!stream.commitTransaction()){
if(!stream.commitTransaction())
{
if(socket->state() == QAbstractSocket::UnconnectedState){
if(socket->state() == QAbstractSocket::UnconnectedState)
{
emit sigSocketDisabled();
return;
}
if(socket->waitForReadyRead(TCP_READ_TIMEOUT)){
if(socket->waitForReadyRead(TCP_READ_TIMEOUT))
{
continue;
}
@@ -349,7 +349,6 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
emit sigSendDebugLog(Tools::getTime() + "CLIENT: toFile :" + array.size());
//sizeReceiveData += array.size();
sizeReceiveData = array.size();
countSend++;
@@ -384,21 +383,6 @@ void RecognizeSystem::recognize(QTcpSocket *socket)
}
packetType = PacketType::TYPE_NONE;
/*
QByteArray array;
stream.startTransaction();
stream >> array;
if(!stream.commitTransaction())
continue;
xmlParserQueryToDB(packetType, array);
packetType = PacketType::TYPE_NONE;
*/
}
break;
};

8
LibInstructorsAndTrainees/metatypes.cpp
View File

@@ -1,7 +1,6 @@
#include "metatypes.h"
void registerMetaType()
{
qRegisterMetaType<QList<Instructor>>("QList<Instructor>");
@@ -11,16 +10,9 @@ void registerMetaType()
qRegisterMetaType<QList<Classroom>>("QList<Classroom>");
qRegisterMetaType<QList<Module*>>("QList<Module*>");
qRegisterMetaType<QList<TaskAmmFim>>("QList<TaskAmmFim>");
//qRegisterMetaType<QMap<int, QList<TaskAmmFim>>>("QMap<int, QList<TaskAmmFim>>");
qRegisterMetaType<MapListsTasksAllTraineeType>("MapListsTasksAllTraineeType");
qRegisterMetaType<PacketType>("PacketType");
qRegisterMetaType<ClientMessage>("ClientMessage");
qRegisterMetaType<QList<QTreeWidgetItem*>>("QList<QTreeWidgetItem*>");
qRegisterMetaType<QList<SubProc>>("QList<SubProc>");
qRegisterMetaType<QMap<int, float>>("QMap<int, float>");
}

5
LibInstructorsAndTrainees/metatypes.h
View File

@@ -2,7 +2,6 @@
#define METATYPES_H
#include <QTreeWidgetItem>
#include <QMap>
#include "instructor.h"
#include "trainee.h"
@@ -25,12 +24,10 @@ Q_DECLARE_METATYPE(QList<Computer>)
Q_DECLARE_METATYPE(QList<Classroom>)
Q_DECLARE_METATYPE(QList<Module*>)
Q_DECLARE_METATYPE(QList<TaskAmmFim>)
Q_DECLARE_METATYPE(MapListsTasksAllTraineeType)
Q_DECLARE_METATYPE(PacketType)
Q_DECLARE_METATYPE(ClientMessage)
Q_DECLARE_METATYPE(QList<QTreeWidgetItem*>)
Q_DECLARE_METATYPE(MapListsTasksAllTraineeType)
Q_DECLARE_METATYPE(QList<SubProc>)
#endif // METATYPES_H

8
LibServer/Systems/processingsystem.cpp
View File

@@ -330,14 +330,6 @@ void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQu
//Отправка списка задач AMM всех обучаемых клиенту GUI
sendListsTasksAMMofAllTraineestoClient(client, listTrainees);
}
/*
for(Trainee trainee : listTrainees)
{
//Отправка списка задач AMM этого обучаемого клиенту GUI
sendListTasksAMMofTraineetoClient(client, trainee.getID());
//Отправка списка задач FIM этого обучаемого клиенту GUI
sendListTasksFIMofTraineetoClient(client, trainee.getID());
}*/
break;
}

2
LibServer/Systems/sendsystem.cpp
View File

@@ -97,14 +97,12 @@ void SendSystem::sendFileBlockByteArray(QByteArray array, PacketType packetType)
stream << packetType; //Отправляем тип блока
stream << size;
//while (size > 0)
while (bytesSended < size)
{
QByteArray chunk = array.mid(bytesSended,sendFileBlockSize);
stream << chunk;
bytesSended += chunk.length();
//size -= bytesSended;
}
}
else