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

XML запросы формируются напрямую в QByteArray

Browse Source
This commit is contained in:
krivoshein
2025-01-23 14:41:25 +03:00
parent 17dcf18da6
commit 8bb8ea0eaf
7 changed files with 45 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp
View File

@@ -54,13 +54,12 @@ void DataParser::createFileDataList(QList<FileData> fileDataList,QString filenam
file.close();
}
void DataParser::createAuthMessage(ClientAutorization *auth)
QByteArray DataParser::createAuthMessage(ClientAutorization *auth)
{
authPassCache = auth; //кэширование даных авторизации, для сохранения при успешном заходе
QFile file(tempName);
file.open(QIODevice::WriteOnly);
QXmlStreamWriter xmlWriter(&file);
QByteArray array;
QXmlStreamWriter xmlWriter(&array);
xmlWriter.setAutoFormatting(true);
xmlWriter.writeStartDocument();
@@ -74,14 +73,13 @@ void DataParser::createAuthMessage(ClientAutorization *auth)
xmlWriter.writeEndElement();
xmlWriter.writeEndDocument();
file.close();
return array;
}
void DataParser::createToClientMessage(ToClientMessage *toClientMessage)
QByteArray DataParser::createToClientMessage(ToClientMessage *toClientMessage)
{
QFile file(tempName);
file.open(QIODevice::WriteOnly);
QXmlStreamWriter xmlWriter(&file);
QByteArray array;
QXmlStreamWriter xmlWriter(&array);
xmlWriter.setAutoFormatting(true);
xmlWriter.writeStartDocument();
@@ -95,16 +93,15 @@ void DataParser::createToClientMessage(ToClientMessage *toClientMessage)
xmlWriter.writeEndElement();
xmlWriter.writeEndDocument();
file.close();
return array;
}
void DataParser::createQueryToDBMessage(ClientQueryToDB *queryToDB, int id, void* data)
QByteArray DataParser::createQueryToDBMessage(ClientQueryToDB *queryToDB, int id, void* data)
{
QFile file(tempName);
file.open(QIODevice::WriteOnly);
QXmlStreamWriter xmlWriter(&file);
QByteArray array;
QXmlStreamWriter xmlWriter(&array);
xmlWriter.setAutoFormatting(true);
xmlWriter.writeStartDocument();
@@ -195,14 +192,13 @@ void DataParser::createQueryToDBMessage(ClientQueryToDB *queryToDB, int id, void
xmlWriter.writeEndElement();
xmlWriter.writeEndDocument();
file.close();
return array;
}
void DataParser::createQueryTasksXMLMessage(QString type)
QByteArray DataParser::createQueryTasksXMLMessage(QString type)
{
QFile file(tempName);
file.open(QIODevice::WriteOnly);
QXmlStreamWriter xmlWriter(&file);
QByteArray array;
QXmlStreamWriter xmlWriter(&array);
xmlWriter.setAutoFormatting(true);
xmlWriter.writeStartDocument();
@@ -214,14 +210,13 @@ void DataParser::createQueryTasksXMLMessage(QString type)
xmlWriter.writeEndElement();
xmlWriter.writeEndDocument();
file.close();
return array;
}
void DataParser::createDeAuthMessage(ClientDeAutorization *deAuth)
QByteArray DataParser::createDeAuthMessage(ClientDeAutorization *deAuth)
{
QFile file(tempName);
file.open(QIODevice::WriteOnly);
QXmlStreamWriter xmlWriter(&file);
QByteArray array;
QXmlStreamWriter xmlWriter(&array);
xmlWriter.setAutoFormatting(true);
xmlWriter.writeStartDocument();
@@ -233,7 +228,7 @@ void DataParser::createDeAuthMessage(ClientDeAutorization *deAuth)
xmlWriter.writeEndElement();
xmlWriter.writeEndDocument();
file.close();
return array;
}

12
InstructorsAndTrainees/connectorToServer/Core/dataparser.h
View File

@@ -21,11 +21,13 @@ public:
void createServerSettings(QString server,QString port);
void saveClientSettrings(QString language,bool isAutoStart);
void createFileDataList(QList<FileData> fileDataList,QString filename);
void createAuthMessage(ClientAutorization *auth);
void createToClientMessage(ToClientMessage *toClientMessage);
void createQueryToDBMessage(ClientQueryToDB *queryToDB, int id = 0, void* data = nullptr);
void createQueryTasksXMLMessage(QString type);
void createDeAuthMessage(ClientDeAutorization *deAuth);
QByteArray createAuthMessage(ClientAutorization *auth);
QByteArray createToClientMessage(ToClientMessage *toClientMessage);
QByteArray createQueryToDBMessage(ClientQueryToDB *queryToDB, int id = 0, void* data = nullptr);
QByteArray createQueryTasksXMLMessage(QString type);
QByteArray createDeAuthMessage(ClientDeAutorization *deAuth);
void createAuthData(ServerAuthorization *serverAuth);
void createAuthDataOffline(QString username,QString pass);
void addRunData(QList<int> displays);

9
InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp
View File

@@ -31,21 +31,14 @@ void SendSystem::sendDisable()
socket->waitForBytesWritten();
}
void SendSystem::sendXMLmsgGUItoServer()
void SendSystem::sendXMLmsgGUItoServer(QByteArray array)
{
QDataStream stream(socket);
stream.setVersion(QDataStream::Qt_DefaultCompiledVersion);
QFile file(tempName);
file.open(QIODevice::ReadOnly);
QByteArray array = file.readAll();
stream << PacketType::TYPE_XMLANSWER;
stream << array;
socket->waitForBytesWritten();
file.close();
}
void SendSystem::sendFileBlock(QString path)

2
InstructorsAndTrainees/connectorToServer/Core/sendsystem.h
View File

@@ -14,7 +14,7 @@ class SendSystem :public QObject
public:
explicit SendSystem(QObject* parent = nullptr);
void setSocket(QTcpSocket *socket);
void sendXMLmsgGUItoServer();
void sendXMLmsgGUItoServer(QByteArray array);
void sendDisable();
void sendFileBlock(QString path);
void sendFolderBlock(QString path);

20
InstructorsAndTrainees/connectorToServer/connectortoserver.cpp
View File

@@ -28,8 +28,8 @@ bool ConnectorToServer::authorizationInstructorLocal(QString login, QString pass
autorization->Password = password;
autorization->TypeClient = TypeClientAutorization::TYPE_GUI;
dataParser->createAuthMessage(autorization);
emit signal_sendXMLmsgGUItoServer();
QByteArray array = dataParser->createAuthMessage(autorization);
emit signal_sendXMLmsgGUItoServer(array);
return true;
}
@@ -44,8 +44,8 @@ bool ConnectorToServer::deAuthorizationInstructorLocal(QString login)
ClientDeAutorization *deAutorization = new ClientDeAutorization;
deAutorization->Login = login;
dataParser->createDeAuthMessage(deAutorization);
emit signal_sendXMLmsgGUItoServer();
QByteArray array = dataParser->createDeAuthMessage(deAutorization);
emit signal_sendXMLmsgGUItoServer(array);
return true;
}
@@ -60,8 +60,8 @@ bool ConnectorToServer::sendQueryToDB(TypeQueryToDB typeQuery, int id, void* dat
ClientQueryToDB *queryToDB = new ClientQueryToDB;
queryToDB->typeQuery = typeQuery;
dataParser->createQueryToDBMessage(queryToDB, id, data);
emit signal_sendXMLmsgGUItoServer();
QByteArray array = dataParser->createQueryToDBMessage(queryToDB, id, data);
emit signal_sendXMLmsgGUItoServer(array);
return true;
}
@@ -78,8 +78,8 @@ bool ConnectorToServer::sendMessageForClient(int id, QString login, QString text
toClientMessage->Login = login;
toClientMessage->Text = text;
dataParser->createToClientMessage(toClientMessage);
emit signal_sendXMLmsgGUItoServer();
QByteArray array = dataParser->createToClientMessage(toClientMessage);
emit signal_sendXMLmsgGUItoServer(array);
return true;
}
@@ -91,8 +91,8 @@ bool ConnectorToServer::sendQueryTasksXML(QString type)
return false;
}
dataParser->createQueryTasksXMLMessage(type);
emit signal_sendXMLmsgGUItoServer();
QByteArray array = dataParser->createQueryTasksXMLMessage(type);
emit signal_sendXMLmsgGUItoServer(array);
return true;
}

2
InstructorsAndTrainees/connectorToServer/connectortoserver.h
View File

@@ -85,7 +85,7 @@ signals:
SendSystem *sendSystem,
QThread *thread);
void signal_sendXMLmsgGUItoServer();
void signal_sendXMLmsgGUItoServer(QByteArray array);
void sigLoginResult(ServerAuthorization * serverAuth);
void sigDeLoginResult(ServerDeAuthorization * serverDeAuth);

6
InstructorsAndTrainees/instructorsandtraineeswidget.cpp
View File

@@ -172,6 +172,10 @@ void InstructorsAndTraineesWidget::checkLoginResult(ServerAuthorization *serverA
updateLabelLoggedInInstructor(serverAuth->Login, serverAuth->ClientName);
connectorToServer->setLoginName(nameInstructorLoggedInLocal);
connectorToServer->sendQueryTasksXML("fim");
connectorToServer->sendQueryTasksXML("amm");
//QMessageBox::information(this, tr("Instructor authorization"), tr("Successfully!"));
}
else
@@ -199,7 +203,7 @@ void InstructorsAndTraineesWidget::checkDeLoginResult(ServerDeAuthorization *ser
ui->btnAuthorizationInstructor->setText(tr("Authorization Instructor"));
updateLabelLoggedInInstructor("","");
QMessageBox::information(this, tr("Instructor deauthorization"), tr("Successfully!"));
//QMessageBox::information(this, tr("Instructor deauthorization"), tr("Successfully!"));
}
else
{