YaoH 1 місяць тому
батько
коміт
f0728a01f3
98 змінених файлів з 834 додано та 1468 видалено
  1. 7 8
      HttpClient.h
  2. 31 44
      PageWidget.cpp
  3. 17 21
      PageWidget.h
  4. 2 8
      addressfactory.cpp
  5. 3 5
      addressfactory.h
  6. 1 3
      addresspage.cpp
  7. 11 12
      addresspage.h
  8. 4 6
      backendapimanager.cpp
  9. 1 2
      backendapimanager.h
  10. 2 8
      blastProject/blastprojectfactory.cpp
  11. 3 5
      blastProject/blastprojectfactory.h
  12. 7 13
      blastProject/blastprojectpage.cpp
  13. 2 6
      blastProject/hproject.cpp
  14. 7 13
      blastProject/hprojectdao.cpp
  15. 6 14
      blastProject/projectdialog.cpp
  16. 4 4
      blastRecord/blastrecord.cpp
  17. 14 15
      blastRecord/blastrecord.h
  18. 2 8
      blastRecord/blastrecordfactory.cpp
  19. 3 4
      blastRecord/blastrecordfactory.h
  20. 6 18
      blastRecord/hblastrecord.cpp
  21. 5 10
      blastRecord/hblastrecorddao.cpp
  22. 9 9
      blastRecord/hblastrecorddao.h
  23. 34 132
      blastRecord/hblastrecorddet.cpp
  24. 8 9
      blastRecord/hblastrecorddet.h
  25. 1 3
      blastRecordDet/hblastrecorddet.cpp
  26. 8 9
      blastRecordDet/hblastrecorddetdao.h
  27. 10 30
      blastRegRecord/hblastregrecord.cpp
  28. 25 47
      blastopepage.cpp
  29. 2 4
      blastopepage.h
  30. 2 8
      blastoperationfactory.cpp
  31. 3 4
      blastoperationfactory.h
  32. 2 8
      blastprojectfactory.cpp
  33. 19 20
      btnserialthread.cpp
  34. 14 12
      btnserialthread.h
  35. 7 21
      btnserialtool.cpp
  36. 13 13
      btnserialtool.h
  37. 15 14
      buttondelegate.cpp
  38. 17 19
      buttondelegate.h
  39. 7 7
      clickabletableview.cpp
  40. 4 4
      clickabletableview.h
  41. 5 10
      countdownwidget.cpp
  42. 9 10
      countdownwidget.h
  43. 6 8
      databasemanager.cpp
  44. 2 4
      des3encryption.cpp
  45. 4 5
      des3encryption.h
  46. 11 11
      detInfo/detdialog.h
  47. 2 8
      detInfo/detinfofactory.cpp
  48. 1 2
      detInfo/detinfopage.cpp
  49. 20 23
      detInfo/detinfopage.h
  50. 2 8
      equipment/equipmentfactory.cpp
  51. 3 4
      equipment/equipmentfactory.h
  52. 3 7
      equipment/equipmentpage.cpp
  53. 17 18
      equipment/equipmentpage.h
  54. 2 8
      equipmentfactory.cpp
  55. 3 4
      equipmentfactory.h
  56. 33 56
      equipmentpage.cpp
  57. 33 55
      fireWidget/firingwidget.cpp
  58. 3 6
      fireWidget/firingwidget.h
  59. 21 41
      fireWidget/navprogress.cpp
  60. 13 15
      fireWidget/navprogress.h
  61. 3 5
      hblastrecorddao.h
  62. 44 175
      hproject.cpp
  63. 7 8
      hproject.h
  64. 4 8
      hprojectdao.cpp
  65. 8 11
      hprojectdao.h
  66. 11 14
      httpclient.cpp
  67. 11 13
      jobs.cpp
  68. 4 5
      jobs.h
  69. 33 58
      logger.cpp
  70. 12 19
      logger.h
  71. 6 8
      login/loginwindow.cpp
  72. 3 6
      loginwindow.cpp
  73. 8 9
      loginwindow.h
  74. 13 27
      mainwindow.cpp
  75. 6 12
      mqtt/mqttclient.cpp
  76. 3 5
      mqtt/mqttclient.h
  77. 1 4
      mqttclient.cpp
  78. 5 9
      mqttthread.cpp
  79. 4 7
      mqttthread.h
  80. 2 2
      pagefactory.cpp
  81. 2 2
      pagefactory.h
  82. 2 5
      paregnrmc.cpp
  83. 5 8
      paregnrmc.h
  84. 2 2
      regex.h
  85. 2 3
      registryManager/registrymanager.cpp
  86. 2 2
      registryManager/registrymanager.h
  87. 1 4
      registrymanager.cpp
  88. 12 13
      serial/serialgps.h
  89. 17 18
      serial/serialtool.h
  90. 9 21
      serialgps.cpp
  91. 12 13
      serialgps.h
  92. 2 7
      serialgpsthread.cpp
  93. 9 10
      serialgpsthread.h
  94. 16 17
      serialtool.h
  95. 4 6
      timeupdatethread.cpp
  96. 6 9
      timeupdatethread.h
  97. 4 10
      worker/timeupdatethread.cpp
  98. 8 10
      worker/timeupdatethread.h

+ 7 - 8
HttpClient.h

@@ -1,15 +1,15 @@
 #ifndef HTTPCLIENT_H
 #define HTTPCLIENT_H
 
-#include <QObject>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
+#include <QObject>
 #include <QUrl>
 
 class HttpClient : public QObject {
     Q_OBJECT
 
-public:
+   public:
     explicit HttpClient(QObject *parent = nullptr);
 
     // 发送 GET 请求的接口
@@ -17,23 +17,22 @@ public:
 
     void sendHttpGetAddress(const QUrl &url);
 
-
-signals:
+   signals:
     // 请求成功后发出的信号
-    void httpGetFinished(const QJsonDocument &responseData,const QUrl &url);
+    void httpGetFinished(const QJsonDocument &responseData, const QUrl &url);
     // 请求失败后发出的信号
     void httpErrorOccurred(const QString &errorString);
 
-private slots:
+   private slots:
     void onGetFinished();
     void onNetworkError(QNetworkReply::NetworkError error);
     void onSslErrors(const QList<QSslError> &errors);
     void onGetAddress();
 
-private:
+   private:
     QNetworkAccessManager *m_networkManager;
     QUrl m_currenturl;
     QUrl m_currenturl2;
 };
 
-#endif // HTTPCLIENT_H
+#endif  // HTTPCLIENT_H

+ 31 - 44
PageWidget.cpp

@@ -1,27 +1,28 @@
 #include "PageWidget.h"
-#include "ui_PageWidget.h"
 
-#include <QtGlobal>
-#include <QHBoxLayout>
-#include <QMouseEvent>
-#include <QKeyEvent>
 #include <QDebug>
+#include <QHBoxLayout>
 #include <QIntValidator>
+#include <QKeyEvent>
+#include <QMouseEvent>
+#include <QtGlobal>
+
+#include "ui_PageWidget.h"
 
-PageWidget::PageWidget(int blockSize, QWidget *parent) : QWidget(parent),
-    ui(new Ui::PageWidget) {
+PageWidget::PageWidget(int blockSize, QWidget *parent) : QWidget(parent), ui(new Ui::PageWidget) {
     ui->setupUi(this);
 
-    QString qss = QString(".QLabel[page=\"true\"] { padding: 1px; }")
-            + QString(".QLabel[currentPage=\"true\"] { color: rgb(190, 0, 0);}")
-            + QString(".QLabel[page=\"true\"]:hover { color: white; border-radius: 4px; background-color: qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(53, 121, 238, 255), stop:1 rgba(0, 202, 237, 255));}");
+    QString qss = QString(".QLabel[page=\"true\"] { padding: 1px; }") +
+                  QString(".QLabel[currentPage=\"true\"] { color: rgb(190, 0, 0);}") +
+                  QString(
+                      ".QLabel[page=\"true\"]:hover { color: white; border-radius: 4px; background-color: "
+                      "qlineargradient(spread:reflect, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(53, 121, 238, 255), stop:1 "
+                      "rgba(0, 202, 237, 255));}");
     this->setStyleSheet(qss);
     setBlockSize(blockSize);
     initialize();
     maxPage = 0;
     ui->pageLineEdit->setText(QString::number(1));
-
-
 }
 
 PageWidget::~PageWidget() {
@@ -32,8 +33,12 @@ PageWidget::~PageWidget() {
 bool PageWidget::eventFilter(QObject *watched, QEvent *e) {
     if (e->type() == QEvent::MouseButtonRelease) {
         int page = -1;
-        if (watched == ui->previousPageLabel) { page = getCurrentPage() - 1; }
-        if (watched == ui->nextPageLabel) { page = getCurrentPage() + 1; }
+        if (watched == ui->previousPageLabel) {
+            page = getCurrentPage() - 1;
+        }
+        if (watched == ui->nextPageLabel) {
+            page = getCurrentPage() + 1;
+        }
         for (int i = 0; i < pageLabels->count(); ++i) {
             if (watched == pageLabels->at(i)) {
                 page = pageLabels->at(i)->text().toInt();
@@ -48,11 +53,9 @@ bool PageWidget::eventFilter(QObject *watched, QEvent *e) {
     }
     if (watched == ui->pageLineEdit && e->type() == QEvent::KeyRelease) {
         QKeyEvent *ke = static_cast<QKeyEvent *>(e);
-        if (ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Return)
-        {
+        if (ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Return) {
             int page = ui->pageLineEdit->text().toInt();
-            if(page > maxPage)
-            {
+            if (page > maxPage) {
                 page = maxPage;
                 ui->pageLineEdit->setText(QString::number(page));
             }
@@ -63,17 +66,11 @@ bool PageWidget::eventFilter(QObject *watched, QEvent *e) {
     return QWidget::eventFilter(watched, e);
 }
 
-int PageWidget::getBlockSize() const {
-    return blockSize;
-}
+int PageWidget::getBlockSize() const { return blockSize; }
 
-int PageWidget::getMaxPage() const {
-    return maxPage;
-}
+int PageWidget::getMaxPage() const { return maxPage; }
 
-int PageWidget::getCurrentPage() const {
-    return currentPage;
-}
+int PageWidget::getCurrentPage() const { return currentPage; }
 
 void PageWidget::setMaxPage(int page) {
     page = qMax(page, 1);
@@ -100,12 +97,7 @@ void PageWidget::setCurrentPage(int page, bool signalEmitted) {
     }
 }
 
-QComboBox *PageWidget::getComboBox() const
-{
-
-    return ui->comboBox;
-
-}
+QComboBox *PageWidget::getComboBox() const { return ui->comboBox; }
 
 void PageWidget::setBlockSize(int blockSize) {
     blockSize = qMax(blockSize, 3);
@@ -115,10 +107,8 @@ void PageWidget::setBlockSize(int blockSize) {
     this->blockSize = blockSize;
 }
 
-
 // 分成三个部分, 左...中...右
 void PageWidget::initialize() {
-
     ui->pageLineEdit->installEventFilter(this);
     ui->pageLineEdit->setValidator(new QIntValidator(1, 10000000, this));
     ui->nextPageLabel->setProperty("page", "true");
@@ -139,7 +129,7 @@ void PageWidget::initialize() {
     rightLayout->setContentsMargins(0, 0, 0, 0);
     rightLayout->setSpacing(0);
 
-    for (int i = 0; i < blockSize * 3-2; ++i) {
+    for (int i = 0; i < blockSize * 3 - 2; ++i) {
         QLabel *label = new QLabel(QString::number(i + 1));
         label->setProperty("page", "true");
         label->installEventFilter(this);
@@ -159,7 +149,7 @@ void PageWidget::initialize() {
     initCombo();
 }
 
-void PageWidget::initCombo(){
+void PageWidget::initCombo() {
     ui->comboBox->addItem("10条/页", QVariant(10));  // 显示文本为 "Apple",值为 1
     ui->comboBox->addItem("50条/页", QVariant(50));
     ui->comboBox->addItem("100条/页", QVariant(100));
@@ -202,7 +192,7 @@ void PageWidget::updatePageLabels() {
         ui->rightSeparateLabel->show();
     } else if (c > m - n - n / 2 && c <= m) {
         // 显示前 n 个, 后 n * 2 个: 只显示左边的分隔符
-        centerStartPage = m - n - n ;
+        centerStartPage = m - n - n;
         ui->leftSeparateLabel->show();
     } else {
         // 显示[1, n], [c - n/2, c + n/2], [m - n + 1, m]: 两个分隔符都显示
@@ -211,11 +201,11 @@ void PageWidget::updatePageLabels() {
         ui->leftSeparateLabel->show();
     }
 
-    pageLabels->at(0)->setText(QString::number(1));// 前面 n 个
+    pageLabels->at(0)->setText(QString::number(1));  // 前面 n 个
     for (int i = 1; i < 6; ++i) {
-        pageLabels->at(i)->setText(QString::number(centerStartPage + i)); // 中间 n 个
+        pageLabels->at(i)->setText(QString::number(centerStartPage + i));  // 中间 n 个
     }
-    pageLabels->at(6)->setText(QString::number(m));// 后面 n 个
+    pageLabels->at(6)->setText(QString::number(m));  // 后面 n 个
 
     for (int i = 0; i < pageLabels->count(); ++i) {
         QLabel *label = pageLabels->at(i);
@@ -230,6 +220,3 @@ void PageWidget::updatePageLabels() {
         label->show();
     }
 }
-
-
-

+ 17 - 21
PageWidget.h

@@ -1,60 +1,56 @@
 #ifndef PAGEWIDGET_H
 #define PAGEWIDGET_H
 
-#include <QWidget>
-#include <QList>
 #include <QComboBox>
-#include "databasemanager.h"
+#include <QList>
+#include <QWidget>
 
+#include "databasemanager.h"
 
 class QLabel;
 class QEvent;
 
-
 struct HeaderInfo {
     QString label;
     QString prop;
 };
 
 namespace Ui {
-    class PageWidget;
+class PageWidget;
 }
 
 class PageWidget : public QWidget {
     Q_OBJECT
 
-public:
+   public:
     explicit PageWidget(int blockSize = 3, QWidget *parent = 0);
     ~PageWidget();
 
-    /*const 关键字在成员函数声明和定义中的使用,确保了该函数不会修改对象的状态,提高了代码的安全性和可读性。这对于那些只需要读取对象状态而不需要修改对象状态的函数非常有用*/
+    /*const
+     * 关键字在成员函数声明和定义中的使用,确保了该函数不会修改对象的状态,提高了代码的安全性和可读性。这对于那些只需要读取对象状态而不需要修改对象状态的函数非常有用*/
     int getBlockSize() const;
     int getMaxPage() const;
     int getCurrentPage() const;
 
     // 其他组件只需要调用这两个函数即可
-    void setMaxPage(int maxPage);   // 当总页数改变时调用
-    void setCurrentPage(int currentPage, bool signalEmitted = false); // 修改当前页时调用
+    void setMaxPage(int maxPage);                                      // 当总页数改变时调用
+    void setCurrentPage(int currentPage, bool signalEmitted = false);  // 修改当前页时调用
     void showLeft();
-    QComboBox* getComboBox() const;
+    QComboBox *getComboBox() const;
 
-protected:
+   protected:
     virtual bool eventFilter(QObject *watched, QEvent *e);
 
-signals:
+   signals:
     void currentPageChanged(int page);
 
-
-
-
-
-private:
+   private:
     Ui::PageWidget *ui;
     int blockSize;
-    int maxPage;        //总页数
-    int currentPage;    //当前页面
+    int maxPage;      // 总页数
+    int currentPage;  // 当前页面
     QList<QLabel *> *pageLabels;
-    int PageRecordCount; //每页显示的记录数量
+    int PageRecordCount;  // 每页显示的记录数量
 
     void setBlockSize(int blockSize);
     void updatePageLabels();
@@ -63,4 +59,4 @@ private:
     void initCombo();
 };
 
-#endif // PAGEWIDGET_H
+#endif  // PAGEWIDGET_H

+ 2 - 8
addressfactory.cpp

@@ -1,11 +1,5 @@
 #include "addressfactory.h"
 
-AddressFactory::AddressFactory()
-{
+AddressFactory::AddressFactory() {}
 
-}
-
-QWidget *AddressFactory::createPage(QWidget *parent) const
-{
-    return new AddressPage(parent);
-}
+QWidget *AddressFactory::createPage(QWidget *parent) const { return new AddressPage(parent); }

+ 3 - 5
addressfactory.h

@@ -3,12 +3,10 @@
 #include "PageFactory.h"
 #include "addresspage.h"
 
-
-class AddressFactory: public PageFactory
-{
-public:
+class AddressFactory : public PageFactory {
+   public:
     AddressFactory();
     QWidget* createPage(QWidget* parent) const override;
 };
 
-#endif // ADDRESSFACTORY_H
+#endif  // ADDRESSFACTORY_H

+ 1 - 3
addresspage.cpp

@@ -16,9 +16,7 @@ AddressPage::AddressPage(QWidget* parent) : QWidget(parent), ui(new Ui::AddressP
     QUrl fullUrl = apiBackendUrl.resolved(localUrl);
     m_httpClient->sendHttpGetRequest(fullUrl);
 
-    connect(m_httpClient, &HttpClient::httpGetFinished, [this](const QJsonDocument& data) {
-        this->dataTable(data);
-    });
+    connect(m_httpClient, &HttpClient::httpGetFinished, [this](const QJsonDocument& data) { this->dataTable(data); });
 }
 
 void AddressPage::dataTable(const QJsonDocument& jsonDoc) {

+ 11 - 12
addresspage.h

@@ -1,37 +1,36 @@
 #ifndef ADDRESSPAGE_H
 #define ADDRESSPAGE_H
 
-#include <QWidget>
-#include <QStandardItemModel>
 #include <QJsonArray>
-#include "buttondelegate.h"
+#include <QStandardItemModel>
+#include <QWidget>
+
 #include "HttpClient.h"
 #include "PageWidget.h"
+#include "buttondelegate.h"
 
 class QJsonArray;
 class QTableView;
 
-
 namespace Ui {
 class AddressPage;
 }
 
-class AddressPage : public QWidget
-{
+class AddressPage : public QWidget {
     Q_OBJECT
 
-public:
+   public:
     explicit AddressPage(QWidget *parent = nullptr);
     ~AddressPage();
 
-private:
-    void parseJsonString(const QJsonDocument& jsonDoc);
-    void dataTable( const QJsonDocument& jsonDoc);
-    QList<QStandardItem*> jsonToItem(const QJsonObject& jsonObj);
+   private:
+    void parseJsonString(const QJsonDocument &jsonDoc);
+    void dataTable(const QJsonDocument &jsonDoc);
+    QList<QStandardItem *> jsonToItem(const QJsonObject &jsonObj);
     HttpClient *m_httpClient;
     Ui::AddressPage *ui;
     QStandardItemModel *model;
     QJsonArray dataArray;
 };
 
-#endif // ADDRESSPAGE_H
+#endif  // ADDRESSPAGE_H

+ 4 - 6
backendapimanager.cpp

@@ -46,8 +46,7 @@ void backendAPIManager::setupRequest(QNetworkRequest &request, const QString &en
     }
 }
 
-QNetworkReply *backendAPIManager::sendRequest(const QString &endpoint, const QJsonObject &data,
-                                              const QString &method) {
+QNetworkReply *backendAPIManager::sendRequest(const QString &endpoint, const QJsonObject &data, const QString &method) {
     QNetworkRequest request;
     setupRequest(request, endpoint);
 
@@ -84,10 +83,9 @@ bool backendAPIManager::uploadBlastProjectFull(const QJsonObject &projectData) {
         QJsonDocument response = QJsonDocument::fromJson(reply->readAll());
         s_instance->handleUploadFinished(response, reply->url());
     } else {
-        Logger::getInstance().error(
-            QString("UploadBlastProjectFull request failed. uuid: %1 error message: %2")
-                .arg(projectData.value("uuid").toString())
-                .arg(reply->errorString()));
+        Logger::getInstance().error(QString("UploadBlastProjectFull request failed. uuid: %1 error message: %2")
+                                        .arg(projectData.value("uuid").toString())
+                                        .arg(reply->errorString()));
         s_instance->handleUploadError(reply->errorString());
     }
 

+ 1 - 2
backendapimanager.h

@@ -33,8 +33,7 @@ class backendAPIManager : public QObject {
     ~backendAPIManager();
 
     // HTTP methods
-    QNetworkReply *sendRequest(const QString &endpoint, const QJsonObject &data,
-                               const QString &method = "POST");
+    QNetworkReply *sendRequest(const QString &endpoint, const QJsonObject &data, const QString &method = "POST");
     void setupRequest(QNetworkRequest &request, const QString &endpoint);
     void handleNetworkReply(QNetworkReply *reply);
 

+ 2 - 8
blastProject/blastprojectfactory.cpp

@@ -1,11 +1,5 @@
 #include "blastprojectfactory.h"
 
-BlastProjectFactory::BlastProjectFactory()
-{
+BlastProjectFactory::BlastProjectFactory() {}
 
-}
-
-QWidget *BlastProjectFactory::createPage(QWidget *parent) const
-{
-    return new BlastProjectPage(parent);
-}
+QWidget *BlastProjectFactory::createPage(QWidget *parent) const { return new BlastProjectPage(parent); }

+ 3 - 5
blastProject/blastprojectfactory.h

@@ -3,12 +3,10 @@
 #include "../PageFactory.h"
 #include "blastprojectpage.h"
 
-
-class BlastProjectFactory:public PageFactory
-{
-public:
+class BlastProjectFactory : public PageFactory {
+   public:
     BlastProjectFactory();
     QWidget* createPage(QWidget* parent) const override;
 };
 
-#endif // BLASTPROJECTFACTORY_H
+#endif  // BLASTPROJECTFACTORY_H

+ 7 - 13
blastProject/blastprojectpage.cpp

@@ -9,9 +9,7 @@
 #include "ui_blastprojectpage.h"
 
 BlastProjectPage::BlastProjectPage(QWidget *parent)
-    : QWidget(parent),
-      ui(new Ui::BlastProjectPage),
-      dao(DatabaseManager::getInstance().getDatabase()) {
+    : QWidget(parent), ui(new Ui::BlastProjectPage), dao(DatabaseManager::getInstance().getDatabase()) {
     ui->setupUi(this);
     pageWidget = new PageWidget;
     connect(pageWidget, &PageWidget::currentPageChanged, this, &BlastProjectPage::PageChanged);
@@ -48,10 +46,8 @@ void BlastProjectPage::loadDataFromSource(int currentPage, int pageSize) {
 
     // 定义表头信息
     QList<HeaderInfo> headers = {
-        {"工程名称", "name"},        {"操作员", "operatorName"},
-        {"爆破员", "blasterName"},   {"井下地址", "addressPath"},
-        {"雷管数量", "detSum"},      {"起爆器数量", "blastCount"},
-        {"起爆状态", "blastStatus"}, {"操作", ""},
+        {"工程名称", "name"},   {"操作员", "operatorName"},   {"爆破员", "blasterName"},   {"井下地址", "addressPath"},
+        {"雷管数量", "detSum"}, {"起爆器数量", "blastCount"}, {"起爆状态", "blastStatus"}, {"操作", ""},
     };
 
     int headerCount = headers.size();
@@ -70,8 +66,8 @@ void BlastProjectPage::loadDataFromSource(int currentPage, int pageSize) {
             QStandardItem *item = nullptr;
 
             if (!prop.isEmpty()) {
-                QMetaProperty metaProp = HProject.metaObject()->property(
-                    HProject.metaObject()->indexOfProperty(prop.toUtf8()));
+                QMetaProperty metaProp =
+                    HProject.metaObject()->property(HProject.metaObject()->indexOfProperty(prop.toUtf8()));
                 QVariant value = metaProp.read(&HProject);
                 if (prop == "blastStatus") {
                     QString statusText;
@@ -211,8 +207,7 @@ void BlastProjectPage::insertPlan(const QMap<QString, QString> &data) {
     project.setBlastCount(data.value("blastCount"));
     project.setBlastStatus("1");
     // 生成 32 位的 UUID
-    QString uuidString =
-        QUuid::createUuid().toString(QUuid::WithoutBraces).remove(QRegularExpression("-"));
+    QString uuidString = QUuid::createUuid().toString(QUuid::WithoutBraces).remove(QRegularExpression("-"));
     project.setUuid(uuidString);
     project.setCreatedAt(QDateTime::currentDateTime());
     if (dao.addHProject(project)) {
@@ -263,8 +258,7 @@ void BlastProjectPage::deleteButtonClicked(const HProject &project) {
     }
 }
 
-void BlastProjectPage::messageAndTopicReceived(const QByteArray &message,
-                                               const QMqttTopicName &topic) {
+void BlastProjectPage::messageAndTopicReceived(const QByteArray &message, const QMqttTopicName &topic) {
     QJsonDocument jsonDoc = QJsonDocument::fromJson(message);
     if (!jsonDoc.isNull() && jsonDoc.isObject()) {
         QJsonObject jsonObj = jsonDoc.object();

+ 2 - 6
blastProject/hproject.cpp

@@ -33,9 +33,7 @@ void HProject::setOperatorName(const QString &newOperatorName) { operatorName =
 
 QString HProject::getOperatorIdentity() const { return operatorIdentity; }
 
-void HProject::setOperatorIdentity(const QString &newOperatorIdentity) {
-    operatorIdentity = newOperatorIdentity;
-}
+void HProject::setOperatorIdentity(const QString &newOperatorIdentity) { operatorIdentity = newOperatorIdentity; }
 
 QString HProject::getBlasterName() const { return blasterName; }
 
@@ -43,9 +41,7 @@ void HProject::setBlasterName(const QString &newBlasterName) { blasterName = new
 
 QString HProject::getBlasterIdentity() const { return blasterIdentity; }
 
-void HProject::setBlasterIdentity(const QString &newBlasterIdentity) {
-    blasterIdentity = newBlasterIdentity;
-}
+void HProject::setBlasterIdentity(const QString &newBlasterIdentity) { blasterIdentity = newBlasterIdentity; }
 
 QString HProject::getAddressUuid() const { return addressUuid; }
 

+ 7 - 13
blastProject/hprojectdao.cpp

@@ -130,8 +130,7 @@ PaginatedHProjectResult HProjectDao::getAllHProjects(int page, int pageSize) {
     QList<QSharedPointer<HProject>> projects;
     QSqlQuery query(database);
     int offset = (page - 1) * pageSize;
-    query.prepare(
-        "SELECT * FROM h_project ORDER BY created_at desc LIMIT :pageSize OFFSET :offset");
+    query.prepare("SELECT * FROM h_project ORDER BY created_at desc LIMIT :pageSize OFFSET :offset");
     query.bindValue(":pageSize", pageSize);
     query.bindValue(":offset", offset);
 
@@ -177,8 +176,7 @@ PaginatedHProjectResult HProjectDao::getAllHProjectsByOpera(int page, int pageSi
     return {projects, totalCount};
 }
 
-QList<QSharedPointer<HProject>> HProjectDao::getRegistedProjectByAddressUuid(
-    QList<QString> addressUuids) {
+QList<QSharedPointer<HProject>> HProjectDao::getRegistedProjectByAddressUuid(QList<QString> addressUuids) {
     QList<QSharedPointer<HProject>> projects;
     QSqlQuery query(database);
 
@@ -208,9 +206,8 @@ QList<QSharedPointer<HProject>> HProjectDao::getRegistedProjectByAddressUuid(
     }
 
     if (!query.exec()) {
-        QMessageBox::critical(
-            nullptr, "数据搜索异常",
-            QString("通过地址查询注册工程数据异常: %1").arg(query.lastError().text()));
+        QMessageBox::critical(nullptr, "数据搜索异常",
+                              QString("通过地址查询注册工程数据异常: %1").arg(query.lastError().text()));
         return projects;
     }
     while (query.next()) {
@@ -271,12 +268,9 @@ QSharedPointer<HProject> HProjectDao::recordToProject(const QSqlRecord &record)
     project->setFileName(record.value("file_name").toString());
     project->setFileUrl(record.value("file_url").toString());
     project->setBlastStatus(record.value("blast_status").toString());
-    project->setCreatedAt(
-        QDateTime::fromString(record.value("created_at").toString(), Qt::ISODateWithMs));
-    project->setUpdatedAt(
-        QDateTime::fromString(record.value("updated_at").toString(), Qt::ISODateWithMs));
-    project->setDeletedAt(
-        QDateTime::fromString(record.value("deleted_at").toString(), Qt::ISODateWithMs));
+    project->setCreatedAt(QDateTime::fromString(record.value("created_at").toString(), Qt::ISODateWithMs));
+    project->setUpdatedAt(QDateTime::fromString(record.value("updated_at").toString(), Qt::ISODateWithMs));
+    project->setDeletedAt(QDateTime::fromString(record.value("deleted_at").toString(), Qt::ISODateWithMs));
     project->setCreateBy(record.value("create_by").toInt());
     project->setUpdateBy(record.value("update_by").toInt());
     return project;

+ 6 - 14
blastProject/projectdialog.cpp

@@ -4,8 +4,7 @@
 
 ProjectDialog::ProjectDialog(QWidget *parent) : QDialog(parent), ui(new Ui::ProjectDialog) {
     ui->setupUi(this);
-    connect(ui->buttonBox, &QDialogButtonBox::accepted, this,
-            &ProjectDialog::validateAndSaveProject);
+    connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &ProjectDialog::validateAndSaveProject);
     connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &ProjectDialog::clearFormData);
 }
 
@@ -52,8 +51,7 @@ void ProjectDialog::SetL1AddressOptions(const QJsonArray &Options) {
     ui->comboBoxAddr->clear();
 
     for (const QJsonValue &option : Options) {
-        ui->comboBoxAddr->addItem(option.toObject()["name"].toString(),
-                                  option.toObject()["uuid"].toString());
+        ui->comboBoxAddr->addItem(option.toObject()["name"].toString(), option.toObject()["uuid"].toString());
     }
     ui->comboBoxAddr->setCurrentIndex(-1);
 }
@@ -61,8 +59,7 @@ void ProjectDialog::SetL1AddressOptions(const QJsonArray &Options) {
 void ProjectDialog::updateL2AddressOptions() {
     ui->comboBoxAddr_2->clear();
     for (const QJsonValue &child : L2AddressOptions) {
-        ui->comboBoxAddr_2->addItem(child.toObject()["name"].toString(),
-                                    child.toObject()["uuid"].toString());
+        ui->comboBoxAddr_2->addItem(child.toObject()["name"].toString(), child.toObject()["uuid"].toString());
     }
     ui->comboBoxAddr_2->setCurrentIndex(-1);
 }
@@ -70,15 +67,12 @@ void ProjectDialog::updateL2AddressOptions() {
 void ProjectDialog::updateL3AddressOptions() {
     ui->comboBoxAddr_3->clear();
     for (const QJsonValue &child : L3AddressOptions) {
-        ui->comboBoxAddr_3->addItem(child.toObject()["name"].toString(),
-                                    child.toObject()["uuid"].toString());
+        ui->comboBoxAddr_3->addItem(child.toObject()["name"].toString(), child.toObject()["uuid"].toString());
     }
     ui->comboBoxAddr_3->setCurrentIndex(-1);
 }
 
-void ProjectDialog::setChildOptions(const QJsonArray &newDataOptions) {
-    dataOptions = newDataOptions;
-}
+void ProjectDialog::setChildOptions(const QJsonArray &newDataOptions) { dataOptions = newDataOptions; }
 
 void ProjectDialog::SetComboBoxLora(const QString &grandChildName) {
     ui->comboBoxLora->clear();
@@ -213,9 +207,7 @@ void ProjectDialog::validateAndSaveProject() {
 
 int ProjectDialog::getOperationStatus() const { return operationStatus; }
 
-void ProjectDialog::setOperationStatus(int newOperationStatus) {
-    operationStatus = newOperationStatus;
-}
+void ProjectDialog::setOperationStatus(int newOperationStatus) { operationStatus = newOperationStatus; }
 
 void ProjectDialog::setFormData(const HProject &Project) {
     try {

+ 4 - 4
blastRecord/blastrecord.cpp

@@ -48,8 +48,8 @@ void BlastRecord::loadDataFromSource(int currentPage, int pageSize) {
             QString prop = propMap[col];
             QStandardItem* item = nullptr;
             if (!prop.isEmpty()) {
-                QMetaProperty metaProp = HBlastRecord.metaObject()->property(
-                    HBlastRecord.metaObject()->indexOfProperty(prop.toUtf8()));
+                QMetaProperty metaProp =
+                    HBlastRecord.metaObject()->property(HBlastRecord.metaObject()->indexOfProperty(prop.toUtf8()));
                 QVariant value = metaProp.read(&HBlastRecord);
                 if (value.type() == QVariant::DateTime) {
                     QDateTime dateTime = value.toDateTime();
@@ -116,8 +116,8 @@ QList<QStandardItem*> BlastRecord::jsonToItem(const QJsonObject& jsonObj) {
     QString formattedCreatedAt = createdAt.toString("yyyy-MM-dd HH:mm:ss");
     QStandardItem* createdItem = new QStandardItem(formattedCreatedAt);
 
-    return QList<QStandardItem*>()
-           << nameItem << isOfflineBlastItem << equipItem << typeItem << statusItem << onlineItem;
+    return QList<QStandardItem*>() << nameItem << isOfflineBlastItem << equipItem << typeItem << statusItem
+                                   << onlineItem;
 }
 void BlastRecord::parseJsonString(const QJsonDocument& jsonDoc) {
     QJsonObject jsonObj = jsonDoc.object();

+ 14 - 15
blastRecord/blastrecord.h

@@ -1,43 +1,42 @@
 #ifndef BLASTRECORD_H
 #define BLASTRECORD_H
 
-#include <QWidget>
-#include <QJsonObject>
 #include <QJsonArray>
 #include <QJsonDocument>
+#include <QJsonObject>
 #include <QStandardItemModel>
 #include <QUrl>
-#include "../httpclient.h"
-#include "../global.h"
+#include <QWidget>
+
 #include "../PageWidget.h"
 #include "../global.h"
+#include "../httpclient.h"
 #include "hblastrecorddao.h"
 namespace Ui {
 class BlastRecord;
 }
 
-class BlastRecord : public QWidget
-{
+class BlastRecord : public QWidget {
     Q_OBJECT
 
-public:
+   public:
     explicit BlastRecord(QWidget *parent = nullptr);
     ~BlastRecord();
 
-private:
-    void parseJsonString(const QJsonDocument& jsonDoc);
-    void dataTable( const QJsonDocument& jsonDoc);
+   private:
+    void parseJsonString(const QJsonDocument &jsonDoc);
+    void dataTable(const QJsonDocument &jsonDoc);
     void loadDataFromSource(int currentPage, int pageSize);
     void loadAndRefreshData();
     void PageChanged(int page);
     void onComboBoxIndexChanged(int index);
-    QList<QStandardItem*> jsonToItem(const QJsonObject& jsonObj);
+    QList<QStandardItem *> jsonToItem(const QJsonObject &jsonObj);
 
-private:
+   private:
     Ui::BlastRecord *ui;
     PageWidget *m_pPageWidget;
-    int pageSize;  //每页显示的记录数量
-    int currentPage;      //当前页面
+    int pageSize;     // 每页显示的记录数量
+    int currentPage;  // 当前页面
     int totalCount;
     HBlastRecordDao dao;
     HttpClient *m_httpClient;
@@ -45,4 +44,4 @@ private:
     QJsonArray dataArray;
 };
 
-#endif // BLASTRECORD_H
+#endif  // BLASTRECORD_H

+ 2 - 8
blastRecord/blastrecordfactory.cpp

@@ -1,10 +1,4 @@
 #include "blastrecordfactory.h"
 
-BlastRecordFactory::BlastRecordFactory()
-{
-
-}
-QWidget *BlastRecordFactory::createPage(QWidget *parent) const
-{
-    return new BlastRecord(parent);
-}
+BlastRecordFactory::BlastRecordFactory() {}
+QWidget *BlastRecordFactory::createPage(QWidget *parent) const { return new BlastRecord(parent); }

+ 3 - 4
blastRecord/blastrecordfactory.h

@@ -3,11 +3,10 @@
 #include "../PageFactory.h"
 #include "blastrecord.h"
 
-class BlastRecordFactory:public PageFactory
-{
-public:
+class BlastRecordFactory : public PageFactory {
+   public:
     BlastRecordFactory();
     QWidget* createPage(QWidget* parent) const override;
 };
 
-#endif // BLASTRECORDFACTORY_H
+#endif  // BLASTRECORDFACTORY_H

+ 6 - 18
blastRecord/hblastrecord.cpp

@@ -26,9 +26,7 @@ void HBlastRecord::setProjectXmbh(const QString &newProjectXmbh) { projectXmbh =
 
 QString HBlastRecord::getOperatorName() const { return operatorName; }
 
-void HBlastRecord::setOperatorName(const QString &newOperatorName) {
-    operatorName = newOperatorName;
-}
+void HBlastRecord::setOperatorName(const QString &newOperatorName) { operatorName = newOperatorName; }
 
 QString HBlastRecord::getPhone() const { return phone; }
 
@@ -36,9 +34,7 @@ void HBlastRecord::setPhone(const QString &newPhone) { phone = newPhone; }
 
 QString HBlastRecord::getOperatorIdentity() const { return operatorIdentity; }
 
-void HBlastRecord::setOperatorIdentity(const QString &newOperatorIdentity) {
-    operatorIdentity = newOperatorIdentity;
-}
+void HBlastRecord::setOperatorIdentity(const QString &newOperatorIdentity) { operatorIdentity = newOperatorIdentity; }
 
 QString HBlastRecord::getEquipmentSn() const { return equipmentSn; }
 
@@ -62,9 +58,7 @@ void HBlastRecord::setLatitude(const QString &newLatitude) { latitude = newLatit
 
 int HBlastRecord::getEquipmentCount() const { return equipmentCount; }
 
-void HBlastRecord::setEquipmentCount(const int newEquipmentCount) {
-    equipmentCount = newEquipmentCount;
-}
+void HBlastRecord::setEquipmentCount(const int newEquipmentCount) { equipmentCount = newEquipmentCount; }
 
 int HBlastRecord::getRegDetCount() const { return regDetCount; }
 
@@ -72,9 +66,7 @@ void HBlastRecord::setRegDetCount(int newRegDetCount) { regDetCount = newRegDetC
 
 int HBlastRecord::getErrorDetCount() const { return errorDetCount; }
 
-void HBlastRecord::setErrorDetCount(const int newErrorDetCount) {
-    errorDetCount = newErrorDetCount;
-}
+void HBlastRecord::setErrorDetCount(const int newErrorDetCount) { errorDetCount = newErrorDetCount; }
 
 QDateTime HBlastRecord::getBlastAt() const { return blastAt; }
 
@@ -103,12 +95,8 @@ qint64 HBlastRecord::getUpdateBy() const { return updateBy; }
 
 void HBlastRecord::setUpdateBy(qint64 newUpdateBy) { updateBy = newUpdateBy; }
 
-void HBlastRecord::setEquipmentRecords(const QList<HBlastEquipmentRecord *> records) {
-    equipmentRecords = records;
-}
-QList<HBlastEquipmentRecord *> HBlastRecord::getEquipmentRecords() const {
-    return equipmentRecords;
-}
+void HBlastRecord::setEquipmentRecords(const QList<HBlastEquipmentRecord *> records) { equipmentRecords = records; }
+QList<HBlastEquipmentRecord *> HBlastRecord::getEquipmentRecords() const { return equipmentRecords; }
 
 QJsonObject HBlastRecord::ToJson() {
     QJsonObject json;

+ 5 - 10
blastRecord/hblastrecorddao.cpp

@@ -6,8 +6,7 @@ PaginatedHBlastRecordResult HBlastRecordDao::getAllHRecords(int page, int pageSi
     QList<QSharedPointer<HBlastRecord>> BlastRecords;
     QSqlQuery query(database);
     int offset = (page - 1) * pageSize;
-    query.prepare(
-        "SELECT * FROM h_blast_record ORDER BY created_at desc LIMIT :pageSize OFFSET :offset");
+    query.prepare("SELECT * FROM h_blast_record ORDER BY created_at desc LIMIT :pageSize OFFSET :offset");
     query.bindValue(":pageSize", pageSize);
     query.bindValue(":offset", offset);
     if (query.exec()) {
@@ -190,14 +189,10 @@ QSharedPointer<HBlastRecord> HBlastRecordDao::recordToBlastRecord(const QSqlReco
     blastRecord->setEquipmentCount(record.value("equipment_count").toInt());
     blastRecord->setRegDetCount(record.value("reg_det_count").toInt());
     blastRecord->setErrorDetCount(record.value("error_det_count").toInt());
-    blastRecord->setBlastAt(
-        QDateTime::fromString(record.value("blast_at").toString(), Qt::ISODateWithMs));
-    blastRecord->setCreatedAt(
-        QDateTime::fromString(record.value("created_at").toString(), Qt::ISODateWithMs));
-    blastRecord->setUpdatedAt(
-        QDateTime::fromString(record.value("updated_at").toString(), Qt::ISODateWithMs));
-    blastRecord->setDeletedAt(
-        QDateTime::fromString(record.value("deleted_at").toString(), Qt::ISODateWithMs));
+    blastRecord->setBlastAt(QDateTime::fromString(record.value("blast_at").toString(), Qt::ISODateWithMs));
+    blastRecord->setCreatedAt(QDateTime::fromString(record.value("created_at").toString(), Qt::ISODateWithMs));
+    blastRecord->setUpdatedAt(QDateTime::fromString(record.value("updated_at").toString(), Qt::ISODateWithMs));
+    blastRecord->setDeletedAt(QDateTime::fromString(record.value("deleted_at").toString(), Qt::ISODateWithMs));
     blastRecord->setCreateBy(record.value("create_by").toLongLong());
     blastRecord->setUpdateBy(record.value("update_by").toLongLong());
     return blastRecord;

+ 9 - 9
blastRecord/hblastrecorddao.h

@@ -1,32 +1,32 @@
 #ifndef HBLASTRECORDDAO_H
 #define HBLASTRECORDDAO_H
-#include "HBlastRecord.h"
+#include <QDebug>
+#include <QList>
 #include <QSqlDatabase>
-#include <QSqlQuery>
 #include <QSqlError>
+#include <QSqlQuery>
 #include <QSqlRecord>
-#include <QList>
-#include <QDebug>
 
+#include "HBlastRecord.h"
 
 struct PaginatedHBlastRecordResult {
     QList<QSharedPointer<HBlastRecord>> BlastRecords;
     int totalCount;
 };
 
-class HBlastRecordDao
-{
-public:
+class HBlastRecordDao {
+   public:
     HBlastRecordDao(QSqlDatabase db);
     // HBlastRecord getById(qint64 id);
     bool deleteHBlastRecord(const HBlastRecord &record);
     bool updateHBlastRecord(const HBlastRecord &record);
     bool addHBlastRecord(const HBlastRecord &record);
     PaginatedHBlastRecordResult getAllHRecords(int page, int pageSize);
-private:
+
+   private:
     QSqlDatabase database;
     // 将QSqlRecord转换为HBlastRecord对象
     QSharedPointer<HBlastRecord> recordToBlastRecord(const QSqlRecord &record);
 };
 
-#endif // HBLASTRECORDDAO_H
+#endif  // HBLASTRECORDDAO_H

+ 34 - 132
blastRecord/hblastrecorddet.cpp

@@ -1,172 +1,74 @@
 #include "hblastrecorddet.h"
 
-HBlastRecordDet::HBlastRecordDet(QObject *parent) : QObject(parent)
-{
+HBlastRecordDet::HBlastRecordDet(QObject *parent) : QObject(parent) {
     // 可以在这里进行一些初始化操作
 }
 
-qint64 HBlastRecordDet::getId() const
-{
-    return id;
-}
+qint64 HBlastRecordDet::getId() const { return id; }
 
-void HBlastRecordDet::setId(qint64 newId)
-{
-    id = newId;
-}
+void HBlastRecordDet::setId(qint64 newId) { id = newId; }
 
-QString HBlastRecordDet::getUuid() const
-{
-    return uuid;
-}
+QString HBlastRecordDet::getUuid() const { return uuid; }
 
-void HBlastRecordDet::setUuid(const QString &newUuid)
-{
-    uuid = newUuid;
-}
+void HBlastRecordDet::setUuid(const QString &newUuid) { uuid = newUuid; }
 
-QString HBlastRecordDet::getOutCode() const
-{
-    return outCode;
-}
+QString HBlastRecordDet::getOutCode() const { return outCode; }
 
-void HBlastRecordDet::setOutCode(const QString &newOutCode)
-{
-    outCode = newOutCode;
-}
+void HBlastRecordDet::setOutCode(const QString &newOutCode) { outCode = newOutCode; }
 
-QString HBlastRecordDet::getInnerCode() const
-{
-    return innerCode;
-}
+QString HBlastRecordDet::getInnerCode() const { return innerCode; }
 
-void HBlastRecordDet::setInnerCode(const QString &newInnerCode)
-{
-    innerCode = newInnerCode;
-}
+void HBlastRecordDet::setInnerCode(const QString &newInnerCode) { innerCode = newInnerCode; }
 
-QString HBlastRecordDet::getUid() const
-{
-    return uid;
-}
+QString HBlastRecordDet::getUid() const { return uid; }
 
-void HBlastRecordDet::setUid(const QString &newUid)
-{
-    uid = newUid;
-}
+void HBlastRecordDet::setUid(const QString &newUid) { uid = newUid; }
 
-QString HBlastRecordDet::getStatus() const
-{
-    return status;
-}
+QString HBlastRecordDet::getStatus() const { return status; }
 
-void HBlastRecordDet::setStatus(const QString &newStatus)
-{
-    status = newStatus;
-}
+void HBlastRecordDet::setStatus(const QString &newStatus) { status = newStatus; }
 
-QString HBlastRecordDet::getFreq() const
-{
-    return freq;
-}
+QString HBlastRecordDet::getFreq() const { return freq; }
 
-void HBlastRecordDet::setFreq(const QString &newFreq)
-{
-    freq = newFreq;
-}
+void HBlastRecordDet::setFreq(const QString &newFreq) { freq = newFreq; }
 
-QString HBlastRecordDet::getDelayTime() const
-{
-    return delayTime;
-}
+QString HBlastRecordDet::getDelayTime() const { return delayTime; }
 
-void HBlastRecordDet::setDelayTime(const QString &newDelayTime)
-{
-    delayTime = newDelayTime;
-}
+void HBlastRecordDet::setDelayTime(const QString &newDelayTime) { delayTime = newDelayTime; }
 
-QString HBlastRecordDet::getTag() const
-{
-    return tag;
-}
+QString HBlastRecordDet::getTag() const { return tag; }
 
-void HBlastRecordDet::setTag(const QString &newTag)
-{
-    tag = newTag;
-}
+void HBlastRecordDet::setTag(const QString &newTag) { tag = newTag; }
 
-int HBlastRecordDet::getBlastRecordId() const
-{
-    return blastRecordId;
-}
+int HBlastRecordDet::getBlastRecordId() const { return blastRecordId; }
 
-void HBlastRecordDet::setBlastRecordId(int newBlastRecordId)
-{
-    blastRecordId = newBlastRecordId;
-}
+void HBlastRecordDet::setBlastRecordId(int newBlastRecordId) { blastRecordId = newBlastRecordId; }
 
-int HBlastRecordDet::getRegId() const
-{
-    return regId;
-}
+int HBlastRecordDet::getRegId() const { return regId; }
 
-void HBlastRecordDet::setRegId(int newRegId)
-{
-    regId = newRegId;
-}
+void HBlastRecordDet::setRegId(int newRegId) { regId = newRegId; }
 
-QDateTime HBlastRecordDet::getCreatedAt() const
-{
-    return createdAt;
-}
+QDateTime HBlastRecordDet::getCreatedAt() const { return createdAt; }
 
-void HBlastRecordDet::setCreatedAt(const QDateTime &newCreatedAt)
-{
-    createdAt = newCreatedAt;
-}
+void HBlastRecordDet::setCreatedAt(const QDateTime &newCreatedAt) { createdAt = newCreatedAt; }
 
-QDateTime HBlastRecordDet::getUpdatedAt() const
-{
-    return updatedAt;
-}
+QDateTime HBlastRecordDet::getUpdatedAt() const { return updatedAt; }
 
-void HBlastRecordDet::setUpdatedAt(const QDateTime &newUpdatedAt)
-{
-    updatedAt = newUpdatedAt;
-}
+void HBlastRecordDet::setUpdatedAt(const QDateTime &newUpdatedAt) { updatedAt = newUpdatedAt; }
 
-QDateTime HBlastRecordDet::getDeletedAt() const
-{
-    return deletedAt;
-}
+QDateTime HBlastRecordDet::getDeletedAt() const { return deletedAt; }
 
-void HBlastRecordDet::setDeletedAt(const QDateTime &newDeletedAt)
-{
-    deletedAt = newDeletedAt;
-}
+void HBlastRecordDet::setDeletedAt(const QDateTime &newDeletedAt) { deletedAt = newDeletedAt; }
 
-qint64 HBlastRecordDet::getCreateBy() const
-{
-    return createBy;
-}
+qint64 HBlastRecordDet::getCreateBy() const { return createBy; }
 
-void HBlastRecordDet::setCreateBy(qint64 newCreateBy)
-{
-    createBy = newCreateBy;
-}
+void HBlastRecordDet::setCreateBy(qint64 newCreateBy) { createBy = newCreateBy; }
 
-qint64 HBlastRecordDet::getUpdateBy() const
-{
-    return updateBy;
-}
+qint64 HBlastRecordDet::getUpdateBy() const { return updateBy; }
 
-void HBlastRecordDet::setUpdateBy(qint64 newUpdateBy)
-{
-    updateBy = newUpdateBy;
-}
+void HBlastRecordDet::setUpdateBy(qint64 newUpdateBy) { updateBy = newUpdateBy; }
 
-QByteArray HBlastRecordDet::BlastRecordDetToJson(const HBlastRecordDet &recordDet)
-{
+QByteArray HBlastRecordDet::BlastRecordDetToJson(const HBlastRecordDet &recordDet) {
     QJsonObject jsonObject;
     jsonObject["id"] = recordDet.getId();
     jsonObject["uuid"] = recordDet.getUuid();

+ 8 - 9
blastRecord/hblastrecorddet.h

@@ -1,13 +1,12 @@
 #ifndef HBLASTRECORDDET_H
 #define HBLASTRECORDDET_H
-#include <QString>
 #include <QDateTime>
-#include <QJsonObject>
 #include <QJsonDocument>
+#include <QJsonObject>
+#include <QString>
 #include <QUuid>
 
-class HBlastRecordDet : public QObject
-{
+class HBlastRecordDet : public QObject {
     Q_OBJECT
     // 定义属性
     Q_PROPERTY(qint64 id READ getId WRITE setId)
@@ -26,10 +25,10 @@ class HBlastRecordDet : public QObject
     Q_PROPERTY(QDateTime deletedAt READ getDeletedAt WRITE setDeletedAt)
     Q_PROPERTY(qint64 createBy READ getCreateBy WRITE setCreateBy)
     Q_PROPERTY(qint64 updateBy READ getUpdateBy WRITE setUpdateBy)
-public:
+   public:
     explicit HBlastRecordDet(QObject *parent = nullptr);
 
-       // Getter and Setter methods
+    // Getter and Setter methods
     qint64 getId() const;
     void setId(qint64 newId);
 
@@ -78,9 +77,9 @@ public:
     qint64 getUpdateBy() const;
     void setUpdateBy(qint64 newUpdateBy);
 
-    QByteArray BlastRecordDetToJson(const HBlastRecordDet& recordDet);
+    QByteArray BlastRecordDetToJson(const HBlastRecordDet &recordDet);
 
-private:
+   private:
     qint64 id;
     QString uuid;
     QString outCode;
@@ -99,4 +98,4 @@ private:
     qint64 updateBy;
 };
 
-#endif // HBLASTRECORDDET_H
+#endif  // HBLASTRECORDDET_H

+ 1 - 3
blastRecordDet/hblastrecorddet.cpp

@@ -42,9 +42,7 @@ void HBlastRecordDet::setTag(const QString &newTag) { tag = newTag; }
 
 QString HBlastRecordDet::getBlastRecordUuid() const { return blastRecordUUID; }
 
-void HBlastRecordDet::setBlastRecordUuid(QString newBlastRecordId) {
-    blastRecordUUID = newBlastRecordId;
-}
+void HBlastRecordDet::setBlastRecordUuid(QString newBlastRecordId) { blastRecordUUID = newBlastRecordId; }
 
 QString HBlastRecordDet::getEquipmentRecordUuid() const { return equipmentRecordUUID; }
 

+ 8 - 9
blastRecordDet/hblastrecorddetdao.h

@@ -1,25 +1,24 @@
 #ifndef HBLASTRECORDDETDAO_H
 #define HBLASTRECORDDETDAO_H
 
-#include "HBlastRecordDet.h"
+#include <QDebug>
 #include <QSqlDatabase>
-#include <QSqlQuery>
 #include <QSqlError>
-#include <QDebug>
+#include <QSqlQuery>
+
+#include "HBlastRecordDet.h"
 
-class HBlastRecordDetDao
-{
-public:
+class HBlastRecordDetDao {
+   public:
     HBlastRecordDetDao(QSqlDatabase db);
     HBlastRecordDet getById(qint64 id);
     bool updateHBlastRecordDet(const HBlastRecordDet &recordDet);
     bool addHBlastRecordDet(const HBlastRecordDet &recordDet);
 
-private:
+   private:
     QSqlDatabase database;
     // 将QSqlRecord转换为HProject对象
     // QSharedPointer<HProject> recordToProject(const QSqlRecord &record);
-
 };
 
-#endif // HBLASTRECORDDETDAO_H
+#endif  // HBLASTRECORDDETDAO_H

+ 10 - 30
blastRegRecord/hblastregrecord.cpp

@@ -18,9 +18,7 @@ void HBlastEquipmentRecord::setEquipSn(const QString &newEquipSn) { equipSn = ne
 
 QString HBlastEquipmentRecord::getEquipVersion() const { return equipVersion; }
 
-void HBlastEquipmentRecord::setEquipVersion(const QString &newEquipVersion) {
-    equipVersion = newEquipVersion;
-}
+void HBlastEquipmentRecord::setEquipVersion(const QString &newEquipVersion) { equipVersion = newEquipVersion; }
 
 int HBlastEquipmentRecord::getRegDetoCount() const { return regDetoCount; }
 
@@ -28,21 +26,15 @@ void HBlastEquipmentRecord::setRegDetoCount(int newRegDetoCount) { regDetoCount
 
 int HBlastEquipmentRecord::getErrorDetoCount() const { return errorDetoCount; }
 
-void HBlastEquipmentRecord::setErrorDetoCount(int newErrorDetoCount) {
-    errorDetoCount = newErrorDetoCount;
-}
+void HBlastEquipmentRecord::setErrorDetoCount(int newErrorDetoCount) { errorDetoCount = newErrorDetoCount; }
 
 QString HBlastEquipmentRecord::getAfterTestBusV() const { return afterTestBusV; }
 
-void HBlastEquipmentRecord::setAfterTestBusV(const QString &newAfterTestBusV) {
-    afterTestBusV = newAfterTestBusV;
-}
+void HBlastEquipmentRecord::setAfterTestBusV(const QString &newAfterTestBusV) { afterTestBusV = newAfterTestBusV; }
 
 QString HBlastEquipmentRecord::getAfterTestBusI() const { return afterTestBusI; }
 
-void HBlastEquipmentRecord::setAfterTestBusI(const QString &newAfterTestBusI) {
-    afterTestBusI = newAfterTestBusI;
-}
+void HBlastEquipmentRecord::setAfterTestBusI(const QString &newAfterTestBusI) { afterTestBusI = newAfterTestBusI; }
 
 QString HBlastEquipmentRecord::getBusLeakageCurrentI() const { return busLeakageCurrentI; }
 
@@ -52,15 +44,11 @@ void HBlastEquipmentRecord::setBusLeakageCurrentI(const QString &newBusLeakageCu
 
 QString HBlastEquipmentRecord::getNetChargedV() const { return netChargedV; }
 
-void HBlastEquipmentRecord::setNetChargedV(const QString &newNetChargedV) {
-    netChargedV = newNetChargedV;
-}
+void HBlastEquipmentRecord::setNetChargedV(const QString &newNetChargedV) { netChargedV = newNetChargedV; }
 
 QString HBlastEquipmentRecord::getNetChargedI() const { return netChargedI; }
 
-void HBlastEquipmentRecord::setNetChargedI(const QString &newNetChargedI) {
-    netChargedI = newNetChargedI;
-}
+void HBlastEquipmentRecord::setNetChargedI(const QString &newNetChargedI) { netChargedI = newNetChargedI; }
 
 QString HBlastEquipmentRecord::getBeforeBlastingV() const { return beforeBlastingV; }
 
@@ -76,27 +64,19 @@ void HBlastEquipmentRecord::setBeforeBlastingI(const QString &newBeforeBlastingI
 
 QString HBlastEquipmentRecord::getRecordUUID() const { return recordUuid; }
 
-void HBlastEquipmentRecord::setRecordUuid(const QString &newRecordUuid) {
-    recordUuid = newRecordUuid;
-}
+void HBlastEquipmentRecord::setRecordUuid(const QString &newRecordUuid) { recordUuid = newRecordUuid; }
 
 QDateTime HBlastEquipmentRecord::getCreatedAt() const { return createdAt; }
 
-void HBlastEquipmentRecord::setCreatedAt(const QDateTime &newCreatedAt) {
-    createdAt = newCreatedAt;
-}
+void HBlastEquipmentRecord::setCreatedAt(const QDateTime &newCreatedAt) { createdAt = newCreatedAt; }
 
 QDateTime HBlastEquipmentRecord::getUpdatedAt() const { return updatedAt; }
 
-void HBlastEquipmentRecord::setUpdatedAt(const QDateTime &newUpdatedAt) {
-    updatedAt = newUpdatedAt;
-}
+void HBlastEquipmentRecord::setUpdatedAt(const QDateTime &newUpdatedAt) { updatedAt = newUpdatedAt; }
 
 QDateTime HBlastEquipmentRecord::getDeletedAt() const { return deletedAt; }
 
-void HBlastEquipmentRecord::setDeletedAt(const QDateTime &newDeletedAt) {
-    deletedAt = newDeletedAt;
-}
+void HBlastEquipmentRecord::setDeletedAt(const QDateTime &newDeletedAt) { deletedAt = newDeletedAt; }
 
 qint64 HBlastEquipmentRecord::getCreateBy() const { return createBy; }
 

+ 25 - 47
blastopepage.cpp

@@ -33,9 +33,7 @@ void BlastOpePage::showCountDownWidget(QString uuid, const QString &topic, const
     if (widget) {
         connect(
             countdownWidget, &CountdownWidget::countdownFinished, widget,
-            [widget, topic, message, countdownWidget]() {
-                widget->onCountdownFinished(topic, message);
-            },
+            [widget, topic, message, countdownWidget]() { widget->onCountdownFinished(topic, message); },
             Qt::SingleShotConnection);
     }
 }
@@ -53,8 +51,7 @@ void BlastOpePage::InitFace() {
 
     QJsonObject metaInfo = getMetaInfo();
     if (metaInfo["certName"] == "" || metaInfo["certNo"] == "") {
-        QMessageBox::information(nullptr, "获取用户信息错误",
-                                 "未获得用户的身份证信息,请联系管理员");
+        QMessageBox::information(nullptr, "获取用户信息错误", "未获得用户的身份证信息,请联系管理员");
         return;
     }
 
@@ -70,8 +67,7 @@ void BlastOpePage::InitFace() {
     if (response["code"] != 200) {
         Logger::getInstance().error(
             QString("创建人脸识别请求服务器返回错误: userName: %1. response: %2")
-                .arg(metaInfo["certName"].toString(),
-                     QString::fromUtf8(QJsonDocument(response).toJson())));
+                .arg(metaInfo["certName"].toString(), QString::fromUtf8(QJsonDocument(response).toJson())));
         QMessageBox::critical(nullptr, "错误", "无法创建人脸识别,请确认后台录入的身份信息正确");
         return;
     }
@@ -121,8 +117,7 @@ void BlastOpePage::onUrlChanged(const QUrl &newUrl) {
     if (newUrl.host() == "www.integrateblaster.com") {
         closeWebViewAndRestoreUI();
         QNetworkAccessManager manager;
-        QUrl requestUrl(
-            apiBackendUrl.resolved(QUrl(QString("h-face-verify/certifyId/%1").arg(certifyId))));
+        QUrl requestUrl(apiBackendUrl.resolved(QUrl(QString("h-face-verify/certifyId/%1").arg(certifyId))));
         QNetworkRequest request(requestUrl);
         QNetworkReply *reply = manager.get(request);
         QEventLoop loop;
@@ -138,10 +133,8 @@ void BlastOpePage::onUrlChanged(const QUrl &newUrl) {
                 QString message = dataObj["Message"].toString();
                 QJsonObject resultObj = dataObj["ResultObject"].toObject();
                 if (resultObj.isEmpty()) {
-                    Logger::getInstance().error(
-                        QString("获取认证初始化数据失败. message: %1.").arg(message));
-                    int ret =
-                        QMessageBox::information(nullptr, "认证失败", message + " ,请重新认证!");
+                    Logger::getInstance().error(QString("获取认证初始化数据失败. message: %1.").arg(message));
+                    int ret = QMessageBox::information(nullptr, "认证失败", message + " ,请重新认证!");
                     if (ret == QMessageBox::Ok) {
                         InitFace();
                     }
@@ -163,8 +156,7 @@ void BlastOpePage::onUrlChanged(const QUrl &newUrl) {
         } else {
             qDebug() << "Request failed:" << reply->errorString();
             Logger::getInstance().error(
-                QString("InitFaseVerification request failed. error message: %1")
-                    .arg(reply->errorString()));
+                QString("InitFaseVerification request failed. error message: %1").arg(reply->errorString()));
         }
 
         reply->deleteLater();
@@ -214,11 +206,9 @@ QJsonObject BlastOpePage::sendPostRequest(const QUrl &url, const QJsonObject &da
 
 void BlastOpePage::handleFeaturePermission(QWebEnginePage *page, const QUrl &securityOrigin,
                                            QWebEnginePage::Feature feature) {
-    if (feature == QWebEnginePage::MediaAudioCapture ||
-        feature == QWebEnginePage::MediaAudioVideoCapture ||
+    if (feature == QWebEnginePage::MediaAudioCapture || feature == QWebEnginePage::MediaAudioVideoCapture ||
         feature == QWebEnginePage::MediaVideoCapture) {
-        page->setFeaturePermission(securityOrigin, feature,
-                                   QWebEnginePage::PermissionGrantedByUser);
+        page->setFeaturePermission(securityOrigin, feature, QWebEnginePage::PermissionGrantedByUser);
     } else {
         page->setFeaturePermission(securityOrigin, feature, QWebEnginePage::PermissionDeniedByUser);
     }
@@ -261,14 +251,8 @@ void BlastOpePage::loadDataFromSource(int currentPage, int pageSize) {
 
     headers = {
         {"选择", ""},  // 新增选择列
-        {"工程名称", "name"},
-        {"操作员", "operatorName"},
-        {"爆破员", "blasterName"},
-        {"井下地址", "addressPath"},
-        {"雷管数量", "detSum"},
-        {"起爆器数量", "blastCount"},
-        {"起爆状态", "blastStatus"},
-        {"进度", ""},
+        {"工程名称", "name"},   {"操作员", "operatorName"},   {"爆破员", "blasterName"},   {"井下地址", "addressPath"},
+        {"雷管数量", "detSum"}, {"起爆器数量", "blastCount"}, {"起爆状态", "blastStatus"}, {"进度", ""},
         {"操作", ""},
     };
 
@@ -295,8 +279,8 @@ void BlastOpePage::loadDataFromSource(int currentPage, int pageSize) {
                 item->setText("");
             }
             if (!prop.isEmpty()) {
-                QMetaProperty metaProp = HProject.metaObject()->property(
-                    HProject.metaObject()->indexOfProperty(prop.toUtf8()));
+                QMetaProperty metaProp =
+                    HProject.metaObject()->property(HProject.metaObject()->indexOfProperty(prop.toUtf8()));
                 QVariant value = metaProp.read(&HProject);
 
                 if (prop == "blastStatus") {
@@ -332,8 +316,8 @@ void BlastOpePage::loadDataFromSource(int currentPage, int pageSize) {
     }
     ui->tableView->setModel(model);
 
-    connectionItem = QObject::connect(model, &QStandardItemModel::itemChanged, this,
-                                      &BlastOpePage::onItemCheckboxChanged);
+    connectionItem =
+        QObject::connect(model, &QStandardItemModel::itemChanged, this, &BlastOpePage::onItemCheckboxChanged);
     ui->tableView->setColumnWidth(0, 30);
     for (int i = 1; i < headerCount; ++i) {
         if (i == 8) {  // Column: 进度
@@ -561,12 +545,10 @@ void BlastOpePage::handleSingleBlastButtonClick(int row, QPushButton *button) {
         button->setText(stopBlastButtonTxt);
         firingWidget *widget = new firingWidget(row, false, uuid);
         connect(widget, &firingWidget::progressChanged, this, &BlastOpePage::updateProgressBar);
-        connect(widget, &firingWidget::updateBlastStatus, this,
-                &BlastOpePage::onFiringStageUpdated);
+        connect(widget, &firingWidget::updateBlastStatus, this, &BlastOpePage::onFiringStageUpdated);
         connect(widget, &firingWidget::updateButton, this, &BlastOpePage::updateOpBtn);
         connect(widget, &firingWidget::countdown, this, &BlastOpePage::showCountDownWidget);
-        connect(widget, &firingWidget::updateProjectStatus, this,
-                &BlastOpePage::handlerUpdateProjectStatus);
+        connect(widget, &firingWidget::updateProjectStatus, this, &BlastOpePage::handlerUpdateProjectStatus);
         connect(widget, &firingWidget::closeFiring, this, &BlastOpePage::destroyFiringWidget);
         if (isShowTriggeringWidget) {
             widget->show();
@@ -674,16 +656,12 @@ void BlastOpePage::on_btnSelect_clicked() {
         }
 
         // 信号连接
-        connect(widgetSelect, &firingWidget::progressChanged, this,
-                &BlastOpePage::updateProgressBar);
-        connect(widgetSelect, &firingWidget::updateBlastStatus, this,
-                &BlastOpePage::onFiringStageUpdated);
+        connect(widgetSelect, &firingWidget::progressChanged, this, &BlastOpePage::updateProgressBar);
+        connect(widgetSelect, &firingWidget::updateBlastStatus, this, &BlastOpePage::onFiringStageUpdated);
         connect(widgetSelect, &firingWidget::selectSignal, this, &BlastOpePage::handleSelect);
         connect(widgetSelect, &firingWidget::updateButton, this, &BlastOpePage::updateOpBtn);
-        connect(widgetSelect, &firingWidget::updateProjectStatus, this,
-                &BlastOpePage::handlerUpdateProjectStatus);
-        connect(widgetSelect, &firingWidget::closeFiring, this,
-                &BlastOpePage::destroyFiringWidgetSelect);
+        connect(widgetSelect, &firingWidget::updateProjectStatus, this, &BlastOpePage::handlerUpdateProjectStatus);
+        connect(widgetSelect, &firingWidget::closeFiring, this, &BlastOpePage::destroyFiringWidgetSelect);
         widgetSelect->show();
         widgetSelect->setAttribute(Qt::WA_DeleteOnClose);
         uuidWidgetSMap.insert(uuid, widgetSelect);
@@ -701,8 +679,8 @@ void BlastOpePage::handleSelect(QString uuid) {
     if (isSame) {
         bool successSelect;
         serialTool = SerialTool::getInstance(nullptr, &successSelect);
-        connect(serialTool, &SerialTool::buttonPressedReceived, this,
-                &BlastOpePage::showDownWidgetSelect, Qt::SingleShotConnection);
+        connect(serialTool, &SerialTool::buttonPressedReceived, this, &BlastOpePage::showDownWidgetSelect,
+                Qt::SingleShotConnection);
         if (serialTool) {
             QByteArray data = "\r\nENABLE_BUTTON\r\n";
             bool success = serialTool->sendData(data);
@@ -758,8 +736,8 @@ void BlastOpePage::showDownWidgetSelect() {
     countdownWidgetSelect->move(x, y);
     countdownWidgetSelect->show();
 
-    connect(countdownWidgetSelect, &CountdownWidget::countdownFinished, this,
-            &BlastOpePage::triggerBlastSelected, Qt::SingleShotConnection);
+    connect(countdownWidgetSelect, &CountdownWidget::countdownFinished, this, &BlastOpePage::triggerBlastSelected,
+            Qt::SingleShotConnection);
 }
 
 void BlastOpePage::triggerBlastSelected() {

+ 2 - 4
blastopepage.h

@@ -29,8 +29,7 @@ struct ProgressBarTriple {
     QProgressBar *bar3;
 
     // 构造函数
-    ProgressBarTriple(QProgressBar *b1, QProgressBar *b2, QProgressBar *b3)
-        : bar1(b1), bar2(b2), bar3(b3) {}
+    ProgressBarTriple(QProgressBar *b1, QProgressBar *b2, QProgressBar *b3) : bar1(b1), bar2(b2), bar3(b3) {}
 };
 namespace Ui {
 class BlastOpePage;
@@ -59,8 +58,7 @@ class BlastOpePage : public QWidget {
     void destroyFiringWidgetSelect(const QString &uuid);
 
    private:
-    void handleFeaturePermission(QWebEnginePage *page, const QUrl &securityOrigin,
-                                 QWebEnginePage::Feature feature);
+    void handleFeaturePermission(QWebEnginePage *page, const QUrl &securityOrigin, QWebEnginePage::Feature feature);
     void RefreshData();
     void loadDataFromSource(int currentPage, int pageSize);
     void InitFace();

+ 2 - 8
blastoperationfactory.cpp

@@ -1,11 +1,5 @@
 #include "blastoperationfactory.h"
 
-BlastOperationFactory::BlastOperationFactory()
-{
+BlastOperationFactory::BlastOperationFactory() {}
 
-}
-
-QWidget *BlastOperationFactory::createPage(QWidget *parent) const
-{
-    return new BlastOpePage(parent);
-}
+QWidget *BlastOperationFactory::createPage(QWidget *parent) const { return new BlastOpePage(parent); }

+ 3 - 4
blastoperationfactory.h

@@ -3,11 +3,10 @@
 #include "PageFactory.h"
 #include "blastopepage.h"
 
-class BlastOperationFactory:public PageFactory
-{
-public:
+class BlastOperationFactory : public PageFactory {
+   public:
     BlastOperationFactory();
     QWidget* createPage(QWidget* parent) const override;
 };
 
-#endif // BLASTOPERATIONFACTORY_H
+#endif  // BLASTOPERATIONFACTORY_H

+ 2 - 8
blastprojectfactory.cpp

@@ -1,11 +1,5 @@
 #include "blastprojectfactory.h"
 
-BlastProjectFactory::BlastProjectFactory()
-{
+BlastProjectFactory::BlastProjectFactory() {}
 
-}
-
-QWidget *BlastProjectFactory::createPage(QWidget *parent) const
-{
-    return new BlastProjectPage(parent);
-}
+QWidget *BlastProjectFactory::createPage(QWidget *parent) const { return new BlastProjectPage(parent); }

+ 19 - 20
btnserialthread.cpp

@@ -1,13 +1,13 @@
 #include "btnserialthread.h"
 
-BtnSerialThread::BtnSerialThread(QObject *parent) : QThread(parent)
-{
+BtnSerialThread::BtnSerialThread(QObject *parent) : QThread(parent) {
     btnSerialTool = nullptr;
-    connect(this, &BtnSerialThread::destroySerialTool, this, &BtnSerialThread::onDestroySerialTool, Qt::QueuedConnection);
+    connect(this, &BtnSerialThread::destroySerialTool, this, &BtnSerialThread::onDestroySerialTool,
+            Qt::QueuedConnection);
 }
 
-BtnSerialThread::~BtnSerialThread()
-{    qDebug() << "SerialToolThread:" ;
+BtnSerialThread::~BtnSerialThread() {
+    qDebug() << "SerialToolThread:";
     // emit destroySerialTool();
     // // if (isRunning()) {
     // //     qDebug() << "SerialToolT:" ;
@@ -19,8 +19,7 @@ BtnSerialThread::~BtnSerialThread()
     qDebug() << "SerialTool object is in thread:" << btnSerialTool->thread();
 }
 
-void BtnSerialThread::run()
-{
+void BtnSerialThread::run() {
     btnSerialTool = new BtnSerialTool();
     emit serialToolCreated();
 
@@ -29,15 +28,16 @@ void BtnSerialThread::run()
     qDebug() << "Current thread in run():" << QThread::currentThread();
     // 连接信号
 
-    connect(this, &BtnSerialThread::sendDataRequest, btnSerialTool, &BtnSerialTool::handleSendDataReques, Qt::QueuedConnection);
-    connect(btnSerialTool, &BtnSerialTool::dataReceived, this, &BtnSerialThread::handleReceivedData, Qt::QueuedConnection);
+    connect(this, &BtnSerialThread::sendDataRequest, btnSerialTool, &BtnSerialTool::handleSendDataReques,
+            Qt::QueuedConnection);
+    connect(btnSerialTool, &BtnSerialTool::dataReceived, this, &BtnSerialThread::handleReceivedData,
+            Qt::QueuedConnection);
     // 启动事件循环
     exec();
 }
 
 // 处理接收到的数据
-void BtnSerialThread::handleReceivedData(const QByteArray &data)
-{
+void BtnSerialThread::handleReceivedData(const QByteArray &data) {
     // 这里可以添加具体的处理逻辑,例如打印接收到的数据
     qDebug() << "Received data:" << data;
 
@@ -45,12 +45,11 @@ void BtnSerialThread::handleReceivedData(const QByteArray &data)
     emit dataReceived(data);
 }
 
-void BtnSerialThread::onDestroySerialTool()
- {
-    qDebug() << "触发信号" ;
-     if (btnSerialTool) {
-         qDebug() << "delete serialTool";
-         delete btnSerialTool;
-         btnSerialTool = nullptr;
-     }
- }
+void BtnSerialThread::onDestroySerialTool() {
+    qDebug() << "触发信号";
+    if (btnSerialTool) {
+        qDebug() << "delete serialTool";
+        delete btnSerialTool;
+        btnSerialTool = nullptr;
+    }
+}

+ 14 - 12
btnserialthread.h

@@ -1,28 +1,30 @@
 #ifndef BTNSERIALTHREAD_H
 #define BTNSERIALTHREAD_H
 
-#include <QThread>
 #include <QByteArray>
+#include <QThread>
+
 #include "btnserialtool.h"
 
-class BtnSerialThread : public QThread
-{
-        Q_OBJECT
-public:
+class BtnSerialThread : public QThread {
+    Q_OBJECT
+   public:
     BtnSerialThread(QObject *parent = nullptr);
-    ~BtnSerialThread(); // 声明析构函数
-signals:
-    void dataReceived(const QByteArray& data);
+    ~BtnSerialThread();  // 声明析构函数
+   signals:
+    void dataReceived(const QByteArray &data);
     void sendDataRequest(const QByteArray &data);
     void serialToolCreated();
     void destroySerialTool();
-private slots:
+   private slots:
     void handleReceivedData(const QByteArray &data);
     void onDestroySerialTool();
-protected:
+
+   protected:
     void run() override;
-private:
+
+   private:
     BtnSerialTool *btnSerialTool;
 };
 
-#endif // BTNSERIALTHREAD_H
+#endif  // BTNSERIALTHREAD_H

+ 7 - 21
btnserialtool.cpp

@@ -1,14 +1,9 @@
 #include "btnserialtool.h"
 
-BtnSerialTool::BtnSerialTool(QObject *parent) : QObject(parent)
-{
-  setupSerialPort();
-}
-
+BtnSerialTool::BtnSerialTool(QObject *parent) : QObject(parent) { setupSerialPort(); }
 
 // 打开串口的函数
-void BtnSerialTool::openSerialPort()
-{
+void BtnSerialTool::openSerialPort() {
     const QString portName = "COM8";
     const qint32 baudRate = 9600;
 
@@ -34,16 +29,14 @@ void BtnSerialTool::openSerialPort()
 }
 
 // 关闭串口的函数
-void BtnSerialTool::closeSerialPort()
-{
+void BtnSerialTool::closeSerialPort() {
     if (serialPort.isOpen()) {
         serialPort.close();
         emit openCloseButtonTextChanged("打开串口");
     }
 }
 
-bool BtnSerialTool::sendData(const QByteArray& data)
-{
+bool BtnSerialTool::sendData(const QByteArray &data) {
     if (serialPort.isOpen()) {
         qint64 bytesWritten = serialPort.write(data);
         return bytesWritten == data.size();
@@ -51,13 +44,9 @@ bool BtnSerialTool::sendData(const QByteArray& data)
     return false;
 }
 
-void BtnSerialTool::handleSendDataReques(const QByteArray &data)
-{
-    sendData(data);
-}
+void BtnSerialTool::handleSendDataReques(const QByteArray &data) { sendData(data); }
 
-void BtnSerialTool::readData()
-{
+void BtnSerialTool::readData() {
     QByteArray newData = serialPort.readAll();
     buffer.append(newData);
 
@@ -79,13 +68,10 @@ void BtnSerialTool::readData()
         startIndex = buffer.indexOf("\\r\\n");
     }
 
-
     qDebug() << "Received data:" << newData;
 }
 
-
-void BtnSerialTool::setupSerialPort()
-{
+void BtnSerialTool::setupSerialPort() {
     openSerialPort();
     connect(&serialPort, &QSerialPort::readyRead, this, &BtnSerialTool::readData);
 }

+ 13 - 13
btnserialtool.h

@@ -1,31 +1,31 @@
 #ifndef BTNSERIALTOOL_H
 #define BTNSERIALTOOL_H
+#include <QByteArray>
+#include <QLineEdit>
 #include <QObject>
-#include <QSerialPort>
 #include <QPushButton>
-#include <QLineEdit>
+#include <QSerialPort>
 #include <QTextEdit>
-#include <QByteArray>
 
-class BtnSerialTool: public QObject
-{
+class BtnSerialTool : public QObject {
     Q_OBJECT
-public:
+   public:
     BtnSerialTool(QObject *parent = nullptr);
     void openSerialPort();
     void closeSerialPort();
     void readData();
     bool sendData(const QByteArray &data);
-signals:
-    void openCloseButtonTextChanged(const QString& text);
+   signals:
+    void openCloseButtonTextChanged(const QString &text);
     void openError();
-    void dataReceived(const QByteArray& data);
-public slots:
+    void dataReceived(const QByteArray &data);
+   public slots:
     void handleSendDataReques(const QByteArray &data);
-private:
+
+   private:
     void setupSerialPort();
-    QByteArray buffer; // 确保这里声明了 buffer 变量
+    QByteArray buffer;  // 确保这里声明了 buffer 变量
     QSerialPort serialPort;
 };
 
-#endif // BTNSERIALTOOL_H
+#endif  // BTNSERIALTOOL_H

+ 15 - 14
buttondelegate.cpp

@@ -1,8 +1,10 @@
 #include "buttondelegate.h"
+
 #include <QStyledItemDelegate>
 #include <qDebug>
 
-ButtonDelegate::ButtonDelegate(int buttonColumn,QObject *parent) : QStyledItemDelegate(parent),buttonColumn(buttonColumn){
+ButtonDelegate::ButtonDelegate(int buttonColumn, QObject *parent)
+    : QStyledItemDelegate(parent), buttonColumn(buttonColumn) {
     // 构造函数实现(如果需要)
 }
 
@@ -11,17 +13,17 @@ void ButtonDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option
         QStyleOptionButton buttonOption1;
         QStyleOptionButton buttonOption2;
         QRect rect = option.rect;
-        rect.adjust(0, 0, -1, -1); // 调整大小以适应边框
+        rect.adjust(0, 0, -1, -1);  // 调整大小以适应边框
 
         // 第一个按钮
         buttonOption1.rect = rect.adjusted(0, 0, -rect.width() / 2, 0);
-        buttonOption1.text = "删除"; // 按钮文本
+        buttonOption1.text = "删除";  // 按钮文本
         buttonOption1.state = QStyle::State_Enabled;
         QApplication::style()->drawControl(QStyle::CE_PushButton, &buttonOption1, painter);
 
         // 第二个按钮
         buttonOption2.rect = rect.adjusted(rect.width() / 2, 0, 0, 0);
-        buttonOption2.text = "编辑"; // 按钮文本
+        buttonOption2.text = "编辑";  // 按钮文本
         buttonOption2.state = QStyle::State_Enabled;
         QApplication::style()->drawControl(QStyle::CE_PushButton, &buttonOption2, painter);
     } else {
@@ -29,32 +31,31 @@ void ButtonDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option
     }
 }
 
-
-bool ButtonDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index)  {
+bool ButtonDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option,
+                                 const QModelIndex &index) {
     if (index.column() == buttonColumn && event->type() == QEvent::MouseButtonPress) {
-        QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(event);
+        QMouseEvent *mouseEvent = static_cast<QMouseEvent *>(event);
         QRect rect = option.rect;
-        rect.adjust(0, 0, -1, -1); // 调整大小以适应边框
+        rect.adjust(0, 0, -1, -1);  // 调整大小以适应边框
 
         // 检测第一个按钮的点击
         QRect button1Rect = rect.adjusted(0, 0, -rect.width() / 2, 0);
         if (button1Rect.contains(mouseEvent->pos())) {
-            handleButtonClick (index.row(),1); // 处理第一个按钮点击
+            handleButtonClick(index.row(), 1);  // 处理第一个按钮点击
             return true;
         }
 
         // 检测第二个按钮的点击
         QRect button2Rect = rect.adjusted(rect.width() / 2, 0, 0, 0);
         if (button2Rect.contains(mouseEvent->pos())) {
-            handleButtonClick(index.row(), 2); // 处理第二个按钮点击
+            handleButtonClick(index.row(), 2);  // 处理第二个按钮点击
             return true;
         }
     }
     return QStyledItemDelegate::editorEvent(event, model, option, index);
 }
 
-
-void ButtonDelegate::handleButtonClick(int row,int button) {
+void ButtonDelegate::handleButtonClick(int row, int button) {
     // qDebug() << "行号: " << row << ", 按钮: " << button;
-    emit buttonClicked(row, button); // 发射信号
-    }
+    emit buttonClicked(row, button);  // 发射信号
+}

+ 17 - 19
buttondelegate.h

@@ -1,39 +1,37 @@
 #ifndef BUTTONDELEGATE_H
 #define BUTTONDELEGATE_H
 
-#include <QStyledItemDelegate>
-#include <QWidget>
+#include <QAbstractItemModel>
+#include <QApplication>
+#include <QDebug>
 #include <QHBoxLayout>
-#include <QPushButton>
 #include <QModelIndex>
-#include <QAbstractItemModel>
+#include <QMouseEvent>
 #include <QPainter>
-#include <QStyleOptionViewItem>
+#include <QPushButton>
 #include <QStyleOptionButton>
-#include <QApplication>
+#include <QStyleOptionViewItem>
+#include <QStyledItemDelegate>
 #include <QTableView>
-#include <QMouseEvent>
-#include <QDebug>
+#include <QWidget>
 
-class ButtonDelegate: public QStyledItemDelegate{
+class ButtonDelegate : public QStyledItemDelegate {
     Q_OBJECT
 
-public:
-    explicit ButtonDelegate(int buttonColumn,QObject *parent = nullptr);
+   public:
+    explicit ButtonDelegate(int buttonColumn, QObject *parent = nullptr);
 
     void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
 
-    bool editorEvent(QEvent *event, QAbstractItemModel *model,const QStyleOptionViewItem &option, const QModelIndex &index) override;
+    bool editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option,
+                     const QModelIndex &index) override;
 
     void handleButtonClick(int row, int button);
 
-private:
-    int buttonColumn; // 成员变量
-signals:
+   private:
+    int buttonColumn;  // 成员变量
+   signals:
     void buttonClicked(int row, int button);
-
 };
 
-
-
-#endif // BUTTONDELEGATE_H
+#endif  // BUTTONDELEGATE_H

+ 7 - 7
clickabletableview.cpp

@@ -1,7 +1,6 @@
 #include "clickabletableview.h"
 
-ClickableTableView::ClickableTableView(QWidget *parent)
-    : QTableView(parent) {
+ClickableTableView::ClickableTableView(QWidget *parent) : QTableView(parent) {
     // 构造函数的实现
     // // 设置背景颜色
     // QPalette palette = this->palette();
@@ -14,9 +13,10 @@ ClickableTableView::ClickableTableView(QWidget *parent)
     // // 设置网格线颜色
     // this->setGridStyle(Qt::SolidLine);
     // QColor gridColor(Qt::darkGray);
-    this->setStyleSheet(QString("QTableView { selection-background-color: blue;}"
-                                "QTableView QTableCornerButton::section { background: transparent; } "
-                                "QHeaderView::section { background-color: gray; color: white; padding-left: 4px; padding-right: 4px; } "));
+    this->setStyleSheet(QString(
+        "QTableView { selection-background-color: blue;}"
+        "QTableView QTableCornerButton::section { background: transparent; } "
+        "QHeaderView::section { background-color: gray; color: white; padding-left: 4px; padding-right: 4px; } "));
 
     // // 设置边框
     // this->setFrameShape(QFrame::Box);
@@ -25,7 +25,7 @@ ClickableTableView::ClickableTableView(QWidget *parent)
     // // 设置单元格内边距
     // this->verticalHeader()->setDefaultSectionSize(30);
     // this->horizontalHeader()->setDefaultSectionSize(100);
-// }
+    // }
 }
 
 void ClickableTableView::mouseReleaseEvent(QMouseEvent *event) {
@@ -49,7 +49,7 @@ void ClickableTableView::mouseReleaseEvent(QMouseEvent *event) {
 }
 
 void ClickableTableView::displayRowData(int row) {
-    QAbstractItemModel* model = this->model();
+    QAbstractItemModel *model = this->model();
     if (model) {
         QString rowData;
         for (int col = 0; col < model->columnCount(); ++col) {

+ 4 - 4
clickabletableview.h

@@ -1,16 +1,16 @@
 #ifndef CLICKABLETABLEVIEW_H
 #define CLICKABLETABLEVIEW_H
 
-#include <QTableView>
-#include <QMouseEvent>
 #include <QDebug>
+#include <QMouseEvent>
+#include <QTableView>
 
 class ClickableTableView : public QTableView {
     Q_OBJECT
-public:
+   public:
     explicit ClickableTableView(QWidget *parent = nullptr);
     void mouseReleaseEvent(QMouseEvent *event) override;
     void displayRowData(int row);
 };
 
-#endif // CLICKABLETABLEVIEW_H
+#endif  // CLICKABLETABLEVIEW_H

+ 5 - 10
countdownwidget.cpp

@@ -1,26 +1,22 @@
 #include "countdownwidget.h"
-CountdownWidget::CountdownWidget(QWidget *parent) : QWidget(parent), m_remainingSeconds(5)
-{
+CountdownWidget::CountdownWidget(QWidget *parent) : QWidget(parent), m_remainingSeconds(5) {
     setWindowFlags(Qt::FramelessWindowHint);
     setAttribute(Qt::WA_TranslucentBackground);
     m_timer = new QTimer(this);
     connect(m_timer, &QTimer::timeout, this, &CountdownWidget::onTimerTimeout);
     m_timer->start(1000);
 }
-CountdownWidget::~CountdownWidget()
-{
+CountdownWidget::~CountdownWidget() {
     if (m_timer->isActive()) {
         m_timer->stop();
     }
 }
-void CountdownWidget::paintEvent(QPaintEvent *event)
-{
+void CountdownWidget::paintEvent(QPaintEvent *event) {
     Q_UNUSED(event);
 
     QPainter painter(this);
     painter.setRenderHint(QPainter::Antialiasing);
 
-
     QBrush brush(Qt::red);
     painter.setBrush(brush);
     painter.drawEllipse(rect());
@@ -36,13 +32,12 @@ void CountdownWidget::paintEvent(QPaintEvent *event)
     }
 }
 
-void CountdownWidget::onTimerTimeout()
-{
+void CountdownWidget::onTimerTimeout() {
     m_remainingSeconds--;
     if (m_remainingSeconds == 0) {
         m_timer->stop();
         close();
-        emit countdownFinished(); // 发出自定义信号
+        emit countdownFinished();  // 发出自定义信号
     }
     update();
 }

+ 9 - 10
countdownwidget.h

@@ -1,29 +1,28 @@
 #ifndef COUNTDOWNWIDGET_H
 #define COUNTDOWNWIDGET_H
 
-#include <QWidget>
-#include <QTimer>
 #include <QPainter>
+#include <QTimer>
+#include <QWidget>
 
-class CountdownWidget : public QWidget
-{
+class CountdownWidget : public QWidget {
     Q_OBJECT
-public:
+   public:
     explicit CountdownWidget(QWidget *parent = nullptr);
     ~CountdownWidget();
 
-protected:
+   protected:
     void paintEvent(QPaintEvent *event) override;
 
-signals:
+   signals:
     void countdownFinished();
 
-private slots:
+   private slots:
     void onTimerTimeout();
 
-private:
+   private:
     QTimer *m_timer;
     int m_remainingSeconds;
 };
 
-#endif // COUNTDOWNWIDGET_H
+#endif  // COUNTDOWNWIDGET_H

+ 6 - 8
databasemanager.cpp

@@ -20,14 +20,12 @@ DatabaseManager::DatabaseManager() : db(QSqlDatabase::addDatabase("QMYSQL")) {
     db.setPassword("123456");
 
     if (!db.open()) {
-        Logger::getInstance().error(QString("Mysql Connected error. host: %1, error: %2")
-                                        .arg(databaseHost, db.lastError().text()));
-        QMessageBox::critical(
-            nullptr, "错误",
-            QString("无法连接数据库, 请联系开发人员。\n 错误: %1").arg(db.lastError().text()));
-
-        throw std::runtime_error("Database connection failed: " +
-                                 db.lastError().text().toStdString());
+        Logger::getInstance().error(
+            QString("Mysql Connected error. host: %1, error: %2").arg(databaseHost, db.lastError().text()));
+        QMessageBox::critical(nullptr, "错误",
+                              QString("无法连接数据库, 请联系开发人员。\n 错误: %1").arg(db.lastError().text()));
+
+        throw std::runtime_error("Database connection failed: " + db.lastError().text().toStdString());
     }
     Logger::getInstance().info(QString("Mysql Connected. host: %1").arg(databaseHost));
 }

+ 2 - 4
des3encryption.cpp

@@ -1,9 +1,7 @@
 #include "des3encryption.h"
-#include <openssl/des.h>
-Des3Encryption::Des3Encryption()
-{
 
-}
+#include <openssl/des.h>
+Des3Encryption::Des3Encryption() {}
 
 QByteArray Des3Encryption::pkcs7Padding(const QByteArray& data, int blockSize) {
     int padding = blockSize - (data.size() % blockSize);

+ 4 - 5
des3encryption.h

@@ -2,12 +2,11 @@
 #define DES3ENCRYPTION_H
 
 #include <QByteArray>
-class Des3Encryption
-{
-public:
+class Des3Encryption {
+   public:
     Des3Encryption();
 
-public:
+   public:
     // PKCS#7 填充函数
     QByteArray pkcs7Padding(const QByteArray& data, int blockSize);
 
@@ -27,4 +26,4 @@ public:
     QByteArray des3Decrypt(const QByteArray& data, const QByteArray& key);
 };
 
-#endif // DES3ENCRYPTION_H
+#endif  // DES3ENCRYPTION_H

+ 11 - 11
detInfo/detdialog.h

@@ -1,31 +1,31 @@
 #ifndef DETDIALOG_H
 #define DETDIALOG_H
-#include <QJsonObject>
-#include <QJsonDocument>
 #include <QDialog>
+#include <QJsonDocument>
+#include <QJsonObject>
 #include <QMessageBox>
 
 namespace Ui {
 class DetDialog;
 }
 
-class DetDialog : public QDialog
-{
+class DetDialog : public QDialog {
     Q_OBJECT
 
-public:
+   public:
     explicit DetDialog(QWidget *parent = nullptr);
     ~DetDialog();
-signals:
+   signals:
     void validateDetNum(const QJsonDocument &jsonDoc);
-private slots:
+   private slots:
     void onComboTypeIndexChanged(int index);
     void validateInput();
-private:
+
+   private:
     void clearFormData();
-private:
-    Ui::DetDialog *ui;
 
+   private:
+    Ui::DetDialog *ui;
 };
 
-#endif // DETDIALOG_H
+#endif  // DETDIALOG_H

+ 2 - 8
detInfo/detinfofactory.cpp

@@ -1,11 +1,5 @@
 #include "detinfofactory.h"
 
-DetInfoFactory::DetInfoFactory()
-{
+DetInfoFactory::DetInfoFactory() {}
 
-}
-
-QWidget *DetInfoFactory::createPage(QWidget *parent) const
-{
-    return new DetInfoPage(parent);
-}
+QWidget *DetInfoFactory::createPage(QWidget *parent) const { return new DetInfoPage(parent); }

+ 1 - 2
detInfo/detinfopage.cpp

@@ -30,8 +30,7 @@ void DetInfoPage::loadDataFromSource(int currentPage, int pageSize, const QStrin
     localUrl.setQuery(query);
     QUrl fullUrl = apiBackendUrl.resolved(localUrl);
     m_httpClient->sendHttpGetRequest(fullUrl);
-    connect(m_httpClient, &HttpClient::httpGetFinished,
-            [this](const QJsonDocument& data) { this->dataTable(data); });
+    connect(m_httpClient, &HttpClient::httpGetFinished, [this](const QJsonDocument& data) { this->dataTable(data); });
 }
 
 void DetInfoPage::PageChanged(int page) {

+ 20 - 23
detInfo/detinfopage.h

@@ -1,56 +1,54 @@
 #ifndef DETINFOPAGE_H
 #define DETINFOPAGE_H
 
-#include <QWidget>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QUrlQuery>
 #include <QEventLoop>
-#include <QStandardItemModel>
 #include <QJsonArray>
-#include <QJsonObject>
 #include <QJsonDocument>
+#include <QJsonObject>
 #include <QLabel>
 #include <QMoveEvent>
-#include "detdialog.h"
-#include "../global.h"
-#include "../PageWidget.h"
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QStandardItemModel>
+#include <QUrlQuery>
+#include <QWidget>
+
 #include "../HttpClient.h"
+#include "../PageWidget.h"
+#include "../global.h"
+#include "detdialog.h"
 
 namespace Ui {
 class DetInfoPage;
 }
 
-class DetInfoPage : public QWidget
-{
+class DetInfoPage : public QWidget {
     Q_OBJECT
 
-public:
+   public:
     explicit DetInfoPage(QWidget *parent = nullptr);
     ~DetInfoPage();
     void insertDet(const QJsonDocument &jsonDoc);
 
-
-private slots:
+   private slots:
     void on_pushButton_clicked();
 
-
-private:
+   private:
     void loadAndRefreshData();
     void PageChanged(int page);
     void onComboBoxIndexChanged(int index);
     void dataTable(const QJsonDocument &jsonDoc);
-    void loadDataFromSource(int currentPage, int pageSize, const QString& equipmentSn="");
+    void loadDataFromSource(int currentPage, int pageSize, const QString &equipmentSn = "");
     QList<QStandardItem *> jsonToItem(const QJsonObject &jsonObj);
     void parseJsonString(const QJsonDocument &jsonDoc);
 
-private:
+   private:
     Ui::DetInfoPage *ui;
     DetDialog *dialog;
     PageWidget *m_pPageWidget;
-    int pageSize;  //每页显示的记录数量
-    int currentPage;      //当前页面
+    int pageSize;     // 每页显示的记录数量
+    int currentPage;  // 当前页面
     int totalCount;
     QString *equipmentSn;
     HttpClient *m_httpClient;
@@ -58,7 +56,6 @@ private:
     QJsonArray dataArray;
     QLabel *loadingLabel;  // 用于显示加载图片的标签
     QPoint lastPos;
-
 };
 
-#endif // DETINFOPAGE_H
+#endif  // DETINFOPAGE_H

+ 2 - 8
equipment/equipmentfactory.cpp

@@ -1,11 +1,5 @@
 #include "equipmentfactory.h"
 
-EquipmentFactory::EquipmentFactory()
-{
+EquipmentFactory::EquipmentFactory() {}
 
-}
-
-QWidget *EquipmentFactory::createPage(QWidget *parent) const
-{
-    return new EquipmentPage(parent);
-}
+QWidget *EquipmentFactory::createPage(QWidget *parent) const { return new EquipmentPage(parent); }

+ 3 - 4
equipment/equipmentfactory.h

@@ -3,11 +3,10 @@
 #include "../PageFactory.h"
 #include "equipmentpage.h"
 
-class EquipmentFactory: public PageFactory
-{
-public:
+class EquipmentFactory : public PageFactory {
+   public:
     EquipmentFactory();
     QWidget* createPage(QWidget* parent) const override;
 };
 
-#endif // EQUIPMENTFACTORY_H
+#endif  // EQUIPMENTFACTORY_H

+ 3 - 7
equipment/equipmentpage.cpp

@@ -36,9 +36,7 @@ void EquipmentPage::loadDataFromSource(int currentPage, int pageSize, const QStr
     QUrl fullUrl = apiBackendUrl.resolved(localUrl);
     m_httpClient->sendHttpGetRequest(fullUrl);
 
-    connect(m_httpClient, &HttpClient::httpGetFinished, [this](const QJsonDocument& data) {
-        this->dataTable(data);
-    });
+    connect(m_httpClient, &HttpClient::httpGetFinished, [this](const QJsonDocument& data) { this->dataTable(data); });
 }
 
 void EquipmentPage::PageChanged(int page) {
@@ -56,8 +54,7 @@ void EquipmentPage::onComboBoxIndexChanged(int index) {
 void EquipmentPage::dataTable(const QJsonDocument& jsonDoc) {
     parseJsonString(jsonDoc);
     model = new QStandardItemModel(this);
-    model->setHorizontalHeaderLabels(
-        {"名称", "设备编号", "设备类型", "设备状态", "在线状态", "创建时间"});
+    model->setHorizontalHeaderLabels({"名称", "设备编号", "设备类型", "设备状态", "在线状态", "创建时间"});
 
     for (const QJsonValue& jsonValue : dataArray) {
         QJsonObject jsonObj = jsonValue.toObject();
@@ -82,8 +79,7 @@ QList<QStandardItem*> EquipmentPage::jsonToItem(const QJsonObject& jsonObj) {
     QString formattedCreatedAt = createdAt.toString("yyyy-MM-dd HH:mm:ss");
     QStandardItem* createdItem = new QStandardItem(formattedCreatedAt);
 
-    return QList<QStandardItem*>()
-           << nameItem << equipItem << typeItem << statusItem << onlineItem << createdItem;
+    return QList<QStandardItem*>() << nameItem << equipItem << typeItem << statusItem << onlineItem << createdItem;
 }
 
 void EquipmentPage::parseJsonString(const QJsonDocument& jsonDoc) {

+ 17 - 18
equipment/equipmentpage.h

@@ -1,49 +1,48 @@
 #ifndef EQUIPMENTPAGE_H
 #define EQUIPMENTPAGE_H
 
-#include <QWidget>
-#include <QStandardItemModel>
 #include <QJsonArray>
-#include <QJsonObject>
 #include <QJsonDocument>
-#include "../buttondelegate.h"
+#include <QJsonObject>
+#include <QStandardItemModel>
+#include <QWidget>
+
 #include "../HttpClient.h"
 #include "../PageWidget.h"
+#include "../buttondelegate.h"
 
 namespace Ui {
 class EquipmentPage;
 }
 
-class EquipmentPage : public QWidget
-{
+class EquipmentPage : public QWidget {
     Q_OBJECT
 
-public:
+   public:
     explicit EquipmentPage(QWidget *parent = nullptr);
     ~EquipmentPage();
-private slots:
+   private slots:
     void on_btnSearch_clicked();
 
-private:
-    void parseJsonString(const QJsonDocument& jsonDoc);
-    void dataTable( const QJsonDocument& jsonDoc);
+   private:
+    void parseJsonString(const QJsonDocument &jsonDoc);
+    void dataTable(const QJsonDocument &jsonDoc);
     void loadAndRefreshData();
-    void loadDataFromSource(int currentPage, int pageSize,const QString& equipmentSn="");
+    void loadDataFromSource(int currentPage, int pageSize, const QString &equipmentSn = "");
     void PageChanged(int page);
     void onComboBoxIndexChanged(int index);
-    QList<QStandardItem*> jsonToItem(const QJsonObject& jsonObj);
+    QList<QStandardItem *> jsonToItem(const QJsonObject &jsonObj);
 
-private:
+   private:
     Ui::EquipmentPage *ui;
     PageWidget *m_pPageWidget;
-    int pageSize;  //每页显示的记录数量
-    int currentPage;      //当前页面
+    int pageSize;     // 每页显示的记录数量
+    int currentPage;  // 当前页面
     int totalCount;
     QString *equipmentSn;
     HttpClient *m_httpClient;
     QStandardItemModel *model;
     QJsonArray dataArray;
-
 };
 
-#endif // EQUIPMENTPAGE_H
+#endif  // EQUIPMENTPAGE_H

+ 2 - 8
equipmentfactory.cpp

@@ -1,11 +1,5 @@
 #include "equipmentfactory.h"
 
-EquipmentFactory::EquipmentFactory()
-{
+EquipmentFactory::EquipmentFactory() {}
 
-}
-
-QWidget *EquipmentFactory::createPage(QWidget *parent) const
-{
-    return new EquipmentPage(parent);
-}
+QWidget *EquipmentFactory::createPage(QWidget *parent) const { return new EquipmentPage(parent); }

+ 3 - 4
equipmentfactory.h

@@ -3,11 +3,10 @@
 #include "PageFactory.h"
 #include "equipmentpage.h"
 
-class EquipmentFactory: public PageFactory
-{
-public:
+class EquipmentFactory : public PageFactory {
+   public:
     EquipmentFactory();
     QWidget* createPage(QWidget* parent) const override;
 };
 
-#endif // EQUIPMENTFACTORY_H
+#endif  // EQUIPMENTFACTORY_H

+ 33 - 56
equipmentpage.cpp

@@ -1,15 +1,14 @@
 #include "equipmentpage.h"
-#include "ui_equipmentpage.h"
+
 #include "../global.h"
+#include "ui_equipmentpage.h"
 
-EquipmentPage::EquipmentPage(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::EquipmentPage)
-{
+EquipmentPage::EquipmentPage(QWidget* parent) : QWidget(parent), ui(new Ui::EquipmentPage) {
     ui->setupUi(this);
     m_pPageWidget = new PageWidget;
     connect(m_pPageWidget, &PageWidget::currentPageChanged, this, &EquipmentPage::PageChanged);
-    connect(m_pPageWidget->getComboBox(), QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EquipmentPage::onComboBoxIndexChanged);
+    connect(m_pPageWidget->getComboBox(), QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+            &EquipmentPage::onComboBoxIndexChanged);
     m_httpClient = new HttpClient(this);
     pageSize = 10;
     currentPage = 1;
@@ -17,13 +16,9 @@ EquipmentPage::EquipmentPage(QWidget *parent) :
     loadAndRefreshData();
 }
 
+void EquipmentPage::loadAndRefreshData() { loadDataFromSource(currentPage, pageSize); }
 
-void EquipmentPage::loadAndRefreshData() {
-    loadDataFromSource(currentPage,pageSize);
-}
-
-void EquipmentPage::loadDataFromSource(int currentPage,int pageSize)
-{
+void EquipmentPage::loadDataFromSource(int currentPage, int pageSize) {
     QUrl localUrl("equipment/pc");
 
     QUrlQuery query;
@@ -38,34 +33,26 @@ void EquipmentPage::loadDataFromSource(int currentPage,int pageSize)
     QUrl fullUrl = g_url.resolved(localUrl);
     m_httpClient->sendHttpGetRequest(fullUrl);
     // // 连接信号到槽,以便处理请求结果或错误
-    connect(m_httpClient, &HttpClient::httpGetFinished, [this](const QJsonDocument &data) {
-        this->dataTable(data);
-
-    });
+    connect(m_httpClient, &HttpClient::httpGetFinished, [this](const QJsonDocument& data) { this->dataTable(data); });
 }
 
-void EquipmentPage::PageChanged(int page)
-{
+void EquipmentPage::PageChanged(int page) {
     currentPage = page;
-    loadDataFromSource(currentPage,pageSize);
+    loadDataFromSource(currentPage, pageSize);
 }
 
-
 void EquipmentPage::onComboBoxIndexChanged(int index) {
     // 获取当前选中的文本
-     QVariant variant = m_pPageWidget->getComboBox()->itemData(index);
-     int value = variant.toInt();
-     pageSize = value;
-    loadDataFromSource(currentPage,pageSize);
-
+    QVariant variant = m_pPageWidget->getComboBox()->itemData(index);
+    int value = variant.toInt();
+    pageSize = value;
+    loadDataFromSource(currentPage, pageSize);
 }
 
-
-void EquipmentPage::dataTable(const QJsonDocument &jsonDoc)
-{
+void EquipmentPage::dataTable(const QJsonDocument& jsonDoc) {
     parseJsonString(jsonDoc);
     model = new QStandardItemModel(this);
-    model->setHorizontalHeaderLabels({"名称", "设备编号", "设备类型","设备状态","在线状态","创建时间"});
+    model->setHorizontalHeaderLabels({"名称", "设备编号", "设备类型", "设备状态", "在线状态", "创建时间"});
 
     // 遍历 JSON 数组,将其转换为 QStandardItemModel
     for (const QJsonValue& jsonValue : dataArray) {
@@ -78,42 +65,32 @@ void EquipmentPage::dataTable(const QJsonDocument &jsonDoc)
     ui->tableView->setModel(model);
     ui->tableView->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
     ui->tableView->setAlternatingRowColors(true);  // 启用交替行颜色
-
 }
 
-QList<QStandardItem *> EquipmentPage::jsonToItem(const QJsonObject &jsonObj)
-{
-
+QList<QStandardItem*> EquipmentPage::jsonToItem(const QJsonObject& jsonObj) {
     // 创建一个 QStandardItem
-      QStandardItem* nameItem = new QStandardItem(jsonObj["name"].toString());
-      nameItem->setTextAlignment(Qt::AlignCenter);
-      QStandardItem* equipItem = new QStandardItem(jsonObj["equipmentSn"].toString());
-      QStandardItem* typeItem = new QStandardItem(jsonObj["equipmentTypeName"].toString());
-      QStandardItem* statusItem = new QStandardItem(jsonObj["statusName"].toString());
-      QStandardItem* onlineItem = new QStandardItem(jsonObj["onlineName"].toString());
-      // 处理 createdAt 字段
-      QString createdAtStr = jsonObj["createdAt"].toString();
-      QDateTime createdAt = QDateTime::fromString(createdAtStr, Qt::ISODateWithMs);
-      QString formattedCreatedAt = createdAt.toString("yyyy-MM-dd HH:mm:ss");
-      QStandardItem* createdItem = new QStandardItem(formattedCreatedAt);
-
-      return QList<QStandardItem*>() << nameItem << equipItem << typeItem<<statusItem<<onlineItem<<createdItem;
-
+    QStandardItem* nameItem = new QStandardItem(jsonObj["name"].toString());
+    nameItem->setTextAlignment(Qt::AlignCenter);
+    QStandardItem* equipItem = new QStandardItem(jsonObj["equipmentSn"].toString());
+    QStandardItem* typeItem = new QStandardItem(jsonObj["equipmentTypeName"].toString());
+    QStandardItem* statusItem = new QStandardItem(jsonObj["statusName"].toString());
+    QStandardItem* onlineItem = new QStandardItem(jsonObj["onlineName"].toString());
+    // 处理 createdAt 字段
+    QString createdAtStr = jsonObj["createdAt"].toString();
+    QDateTime createdAt = QDateTime::fromString(createdAtStr, Qt::ISODateWithMs);
+    QString formattedCreatedAt = createdAt.toString("yyyy-MM-dd HH:mm:ss");
+    QStandardItem* createdItem = new QStandardItem(formattedCreatedAt);
+
+    return QList<QStandardItem*>() << nameItem << equipItem << typeItem << statusItem << onlineItem << createdItem;
 }
 
-
-void EquipmentPage::parseJsonString(const QJsonDocument &jsonDoc)
-{
+void EquipmentPage::parseJsonString(const QJsonDocument& jsonDoc) {
     QJsonObject jsonObj = jsonDoc.object();
     QJsonObject dataObj = jsonObj["data"].toObject();
     dataArray = dataObj["list"].toArray();
     totalCount = dataObj["count"].toInt();
-    m_pPageWidget->setMaxPage(ceil(static_cast<double>(totalCount)/pageSize));
+    m_pPageWidget->setMaxPage(ceil(static_cast<double>(totalCount) / pageSize));
     // qDebug()<<"Row data"<<dataObj["count"].toInt();
 }
 
-
-EquipmentPage::~EquipmentPage()
-{
-    delete ui;
-}
+EquipmentPage::~EquipmentPage() { delete ui; }

+ 33 - 55
fireWidget/firingwidget.cpp

@@ -51,8 +51,7 @@ firingWidget::firingWidget(const int &row, const bool &select, const QString &uu
     mqttThread->setConnectionInfo("114.55.233.194", 1883, "hxgc", "hxgc123456", "P" + uuid, topics);
     connect(mqttThread, &MqttThread::mqttConnected, this, &firingWidget::onMqttConnected);
     mqttThread->start();
-    connect(mqttThread, &MqttThread::projectMqttMessageReceived, this,
-            &firingWidget::handleProjectFiringMqttMessage);
+    connect(mqttThread, &MqttThread::projectMqttMessageReceived, this, &firingWidget::handleProjectFiringMqttMessage);
     connect(this, &firingWidget::lastStageChanged, this, &firingWidget::handleFiringStageChanged);
     connect(this, &firingWidget::updateData, this, &firingWidget::onBlastSuccess);
     startBlasting();
@@ -80,15 +79,13 @@ void firingWidget::startBlasting() {
     bool isReceivedMessage = false;
     connect(mqttThread, &MqttThread::projectMqttMessageReceived, this,
             [connectionCheckTimer](const QByteArray &message) {
-                qDebug() << ANSI_COLOR_GREEN
-                         << "Received connection confirmation message from MQTT server."
+                qDebug() << ANSI_COLOR_GREEN << "Received connection confirmation message from MQTT server."
                          << ANSI_COLOR_RESET;
                 connectionCheckTimer->stop();
             });
     connect(connectionCheckTimer, &QTimer::timeout, this, [this]() {
         if (m_isMqttConnected) {
-            QMessageBox::critical(nullptr, "起爆错误",
-                                  "未收到爆破器的连接确认消息,请检查爆破器是否在线");
+            QMessageBox::critical(nullptr, "起爆错误", "未收到爆破器的连接确认消息,请检查爆破器是否在线");
             Logger::getInstance().error("启动爆破后,未收到爆破器的连接确认消息");
             cancelBlasting();
         } else {
@@ -197,15 +194,14 @@ bool firingWidget::uploadToDanLing(const QJsonObject &jsonObj) {
     return true;
 }
 
-void firingWidget::handleProjectFiringMqttMessage(const QByteArray &message,
-                                                  const QMqttTopicName &topic) {
+void firingWidget::handleProjectFiringMqttMessage(const QByteArray &message, const QMqttTopicName &topic) {
     QString msgText = QString("Topic: %1, Message: %2").arg(topic.name(), QString(message));
     QTextEdit *textEdit = ui->scrollAreaWidgetContents->findChild<QTextEdit *>("textEdit");
     if (textEdit) {
         textEdit->append(msgText);
     }
-    qDebug() << ANSI_COLOR_GREEN << "Received message on topic:" << topic.name()
-             << ", Message:" << QString(message) << ANSI_COLOR_RESET;
+    qDebug() << ANSI_COLOR_GREEN << "Received message on topic:" << topic.name() << ", Message:" << QString(message)
+             << ANSI_COLOR_RESET;
     int stage = 0;
     QJsonDocument jsonDoc = QJsonDocument::fromJson(message);
     if (!jsonDoc.isNull() && jsonDoc.isObject()) {
@@ -216,12 +212,11 @@ void firingWidget::handleProjectFiringMqttMessage(const QByteArray &message,
                 QJsonObject dataObject = jsonObj["data"].toObject();
                 int status = dataObject["status"].toInt();
                 if (ErrorBlastStatusList::isErrorStatus(status)) {
-                    Logger::getInstance().error(
-                        QString("爆破器返回异常. 工程uuid: %1; 错误code: %2")
-                            .arg(m_uuid, ErrorBlastStatusList::getErrorMessage(status)));
-                    QMessageBox::critical(nullptr, "爆破器报错",
-                                          QString("错误错误信息: %1")
-                                              .arg(ErrorBlastStatusList::getErrorMessage(status)));
+                    Logger::getInstance().error(QString("爆破器返回异常. 工程uuid: %1; 错误code: %2")
+                                                    .arg(m_uuid, ErrorBlastStatusList::getErrorMessage(status)));
+                    QMessageBox::critical(
+                        nullptr, "爆破器报错",
+                        QString("错误错误信息: %1").arg(ErrorBlastStatusList::getErrorMessage(status)));
                     cancelBlasting();
                     return;
                 }
@@ -312,8 +307,7 @@ void firingWidget::onCountdownFinished(const QString &topic, const QString &mess
 }
 
 void firingWidget::onMqttConnected() {
-    Logger::getInstance().info(
-        QString("Project(%1) firing MQTT connected successfully.").arg(m_uuid));
+    Logger::getInstance().info(QString("Project(%1) firing MQTT connected successfully.").arg(m_uuid));
     m_isMqttConnected = true;
 }
 
@@ -322,8 +316,7 @@ void firingWidget::onButtonPressedReceived(const QString &topic, const QString &
     // 调用发送数据的方法
     bool success = serialTool->sendData(data);
     if (!success) {
-        Logger::getInstance().error(
-            QString("onButtonPressedReceived: Failed to send data: %1").arg(data));
+        Logger::getInstance().error(QString("onButtonPressedReceived: Failed to send data: %1").arg(data));
         return;
     }
     emit countdown(m_uuid, topic, message);
@@ -396,9 +389,8 @@ void firingWidget::handleFiringStageChanged(int newStage) {
                 }
                 connection = connect(serialTool, &SerialTool::enableButtonReceived,
                                      [this]() { emit updateBlastStatus(10, m_row); });
-                connectionPress = connect(
-                    serialTool, &SerialTool::buttonPressedReceived,
-                    [this, topic, message]() { this->onButtonPressedReceived(topic, message); });
+                connectionPress = connect(serialTool, &SerialTool::buttonPressedReceived,
+                                          [this, topic, message]() { this->onButtonPressedReceived(topic, message); });
 
             } else {
                 qDebug() << "serialTool Not fond.";
@@ -430,8 +422,7 @@ void firingWidget::on_sendTest_4_clicked() {}
 void firingWidget::testOnBlastSuccess(const QJsonObject &jsonObj) { onBlastSuccess(jsonObj); }
 // 处理爆破成功,安全验证装置通过MQTT传回的数据
 void firingWidget::onBlastSuccess(const QJsonObject &jsonObj) {
-    Logger::getInstance("blastRecord.log")
-        .info(QJsonDocument(jsonObj).toJson(QJsonDocument::Indented));
+    Logger::getInstance("blastRecord.log").info(QJsonDocument(jsonObj).toJson(QJsonDocument::Indented));
     blast_uuid = QUuid::createUuid().toString(QUuid::WithoutBraces).remove(QRegularExpression("-"));
 
     saveAndUploadRecord(jsonObj);
@@ -440,8 +431,7 @@ void firingWidget::onBlastSuccess(const QJsonObject &jsonObj) {
 void firingWidget::saveAndUploadRecord(const QJsonObject &jsonObj) {
     QSqlDatabase db = DatabaseManager::getInstance().getDatabase();
     if (!db.transaction()) {
-        Logger::getInstance().critical(
-            QString("Failed to start DB transaction. Error: %1").arg(db.lastError().text()));
+        Logger::getInstance().critical(QString("Failed to start DB transaction. Error: %1").arg(db.lastError().text()));
         return;
     }
 
@@ -464,26 +454,22 @@ void firingWidget::saveAndUploadRecord(const QJsonObject &jsonObj) {
             blastEquipmentRecords.append(hBlastEquipmentRecord);
         }
 
-        QList<HBlastRecordDet *> hBlastRecordDets =
-            recordBlastProjectDets(blastRecord->getUuid(), hBlastEquipmentRecord->getUuid(),
-                                   equipmentJsonObject["dets"].toArray());
+        QList<HBlastRecordDet *> hBlastRecordDets = recordBlastProjectDets(
+            blastRecord->getUuid(), hBlastEquipmentRecord->getUuid(), equipmentJsonObject["dets"].toArray());
         hBlastEquipmentRecord->setDetRecords(hBlastRecordDets);
     }
 
     blastRecord->setEquipmentRecords(blastEquipmentRecords);
 
     if (db.commit()) {
-        Logger::getInstance().info(
-            QString("Transaction committed successfully. blast_uuid: %1").arg(blast_uuid));
+        Logger::getInstance().info(QString("Transaction committed successfully. blast_uuid: %1").arg(blast_uuid));
     } else {
-        Logger::getInstance().error(
-            QString("Failed to commit transaction: %1. try to rollback: %2")
-                .arg(db.lastError().text(), db.rollback() ? "success" : "failed"));
+        Logger::getInstance().error(QString("Failed to commit transaction: %1. try to rollback: %2")
+                                        .arg(db.lastError().text(), db.rollback() ? "success" : "failed"));
         return;
     }
 
-    qDebug() << "Transaction committed successfully for blast record with uuid:"
-             << blastRecord->getUuid();
+    qDebug() << "Transaction committed successfully for blast record with uuid:" << blastRecord->getUuid();
     uploadBlastRecordToServer(blastRecord);
 }
 
@@ -492,13 +478,11 @@ void firingWidget::uploadBlastRecordToServer(HBlastRecord *blastRecord) {
         return;
     }
     if (!backendAPIManager::uploadBlastProjectFull(blastRecord->ToJson())) {
-        Logger::getInstance().error(
-            QString("Failed to upload blast project. data: %1")
-                .arg(QJsonDocument(blastRecord->ToJson()).toJson(QJsonDocument::Indented)));
+        Logger::getInstance().error(QString("Failed to upload blast project. data: %1")
+                                        .arg(QJsonDocument(blastRecord->ToJson()).toJson(QJsonDocument::Indented)));
     }
     Logger::getInstance().info(
-        QString("Blast project uploaded to server successfully. blast_uuid: %1")
-            .arg(blastRecord->getUuid()));
+        QString("Blast project uploaded to server successfully. blast_uuid: %1").arg(blastRecord->getUuid()));
 }
 
 HBlastRecord *firingWidget::recordBlastProject(const QJsonObject &jsonObj) {
@@ -520,8 +504,7 @@ HBlastRecord *firingWidget::recordBlastProject(const QJsonObject &jsonObj) {
 
     record->setRegDetCount(jsonObj["reg_deto_count"].toString().toInt());
     record->setErrorDetCount(jsonObj["error_deto_count"].toString().toInt());
-    QDateTime blastTime =
-        QDateTime::fromString(jsonObj["blast_time"].toString(), "yyyy-MM-dd hh:mm:ss");
+    QDateTime blastTime = QDateTime::fromString(jsonObj["blast_time"].toString(), "yyyy-MM-dd hh:mm:ss");
     record->setBlastAt(blastTime);
     record->setCreatedAt(QDateTime::currentDateTime());
     record->setUuid(blast_uuid);
@@ -536,8 +519,7 @@ HBlastRecord *firingWidget::recordBlastProject(const QJsonObject &jsonObj) {
     }
 }
 
-HBlastEquipmentRecord *firingWidget::recordBlastEquipment(const QString blastProjectUuid,
-                                                          const QJsonObject &regObj) {
+HBlastEquipmentRecord *firingWidget::recordBlastEquipment(const QString blastProjectUuid, const QJsonObject &regObj) {
     HBlastEquipmentRecord *recordReg = new HBlastEquipmentRecord();
     reg_uuid = QUuid::createUuid().toString(QUuid::WithoutBraces).remove(QRegularExpression("-"));
     recordReg->setUuid(reg_uuid);
@@ -556,16 +538,14 @@ HBlastEquipmentRecord *firingWidget::recordBlastEquipment(const QString blastPro
     recordReg->setCreatedAt(QDateTime::currentDateTime());
 
     if (!daoReg.saveHBlastRegRecord(*recordReg)) {
-        Logger::getInstance().error(
-            QString("Failed to save HBlastRegRecord: %1").arg(recordReg->getEquipSn()));
+        Logger::getInstance().error(QString("Failed to save HBlastRegRecord: %1").arg(recordReg->getEquipSn()));
         delete recordReg;
         return nullptr;
     }
     return recordReg;
 }
 
-QList<HBlastRecordDet *> firingWidget::recordBlastProjectDets(const QString projectUuid,
-                                                              const QString equipmentUuid,
+QList<HBlastRecordDet *> firingWidget::recordBlastProjectDets(const QString projectUuid, const QString equipmentUuid,
                                                               const QJsonArray detsArray) {
     QList<HBlastRecordDet *> recordDets;
 
@@ -574,8 +554,7 @@ QList<HBlastRecordDet *> firingWidget::recordBlastProjectDets(const QString proj
         HBlastRecordDet *recordDet = new HBlastRecordDet();
 
         recordDet->setId(0);
-        recordDet->setUuid(
-            QUuid::createUuid().toString(QUuid::WithoutBraces).remove(QRegularExpression("-")));
+        recordDet->setUuid(QUuid::createUuid().toString(QUuid::WithoutBraces).remove(QRegularExpression("-")));
         recordDet->setOutCode(detObj["out_code"].toString());
         recordDet->setInnerCode(detObj["in_code"].toString());
         recordDet->setUid(detObj["uid"].toString());
@@ -590,9 +569,8 @@ QList<HBlastRecordDet *> firingWidget::recordBlastProjectDets(const QString proj
         if (daoDet.addHBlastRecordDet(*recordDet)) {
             recordDets.append(recordDet);
         } else {
-            Logger::getInstance().error(
-                QString("Failed to insert record det. data %1")
-                    .arg(QJsonDocument(recordDet->ToJson()).toJson(QJsonDocument::Compact)));
+            Logger::getInstance().error(QString("Failed to insert record det. data %1")
+                                            .arg(QJsonDocument(recordDet->ToJson()).toJson(QJsonDocument::Compact)));
             delete recordDet;
             continue;
         }

+ 3 - 6
fireWidget/firingwidget.h

@@ -55,8 +55,7 @@ class firingWidget : public QWidget {
     Q_OBJECT
 
    public:
-    explicit firingWidget(const int &row, const bool &select, const QString &uuid = "",
-                          QWidget *parent = nullptr);
+    explicit firingWidget(const int &row, const bool &select, const QString &uuid = "", QWidget *parent = nullptr);
     ~firingWidget();
     void cancelBlasting();
     void testOnBlastSuccess(const QJsonObject &data);
@@ -91,10 +90,8 @@ class firingWidget : public QWidget {
    private:
     void uploadBlastRecordToServer(HBlastRecord *blastRecord);
     HBlastRecord *recordBlastProject(const QJsonObject &jsonObj);
-    HBlastEquipmentRecord *recordBlastEquipment(const QString blastProjectUUID,
-                                                const QJsonObject &regObj);
-    QList<HBlastRecordDet *> recordBlastProjectDets(const QString projectUUID,
-                                                    const QString equipmentUUID,
+    HBlastEquipmentRecord *recordBlastEquipment(const QString blastProjectUUID, const QJsonObject &regObj);
+    QList<HBlastRecordDet *> recordBlastProjectDets(const QString projectUUID, const QString equipmentUUID,
                                                     const QJsonArray regsArray);
     bool uploadToDanLing(const QJsonObject &jsonObj);
     void saveAndUploadRecord(const QJsonObject &jsonObj);

+ 21 - 41
fireWidget/navprogress.cpp

@@ -1,11 +1,10 @@
 #include "navprogress.h"
 
-NavProgress::NavProgress(QWidget *parent) : QWidget(parent), navStyle(NavStyle_JD), maxStep(3), state(0)  {
-
+NavProgress::NavProgress(QWidget *parent) : QWidget(parent), navStyle(NavStyle_JD), maxStep(3), state(0) {
     background = Qt::gray;
     foreground = Qt::white;
     firstCircleGreen = false;
-    firstCircleBlinking =false;
+    firstCircleBlinking = false;
     secondCircleGreen = false;
     secondCircleBlinking = false;
     thridCircleGreen = false;
@@ -15,7 +14,7 @@ NavProgress::NavProgress(QWidget *parent) : QWidget(parent), navStyle(NavStyle_J
     connect(blinkTimer, &QTimer::timeout, this, &NavProgress::toggleBlinkColors);
     blinkColor = Qt::red;
     secondBlinkColor = Qt::red;
-    qDebug()<<"width"<<this->width();
+    qDebug() << "width" << this->width();
 }
 void NavProgress::setNavStyle(NavStyle style) {
     navStyle = style;
@@ -27,13 +26,11 @@ void NavProgress::setMaxStep(int step) {
     update();
 }
 
-
-void NavProgress::setTopInfo(const QVector<QString>& info) {
+void NavProgress::setTopInfo(const QVector<QString> &info) {
     topInfo = info;
     update();
 }
 
-
 void NavProgress::setFirstCircleGreen(bool green) {
     firstCircleGreen = green;
     update();
@@ -49,8 +46,6 @@ void NavProgress::setFirstCircleBlinking(bool blinking) {
     }
 }
 
-
-
 QVector<QColor> NavProgress::getCircleColors() {
     QVector<QColor> colors;
     for (int i = 0; i < maxStep; i++) {
@@ -64,20 +59,16 @@ QVector<QColor> NavProgress::getCircleColors() {
 }
 
 void NavProgress::toggleBlinkColors() {
-
-    blinkColor = (blinkColor == Qt::red)? Qt::gray : Qt::red;
+    blinkColor = (blinkColor == Qt::red) ? Qt::gray : Qt::red;
     if (secondCircleBlinking) {
-
-        secondBlinkColor = (secondBlinkColor == Qt::red)? Qt::gray : Qt::red;
+        secondBlinkColor = (secondBlinkColor == Qt::red) ? Qt::gray : Qt::red;
     }
     if (thridCircleBlinking) {
-
-        secondBlinkColor = (secondBlinkColor == Qt::red)? Qt::gray : Qt::red;
+        secondBlinkColor = (secondBlinkColor == Qt::red) ? Qt::gray : Qt::red;
     }
     update();
 }
 
-
 void NavProgress::setState(int newState) {
     state = newState;
     switch (state) {
@@ -148,24 +139,19 @@ void NavProgress::setState(int newState) {
 }
 
 void NavProgress::paintEvent(QPaintEvent *) {
-
     QPainter painter(this);
     painter.setRenderHints(QPainter::Antialiasing | QPainter::TextAntialiasing);
 
-
     if (navStyle == NavStyle_JD) {
-
         drawBg_JD(&painter);
 
         drawText_JD(&painter);
-
     }
 }
 
 void NavProgress::drawBg_JD(QPainter *painter) {
     painter->save();
 
-
     int width = this->width() / maxStep;
     int height = this->height() / 2;
     int radius = height / 4;
@@ -180,37 +166,34 @@ void NavProgress::drawBg_JD(QPainter *painter) {
     for (int i = 0; i < maxStep - 1; i++) {
         if (i == 0 && firstCircleGreen) {
             pen.setColor(Qt::green);
-        }else if(i == 1 && secondCircleGreen){
+        } else if (i == 1 && secondCircleGreen) {
             pen.setColor(Qt::green);
-        }else {
+        } else {
             pen.setColor(background);
         }
         painter->setPen(pen);
         painter->setBrush(Qt::NoBrush);
-        painter->drawLine(QPoint(initX+ radius + radius , initY), QPoint(initX + width - (radius + radius), initY));
+        painter->drawLine(QPoint(initX + radius + radius, initY), QPoint(initX + width - (radius + radius), initY));
         initX += width;
     }
 
-
     initX = width / 2;
     painter->setPen(Qt::NoPen);
 
     for (int i = 0; i < maxStep; i++) {
-
         if (i == 0 && firstCircleGreen) {
             painter->setBrush(Qt::green);
         } else if (i == 0 && firstCircleBlinking) {
             painter->setBrush(blinkColor);
         } else if (i == 1 && secondCircleBlinking) {
             painter->setBrush(secondBlinkColor);
-        }  else if (i == 1 && secondCircleGreen) {
+        } else if (i == 1 && secondCircleGreen) {
             painter->setBrush(Qt::green);
-        }else if (i == 2 && thridCircleBlinking) {
+        } else if (i == 2 && thridCircleBlinking) {
             painter->setBrush(secondBlinkColor);
-        }else if (i == 2 && thridCircleGreen) {
+        } else if (i == 2 && thridCircleGreen) {
             painter->setBrush(Qt::green);
-        }
-        else {
+        } else {
             painter->setBrush(background);
         }
         painter->drawEllipse(QPoint(initX, initY), radius, radius);
@@ -224,23 +207,21 @@ void NavProgress::drawBg_JD(QPainter *painter) {
         if (i == 0 && firstCircleBlinking) {
             outerPen.setColor(blinkColor);
         } else if (i == 0 && firstCircleGreen) {
-            outerPen.setColor(Qt::green); // 第一个空心圆常亮绿色
+            outerPen.setColor(Qt::green);  // 第一个空心圆常亮绿色
         } else if (i == 1 && secondCircleBlinking) {
             outerPen.setColor(secondBlinkColor);
         } else if (i == 1 && secondCircleGreen) {
             outerPen.setColor(Qt::green);
-        }
-        else if (i == 2 && thridCircleBlinking) {
+        } else if (i == 2 && thridCircleBlinking) {
             outerPen.setColor(secondBlinkColor);
-        }else if (i == 2 && thridCircleGreen) {
+        } else if (i == 2 && thridCircleGreen) {
             outerPen.setColor(Qt::green);
-        }
-        else {
+        } else {
             outerPen.setColor(background);
         }
         painter->setPen(outerPen);
         painter->setBrush(Qt::NoBrush);
-        int outerRadius = radius + 5; // 外层圆半径比内层圆大 5,可按需调整
+        int outerRadius = radius + 5;  // 外层圆半径比内层圆大 5,可按需调整
         painter->drawEllipse(QPoint(initX, initY), outerRadius, outerRadius);
         initX += width;
     }
@@ -265,14 +246,14 @@ void NavProgress::drawText_JD(QPainter *painter) {
     int width = this->width() / maxStep;
     int height = this->height() / 2;
     int initX = 0;
-    int initY = height * 1 /2 +10;
+    int initY = height * 1 / 2 + 10;
     painter->save();
     QFont font;
     font.setPixelSize(height / 4);
     painter->setFont(font);
     for (int i = 0; i < maxStep; i++) {
         if (i == 0 && firstCircleGreen) {
-            painter->setPen(Qt::green); // 第一个文字为绿色
+            painter->setPen(Qt::green);  // 第一个文字为绿色
         } else {
             painter->setPen(background);
         }
@@ -283,4 +264,3 @@ void NavProgress::drawText_JD(QPainter *painter) {
     }
     painter->restore();
 }
-

+ 13 - 15
fireWidget/navprogress.h

@@ -1,20 +1,18 @@
 #ifndef NAVPROGRESS_H
 #define NAVPROGRESS_H
 
-
-#include <QWidget>
+#include <QApplication>
+#include <QDebug>
+#include <QFont>
 #include <QPainter>
 #include <QPen>
-#include <QFont>
+#include <QPushButton>
 #include <QRect>
 #include <QString>
-#include <QVector>
-#include <QVBoxLayout>
-#include <QPushButton>
-#include <QApplication>
-#include <QDebug>
 #include <QTimer>
-
+#include <QVBoxLayout>
+#include <QVector>
+#include <QWidget>
 
 // 定义导航样式枚举
 enum NavStyle {
@@ -23,7 +21,7 @@ enum NavStyle {
 
 class NavProgress : public QWidget {
     Q_OBJECT
-public:
+   public:
     NavProgress(QWidget *parent = nullptr);
 
     // 设置导航样式
@@ -33,7 +31,7 @@ public:
     void setMaxStep(int step);
 
     // 设置顶部信息
-    void setTopInfo(const QVector<QString>& info);
+    void setTopInfo(const QVector<QString> &info);
 
     // 设置第一个圆为绿色
     void setFirstCircleGreen(bool green);
@@ -46,7 +44,7 @@ public:
     // 设置状态
     void setState(int newState);
 
-protected:
+   protected:
     void paintEvent(QPaintEvent *) override;
     void drawBg_JD(QPainter *painter);
     void drawText_JD(QPainter *painter);
@@ -54,10 +52,10 @@ protected:
     // void drawCurrentBg_JD(QPainter *painter);
     // void drawCurrentText_JD(QPainter *painter);
 
-private slots:
+   private slots:
     void toggleBlinkColors();
 
-private:
+   private:
     NavStyle navStyle;
     int maxStep;
     int state;
@@ -75,4 +73,4 @@ private:
     QTimer *blinkTimer;
 };
 
-#endif // NAVPROGRESS_H
+#endif  // NAVPROGRESS_H

+ 3 - 5
hblastrecorddao.h

@@ -1,11 +1,9 @@
 #ifndef HBLASTRECORDDAO_H
 #define HBLASTRECORDDAO_H
 
-
-class HBlastRecordDao
-{
-public:
+class HBlastRecordDao {
+   public:
     HBlastRecordDao();
 };
 
-#endif // HBLASTRECORDDAO_H
+#endif  // HBLASTRECORDDAO_H

+ 44 - 175
hproject.cpp

@@ -1,224 +1,93 @@
 #include "hproject.h"
 
-HProject::HProject(QObject *parent) : QObject(parent),
-    id(0),
-    createBy(0),
-    updateBy(0)
-{
-}
+HProject::HProject(QObject *parent) : QObject(parent), id(0), createBy(0), updateBy(0) {}
 
 // Getter and Setter implementations
-qint64 HProject::getId() const
-{
-    return id;
-}
+qint64 HProject::getId() const { return id; }
 
-void HProject::setId(qint64 newId)
-{
-    id = newId;
-}
+void HProject::setId(qint64 newId) { id = newId; }
 
-QString HProject::getUuid() const
-{
-    return uuid;
-}
+QString HProject::getUuid() const { return uuid; }
 
-void HProject::setUuid(const QString &newUuid)
-{
-    uuid = newUuid;
-}
+void HProject::setUuid(const QString &newUuid) { uuid = newUuid; }
 
-QString HProject::getName() const
-{
-    return name;
-}
+QString HProject::getName() const { return name; }
 
-void HProject::setName(const QString &newName)
-{
-    name = newName;
-}
+void HProject::setName(const QString &newName) { name = newName; }
 
-QString HProject::getCompanyCode() const
-{
-    return companyCode;
-}
+QString HProject::getCompanyCode() const { return companyCode; }
 
-void HProject::setCompanyCode(const QString &newCompanyCode)
-{
-    companyCode = newCompanyCode;
-}
+void HProject::setCompanyCode(const QString &newCompanyCode) { companyCode = newCompanyCode; }
 
-QString HProject::getHtid() const
-{
-    return htid;
-}
+QString HProject::getHtid() const { return htid; }
 
-void HProject::setHtid(const QString &newHtid)
-{
-    htid = newHtid;
-}
+void HProject::setHtid(const QString &newHtid) { htid = newHtid; }
 
-QString HProject::getXmbh() const
-{
-    return xmbh;
-}
+QString HProject::getXmbh() const { return xmbh; }
 
-void HProject::setXmbh(const QString &newXmbh)
-{
-    xmbh = newXmbh;
-}
+void HProject::setXmbh(const QString &newXmbh) { xmbh = newXmbh; }
 
-QString HProject::getOperatorName() const
-{
-    return operatorName;
-}
+QString HProject::getOperatorName() const { return operatorName; }
 
-void HProject::setOperatorName(const QString &newOperatorName)
-{
-    operatorName = newOperatorName;
-}
+void HProject::setOperatorName(const QString &newOperatorName) { operatorName = newOperatorName; }
 
-QString HProject::getOperatorIdentity() const
-{
-    return operatorIdentity;
-}
+QString HProject::getOperatorIdentity() const { return operatorIdentity; }
 
-void HProject::setOperatorIdentity(const QString &newOperatorIdentity)
-{
-    operatorIdentity = newOperatorIdentity;
-}
+void HProject::setOperatorIdentity(const QString &newOperatorIdentity) { operatorIdentity = newOperatorIdentity; }
 
-QString HProject::getBlasterName() const
-{
-    return blasterName;
-}
+QString HProject::getBlasterName() const { return blasterName; }
 
-void HProject::setBlasterName(const QString &newBlasterName)
-{
-    blasterName = newBlasterName;
-}
+void HProject::setBlasterName(const QString &newBlasterName) { blasterName = newBlasterName; }
 
-QString HProject::getBlasterIdentity() const
-{
-    return blasterIdentity;
-}
+QString HProject::getBlasterIdentity() const { return blasterIdentity; }
 
-void HProject::setBlasterIdentity(const QString &newBlasterIdentity)
-{
-    blasterIdentity = newBlasterIdentity;
-}
+void HProject::setBlasterIdentity(const QString &newBlasterIdentity) { blasterIdentity = newBlasterIdentity; }
 
-QString HProject::getAddressUuid() const
-{
-    return addressUuid;
-}
+QString HProject::getAddressUuid() const { return addressUuid; }
 
-void HProject::setAddressUuid(const QString &newAddressUuid)
-{
-    addressUuid = newAddressUuid;
-}
+void HProject::setAddressUuid(const QString &newAddressUuid) { addressUuid = newAddressUuid; }
 
-QString HProject::getPcSn() const
-{
-    return pcSn;
-}
+QString HProject::getPcSn() const { return pcSn; }
 
-void HProject::setPcSn(const QString &newPcSn)
-{
-    pcSn = newPcSn;
-}
+void HProject::setPcSn(const QString &newPcSn) { pcSn = newPcSn; }
 
-QString HProject::getDetSum() const
-{
-    return detSum;
-}
+QString HProject::getDetSum() const { return detSum; }
 
-void HProject::setDetSum(const QString &newDetSum)
-{
-    detSum = newDetSum;
-}
+void HProject::setDetSum(const QString &newDetSum) { detSum = newDetSum; }
 
-QString HProject::getFileName() const
-{
-    return fileName;
-}
+QString HProject::getFileName() const { return fileName; }
 
-void HProject::setFileName(const QString &newFileName)
-{
-    fileName = newFileName;
-}
+void HProject::setFileName(const QString &newFileName) { fileName = newFileName; }
 
-QString HProject::getFileUrl() const
-{
-    return fileUrl;
-}
+QString HProject::getFileUrl() const { return fileUrl; }
 
-void HProject::setFileUrl(const QString &newFileUrl)
-{
-    fileUrl = newFileUrl;
-}
+void HProject::setFileUrl(const QString &newFileUrl) { fileUrl = newFileUrl; }
 
-QString HProject::getBlastStatus() const
-{
-    return blastStatus;
-}
+QString HProject::getBlastStatus() const { return blastStatus; }
 
-void HProject::setBlastStatus(const QString &newBlastStatus)
-{
-    blastStatus = newBlastStatus;
-}
+void HProject::setBlastStatus(const QString &newBlastStatus) { blastStatus = newBlastStatus; }
 
-QDateTime HProject::getCreatedAt() const
-{
-    return createdAt;
-}
+QDateTime HProject::getCreatedAt() const { return createdAt; }
 
-void HProject::setCreatedAt(const QDateTime &newCreatedAt)
-{
-    createdAt = newCreatedAt;
-}
+void HProject::setCreatedAt(const QDateTime &newCreatedAt) { createdAt = newCreatedAt; }
 
-QDateTime HProject::getUpdatedAt() const
-{
-    return updatedAt;
-}
+QDateTime HProject::getUpdatedAt() const { return updatedAt; }
 
-void HProject::setUpdatedAt(const QDateTime &newUpdatedAt)
-{
-    updatedAt = newUpdatedAt;
-}
+void HProject::setUpdatedAt(const QDateTime &newUpdatedAt) { updatedAt = newUpdatedAt; }
 
-QDateTime HProject::getDeletedAt() const
-{
-    return deletedAt;
-}
+QDateTime HProject::getDeletedAt() const { return deletedAt; }
 
-void HProject::setDeletedAt(const QDateTime &newDeletedAt)
-{
-    deletedAt = newDeletedAt;
-}
+void HProject::setDeletedAt(const QDateTime &newDeletedAt) { deletedAt = newDeletedAt; }
 
-qint64 HProject::getCreateBy() const
-{
-    return createBy;
-}
+qint64 HProject::getCreateBy() const { return createBy; }
 
-void HProject::setCreateBy(qint64 newCreateBy)
-{
-    createBy = newCreateBy;
-}
+void HProject::setCreateBy(qint64 newCreateBy) { createBy = newCreateBy; }
 
-qint64 HProject::getUpdateBy() const
-{
-    return updateBy;
-}
+qint64 HProject::getUpdateBy() const { return updateBy; }
 
-void HProject::setUpdateBy(qint64 newUpdateBy)
-{
-    updateBy = newUpdateBy;
-}
+void HProject::setUpdateBy(qint64 newUpdateBy) { updateBy = newUpdateBy; }
 
-QByteArray HProject::ProjectToJson(const HProject& project) {
+QByteArray HProject::ProjectToJson(const HProject &project) {
     QJsonObject jsonObject;
     jsonObject["name"] = project.getName();
     jsonObject["detSum"] = project.getDetSum();

+ 7 - 8
hproject.h

@@ -1,14 +1,13 @@
 #ifndef HPROJECT_H
 #define HPROJECT_H
 
-#include <QString>
 #include <QDateTime>
-#include <QJsonObject>
 #include <QJsonDocument>
+#include <QJsonObject>
+#include <QString>
 #include <QUuid>
 
-class HProject : public QObject
-{
+class HProject : public QObject {
     Q_OBJECT
     // 定义属性
     Q_PROPERTY(qint64 id READ getId WRITE setId)
@@ -33,7 +32,7 @@ class HProject : public QObject
     Q_PROPERTY(qint64 createBy READ getCreateBy WRITE setCreateBy)
     Q_PROPERTY(qint64 updateBy READ getUpdateBy WRITE setUpdateBy)
 
-public:
+   public:
     explicit HProject(QObject *parent = nullptr);
 
     // Getter and Setter methods
@@ -100,9 +99,9 @@ public:
     qint64 getUpdateBy() const;
     void setUpdateBy(qint64 newUpdateBy);
 
-    QByteArray ProjectToJson(const HProject& project);
+    QByteArray ProjectToJson(const HProject &project);
 
-private:
+   private:
     qint64 id;
     QString uuid;
     QString name;
@@ -126,4 +125,4 @@ private:
     qint64 updateBy;
 };
 
-#endif // HPROJECT_H
+#endif  // HPROJECT_H

+ 4 - 8
hprojectdao.cpp

@@ -127,8 +127,7 @@ PaginatedHProjectResult HProjectDao::getAllHProjects(int page, int pageSize) {
     QList<QSharedPointer<HProject>> projects;
     QSqlQuery query(database);
     int offset = (page - 1) * pageSize;
-    query.prepare(
-        "SELECT * FROM h_project ORDER BY created_at desc LIMIT :pageSize OFFSET :offset");
+    query.prepare("SELECT * FROM h_project ORDER BY created_at desc LIMIT :pageSize OFFSET :offset");
     query.bindValue(":pageSize", pageSize);
     query.bindValue(":offset", offset);
     // while (query.next()) {
@@ -171,12 +170,9 @@ QSharedPointer<HProject> HProjectDao::recordToProject(const QSqlRecord &record)
     project->setFileName(record.value("file_name").toString());
     project->setFileUrl(record.value("file_url").toString());
     project->setBlastStatus(record.value("blast_status").toString());
-    project->setCreatedAt(
-        QDateTime::fromString(record.value("created_at").toString(), Qt::ISODateWithMs));
-    project->setUpdatedAt(
-        QDateTime::fromString(record.value("updated_at").toString(), Qt::ISODateWithMs));
-    project->setDeletedAt(
-        QDateTime::fromString(record.value("deleted_at").toString(), Qt::ISODateWithMs));
+    project->setCreatedAt(QDateTime::fromString(record.value("created_at").toString(), Qt::ISODateWithMs));
+    project->setUpdatedAt(QDateTime::fromString(record.value("updated_at").toString(), Qt::ISODateWithMs));
+    project->setDeletedAt(QDateTime::fromString(record.value("deleted_at").toString(), Qt::ISODateWithMs));
     project->setCreateBy(record.value("create_by").toInt());
     project->setUpdateBy(record.value("update_by").toInt());
     return project;

+ 8 - 11
hprojectdao.h

@@ -1,13 +1,14 @@
 #ifndef HPROJECTDAO_H
 #define HPROJECTDAO_H
 
+#include <QList>
 #include <QObject>
+#include <QRegularExpression>
 #include <QSqlDatabase>
-#include <QSqlQuery>
 #include <QSqlError>
-#include <QList>
+#include <QSqlQuery>
 #include <QSqlRecord>
-#include <QRegularExpression>
+
 #include "HProject.h"
 
 struct PaginatedHProjectResult {
@@ -15,13 +16,10 @@ struct PaginatedHProjectResult {
     int totalCount;
 };
 
-class HProjectDao
-{
-
-public:
+class HProjectDao {
+   public:
     HProjectDao(QSqlDatabase db);
 
-
     // 添加一个新的HProject记录
     bool addHProject(const HProject &project);
 
@@ -40,11 +38,10 @@ public:
 
     PaginatedHProjectResult getAllHProjectsByOpera(int page, int pageSize);
 
-
-private:
+   private:
     QSqlDatabase database;
     // 将QSqlRecord转换为HProject对象
     QSharedPointer<HProject> recordToProject(const QSqlRecord &record);
 };
 
-#endif // HPROJECTDAO_H
+#endif  // HPROJECTDAO_H

+ 11 - 14
httpclient.cpp

@@ -1,14 +1,14 @@
 #include "HttpClient.h"
-#include <QNetworkReply>
+
+#include <QDebug>
+#include <QJsonArray>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QJsonArray>
-#include <QDebug>
+#include <QNetworkReply>
 
 // HttpClient 类的实现
 
-HttpClient::HttpClient(QObject *parent)
-    : QObject(parent), m_networkManager(new QNetworkAccessManager(this)) {
+HttpClient::HttpClient(QObject *parent) : QObject(parent), m_networkManager(new QNetworkAccessManager(this)) {
     // 构造函数中可以初始化一些变量或设置默认值
 }
 
@@ -36,13 +36,12 @@ void HttpClient::onGetFinished() {
             if (jsonDoc.isNull()) {
                 qDebug() << "Failed to parse JSON!";
                 return;
-            }
-            else {
-                emit httpGetFinished(jsonDoc,m_currenturl); // 发出信号通知外部处理
+            } else {
+                emit httpGetFinished(jsonDoc, m_currenturl);  // 发出信号通知外部处理
             }
 
         } else {
-            emit httpErrorOccurred(reply->errorString()); // 发出信号通知外部错误
+            emit httpErrorOccurred(reply->errorString());  // 发出信号通知外部错误
         }
         // 确保释放 reply 对象
         reply->deleteLater();
@@ -69,21 +68,19 @@ void HttpClient::onGetAddress() {
     QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender());
     if (reply) {
         if (reply->error() == QNetworkReply::NoError) {
-
             QByteArray responseData = reply->readAll();
             QJsonDocument jsonDoc = QJsonDocument::fromJson(responseData);
             if (jsonDoc.isNull()) {
                 return;
-            }
-            else {
+            } else {
                 // 可以进一步处理响应数据,比如解析 JSON 或 XML
-                emit httpGetFinished(jsonDoc,m_currenturl2); // 发出信号通知外部处理
+                emit httpGetFinished(jsonDoc, m_currenturl2);  // 发出信号通知外部处理
             }
 
         } else {
             // 处理请求错误
             // qDebug() << "GET Error:" << reply->errorString();
-            emit httpErrorOccurred(reply->errorString()); // 发出信号通知外部错误
+            emit httpErrorOccurred(reply->errorString());  // 发出信号通知外部错误
         }
 
         reply->deleteLater();

+ 11 - 13
jobs.cpp

@@ -1,19 +1,17 @@
 #include "jobs.h"
 
-
-void JOBS ::btn_animation(QWidget *obj, QPropertyAnimation *animation, int start, int end)
-{
+void JOBS ::btn_animation(QWidget *obj, QPropertyAnimation *animation, int start, int end) {
     int start_size = obj->width();
-     int end_size;
+    int end_size;
 
-     if (obj->width() == start) {
-         end_size = end;
-     } else {
-         end_size = start;
-     }
+    if (obj->width() == start) {
+        end_size = end;
+    } else {
+        end_size = start;
+    }
 
-     animation->setStartValue(start_size);
-     animation->setEndValue(end_size);
-     animation->setEasingCurve(QEasingCurve::InOutQuart);
-     animation->start();
+    animation->setStartValue(start_size);
+    animation->setEndValue(end_size);
+    animation->setEasingCurve(QEasingCurve::InOutQuart);
+    animation->start();
 }

+ 4 - 5
jobs.h

@@ -1,15 +1,14 @@
 #ifndef JOBS_H
 #define JOBS_H
+#include <QEasingCurve>
 #include <QObject>
 #include <QPropertyAnimation>
-#include <QEasingCurve>
 #include <QWidget>
-class JOBS  : public QObject{
+class JOBS : public QObject {
     Q_OBJECT
 
-public:
+   public:
     static void btn_animation(QWidget* obj, QPropertyAnimation* animation, int start = 50, int end = 170);
-
 };
 
-#endif // JOBS_H
+#endif  // JOBS_H

+ 33 - 58
logger.cpp

@@ -1,14 +1,14 @@
 #include "Logger.h"
+
 #include <QDebug>
 #include <QDir>
 #include <QFileInfo>
 
 // Initialize static members
-QScopedPointer<Logger> Logger::m_instance; // Correct: Default constructs to a null pointer
+QScopedPointer<Logger> Logger::m_instance;  // Correct: Default constructs to a null pointer
 QMutex Logger::m_instanceMutex;
 
-Logger& Logger::getInstance(const QString &filePath)
-{
+Logger &Logger::getInstance(const QString &filePath) {
     // Use a QMutexLocker to ensure thread-safe initialization of the singleton
     QMutexLocker locker(&m_instanceMutex);
     if (m_instance.isNull()) {
@@ -16,7 +16,7 @@ Logger& Logger::getInstance(const QString &filePath)
             qWarning() << "Logger: No file path provided for initial singleton creation. Logging might be disabled.";
             // Fallback to a default or disable logging, or throw an error.
             // For simplicity, we'll proceed but warn.
-            m_instance.reset(new Logger("default.log")); // Provide a default if not given
+            m_instance.reset(new Logger("default.log"));  // Provide a default if not given
         } else {
             m_instance.reset(new Logger(filePath));
         }
@@ -27,59 +27,42 @@ Logger& Logger::getInstance(const QString &filePath)
 // Private constructor
 Logger::Logger(const QString &filePath)
     : m_logFile(filePath),
-    m_textStream(&m_logFile),
-    m_maxFileSize(10 * 1024 * 1024), // Default to 10 MB
-    m_maxBackupFiles(5)             // Default to 5 backup files
+      m_textStream(&m_logFile),
+      m_maxFileSize(10 * 1024 * 1024),  // Default to 10 MB
+      m_maxBackupFiles(5)               // Default to 5 backup files
 {
     QFileInfo fileInfo(filePath);
     QDir dir = fileInfo.absoluteDir();
     if (!dir.exists()) {
-        dir.mkpath("."); // Create directory if it doesn't exist
+        dir.mkpath(".");  // Create directory if it doesn't exist
     }
 
     if (!m_logFile.open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::Text)) {
         qWarning() << "Logger: Could not open log file for writing:" << m_logFile.errorString();
     } else {
-        info("Logger initialized."); // Log the initialization
+        info("Logger initialized.");  // Log the initialization
     }
 }
 
 // Private destructor
-Logger::~Logger()
-{
+Logger::~Logger() {
     if (m_logFile.isOpen()) {
-        info("Logger shutting down."); // Log shutdown
+        info("Logger shutting down.");  // Log shutdown
         m_logFile.close();
     }
 }
 
-void Logger::debug(const QString &message)
-{
-    writeLog(Debug, message);
-}
+void Logger::debug(const QString &message) { writeLog(Debug, message); }
 
-void Logger::info(const QString &message)
-{
-    writeLog(Info, message);
-}
+void Logger::info(const QString &message) { writeLog(Info, message); }
 
-void Logger::warn(const QString &message)
-{
-    writeLog(Warning, message);
-}
+void Logger::warn(const QString &message) { writeLog(Warning, message); }
 
-void Logger::error(const QString &message)
-{
-    writeLog(Error, message);
-}
+void Logger::error(const QString &message) { writeLog(Error, message); }
 
-void Logger::critical(const QString &message)
-{
-    writeLog(Critical, message);
-}
+void Logger::critical(const QString &message) { writeLog(Critical, message); }
 
-void Logger::writeLog(LogLevel level, const QString &message)
-{
+void Logger::writeLog(LogLevel level, const QString &message) {
     QMutexLocker locker(&m_mutex);
 
     if (!m_logFile.isOpen()) {
@@ -98,18 +81,11 @@ void Logger::writeLog(LogLevel level, const QString &message)
     m_textStream.flush();
 }
 
-void Logger::setMaxFileSize(qint64 bytes)
-{
-    m_maxFileSize = bytes;
-}
+void Logger::setMaxFileSize(qint64 bytes) { m_maxFileSize = bytes; }
 
-void Logger::setMaxBackupFiles(int count)
-{
-    m_maxBackupFiles = count;
-}
+void Logger::setMaxBackupFiles(int count) { m_maxBackupFiles = count; }
 
-void Logger::rotateLogFile()
-{
+void Logger::rotateLogFile() {
     m_logFile.close();
 
     QFileInfo fileInfo(m_logFile.fileName());
@@ -138,20 +114,19 @@ void Logger::rotateLogFile()
     }
 }
 
-QString Logger::logLevelToString(LogLevel level) const
-{
+QString Logger::logLevelToString(LogLevel level) const {
     switch (level) {
-    case Debug:
-        return "DEBUG";
-    case Info:
-        return "INFO";
-    case Warning:
-        return "WARNING";
-    case Error:
-        return "ERROR";
-    case Critical:
-        return "CRITICAL";
-    default:
-        return "UNKNOWN";
+        case Debug:
+            return "DEBUG";
+        case Info:
+            return "INFO";
+        case Warning:
+            return "WARNING";
+        case Error:
+            return "ERROR";
+        case Critical:
+            return "CRITICAL";
+        default:
+            return "UNKNOWN";
     }
 }

+ 12 - 19
logger.h

@@ -1,26 +1,19 @@
 #ifndef LOGGER_H
 #define LOGGER_H
 
-#include <QFile>
-#include <QTextStream>
 #include <QDateTime>
+#include <QFile>
 #include <QMutex>
-#include <QString>
 #include <QScopedPointer>
+#include <QString>
+#include <QTextStream>
 
-class Logger
-{
-public:
-    enum LogLevel {
-        Debug,
-        Info,
-        Warning,
-        Error,
-        Critical
-    };
+class Logger {
+   public:
+    enum LogLevel { Debug, Info, Warning, Error, Critical };
 
     // Public static method to get the single instance of the Logger
-    static Logger& getInstance(const QString &filePath = "");
+    static Logger &getInstance(const QString &filePath = "");
 
     // Direct logging methods
     void debug(const QString &message);
@@ -33,15 +26,15 @@ public:
     void setMaxBackupFiles(int count);
 
     // Make the destructor public so QScopedPointer can call it
-    ~Logger(); // <-- CHANGE THIS LINE: MOVED FROM PRIVATE TO PUBLIC
+    ~Logger();  // <-- CHANGE THIS LINE: MOVED FROM PRIVATE TO PUBLIC
 
-private:
+   private:
     // Private constructor to prevent direct instantiation
     explicit Logger(const QString &filePath);
 
     // Delete copy constructor and assignment operator to prevent copying
-    Logger(const Logger&) = delete;
-    Logger& operator=(const Logger&) = delete;
+    Logger(const Logger &) = delete;
+    Logger &operator=(const Logger &) = delete;
 
     QFile m_logFile;
     QTextStream m_textStream;
@@ -58,4 +51,4 @@ private:
     static QMutex m_instanceMutex;
 };
 
-#endif // LOGGER_H
+#endif  // LOGGER_H

+ 6 - 8
login/loginwindow.cpp

@@ -73,8 +73,7 @@ void LoginWindow::on_btnLogin_clicked() {
                                 msgBox->setAttribute(Qt::WA_TranslucentBackground, true);
                                 msgBox->setWindowTitle("");
                                 msgBox->setText("用户名或密码错误,请重试。");
-                                msgBox->setWindowFlags(msgBox->windowFlags() |
-                                                       Qt::FramelessWindowHint);
+                                msgBox->setWindowFlags(msgBox->windowFlags() | Qt::FramelessWindowHint);
                                 msgBox->setStandardButtons(QMessageBox::NoButton);
 
                                 msgBox->setStyleSheet(
@@ -101,8 +100,8 @@ void LoginWindow::on_btnLogin_clicked() {
                                 QString identity = userObj["identity"].toString();
                                 QString userIdStr = QString::number(userId);
                                 QString certName = userObj["nickName"].toString();
-                                RegistryManager::instance()->saveUserInfo(
-                                    userIdStr, username, password, identity, certName);
+                                RegistryManager::instance()->saveUserInfo(userIdStr, username, password, identity,
+                                                                          certName);
                                 RegistryManager::instance()->setCurentLoginUserId(userIdStr);
                                 QString Authority = responseObj["currentAuthority"].toString();
                                 globalAuthority = "Bearer " + Authority;
@@ -163,10 +162,9 @@ void LoginWindow::on_btnLogin_clicked() {
                         }
                     }
                 } else {
-                    QMessageBox::critical(nullptr, "无法登录,网络请求错误",
-                                          QString("错误信息: %1\n错误代码: %2")
-                                              .arg(reply->errorString())
-                                              .arg(reply->error()));
+                    QMessageBox::critical(
+                        nullptr, "无法登录,网络请求错误",
+                        QString("错误信息: %1\n错误代码: %2").arg(reply->errorString()).arg(reply->error()));
                 }
             } catch (const std::exception &e) {
                 qDebug() << "Exception in response handling: " << e.what();

+ 3 - 6
loginwindow.cpp

@@ -38,8 +38,7 @@ void LoginWindow::on_btnLogin_clicked() {
         // 构造请求
         // QNetworkRequest request(QUrl("http://localhost:8000/api/v1/login/pc")); //
         // 替换为实际的服务器接口地址
-        QNetworkRequest request(
-            QUrl("http://localhost:8000/api/v1/login/pc"));  // 替换为实际的服务器接口地址
+        QNetworkRequest request(QUrl("http://localhost:8000/api/v1/login/pc"));  // 替换为实际的服务器接口地址
         request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
 
         // 发送 POST 请求
@@ -64,10 +63,8 @@ void LoginWindow::on_btnLogin_clicked() {
                                 msgBox->setAttribute(Qt::WA_TranslucentBackground, true);
                                 msgBox->setWindowTitle("");  // 清空窗口标题
                                 msgBox->setText("用户名或密码错误,请重试。");
-                                msgBox->setWindowFlags(msgBox->windowFlags() |
-                                                       Qt::FramelessWindowHint);
-                                msgBox->setStandardButtons(
-                                    QMessageBox::NoButton);  // 不设置标准按钮
+                                msgBox->setWindowFlags(msgBox->windowFlags() | Qt::FramelessWindowHint);
+                                msgBox->setStandardButtons(QMessageBox::NoButton);  // 不设置标准按钮
 
                                 // 设置样式表
                                 msgBox->setStyleSheet(

+ 8 - 9
loginwindow.h

@@ -1,31 +1,30 @@
 #ifndef LOGINWINDOW_H
 #define LOGINWINDOW_H
 
-#include <QWidget>
-#include "mainwindow.h"
-#include <QNetworkAccessManager>
 #include <QMessageBox>
+#include <QNetworkAccessManager>
 #include <QTimer>
+#include <QWidget>
 
+#include "mainwindow.h"
 
 namespace Ui {
 class LoginWindow;
 }
 
-class LoginWindow : public QWidget
-{
+class LoginWindow : public QWidget {
     Q_OBJECT
 
-public:
+   public:
     explicit LoginWindow(QWidget *parent = nullptr);
     ~LoginWindow();
 
-private slots:
+   private slots:
     void on_btnLogin_clicked();
 
-private:
+   private:
     Ui::LoginWindow *ui;
     QNetworkAccessManager *manager;
 };
 
-#endif // LOGINWINDOW_H
+#endif  // LOGINWINDOW_H

+ 13 - 27
mainwindow.cpp

@@ -42,8 +42,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
         for (auto *widget : left_button_station) {
             QPushButton *button = qobject_cast<QPushButton *>(widget);
             if (button) {
-                connect(button, &QPushButton::clicked, this,
-                        [this, button] { onButtonClicked(button); });
+                connect(button, &QPushButton::clicked, this, [this, button] { onButtonClicked(button); });
             }
         }
         initDateTime();
@@ -64,9 +63,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
     }
 }
 
-void MainWindow::updateProjectTitleLabel(const QString &newTitle) {
-    ui->projectTitleLable->setText(newTitle);
-}
+void MainWindow::updateProjectTitleLabel(const QString &newTitle) { ui->projectTitleLable->setText(newTitle); }
 
 void MainWindow::setProjectTitle(const QString &newTitle) {
     if (m_currentProjectTitle != newTitle) {
@@ -133,10 +130,8 @@ void MainWindow::initialMqttService() {
     MqttClient *pcMqttInit = MqttClient::getInstance();
     // "hxgc/topic"
     QStringList topics = {MQTT_TOPIC_COMPANY_PROJECTS};
-    pcMqttInit->connectToMqttBroker("114.55.233.194", 1883, "hxgc", "hxgc123456", mqttClientId,
-                                    topics);
-    connect(pcMqttInit, &MqttClient::proMessageReceived, this,
-            &MainWindow::handleMqttProjectsMessage);
+    pcMqttInit->connectToMqttBroker("114.55.233.194", 1883, "hxgc", "hxgc123456", mqttClientId, topics);
+    connect(pcMqttInit, &MqttClient::proMessageReceived, this, &MainWindow::handleMqttProjectsMessage);
     Logger::getInstance().info("Connect Mqtt server request sent.");
 }
 
@@ -149,8 +144,7 @@ void MainWindow::handleMqttProjectsMessage(const QByteArray &message, const QMqt
         if (jsonObj.contains("uuid") && jsonObj.contains("status")) {
             QJsonValue uuidValue = jsonObj["uuid"];
             QJsonValue statusValue = jsonObj["status"];
-            if (statusValue.isString() &&
-                statusValue.toString() == BlastStatus::Created) {  // "1" 未注册
+            if (statusValue.isString() && statusValue.toString() == BlastStatus::Created) {  // "1" 未注册
                 if (uuidValue.isNull()) {
                     qDebug() << "uuid 的值为 null";
                 } else {
@@ -162,8 +156,7 @@ void MainWindow::handleMqttProjectsMessage(const QByteArray &message, const QMqt
         } else if (jsonObj.contains("msgType") && jsonObj["msgType"].toString() == "safeCheck") {
             // 处理安全验证消息
             if (jsonObj["status"] != "ok") {
-                QMessageBox::warning(this, "安全验证失败",
-                                     QString("安全验证未通过,练习安全员确认"));
+                QMessageBox::warning(this, "安全验证失败", QString("安全验证未通过,练习安全员确认"));
                 return;
             }
 
@@ -174,20 +167,17 @@ void MainWindow::handleMqttProjectsMessage(const QByteArray &message, const QMqt
             subAddressUuids.append(addressUuid);  // 添加当前地址的 UUID
             qDebug() << "子地址 UUIDs: " << subAddressUuids << "-----" << addressUuid;
             if (subAddressUuids.isEmpty()) {
-                QMessageBox::information(nullptr, "安全验证失败",
-                                         QString("未找到子地址,练习安全员确认"));
+                QMessageBox::information(nullptr, "安全验证失败", QString("未找到子地址,练习安全员确认"));
                 return;
             }
             HProjectDao dao = HProjectDao(DatabaseManager::getInstance().getDatabase());
 
-            QList<QSharedPointer<HProject>> pendingCheckProjects =
-                dao.getRegistedProjectByAddressUuid(subAddressUuids);
+            QList<QSharedPointer<HProject>> pendingCheckProjects = dao.getRegistedProjectByAddressUuid(subAddressUuids);
             for (const auto &project : pendingCheckProjects) {
                 dao.updateBlastStatusByUuid(project->getUuid(), BlastStatus::SafeChecked);
             }
             if (!pendingCheckProjects.isEmpty()) {
-                QMessageBox::information(nullptr, "安全员确认信息",
-                                         QString("收到工程被安全员确认,请查看爆破列表"));
+                QMessageBox::information(nullptr, "安全员确认信息", QString("收到工程被安全员确认,请查看爆破列表"));
                 return;
             }
             // TODO: refresh the project list page
@@ -226,8 +216,7 @@ void MainWindow::onSerialToolCreated() {
 void MainWindow::initialGPSSerial() {
     Logger::getInstance().info("开始初始化GPS");
     SerialGPSThread *threadGPS = new SerialGPSThread(this);
-    connect(threadGPS, &SerialGPSThread::storedGNRMCDataUpdated, this,
-            &MainWindow::handleStoredGNRMCData);
+    connect(threadGPS, &SerialGPSThread::storedGNRMCDataUpdated, this, &MainWindow::handleStoredGNRMCData);
     threadGPS->start();
 }
 // 槽函数,用于接收 RMCData 数据
@@ -271,8 +260,7 @@ void MainWindow::mouseMoveEvent(QMouseEvent *event) {
     }
 }
 
-QList<QString> MainWindow::findAllChildUuids(const QJsonArray &addressArray,
-                                             const QString targetUuid) {
+QList<QString> MainWindow::findAllChildUuids(const QJsonArray &addressArray, const QString targetUuid) {
     QList<QString> childrenUuids;
 
     for (const QJsonValue &value : addressArray) {
@@ -291,13 +279,11 @@ QList<QString> MainWindow::findAllChildUuids(const QJsonArray &addressArray,
                         childrenUuids.append(childUuid);
 
                         // max depth 3
-                        if (child.toObject().contains("children") &&
-                            child.toObject()["children"].isArray()) {
+                        if (child.toObject().contains("children") && child.toObject()["children"].isArray()) {
                             QJsonArray grandchildren = child.toObject()["children"].toArray();
                             for (const QJsonValue &grandchild : grandchildren) {
                                 if (grandchild.isObject()) {
-                                    QString grandchildUuid =
-                                        grandchild.toObject()["uuid"].toString();
+                                    QString grandchildUuid = grandchild.toObject()["uuid"].toString();
                                     childrenUuids.append(grandchildUuid);
                                 }
                             }

+ 6 - 12
mqtt/mqttclient.cpp

@@ -74,27 +74,21 @@ void MqttClient::subscribeToTopics(const QStringList &topics) {
 
 void MqttClient::subscribeToTopic(const QString &topic) { mqClient->subscribe(topic); }
 
-void MqttClient::sendMessage(const QString &topic, const QByteArray &message, quint8 qos,
-                             bool isRetainedMsg) {
+void MqttClient::sendMessage(const QString &topic, const QByteArray &message, quint8 qos, bool isRetainedMsg) {
     if (mqClient->state() == QMqttClient::Connected) {
         auto pub = mqClient->publish(QMqttTopicName(topic), message, qos, isRetainedMsg);
         if (pub == -1)
             Logger::getInstance().error(
-                QString(
-                    "MQTT client sent message to topic: %1, msg: %2, qos: %3, isRetainedMsg: %4")
-                    .arg(topic, QString(message), QString::number(qos),
-                         isRetainedMsg ? "true" : "false"));
+                QString("MQTT client sent message to topic: %1, msg: %2, qos: %3, isRetainedMsg: %4")
+                    .arg(topic, QString(message), QString::number(qos), isRetainedMsg ? "true" : "false"));
         else
             Logger::getInstance().info(
-                QString(
-                    "MQTT client sent message to topic: %1, msg: %2, qos: %3, isRetainedMsg: %4")
-                    .arg(topic, QString(message), QString::number(qos),
-                         isRetainedMsg ? "true" : "false"));
+                QString("MQTT client sent message to topic: %1, msg: %2, qos: %3, isRetainedMsg: %4")
+                    .arg(topic, QString(message), QString::number(qos), isRetainedMsg ? "true" : "false"));
     } else {
         qDebug() << "Not connected to MQTT server";
         Logger::getInstance().error(
-            QString("MQTT client is not connected to the server. topic: %1, msg: %2")
-                .arg(topic, QString(message)));
+            QString("MQTT client is not connected to the server. topic: %1, msg: %2").arg(topic, QString(message)));
     }
 }
 

+ 3 - 5
mqtt/mqttclient.h

@@ -14,12 +14,10 @@ class MqttClient : public QObject {
     static MqttClient *createNewInstance();
     explicit MqttClient(QObject *parent = nullptr);
     void subscribeToTopic(const QString &topic);
-    void sendMessage(const QString &topic, const QByteArray &message, quint8 qos,
-                     bool isRetainedMsg);
+    void sendMessage(const QString &topic, const QByteArray &message, quint8 qos, bool isRetainedMsg);
     void onMessageReceived(const QByteArray &message, const QMqttTopicName &topic);
-    void connectToMqttBroker(const QString &hostname, quint16 port, const QString &username,
-                             const QString &password, const QString &clientId,
-                             const QStringList &topicsToSubscribe);
+    void connectToMqttBroker(const QString &hostname, quint16 port, const QString &username, const QString &password,
+                             const QString &clientId, const QStringList &topicsToSubscribe);
     void subscribeToTopics(const QStringList &topics);
     void connectToMqttBroker();
    signals:

+ 1 - 4
mqttclient.cpp

@@ -1,6 +1,3 @@
 #include "mqttclient.h"
 
-MqttClient::MqttClient()
-{
-
-}
+MqttClient::MqttClient() {}

+ 5 - 9
mqttthread.cpp

@@ -35,24 +35,20 @@ void MqttThread::stopThread() {
 void MqttThread::run() {
     // mqttClient = new MqttClient();
     mqttClient = MqttClient::createNewInstance();
-    mqttClient->connectToMqttBroker(m_hostname, m_port, m_username, m_password, m_clientId,
-                                    m_topicsToSubscribe);
+    mqttClient->connectToMqttBroker(m_hostname, m_port, m_username, m_password, m_clientId, m_topicsToSubscribe);
 
     connect(mqttClient, &MqttClient::connected, this, &MqttThread::mqttConnected);
-    connect(mqttClient, &MqttClient::messageReceived, this,
-            &MqttThread::projectMqttMessageReceived);
+    connect(mqttClient, &MqttClient::messageReceived, this, &MqttThread::projectMqttMessageReceived);
     connect(this, &MqttThread::sendMessageRequested, mqttClient, &MqttClient::sendMessage);
     while (!m_stopFlag) {
         exec();
     }
 }
 
-void MqttThread::sendMqttMessage(const QString &topic, const QByteArray &message, quint8 qos,
-                                 bool isRetainedMsg) {
+void MqttThread::sendMqttMessage(const QString &topic, const QByteArray &message, quint8 qos, bool isRetainedMsg) {
     if (mqttClient) {
-        Logger::getInstance().info(
-            QString("Mqtt thread 发送MQTT消息到主题: %1, 消息: %2, qos: %3, isRetainMsg: %4")
-                .arg(topic, QString(message), qos, isRetainedMsg ? "true" : "false"));
+        Logger::getInstance().info(QString("Mqtt thread 发送MQTT消息到主题: %1, 消息: %2, qos: %3, isRetainMsg: %4")
+                                       .arg(topic, QString(message), qos, isRetainedMsg ? "true" : "false"));
         mqttClient->sendMessage(topic, message, qos, isRetainedMsg);
     }
 }

+ 4 - 7
mqttthread.h

@@ -16,19 +16,16 @@ class MqttThread : public QThread {
     ~MqttThread();
     void stopThread();
 
-    void sendMqttMessage(const QString &topic, const QByteArray &message, quint8 qos,
-                         bool isRetainedMsg);
-    void setConnectionInfo(const QString &hostname, quint16 port, const QString &username,
-                           const QString &password, const QString &clientId,
-                           const QStringList &topicsToSubscribe);
+    void sendMqttMessage(const QString &topic, const QByteArray &message, quint8 qos, bool isRetainedMsg);
+    void setConnectionInfo(const QString &hostname, quint16 port, const QString &username, const QString &password,
+                           const QString &clientId, const QStringList &topicsToSubscribe);
     MqttClient *getMqttClient() const;
 
    signals:
     void mqttConnected();
     // 转发 MQTT 消息接收信号
     void projectMqttMessageReceived(const QByteArray &message, const QMqttTopicName &topic);
-    void sendMessageRequested(const QString &topic, const QByteArray &message, quint8 qos,
-                              bool isRetainedMsg);
+    void sendMessageRequested(const QString &topic, const QByteArray &message, quint8 qos, bool isRetainedMsg);
 
    protected:
     void run() override;

+ 2 - 2
pagefactory.cpp

@@ -1,9 +1,9 @@
-#include <QWidget>
 #include <QStackedWidget>
 #include <QString>
+#include <QWidget>
 
 // 页面工厂接口
 class PageFactory {
-public:
+   public:
     virtual QWidget* createPage(QWidget* parent) const = 0;
 };

+ 2 - 2
pagefactory.h

@@ -3,8 +3,8 @@
 #include <QWidget>
 
 class PageFactory {
-public:
+   public:
     virtual QWidget* createPage(QWidget* parent) const = 0;
 };
 
-#endif // PAGEFACTORY_H
+#endif  // PAGEFACTORY_H

+ 2 - 5
paregnrmc.cpp

@@ -1,10 +1,8 @@
 #include "paregnrmc.h"
-#include <QDebug>
 
-PareGNRMC::PareGNRMC()
-{
+#include <QDebug>
 
-}
+PareGNRMC::PareGNRMC() {}
 bool PareGNRMC::verifyChecksum(const QString& sentence) {
     int index = sentence.indexOf('*');
     if (index == -1) {
@@ -68,7 +66,6 @@ RMCData PareGNRMC::parseRMC(const QString& input) {
     return data;
 }
 
-
 // 将 RMCData 转换为 QString
 QString PareGNRMC::rmcDataToString(const RMCData& data) {
     QString result;

+ 5 - 8
paregnrmc.h

@@ -15,17 +15,14 @@ struct RMCData {
     QString date;
 };
 
-
-
-class PareGNRMC
-{
-public:
+class PareGNRMC {
+   public:
     PareGNRMC();
     RMCData parseRMC(const QString &input);
     QString rmcDataToString(const RMCData &data);
-private:
-    bool verifyChecksum(const QString &sentence);
 
+   private:
+    bool verifyChecksum(const QString &sentence);
 };
 
-#endif // PAREGNRMC_H
+#endif  // PAREGNRMC_H

+ 2 - 2
regex.h

@@ -4,6 +4,6 @@
 // 定义正则表达式宏
 #define EMAIL_REGEX R"(\S+@\S+\.\S+)"
 #define PHONE_REGEX R"(\d{10})"
-#define DIGITS_ONLY_REGEX R"(\d+)" //只允许输入数字
+#define DIGITS_ONLY_REGEX R"(\d+)"  // 只允许输入数字
 
-#endif // REGEX_H
+#endif  // REGEX_H

+ 2 - 3
registryManager/registrymanager.cpp

@@ -23,9 +23,8 @@ RegistryManager::RegistryManager(QObject *parent) : QObject(parent) {}
 
 RegistryManager::~RegistryManager() {}
 
-bool RegistryManager::saveUserInfo(const QString &userId, const QString &username,
-                                   const QString &password, const QString &identity,
-                                   const QString &certName) {
+bool RegistryManager::saveUserInfo(const QString &userId, const QString &username, const QString &password,
+                                   const QString &identity, const QString &certName) {
     QSettings settings(organizationName, applicationName);
     settings.beginGroup(userId);
     settings.setValue("Username", username);

+ 2 - 2
registryManager/registrymanager.h

@@ -9,8 +9,8 @@ class RegistryManager : public QObject {
     static RegistryManager *instance();
     static void cleanup();
 
-    bool saveUserInfo(const QString &userId, const QString &username, const QString &password,
-                      const QString &identity, const QString &certName);
+    bool saveUserInfo(const QString &userId, const QString &username, const QString &password, const QString &identity,
+                      const QString &certName);
     bool readUserInfo(const QString &userId, QString &username, QString &password);
     QStringList getAllUserIds();
     QStringList getAllUsernames();

+ 1 - 4
registrymanager.cpp

@@ -1,6 +1,3 @@
 #include "registrymanager.h"
 
-RegistryManager::RegistryManager()
-{
-
-}
+RegistryManager::RegistryManager() {}

+ 12 - 13
serial/serialgps.h

@@ -1,39 +1,38 @@
 #ifndef SERIALGPS_H
 #define SERIALGPS_H
+#include <QByteArray>
+#include <QLineEdit>
 #include <QObject>
-#include <QSerialPort>
 #include <QPushButton>
-#include <QLineEdit>
+#include <QSerialPort>
 #include <QTextEdit>
-#include <QByteArray>
+
 #include "../paregnrmc.h"
 
-class SerialGPS: public QObject
-{
+class SerialGPS : public QObject {
     Q_OBJECT
-public:
-    SerialGPS(QObject *parent = nullptr);
+   public:
+    SerialGPS(QObject* parent = nullptr);
     RMCData getStoredGNRMCData() const;
     void openSerialPort();
     void closeSerialPort();
 
-signals:
+   signals:
     void openCloseButtonTextChanged(const QString& text);
     void openError();
     void dataReceived(const QByteArray& data);
     void gnrmcDataReceived(const RMCData storedGNRMCData);
-    void storedGNRMCDataUpdated(const RMCData &data); // 新增信号
+    void storedGNRMCDataUpdated(const RMCData& data);  // 新增信号
 
-private slots:
+   private slots:
     void sendData();
     void readData();
 
-
-private:
+   private:
     void setupSerialPort();
 
     QSerialPort serialPort;
     RMCData storedGNRMCData;
 };
 
-#endif // SERIALGPS_H
+#endif  // SERIALGPS_H

+ 17 - 18
serial/serialtool.h

@@ -1,46 +1,45 @@
 #ifndef SERIALTOOL_H
 #define SERIALTOOL_H
 
-
+#include <QByteArray>
+#include <QLineEdit>
+#include <QMutex>
 #include <QObject>
-#include <QSerialPort>
 #include <QPushButton>
-#include <QLineEdit>
+#include <QSerialPort>
 #include <QTextEdit>
-#include <QByteArray>
-#include <QMutex>
-class SerialTool : public QObject
-{
+class SerialTool : public QObject {
     Q_OBJECT
-public:
-    static SerialTool* getInstance(QObject *parent = nullptr, bool* success = nullptr);
-    SerialTool(QObject *parent = nullptr);
+   public:
+    static SerialTool* getInstance(QObject* parent = nullptr, bool* success = nullptr);
+    SerialTool(QObject* parent = nullptr);
     ~SerialTool();
     static SerialTool* instance;
     void setupSerialPort();
     void openSerialPort();
     void closeSerialPort();
     void readData();
-    bool sendData(const QByteArray &data);
+    bool sendData(const QByteArray& data);
     void releaseInstance();
     bool isInUse = false;
     bool getIsInUse();
-signals:
+   signals:
     void openCloseButtonTextChanged(const QString& text);
     void openError();
     void dataReceived(const QByteArray& data);
-    void serialPortOpened(); // 新增信号
+    void serialPortOpened();  // 新增信号
     // 新增三个信号
     void disableButtonReceived();
     void buttonPressedReceived();
     void enableButtonReceived();
 
-public slots:
-    void handleSendDataReques(const QByteArray &data);
-private:
-    QByteArray buffer; // 确保这里声明了 buffer 变量
+   public slots:
+    void handleSendDataReques(const QByteArray& data);
+
+   private:
+    QByteArray buffer;  // 确保这里声明了 buffer 变量
     QSerialPort serialPort;
     static QMutex globalMutex;
 };
 
-#endif // SERIALTOOL_H
+#endif  // SERIALTOOL_H

+ 9 - 21
serialgps.cpp

@@ -1,12 +1,8 @@
 #include "serialgps.h"
 
-SerialGPS::SerialGPS()
-{
-
-}
+SerialGPS::SerialGPS() {}
 // 打开串口的函数
-void SerialGPS::openSerialPort()
-{
+void SerialGPS::openSerialPort() {
     const QString portName = "COM9";
     const qint32 baudRate = 9600;
 
@@ -14,47 +10,39 @@ void SerialGPS::openSerialPort()
         serialPort.setPortName(portName);
         serialPort.setBaudRate(baudRate);
         if (serialPort.open(QIODevice::ReadWrite)) {
-            //提示打开串口
+            // 提示打开串口
         } else {
             emit openError();
         }
     }
 }
 // 关闭串口的函数
-void SerialGPS::closeSerialPort()
-{
+void SerialGPS::closeSerialPort() {
     if (serialPort.isOpen()) {
         serialPort.close();
     }
 }
 
-
-void SerialGPS::sendData()
-{
+void SerialGPS::sendData() {
     if (serialPort.isOpen()) {
         // serialPort.write(data.toUtf8());
     }
 }
 
-void SerialGPS::readData()
-{
+void SerialGPS::readData() {
     QByteArray data = serialPort.readAll();
     emit dataReceived(data);
     PareGNRMC parser;
     RMCData m_data = parser.parseRMC(data);
     storedGNRMCData = m_data;
     emit gnrmcDataReceived(storedGNRMCData);
-    emit storedGNRMCDataUpdated(storedGNRMCData); // 发出信号
+    emit storedGNRMCDataUpdated(storedGNRMCData);  // 发出信号
     // qDebug() << "storedGNRMCData:" << parser.rmcDataToString(storedGNRMCData);
 }
 
-RMCData SerialGPS::getStoredGNRMCData() const
-{
-    return storedGNRMCData;
-}
+RMCData SerialGPS::getStoredGNRMCData() const { return storedGNRMCData; }
 
-void SerialGPS::setupSerialPort()
-{
+void SerialGPS::setupSerialPort() {
     openSerialPort();
     connect(&serialPort, &QSerialPort::readyRead, this, &SerialTool::readData);
 }

+ 12 - 13
serialgps.h

@@ -1,39 +1,38 @@
 #ifndef SERIALGPS_H
 #define SERIALGPS_H
+#include <QByteArray>
+#include <QLineEdit>
 #include <QObject>
-#include <QSerialPort>
 #include <QPushButton>
-#include <QLineEdit>
+#include <QSerialPort>
 #include <QTextEdit>
-#include <QByteArray>
+
 #include "paregnrmc.h"
 
-class SerialGPS: public QObject
-{
+class SerialGPS : public QObject {
     Q_OBJECT
-public:
-    SerialGPS(QObject *parent = nullptr);
+   public:
+    SerialGPS(QObject* parent = nullptr);
     RMCData getStoredGNRMCData() const;
     void openSerialPort();
     void closeSerialPort();
 
-signals:
+   signals:
     void openCloseButtonTextChanged(const QString& text);
     void openError();
     void dataReceived(const QByteArray& data);
     void gnrmcDataReceived(const RMCData storedGNRMCData);
-    void storedGNRMCDataUpdated(const RMCData &data); // 新增信号
+    void storedGNRMCDataUpdated(const RMCData& data);  // 新增信号
 
-private slots:
+   private slots:
     void sendData();
     void readData();
 
-
-private:
+   private:
     void setupSerialPort();
 
     QSerialPort serialPort;
     RMCData storedGNRMCData;
 };
 
-#endif // SERIALGPS_H
+#endif  // SERIALGPS_H

+ 2 - 7
serialgpsthread.cpp

@@ -1,12 +1,8 @@
 #include "serialgpsthread.h"
 
-SerialGPSThread::SerialGPSThread(QObject *parent) : QThread(parent)
-{
-    serialGPS = nullptr;
-}
+SerialGPSThread::SerialGPSThread(QObject *parent) : QThread(parent) { serialGPS = nullptr; }
 
-void SerialGPSThread::run()
-{
+void SerialGPSThread::run() {
     serialGPS = new SerialGPS();
     // 连接信号
     connect(serialGPS, &SerialGPS::dataReceived, this, &SerialGPSThread::dataReceived);
@@ -14,5 +10,4 @@ void SerialGPSThread::run()
 
     // 启动事件循环
     exec();
-
 }

+ 9 - 10
serialgpsthread.h

@@ -1,24 +1,23 @@
 #ifndef SERIALGPSTHREAD_H
 #define SERIALGPSTHREAD_H
-#include <QThread>
 #include <QByteArray>
+#include <QThread>
+
 #include "serial/serialgps.h"
-class SerialGPSThread: public QThread
-{
+class SerialGPSThread : public QThread {
     Q_OBJECT
-public:
+   public:
     SerialGPSThread(QObject *parent = nullptr);
 
-
-signals:
-    void dataReceived(const QByteArray& data);
+   signals:
+    void dataReceived(const QByteArray &data);
     void storedGNRMCDataUpdated(const RMCData data);
 
-protected:
+   protected:
     void run() override;
 
-private:
+   private:
     SerialGPS *serialGPS;
 };
 
-#endif // SERIALGPSTHREAD_H
+#endif  // SERIALGPSTHREAD_H

+ 16 - 17
serialtool.h

@@ -1,38 +1,37 @@
 #ifndef SERIALTOOL_H
 #define SERIALTOOL_H
 
-
+#include <QByteArray>
+#include <QLineEdit>
 #include <QObject>
-#include <QSerialPort>
 #include <QPushButton>
-#include <QLineEdit>
+#include <QSerialPort>
 #include <QTextEdit>
-#include <QByteArray>
-class SerialTool : public QObject
-{
+class SerialTool : public QObject {
     Q_OBJECT
-public:
-    static SerialTool* getInstance(QObject *parent = nullptr);
-    SerialTool(QObject *parent = nullptr);
+   public:
+    static SerialTool* getInstance(QObject* parent = nullptr);
+    SerialTool(QObject* parent = nullptr);
     ~SerialTool();
     static SerialTool* instance;
     void openSerialPort();
     void closeSerialPort();
     void readData();
 
-    bool sendData(const QByteArray &data);
-signals:
+    bool sendData(const QByteArray& data);
+   signals:
     void openCloseButtonTextChanged(const QString& text);
     void openError();
     void dataReceived(const QByteArray& data);
-    void serialPortOpened(); // 新增信号
+    void serialPortOpened();  // 新增信号
+
+   public slots:
+    void handleSendDataReques(const QByteArray& data);
 
-public slots:
-    void handleSendDataReques(const QByteArray &data);
-private:
+   private:
     void setupSerialPort();
-    QByteArray buffer; // 确保这里声明了 buffer 变量
+    QByteArray buffer;  // 确保这里声明了 buffer 变量
     QSerialPort serialPort;
 };
 
-#endif // SERIALTOOL_H
+#endif  // SERIALTOOL_H

+ 4 - 6
timeupdatethread.cpp

@@ -1,12 +1,10 @@
 #include "timeupdatethread.h"
+
 #include <QTimer>
 
-TimeUpdateThread::TimeUpdateThread(QObject *parent) : QThread(parent)
-{
-}
+TimeUpdateThread::TimeUpdateThread(QObject *parent) : QThread(parent) {}
 
-void TimeUpdateThread::run()
-{
+void TimeUpdateThread::run() {
     QTimer timer;
     connect(&timer, &QTimer::timeout, [this]() {
         QDateTime currentDateTime = QDateTime::currentDateTime();
@@ -20,5 +18,5 @@ void TimeUpdateThread::run()
     QString currentTimeString = currentDateTime.toString("yyyy-MM-dd hh:mm:ss");
     emit timeUpdated(currentTimeString);
 
-    exec(); // 启动线程的事件循环
+    exec();  // 启动线程的事件循环
 }

+ 6 - 9
timeupdatethread.h

@@ -1,23 +1,20 @@
 #ifndef TIMEUPDATETHREAD_H
 #define TIMEUPDATETHREAD_H
 
-
-#include <QThread>
 #include <QDateTime>
 #include <QString>
+#include <QThread>
 
-class TimeUpdateThread : public QThread
-{
+class TimeUpdateThread : public QThread {
     Q_OBJECT
-public:
+   public:
     explicit TimeUpdateThread(QObject *parent = nullptr);
 
-signals:
+   signals:
     void timeUpdated(const QString &timeString);
 
-protected:
+   protected:
     void run() override;
 };
 
-
-#endif // TIMEUPDATETHREAD_H
+#endif  // TIMEUPDATETHREAD_H

+ 4 - 10
worker/timeupdatethread.cpp

@@ -1,8 +1,6 @@
 #include "timeupdatethread.h"
 
-
-TimeUpdateThread::TimeUpdateThread(QObject *parent) : QThread(parent)
-{
+TimeUpdateThread::TimeUpdateThread(QObject *parent) : QThread(parent) {
     timer = new QTimer(this);
     connect(timer, &QTimer::timeout, [this]() {
         QDateTime currentDateTime = QDateTime::currentDateTime();
@@ -11,20 +9,16 @@ TimeUpdateThread::TimeUpdateThread(QObject *parent) : QThread(parent)
     });
 }
 
-void TimeUpdateThread::stop()
-{
+void TimeUpdateThread::stop() {
     isStopped = true;
     timer->stop();
     quit();
 }
-TimeUpdateThread::~TimeUpdateThread()
-{
+TimeUpdateThread::~TimeUpdateThread() {
     stop();
     wait();
 }
-void TimeUpdateThread::run()
-{
-
+void TimeUpdateThread::run() {
     timer->start(1000);
 
     QDateTime currentDateTime = QDateTime::currentDateTime();

+ 8 - 10
worker/timeupdatethread.h

@@ -1,29 +1,27 @@
 #ifndef TIMEUPDATETHREAD_H
 #define TIMEUPDATETHREAD_H
 
-
-#include <QThread>
 #include <QDateTime>
 #include <QString>
+#include <QThread>
 #include <QTimer>
 
-class TimeUpdateThread : public QThread
-{
+class TimeUpdateThread : public QThread {
     Q_OBJECT
-public:
+   public:
     explicit TimeUpdateThread(QObject *parent = nullptr);
     ~TimeUpdateThread();
     void stop();
 
-signals:
+   signals:
     void timeUpdated(const QString &timeString);
 
-protected:
+   protected:
     void run() override;
-private:
+
+   private:
     QTimer *timer;
     bool isStopped;
 };
 
-
-#endif // TIMEUPDATETHREAD_H
+#endif  // TIMEUPDATETHREAD_H