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

В основном работает

Browse Source
This commit is contained in:
krivoshein
2024-12-12 17:20:06 +03:00
parent d28453440f
commit 1c9e0510a9
51 changed files with 634 additions and 810 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.cpp
View File

@@ -31,7 +31,7 @@ void TCPClient::setConnect(ServerSettings *serverSettings)
emit sigSendDebugLog("Try connect...");
isConnected = true;
if (socket->waitForConnected(2000))
if (socket->waitForConnected(5))
{
connect(socket,&QTcpSocket::readyRead,this,&TCPClient::slotReadyRead,Qt::DirectConnection);
connect(socket,&QTcpSocket::disconnected,this,&TCPClient::setDisconnect);
@@ -42,6 +42,8 @@ void TCPClient::setConnect(ServerSettings *serverSettings)
emit sigSetSocket(socket);
slotConnectNotify();
emit signal_ConnectedToServer(true);
}
else
{
@@ -56,6 +58,8 @@ void TCPClient::setDisconnect()
isConnected = false;
emit sigServerDisconnect();
emit sigSendDebugLog("Server disabled");
emit signal_ConnectedToServer(false);
}

2
DB_IaT/InstructorsAndTrainees/connectorToServer/Core/tcpclient.h
View File

@@ -40,6 +40,8 @@ signals:
void sigConnectionState(bool flag);
void sigSetSocket(QTcpSocket *socket);
void signal_ConnectedToServer(bool state);
public slots:
void slotSendCommand(QString message);
void slotConnectNotify();

12
DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.cpp
View File

@@ -62,6 +62,11 @@ bool ConnectorToServer::sendQueryToDB(TypeQueryToDB typeQuery, int id, void* dat
return true;
}
void ConnectorToServer::SetConnectToServer()
{
emit sigSetConnect(dataParser->getServerSettings(),connectionThread);
}
QList<Instructor> ConnectorToServer::getListInstructors()
{
return listInstructors;
@@ -193,6 +198,7 @@ Group ConnectorToServer::getGroup(int id)
return Group();
}
/*
void ConnectorToServer::slot_AnswerQueryToDB(QList<Instructor>* listInstructors,
QList<Trainee>* listTrainees,
QList<Group>* listGroups)
@@ -201,7 +207,7 @@ void ConnectorToServer::slot_AnswerQueryToDB(QList<Instructor>* listInstructors,
this->listTrainees = *listTrainees;
this->listGroups = *listGroups;
emit signal_UpdateDB(true, true);
}
}*/
void ConnectorToServer::slot_AnswerQueryToDB_ListInstructors(QList<Instructor> listInstructors)
{
@@ -263,7 +269,7 @@ void ConnectorToServer::bindConnection()
connect(recognizeSystem,&RecognizeSystem::sigAuth,this,&ConnectorToServer::sigLoginResult);
connect(recognizeSystem,&RecognizeSystem::sigDeAuth,this,&ConnectorToServer::sigDeLoginResult);
connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB,this,&ConnectorToServer::slot_AnswerQueryToDB);
//connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB,this,&ConnectorToServer::slot_AnswerQueryToDB);
connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB_ListInstructors,this,&ConnectorToServer::slot_AnswerQueryToDB_ListInstructors);
connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB_ListGroups,this,&ConnectorToServer::slot_AnswerQueryToDB_ListGroups);
@@ -271,6 +277,8 @@ void ConnectorToServer::bindConnection()
connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB_ListComputers,this,&ConnectorToServer::slot_AnswerQueryToDB_ListComputers);
connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB_ListClassrooms,this,&ConnectorToServer::slot_AnswerQueryToDB_ListClassrooms);
connect(recognizeSystem,&RecognizeSystem::sigAnswerQueryToDB_ListTasks,this,&ConnectorToServer::slot_AnswerQueryToDB_ListTasks);
connect(client,&TCPClient::signal_ConnectedToServer,this,&ConnectorToServer::signal_ConnectedToServer);
}
void ConnectorToServer::createObjects()

9
DB_IaT/InstructorsAndTrainees/connectorToServer/connectortoserver.h
View File

@@ -22,9 +22,10 @@ public:
bool authorizationInstructorLocal(QString login, QString password);
bool deAuthorizationInstructorLocal(QString login);
//bool sendQueryToDB(TypeQueryToDB typeQuery, int id = 0, Instructor* instructor = nullptr);
bool sendQueryToDB(TypeQueryToDB typeQuery, int id = 0, void* data = nullptr);
void SetConnectToServer();
public:
//Запросы к БД (локальной)
QList<Instructor> getListInstructors();
@@ -46,9 +47,9 @@ public:
Group getGroup(int id);
public slots:
void slot_AnswerQueryToDB(QList<Instructor>* listInstructors,
/*void slot_AnswerQueryToDB(QList<Instructor>* listInstructors,
QList<Trainee>* listTrainees,
QList<Group>* listGroups);
QList<Group>* listGroups);*/
void slot_AnswerQueryToDB_ListInstructors(QList<Instructor> listInstructors);
void slot_AnswerQueryToDB_ListGroups(QList<Group> listGroups);
@@ -73,6 +74,8 @@ signals:
void signal_UpdateDB(bool treeInstructor, bool treeTrainee);
void signal_ConnectedToServer(bool state);
private:
void initialize();