Контроль целостности логинов юзеров

ServerLMS/Systems/processingsystem.cpp

@@ -8,10 +8,7 @@ ProcessingSystem::ProcessingSystem(ProviderDBLMS* providerDBLMS, UpdateControlle
     updateController(nullptr),
     providerDBLMS(nullptr)
 {
-    //this->providerDBLMS = providerDBLMS;
-
-
-
+    this->providerDBLMS = providerDBLMS;
     this->updateController = updateController;
 }
 
@@ -20,10 +17,6 @@ void ProcessingSystem::initialize(MultiThreadServer *server, DataParser *dataPar
                                   UpdateController *updateController,
                                   ChatSystem *chatSystem)
 {
-    this->providerDBLMS = new ProviderDBLMS(/*parent*/nullptr);
-    this->providerDBLMS->ConnectionToDB();
-    this->providerDBLMS->deAuthorizationAll();
-
     this->commonClientServer = commonClientHandler;
     this->dataParser = dataParser;
     this->server = server;

ServerLMS/providerdblms.cpp

@@ -224,18 +224,32 @@ bool ProviderDBLMS::deAuthorizationAll()
 
 bool ProviderDBLMS::entryTraineeOnSimulator(int id_trainee)
 {
+    mtxAccess.lock();
     if(dbLMS->entryTraineeOnSimulator(id_trainee))
+    {
+        mtxAccess.unlock();
         return true;
+    }
     else
+    {
+        mtxAccess.unlock();
         return false;
+    }
 }
 
 bool ProviderDBLMS::exitTraineeFromSimulator(int id_trainee)
 {
+    mtxAccess.lock();
     if(dbLMS->exitTraineeFromSimulator(id_trainee))
+    {
+        mtxAccess.unlock();
         return true;
+    }
     else
+    {
+        mtxAccess.unlock();
         return false;
+    }
 }
 
 int ProviderDBLMS::getIdTraineeByLogin(QString login)
@@ -348,92 +362,164 @@ QList<Group> ProviderDBLMS::GetListAllGroups()
 
 int ProviderDBLMS::newInstructor()
 {
-    return dbLMS->newInstructor();
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->newInstructor();
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::delInstructor(int id)
 {
-    return dbLMS->delInstructor(id);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->delInstructor(id);
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::editInstructor(Instructor instructor)
 {
-    return dbLMS->editInstructor(instructor);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->editInstructor(instructor);
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::newTrainee(int id_group)
 {
-    return dbLMS->newTrainee(id_group);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->newTrainee(id_group);
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::delTrainee(int id)
 {
-    return dbLMS->delTrainee(id);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->delTrainee(id);
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::editTrainee(Trainee trainee)
 {
-    return dbLMS->editTrainee(trainee);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->editTrainee(trainee);
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::newGroup()
 {
-    return dbLMS->newGroup();
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->newGroup();
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::delGroup(int id)
 {
-    return dbLMS->delGroup(id);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->delGroup(id);
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::editGroup(Group group)
 {
-    return dbLMS->editGroup(group);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->editGroup(group);
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::newTaskAMM(TaskAmmFim task, int id_trainee)
 {
-    return dbLMS->newTaskAMM(task, id_trainee);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->newTaskAMM(task, id_trainee);
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::delTaskAMM(int id)
 {
-    return dbLMS->delTaskAMM(id);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->delTaskAMM(id);
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::editTaskAMM(TaskAmmFim task)
 {
-    return dbLMS->editTaskAMM(task);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->editTaskAMM(task);
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::newTaskFIM(TaskAmmFim task, int id_trainee)
 {
-    return dbLMS->newTaskFIM(task, id_trainee);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->newTaskFIM(task, id_trainee);
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::delTaskFIM(int id)
 {
-    return dbLMS->delTaskFIM(id);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->delTaskFIM(id);
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::editTaskFIM(TaskAmmFim task)
 {
-    return dbLMS->editTaskFIM(task);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->editTaskFIM(task);
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::replaceReportFIM(TaskAmmFim task)
 {
-    return dbLMS->replaceReportFIM(task);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->replaceReportFIM(task);
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::changeStatusTaskFIM(int id_task, QString status)
 {
-    return dbLMS->changeStatusTaskFIM(id_task, status);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->changeStatusTaskFIM(id_task, status);
+    mtxAccess.unlock();
+    return res;
 }
 
 int ProviderDBLMS::changeStatusTaskAMM(int id_task, QString status)
 {
-    return dbLMS->changeStatusTaskAMM(id_task, status);
+    int res = 0;
+    mtxAccess.lock();
+    res = dbLMS->changeStatusTaskAMM(id_task, status);
+    mtxAccess.unlock();
+    return res;
 }
 
 QList<TaskAmmFim> ProviderDBLMS::GetListTasksAMMofTrainee(int id_trainee)

ServerLMS/serverlmswidget.cpp

@@ -16,8 +16,8 @@ ServerLMSWidget::ServerLMSWidget(QWidget *parent) :
     loggerThread(nullptr),
     dataParser(nullptr),
     processingSystem(nullptr),
-    updateController(nullptr)//,
-    //providerDBLMS(nullptr)
+    updateController(nullptr),
+    providerDBLMS(nullptr)
 {
     ui->setupUi(this);
     mutex = new QMutex;
@@ -37,13 +37,13 @@ ServerLMSWidget::ServerLMSWidget(QWidget *parent) :
     updateThread = new QThread;
     loggerThread = new QThread;
 
-    //providerDBLMS = new ProviderDBLMS(this);
-    //providerDBLMS->ConnectionToDB();
-    //providerDBLMS->deAuthorizationAll();
+    providerDBLMS = new ProviderDBLMS(this);
+    providerDBLMS->ConnectionToDB();
+    providerDBLMS->deAuthorizationAll();
 
     chatSystem = new ChatSystem();
 
-    //connect(providerDBLMS, &ProviderDBLMS::signal_BlockAutorization, this, &ServerLMSWidget::slot_BlockAutorization);
+    connect(providerDBLMS, &ProviderDBLMS::signal_BlockAutorization, this, &ServerLMSWidget::slot_BlockAutorization);
 
     assetsManager = new AssetsManager;
     assetsManager->moveToThread(updateThread);
@@ -51,9 +51,8 @@ ServerLMSWidget::ServerLMSWidget(QWidget *parent) :
     updateController = new UpdateController;
     updateController->moveToThread(updateThread);
 
-    processingSystem = new ProcessingSystem(/*providerDBLMS*/nullptr, updateController);
+    processingSystem = new ProcessingSystem(providerDBLMS, updateController);
     //processingSystem->moveToThread(updateThread);
-    //providerDBLMS->moveToThread(updateThread);
 
     dataParser = new DataParser(assetsManager,processingSystem);
 

ServerLMS/serverlmswidget.h

@@ -103,7 +103,7 @@ private:
     CommonClientHandler *commonClientHandler;
     ChatSystem *chatSystem;
 
-    //ProviderDBLMS* providerDBLMS;
+    ProviderDBLMS* providerDBLMS;
 
     bool first = true; // для тестов Unity