From 26a6e86cc964a9934d706a914df7fccb9bd87ec1 Mon Sep 17 00:00:00 2001 From: sunwen Date: Tue, 11 Jun 2024 15:21:00 +0800 Subject: [PATCH] feat: Add UserOperationLog : Ip Settings, Mpps Settings, Worklist Settings, Recon Settings, Pacs Settings, Rest Password, Add Account, Set Lock Screen, Set Anonymousmode, Set Screen Saver, Set Default Protocol, --- src/dialogs/AccountFormDialog.cpp | 2 ++ src/dialogs/IpSettingsDialog.cpp | 2 ++ src/dialogs/MppsSettingsDialog.cpp | 3 ++- src/dialogs/PacsSettingsDialog.cpp | 3 ++- src/dialogs/ReconSettingsDialog.cpp | 3 ++- src/dialogs/WorklistSettingsDialog.cpp | 3 ++- src/forms/settings/GeneralForm.cpp | 24 +++++++++++++++++------- 7 files changed, 29 insertions(+), 11 deletions(-) diff --git a/src/dialogs/AccountFormDialog.cpp b/src/dialogs/AccountFormDialog.cpp index acfb826..cc86e53 100644 --- a/src/dialogs/AccountFormDialog.cpp +++ b/src/dialogs/AccountFormDialog.cpp @@ -71,6 +71,7 @@ void AccountFormDialog::resetUserPassword() { if (DialogManager::Default()->requestAlertMessage(tr("Reset to default password?"),DialogButtonMode::OkAndCancel) == Accepted) { + LOG_USER_OPERATION("Password Reset, ID:" + mLeUserCode->text()); User user; if (!User::getUser(mUserID, user)) { @@ -311,6 +312,7 @@ bool AccountFormDialog::updateReferenceData() if (mRefModel->submit()) { hideWarn(); + LOG_USER_OPERATION("Add Account, ID:" + mLeUserName->text()); return true; } else diff --git a/src/dialogs/IpSettingsDialog.cpp b/src/dialogs/IpSettingsDialog.cpp index 81d1090..e37a38a 100644 --- a/src/dialogs/IpSettingsDialog.cpp +++ b/src/dialogs/IpSettingsDialog.cpp @@ -5,6 +5,7 @@ #include "utilities/InputFormatValidator.h" #include "device/networkmanager.h" #include "DialogManager.h" +#include "log/UserOperationLog.h" #include #include @@ -93,6 +94,7 @@ bool IpSettingsDialog::updateReferenceData() connect(mThread, &QThread::started, this, &IpSettingsDialog::handleThreadStart); connect(mThread, &QThread::finished, this, &IpSettingsDialog::handleThreadExit); mThread->start(); + LOG_USER_OPERATION("Set Ip Settings"); return false; } diff --git a/src/dialogs/MppsSettingsDialog.cpp b/src/dialogs/MppsSettingsDialog.cpp index 9b42250..8d533c1 100644 --- a/src/dialogs/MppsSettingsDialog.cpp +++ b/src/dialogs/MppsSettingsDialog.cpp @@ -3,6 +3,7 @@ #include "components/ULineEdit.h" #include "dialogs/DicomSettingsArea.h" #include "json/jsonobject.h" +#include "log/UserOperationLog.h" #include #include @@ -105,7 +106,7 @@ bool MppsSettingsDialog::updateReferenceData() serverInfo.port = serverPort; JsonObject::Instance()->setServer(JsonObject::MPPS, serverInfo); JsonObject::Instance()->setMppsOpen(mSettingsArea->getMppsIsOpen()); - + LOG_USER_OPERATION("Set MPPS Settings"); return true; } diff --git a/src/dialogs/PacsSettingsDialog.cpp b/src/dialogs/PacsSettingsDialog.cpp index 81296c0..1b42ff4 100644 --- a/src/dialogs/PacsSettingsDialog.cpp +++ b/src/dialogs/PacsSettingsDialog.cpp @@ -1,6 +1,7 @@ #include "PacsSettingsDialog.h" #include "dialogs/DicomSettingsArea.h" #include "json/jsonobject.h" +#include "log/UserOperationLog.h" #include #include @@ -101,6 +102,6 @@ bool PacsSettingsDialog::updateReferenceData() serverInfo.localAE = myAETitle; serverInfo.port = serverPort; JsonObject::Instance()->setServer(JsonObject::PACS, serverInfo); - + LOG_USER_OPERATION("Set PACS Settings"); return true; } diff --git a/src/dialogs/ReconSettingsDialog.cpp b/src/dialogs/ReconSettingsDialog.cpp index c41f903..122ca9a 100644 --- a/src/dialogs/ReconSettingsDialog.cpp +++ b/src/dialogs/ReconSettingsDialog.cpp @@ -3,6 +3,7 @@ #include "dialogs/DicomSettingsArea.h" #include "json/jsonobject.h" #include "recon/ReconManager.h" +#include "log/UserOperationLog.h" #include #include @@ -105,6 +106,6 @@ bool ReconSettingsDialog::updateReferenceData() JsonObject::Instance()->setServer(JsonObject::RECON, serverInfo); ReconManager::getInstance()->setReconIpAndPort(serverIp, serverPort); QMetaObject::invokeMethod(ReconManager::getInstance(), "checkReconConnection", Qt::QueuedConnection); - + LOG_USER_OPERATION("Set Recon Settings"); return true; } diff --git a/src/dialogs/WorklistSettingsDialog.cpp b/src/dialogs/WorklistSettingsDialog.cpp index 5d3e406..9f04345 100644 --- a/src/dialogs/WorklistSettingsDialog.cpp +++ b/src/dialogs/WorklistSettingsDialog.cpp @@ -2,6 +2,7 @@ #include "components/ULineEdit.h" #include "dialogs/DicomSettingsArea.h" #include "json/jsonobject.h" +#include "log/UserOperationLog.h" #include #include @@ -102,6 +103,6 @@ bool WorklistSettingsDialog::updateReferenceData() serverInfo.localAE = myAETitle; serverInfo.port = serverPort; JsonObject::Instance()->setServer(JsonObject::WORKLIST, serverInfo); - + LOG_USER_OPERATION("Set Worklist Settings"); return true; } diff --git a/src/forms/settings/GeneralForm.cpp b/src/forms/settings/GeneralForm.cpp index 83f7919..7bfbec1 100644 --- a/src/forms/settings/GeneralForm.cpp +++ b/src/forms/settings/GeneralForm.cpp @@ -180,7 +180,7 @@ GeneralForm::GeneralForm(QWidget* aParent) QString lockTimeStr = result.ResultData.toString(); lockTime->setText(lockTimeStr); GetLockScreenTimeHelper::setLockScreenTime(lockTimeStr); - + LOG_USER_OPERATION(QString("Set Lock Screen, Time:%1").arg(lockTimeStr)); }); connect(btnLan, &QPushButton::clicked, [=]() @@ -215,13 +215,19 @@ GeneralForm::GeneralForm(QWidget* aParent) updateStorageUsed(); }); - connect(anonyButton, &ImageSwitch::clicked, [=]() { - JsonObject::Instance()->setAnonymousMode(anonyButton->getChecked()); + connect(anonyButton, &ImageSwitch::clicked, [=]() + { + bool isOpen = anonyButton->getChecked(); + JsonObject::Instance()->setAnonymousMode(isOpen); EventCenter::Default()->triggerEvent(AnonymousModeChanged,this,nullptr); + LOG_USER_OPERATION((isOpen ? QString("Open") : QString("Close")) + " AnonymousMode"); }); - connect(screenSaverButton, &ImageSwitch::clicked, [=]() { - JsonObject::Instance()->setScreenSaverMode(screenSaverButton->getChecked()); + connect(screenSaverButton, &ImageSwitch::clicked, [=]() + { + bool isOpen = screenSaverButton->getChecked(); + JsonObject::Instance()->setScreenSaverMode(isOpen); + LOG_USER_OPERATION((isOpen ? QString("Open") : QString("Close")) + " Screen Saver"); }); connect(scanProtocolButton, &QPushButton::clicked, [=]() @@ -232,13 +238,17 @@ GeneralForm::GeneralForm(QWidget* aParent) QString pro = result.ResultData.toString(); //take effect GetProtocalHelper::setProtocal(pro); - scanProtocolButton->setText(GetProtocalHelper::getProtocalStr()); + QString protocal = GetProtocalHelper::getProtocalStr(); + scanProtocolButton->setText(protocal); + LOG_USER_OPERATION(QString("Set Default Protocol:%1").arg(protocal)); } }); connect(scanCompleteButton, &ImageSwitch::clicked, [=]() { - JsonObject::Instance()->setCompleteNotify(scanCompleteButton->getChecked()); + bool isOpen = scanCompleteButton->getChecked(); + JsonObject::Instance()->setCompleteNotify(isOpen); + LOG_USER_OPERATION((isOpen ? QString("Open") : QString("Close")) + " Complete Notify"); }); }