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

signal_updateDocsXML

Browse Source
This commit is contained in:
Кривошеин Андрей
2026-02-04 13:15:37 +03:00
parent a901e7ecb3
commit efa08e4330
4 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
LibServer/Systems/docsupdater.cpp
View File

@@ -37,8 +37,10 @@ QList<SubProc> DocsUpdater::getListSubProcForDMcode(QString dmCode)
return listSubProcMap.value(dmCode); return listSubProcMap.value(dmCode);
} }
bool DocsUpdater::updateDocsXML() bool DocsUpdater::slot_updateDocsXML()
{ {
qDebug() << "DocsUpdater::updateDocsXML thread ID " << QThread::currentThreadId();
QMutexLocker locker(&mtxAccess); QMutexLocker locker(&mtxAccess);
QString pathDocsFile = updateController->getPathAdditionalFile(tasksAMMfileName); QString pathDocsFile = updateController->getPathAdditionalFile(tasksAMMfileName);
@@ -97,6 +99,7 @@ bool DocsUpdater::updateDocsXML()
} }
} }
emit signal_DocsChanged();
return true; return true;
} }

8
LibServer/Systems/docsupdater.h
View File

@@ -16,9 +16,10 @@ public:
void lockAccessToDocsXML(); void lockAccessToDocsXML();
void unLockAccessToDocsXML(); void unLockAccessToDocsXML();
QList<SubProc> getListSubProcForDMcode(QString dmCode); QList<SubProc> getListSubProcForDMcode(QString dmCode);
bool updateDocsXML(); public slots:
bool slot_updateDocsXML();
private: private:
void domElementParserAMM(QDomElement element, Module* moduleParent); void domElementParserAMM(QDomElement element, Module* moduleParent);
@@ -27,6 +28,9 @@ private:
void selectSubProc(QDomElement& modeElement, QList<SubProc>& listSubProc); void selectSubProc(QDomElement& modeElement, QList<SubProc>& listSubProc);
DM* getDMmoduleByDMcode(QString dmCode); DM* getDMmoduleByDMcode(QString dmCode);
signals:
void signal_DocsChanged();
private: private:
UpdateController* updateController; UpdateController* updateController;

15
LibServer/serverlmswidget.cpp
View File

@@ -147,12 +147,14 @@ void ServerLMSWidget::slot_ErrorPostgreSQL(QString text)
void ServerLMSWidget::slot_UpdateDocs() void ServerLMSWidget::slot_UpdateDocs()
{ {
QApplication::setOverrideCursor(Qt::WaitCursor); //QApplication::setOverrideCursor(Qt::WaitCursor);
if(docsUpdater->updateDocsXML()) emit signal_updateDocsXML();
emit signal_DocsChanged();
QApplication::restoreOverrideCursor(); //if(docsUpdater->slot_updateDocsXML())
//emit signal_DocsChanged();
//QApplication::restoreOverrideCursor();
//TODO для теста //TODO для теста
//cfiController->test(); //cfiController->test();
@@ -387,7 +389,8 @@ void ServerLMSWidget::startInitialization_step0()
dataParser = new DataParser(assetsManager, processingSystem); dataParser = new DataParser(assetsManager, processingSystem);
commonClientHandler = new CommonClientHandler; commonClientHandler = new CommonClientHandler;
connect(this, &ServerLMSWidget::signal_DocsChanged, commonClientHandler, &CommonClientHandler::slot_DocsChanged); //connect(this, &ServerLMSWidget::signal_DocsChanged, commonClientHandler, &CommonClientHandler::slot_DocsChanged);
connect(docsUpdater, &DocsUpdater::signal_DocsChanged, commonClientHandler, &CommonClientHandler::slot_DocsChanged);
//connect(commonClientHandler, &CommonClientHandler::sigSetServerState, this, &ServerLMSWidget::slot_trySetServerState); //connect(commonClientHandler, &CommonClientHandler::sigSetServerState, this, &ServerLMSWidget::slot_trySetServerState);
server = new MultiThreadServer(this, updateController, processingSystem, dataParser, 6000); server = new MultiThreadServer(this, updateController, processingSystem, dataParser, 6000);
@@ -416,6 +419,8 @@ void ServerLMSWidget::startInitialization_step0()
connect(assetsManager, &AssetsManager::signal_setVersion, this, &ServerLMSWidget::slot_setVersion); connect(assetsManager, &AssetsManager::signal_setVersion, this, &ServerLMSWidget::slot_setVersion);
connect(this, &ServerLMSWidget::signal_updateDocsXML, docsUpdater, &DocsUpdater::slot_updateDocsXML);
emit sigUpdateControllerInitialize(commonClientHandler, dataParser, assetsManager); emit sigUpdateControllerInitialize(commonClientHandler, dataParser, assetsManager);
} }

3
LibServer/serverlmswidget.h
View File

@@ -86,11 +86,12 @@ signals:
void sigCalculateFullHash(); void sigCalculateFullHash();
void sigUpdateControllerInitialize(CommonClientHandler* commonClientHandler,DataParser *dataParser,AssetsManager *assetManager); void sigUpdateControllerInitialize(CommonClientHandler* commonClientHandler,DataParser *dataParser,AssetsManager *assetManager);
void signal_DocsChanged(); //void signal_DocsChanged();
void signal_hasError(int code); void signal_hasError(int code);
void signal_updateStateServer(EStateServer stateServer, EStateBlockAutorization stateBlockAutorization); void signal_updateStateServer(EStateServer stateServer, EStateBlockAutorization stateBlockAutorization);
void signal_updateDocsXML();
public slots: public slots:
void slot_LanguageChanged(QString language); void slot_LanguageChanged(QString language);
void slot_UpdateListClients(); void slot_UpdateListClients();