diff --git a/cfgs/usct-product.json b/cfgs/usct-product.json index 597da3b..d53499a 100644 --- a/cfgs/usct-product.json +++ b/cfgs/usct-product.json @@ -25,7 +25,7 @@ "lockscreen": "0", "CompleteNotify": true, "ScanConfirm": false, - "AnonymousMode": false + "AnonymousMode": false, }, "protocol": { "default": "0", @@ -101,8 +101,8 @@ }] }, "worklistfilter": { - "default": "Recent3Days", - "lists": "Today;Recent3Days;ThisWeek;ThisMonth" + "modality": "US", + "date": "0" }, "screensaver": { "open": false, diff --git a/src/device/DmsAsyncAction.cpp b/src/device/DmsAsyncAction.cpp index 6ad761c..8e40937 100644 --- a/src/device/DmsAsyncAction.cpp +++ b/src/device/DmsAsyncAction.cpp @@ -1,5 +1,6 @@ #include "DmsAsyncAction.h" #include "dms_mq.h" +#include "log/LogManager.h" #include @@ -17,7 +18,6 @@ DmsAsyncAction::DmsAsyncAction(int aServerId, int aActionId, QObject* aObject, c , mResponseSignal(aResponseSignal) , mSendData() , mIsResponsed(false) - , mIsRunning(false) { mTimer->setSingleShot(true); mTimer->setInterval(TIMEOUT_MSEC); @@ -45,6 +45,7 @@ bool DmsAsyncAction::execute() { return false; } + LOG_SYS_OPERATION(QString("GUI -> DMS : %1-%2, Message:%3").arg(mServerId).arg(mActionId).arg(mSendData)); mTimer->start(); return true; } diff --git a/src/device/DmsAsyncAction.h b/src/device/DmsAsyncAction.h index 13b6364..3b22678 100644 --- a/src/device/DmsAsyncAction.h +++ b/src/device/DmsAsyncAction.h @@ -43,7 +43,6 @@ private: QString mResponseSignal; QString mSendData; bool mIsResponsed; - bool mIsRunning; }; #endif // DMSASYNCACTION_H diff --git a/src/device/DmsSyncAction.cpp b/src/device/DmsSyncAction.cpp index 2510b96..c596e2f 100644 --- a/src/device/DmsSyncAction.cpp +++ b/src/device/DmsSyncAction.cpp @@ -25,6 +25,7 @@ DmsSyncAction::DmsSyncAction(int aServerId, int aActionId, QObject* aObject, con { mTimer->setSingleShot(true); connect(mObject, ("2" + mSignal).toStdString().c_str(), this, SLOT(saveActionResult(const QString&))); + connect(mObject, ("2" + mSignal).toStdString().c_str(), mTimer, SLOT(stop())); connect(mObject, ("2" + mSignal).toStdString().c_str(), mLoop, SLOT(quit())); connect(mTimer, &QTimer::timeout, mLoop, &QEventLoop::quit); } @@ -49,6 +50,7 @@ DmsSyncActionResult DmsSyncAction::execute() LOG_SYS_OPERATION(QString("GUI -> DMS : %1-%2, Message:%3").arg(mServerId).arg(mActionId).arg(mSendData)); if(!waitUntilSignalReceived()) { + LOG_SYS_OPERATION(QString("GUI -> DMS : %1-%2, Time out.").arg(mServerId).arg(mActionId)); DmsSyncActionResult result(false, "time out"); return result; } diff --git a/src/log/LogManager.cpp b/src/log/LogManager.cpp index 9c79b45..0fdec7d 100644 --- a/src/log/LogManager.cpp +++ b/src/log/LogManager.cpp @@ -33,7 +33,7 @@ LogManager::~LogManager() void LogManager::writeSystemOperationLog(const QString& aMessage) { - emit doWriteSystemOperationLog(aMessage); + emit doWriteSystemOperationLog(aMessage, QDateTime::currentDateTime()); } void LogManager::writeUserOperationLog(const QString& aMessage) diff --git a/src/log/LogManager.h b/src/log/LogManager.h index a52f2bc..1be5508 100644 --- a/src/log/LogManager.h +++ b/src/log/LogManager.h @@ -25,7 +25,7 @@ public: QString getCurrentUserOperationLogFile(); signals: - void doWriteSystemOperationLog(const QString& aMessage); + void doWriteSystemOperationLog(const QString& aMessage, const QDateTime& aOperationDate); void doWriteUserOperationLog(const QString& aMessage); private: diff --git a/src/log/SystemOperationLog.cpp b/src/log/SystemOperationLog.cpp index d1d48b6..3d4721b 100644 --- a/src/log/SystemOperationLog.cpp +++ b/src/log/SystemOperationLog.cpp @@ -44,7 +44,7 @@ SystemOperationLog::~SystemOperationLog() void SystemOperationLog::reloadFile() { QString newFileName = LOG_DIR + QDate::currentDate().toString("/yyyy-MM-dd") + SYS_LOG_SUFFIX; - if (newFileName == mCurrentFileName && !AppGlobalValues::InProcessing().toBool()) return; + if (newFileName == mCurrentFileName) return; mLogFile.close(); mLogFile.setFileName(newFileName); if (mLogFile.exists()) @@ -58,9 +58,8 @@ void SystemOperationLog::reloadFile() mStreamOut.setDevice(&mLogFile); } -void SystemOperationLog::log(const QString &aOperationText) +void SystemOperationLog::log(const QString &aOperationText, const QDateTime& aOperationDate) { reloadFile(); - QDateTime now = QDateTime::currentDateTime(); - mStreamOut << now.toString(Qt::DateFormat::ISODateWithMs).replace("T","\t")<<"\t"<