From 8bb8ea0eaf109dd119a702a67bdc56c9f08d9031 Mon Sep 17 00:00:00 2001 From: krivoshein Date: Thu, 23 Jan 2025 14:41:25 +0300 Subject: [PATCH] =?UTF-8?q?XML=20=D0=B7=D0=B0=D0=BF=D1=80=D0=BE=D1=81?= =?UTF-8?q?=D1=8B=20=D1=84=D0=BE=D1=80=D0=BC=D0=B8=D1=80=D1=83=D1=8E=D1=82?= =?UTF-8?q?=D1=81=D1=8F=20=D0=BD=D0=B0=D0=BF=D1=80=D1=8F=D0=BC=D1=83=D1=8E?= =?UTF-8?q?=20=D0=B2=20QByteArray?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../connectorToServer/Core/dataparser.cpp | 45 +++++++++---------- .../connectorToServer/Core/dataparser.h | 12 ++--- .../connectorToServer/Core/sendsystem.cpp | 9 +--- .../connectorToServer/Core/sendsystem.h | 2 +- .../connectorToServer/connectortoserver.cpp | 20 ++++----- .../connectorToServer/connectortoserver.h | 2 +- .../instructorsandtraineeswidget.cpp | 6 ++- 7 files changed, 45 insertions(+), 51 deletions(-) diff --git a/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp b/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp index acf46b5..b3ad8c3 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp +++ b/InstructorsAndTrainees/connectorToServer/Core/dataparser.cpp @@ -54,13 +54,12 @@ void DataParser::createFileDataList(QList 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; } diff --git a/InstructorsAndTrainees/connectorToServer/Core/dataparser.h b/InstructorsAndTrainees/connectorToServer/Core/dataparser.h index c0a3406..8e2e85c 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/dataparser.h +++ b/InstructorsAndTrainees/connectorToServer/Core/dataparser.h @@ -21,11 +21,13 @@ public: void createServerSettings(QString server,QString port); void saveClientSettrings(QString language,bool isAutoStart); void createFileDataList(QList 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 displays); diff --git a/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp b/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp index dadaaf7..3c34e5b 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp +++ b/InstructorsAndTrainees/connectorToServer/Core/sendsystem.cpp @@ -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) diff --git a/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h b/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h index 1e22eef..924b411 100644 --- a/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h +++ b/InstructorsAndTrainees/connectorToServer/Core/sendsystem.h @@ -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); diff --git a/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp b/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp index 13dabe1..69e6687 100644 --- a/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp +++ b/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp @@ -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; } diff --git a/InstructorsAndTrainees/connectorToServer/connectortoserver.h b/InstructorsAndTrainees/connectorToServer/connectortoserver.h index 67b06c8..70e0867 100644 --- a/InstructorsAndTrainees/connectorToServer/connectortoserver.h +++ b/InstructorsAndTrainees/connectorToServer/connectortoserver.h @@ -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); diff --git a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp index 62fa036..1e36a42 100644 --- a/InstructorsAndTrainees/instructorsandtraineeswidget.cpp +++ b/InstructorsAndTrainees/instructorsandtraineeswidget.cpp @@ -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 {