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

Рефакт Администрирование БД 2

Browse Source
This commit is contained in:
Кривошеин Андрей
2025-11-05 23:50:10 +03:00
parent 99d9c6d1e3
commit 2d91b18bfb
8 changed files with 61 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
DataBaseLMS/databaselms.h
View File

@@ -47,6 +47,7 @@ public:
bool checkDataBaseLMSexist();
bool createUser();
bool createDB();
bool prepareRestoreDBscript();
protected:
//Подключение

51
DataBaseLMS/databaselms_Postgresql.cpp
View File

@@ -164,25 +164,14 @@ bool DataBaseLMS::createDB()
qDebug() << "The database has been created.";
//Залитие БД
if(prepareRestoreDBscript())
{
QProcess process;
QString pgRestorePath = "restoreDBscript.bat";
QProcess process;
//QString pgRestorePath = "C:\\restoreDB.bat";
QString pgRestorePath = "restoreDB.bat";
/*
QString dbName = "databaselms2";
QString user = "postgres";
QString backupFile = "C:\\DBLMS_EMPTY_30_09_2025.backup";
QStringList arguments;
arguments << "-d" << dbName;
arguments << "-U" << user;
arguments << backupFile;
*/
process.start("cmd /C " + pgRestorePath);
process.waitForFinished(-1); // Ждать бесконечно, пока процесс не завершится
process.start("cmd /C " + pgRestorePath);
process.waitForFinished(-1); // Ждать бесконечно, пока процесс не завершится
}
//Назначение владельца
QString queryStr = QString("ALTER DATABASE %1 OWNER TO %2").arg(settings.dbName, settings.dbUserName);
@@ -210,8 +199,8 @@ bool DataBaseLMS::createDB()
QSqlDatabase dbCheck2 = QSqlDatabase::addDatabase("QPSQL");
dbCheck.setUserName(UserNamePostgres);
dbCheck.setPassword(PasswordPostgres);
dbCheck2.setUserName(UserNamePostgres);
dbCheck2.setPassword(PasswordPostgres);
dbCheck2.setHostName(settings.dbHostName);
dbCheck2.setPort(settings.dbPort);
dbCheck2.setDatabaseName(settings.dbName);
@@ -242,3 +231,25 @@ bool DataBaseLMS::createDB()
return true;
}
bool DataBaseLMS::prepareRestoreDBscript()
{
DataBaseSettings settings = getDataBaseSettings();
QFile file("restoreDBscript.bat");
if (file.open(QIODevice::WriteOnly | QIODevice::Text))
{
QTextStream out(&file);
out << "set CURRENT_DIR=%~dp0\n";
out << "cd %CURRENT_DIR%\n";
out << QString("set \"PGPASSWORD=%1\"\n").arg(PasswordPostgres);
out << QString("pg_restore -U %1 -h %2 -p %3 -d %4 DBLMS_EMPTY.backup\n").arg(UserNamePostgres,
settings.dbHostName,
QString::number(settings.dbPort),
settings.dbName);
file.close();
return true;
}
else
return false;
}

20
InstructorsAndTrainees/CMakeLists.txt
View File

@@ -156,22 +156,22 @@ if(PROJECT_TYPE_DEBUG)
${REPO_PATH}/BUILDS/Debug64/InstructorsAndTrainees/libInstructorsAndTrainees.dll
${REPO_PATH}/BUILDS/Debug64/GUIdataBaseLMS)
add_custom_command(TARGET InstructorsAndTrainees
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${REPO_PATH}/BUILDS/Debug64/InstructorsAndTrainees/libInstructorsAndTrainees.dll
${REPO_PATH}/BUILDS/Debug64/TrayServerLMS)
add_custom_command(TARGET InstructorsAndTrainees
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${REPO_PATH}/BUILDS/Debug64/InstructorsAndTrainees/libInstructorsAndTrainees.dll
${REPO_PATH}/BUILDS/Debug64/TrayServerLMS)
else()
add_custom_command(TARGET InstructorsAndTrainees
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${REPO_PATH}/BUILDS/Release64/InstructorsAndTrainees/libInstructorsAndTrainees.dll
${REPO_PATH}/BUILDS/Release64/GUIdataBaseLMS)
add_custom_command(TARGET InstructorsAndTrainees
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${REPO_PATH}/BUILDS/Release64/InstructorsAndTrainees/libInstructorsAndTrainees.dll
${REPO_PATH}/BUILDS/Release64/TrayServerLMS)
add_custom_command(TARGET InstructorsAndTrainees
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${REPO_PATH}/BUILDS/Release64/InstructorsAndTrainees/libInstructorsAndTrainees.dll
${REPO_PATH}/BUILDS/Release64/TrayServerLMS)
endif()
#Только для TSMP!

13
ServerLMS/dialogcheckdb.cpp
View File

@@ -1,5 +1,6 @@
#include <QMessageBox>
#include <QProcess>
#include <QFile>
#include "dialogcheckdb.h"
#include "ui_dialogcheckdb.h"
@@ -68,7 +69,9 @@ void DialogCheckDB::check()
}
if(!resDriver || !resUser || !resDB)
{
ui->btnRepare->setEnabled(true);
}
else
ui->btnRepare->setEnabled(false);
}
@@ -86,6 +89,7 @@ void DialogCheckDB::on_btnRepare_clicked()
if(!providerDBLMS->createUser())
{
QMessageBox::critical(this, tr("Error!"), tr("Failed to create user!"));
check();
return;
}
}
@@ -95,7 +99,16 @@ void DialogCheckDB::on_btnRepare_clicked()
if(!providerDBLMS->createDB())
{
QMessageBox::critical(this, tr("Error!"), tr("Failed to create Database!"));
check();
return;
}
}
check();
if(resDriver && resUser && resDB)
{
QMessageBox::information(this, tr("Completed!"), tr("The database has been successfully restored!"));
this->accept();
}
}

1
ServerLMS/dialogcheckdb.h
View File

@@ -21,6 +21,7 @@ private slots:
private:
void check();
void prepareRestoreDBscript();
private:
Ui::DialogCheckDB *ui;

6
ServerLMS/dialogsettingstray.cpp
View File

@@ -277,10 +277,6 @@ void DialogSettingsTray::on_btnCheckDB_clicked()
return;
}
//Имитация
//UserNamePostgres = "postgres";
//PasswordPostgres = "12345678";
if(providerDBLMS->setUserPasswordPostgres(UserNamePostgres, PasswordPostgres))
{
DialogCheckDB dlgCheckDB(providerDBLMS, this);
@@ -289,6 +285,8 @@ void DialogSettingsTray::on_btnCheckDB_clicked()
switch( dlgCheckDB.exec() )
{
case QDialog::Accepted:
ui->btnSave->setEnabled(true);
flSettingsServerChanged = true;
break;
case QDialog::Rejected:
break;

2
ServerLMS/dialogsettingstray.ui
View File

@@ -203,7 +203,7 @@
</size>
</property>
<property name="text">
<string>Check</string>
<string>Check&amp;&amp;Repare</string>
</property>
<property name="icon">
<iconset resource="ServerLMS.qrc">

2
ServerLMS/serverlmswidget.cpp
View File

@@ -314,6 +314,8 @@ void ServerLMSWidget::tryConnectionToDB()
emit signal_Menu_ShowWindow();
QMessageBox::critical(this, tr("Error!"), tr("Database connection error!"));
on_btnSettings_clicked();
}
else
{