git_user/arc
1
0
Fork 0
forked from BRT/arc
Code Pull Requests Activity

Add bank profile toggling in DeviceWidget and enhance error handling in EventHandler

Browse Source 
- Implemented `sendBankStatus` logic with `NetworkService` and threading for bank profile enable/disable functionality.
- Improved error handling in `EventHandler` by logging and updating events when bank profiles are disabled.
This commit is contained in:
trnsmkot 2026-03-25 16:05:27 +07:00
parent f327c96c98
commit 9a7ec1d087
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
services/EventHandler.cpp
View File

@ -450,7 +450,13 @@ void EventHandler::processNextTask(const QString &deviceId) {
const AccountInfo account = AccountDAO::getAccountById(event.accountId); const AccountInfo account = AccountDAO::getAccountById(event.accountId);
const ApplicationInfo app = ApplicationDAO::getApplication(deviceId, account.appCode); const ApplicationInfo app = ApplicationDAO::getApplication(deviceId, account.appCode);
if (app.status != "active") break; if (app.status != "active") {
qWarning() << "[EventHandler] Bank profile disabled for" << account.appCode << "device:" << deviceId;
EventDAO::updateEvent(event.id, EventStatus::Error, "Bank profile is disabled");
sendTaskError(eventTypeToString(event.type), event.externalId, event.bankName,
"Bank profile is disabled: " + account.appCode);
continue;
}
if (!EventDAO::updateEvent(event.id, EventStatus::InProgress, "")) { if (!EventDAO::updateEvent(event.id, EventStatus::InProgress, "")) {
qCritical() << "[EventHandler] Failed to set InProgress, event id:" << event.id; qCritical() << "[EventHandler] Failed to set InProgress, event id:" << event.id;

21
views/device/DeviceWidget.cpp
View File

@ -16,6 +16,8 @@
#include "dao/ApplicationDAO.h" #include "dao/ApplicationDAO.h"
#include "dao/DeviceDAO.h" #include "dao/DeviceDAO.h"
#include "db/ApplicationInfo.h" #include "db/ApplicationInfo.h"
#include "net/NetworkService.h"
#include <QThread>
QString getColorByStatus(const ApplicationInfo &app) { QString getColorByStatus(const ApplicationInfo &app) {
@ -35,8 +37,23 @@ QString getColorByStatus(const ApplicationInfo &app) {
} }
void sendBankStatus(const QString &deviceId, const QString &code, const QString &status) { void sendBankStatus(const QString &deviceId, const QString &code, const QString &status) {
Q_UNUSED(deviceId) Q_UNUSED(code) Q_UNUSED(status) const ApplicationInfo app = ApplicationDAO::getApplication(deviceId, code);
// TODO: заменить на новый API if (app.bankProfileId.isEmpty()) {
qWarning() << "[DeviceWidget] sendBankStatus: no bankProfileId for" << code;
return;
}
const bool enable = (status == "active");
auto *thread = new QThread;
auto *net = new NetworkService;
net->moveToThread(thread);
net->addExtra("bank_profile_id", app.bankProfileId);
net->addExtra("enable", enable);
QObject::connect(thread, &QThread::started, net, &NetworkService::toggleBankProfile);
QObject::connect(net, &NetworkService::finished, thread, &QThread::quit);
QObject::connect(net, &NetworkService::finished, net, &QObject::deleteLater);
QObject::connect(thread, &QThread::finished, thread, &QThread::deleteLater);
thread->start();
} }
void DeviceWidget::buildBankRow(const ApplicationInfo &app, QWidget *rowWidget, QWidget *parent, bool isOffline) { void DeviceWidget::buildBankRow(const ApplicationInfo &app, QWidget *rowWidget, QWidget *parent, bool isOffline) {