Переглянути джерело

add isOfflineBlast in blastrecord

Yao 12 годин тому
батько
коміт
a9fdfa2b2e

+ 6 - 0
CMakeLists.txt

@@ -151,6 +151,12 @@ add_executable(${PROJECT_NAME}
 
 
 )
+
+
+set_target_properties(${PROJECT_NAME} PROPERTIES
+    WIN32_EXECUTABLE FALSE
+)
+
 target_link_libraries(pc_system Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Gui
     Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Sql  Qt${QT_VERSION_MAJOR}::Network
     Qt${QT_VERSION_MAJOR}::Mqtt Qt${QT_VERSION_MAJOR}::WebEngineWidgets OpenSSL::Crypto OpenSSL::SSL Qt${QT_VERSION_MAJOR}::SerialPort)

+ 5 - 0
blastRecord/HBlastRecord.h

@@ -28,6 +28,7 @@ class HBlastRecord : public QObject {
     Q_PROPERTY(int equipmentCount READ getEquipmentCount WRITE setEquipmentCount)
     Q_PROPERTY(int regDetCount READ getRegDetCount WRITE setRegDetCount)
     Q_PROPERTY(int errorDetCount READ getErrorDetCount WRITE setErrorDetCount)
+    Q_PROPERTY(bool isOfflineBlast READ getIsOfflineBlast WRITE setIsOfflineBlast)
     Q_PROPERTY(QDateTime blastAt READ getBlastAt WRITE setBlastAt)
     Q_PROPERTY(QDateTime createdAt READ getCreatedAt WRITE setCreatedAt)
     Q_PROPERTY(QDateTime updatedAt READ getUpdatedAt WRITE setUpdatedAt)
@@ -103,6 +104,9 @@ class HBlastRecord : public QObject {
     qint64 getUpdateBy() const;
     void setUpdateBy(qint64 newUpdateBy);
 
+    void setIsOfflineBlast(bool isOfflineBlast);
+    bool getIsOfflineBlast() const;
+
     QList<HBlastEquipmentRecord *> getEquipmentRecords() const;
     void setEquipmentRecords(const QList<HBlastEquipmentRecord *> records);
 
@@ -131,6 +135,7 @@ class HBlastRecord : public QObject {
     QDateTime deletedAt;
     qint64 createBy;
     qint64 updateBy;
+    bool isOfflineBlast;  // 是否离线爆破
     QList<HBlastEquipmentRecord *> equipmentRecords;
 };
 

+ 47 - 61
blastRecord/blastrecord.cpp

@@ -1,45 +1,37 @@
 #include "blastrecord.h"
+
 #include "ui_blastrecord.h"
 
-BlastRecord::BlastRecord(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::BlastRecord),
-    dao(DatabaseManager::getInstance().getDatabase())
-{
+BlastRecord::BlastRecord(QWidget* parent)
+    : QWidget(parent), ui(new Ui::BlastRecord), dao(DatabaseManager::getInstance().getDatabase()) {
     ui->setupUi(this);
     m_pPageWidget = new PageWidget;
     connect(m_pPageWidget, &PageWidget::currentPageChanged, this, &BlastRecord::PageChanged);
-    connect(m_pPageWidget->getComboBox(), QOverload<int>::of(&QComboBox::currentIndexChanged), this, &BlastRecord::onComboBoxIndexChanged);
+    connect(m_pPageWidget->getComboBox(), QOverload<int>::of(&QComboBox::currentIndexChanged), this,
+            &BlastRecord::onComboBoxIndexChanged);
     m_httpClient = new HttpClient(this);
     pageSize = 10;
     currentPage = 1;
     ui->verticalLayout_4->addWidget(m_pPageWidget);
     loadAndRefreshData();
-
 }
 
-void BlastRecord::loadAndRefreshData() {
-    loadDataFromSource(currentPage,pageSize);
-}
+void BlastRecord::loadAndRefreshData() { loadDataFromSource(currentPage, pageSize); }
 
-void BlastRecord::loadDataFromSource(int currentPage,int pageSize)
-{
-    PaginatedHBlastRecordResult result =dao.getAllHRecords(currentPage,pageSize);
+void BlastRecord::loadDataFromSource(int currentPage, int pageSize) {
+    PaginatedHBlastRecordResult result = dao.getAllHRecords(currentPage, pageSize);
 
     QList<QSharedPointer<HBlastRecord>> blastRecordsList = result.BlastRecords;
     totalCount = result.totalCount;
 
-    m_pPageWidget->setMaxPage(ceil(static_cast<double>(totalCount)/pageSize));
-    QStandardItemModel *model;
+    m_pPageWidget->setMaxPage(ceil(static_cast<double>(totalCount) / pageSize));
+    QStandardItemModel* model;
     model = new QStandardItemModel(this);
     // 定义表头信息
 
     QList<HeaderInfo> headers = {
-        {"工程名称", "projectName"},
-        {"app版本", "appVersion"},
-        {"起爆器编号", "equipmentSn"},
-        {"注册雷管", "regDetCount"},
-        {"起爆时间", "blastAt"},
+        {"工程名称", "projectName"},   {"是否离线", "isOfflineBlast"}, {"app版本", "appVersion"},
+        {"起爆器编号", "equipmentSn"}, {"注册雷管", "regDetCount"},    {"起爆时间", "blastAt"},
         {"上报时间", "updatedAt"},
     };
 
@@ -57,14 +49,19 @@ 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();
                     item = new QStandardItem(dateTime.toString("yyyy-MM-dd HH:mm:ss"));
+                } else if (prop == "isOfflineBlast") {
+                    qDebug() << "isOfflineBlast value:" << HBlastRecord.getIsOfflineBlast()
+                             << prop.toUtf8() << value.toBool() << value;
+                    item = new QStandardItem(value.toBool() ? "离线爆破" : "线上爆破");
                 } else {
                     item = new QStandardItem(value.toString());
-                    }
+                }
             } else {
                 item = new QStandardItem("操作");
             }
@@ -78,29 +75,24 @@ void BlastRecord::loadDataFromSource(int currentPage,int pageSize)
     ui->tableView->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
     ui->tableView->setAlternatingRowColors(true);  // 启用交替行颜色
     ui->tableView->setEditTriggers(QAbstractItemView::NoEditTriggers);
-
 }
-void BlastRecord::PageChanged(int page)
-{
+void BlastRecord::PageChanged(int page) {
     currentPage = page;
-    loadDataFromSource(currentPage,pageSize);
+    loadDataFromSource(currentPage, pageSize);
 }
 
-
 void BlastRecord::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 BlastRecord::dataTable(const QJsonDocument &jsonDoc)
-{
+void BlastRecord::dataTable(const QJsonDocument& jsonDoc) {
     parseJsonString(jsonDoc);
     model = new QStandardItemModel(this);
-    model->setHorizontalHeaderLabels({"工程名称", "app版本", "起爆器编号","注册雷管","起爆时间","上报时间"});
+    model->setHorizontalHeaderLabels(
+        {"工程名称", "离线爆破", "app版本", "起爆器编号", "注册雷管", "起爆时间", "上报时间"});
 
     for (const QJsonValue& jsonValue : dataArray) {
         QJsonObject jsonObj = jsonValue.toObject();
@@ -108,39 +100,33 @@ void BlastRecord::dataTable(const QJsonDocument &jsonDoc)
         model->appendRow(items);
     }
 
-
     ui->tableView->setModel(model);
     ui->tableView->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
     ui->tableView->setAlternatingRowColors(true);
-
 }
 
-
-QList<QStandardItem *> BlastRecord::jsonToItem(const QJsonObject &jsonObj)
-{
-      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());
-      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;
-
+QList<QStandardItem*> BlastRecord::jsonToItem(const QJsonObject& jsonObj) {
+    QStandardItem* nameItem = new QStandardItem(jsonObj["name"].toString());
+    nameItem->setTextAlignment(Qt::AlignCenter);
+    qDebug() << "jsonObj:" << jsonObj;
+    QStandardItem* isOfflineBlastItem = new QStandardItem(jsonObj["isOfflineBlast"].toString());
+    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());
+    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 << isOfflineBlastItem << equipItem << typeItem
+                                   << statusItem << onlineItem << createdItem;
 }
-void BlastRecord::parseJsonString(const QJsonDocument &jsonDoc)
-{
+void BlastRecord::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));
-}
-BlastRecord::~BlastRecord()
-{
-    delete ui;
+    m_pPageWidget->setMaxPage(ceil(static_cast<double>(totalCount) / pageSize));
 }
+BlastRecord::~BlastRecord() { delete ui; }

+ 3 - 0
blastRecord/hblastrecord.cpp

@@ -92,6 +92,9 @@ QDateTime HBlastRecord::getDeletedAt() const { return deletedAt; }
 
 void HBlastRecord::setDeletedAt(const QDateTime &newDeletedAt) { deletedAt = newDeletedAt; }
 
+void HBlastRecord::setIsOfflineBlast(bool isOfflineBlast) { isOfflineBlast = isOfflineBlast; }
+bool HBlastRecord::getIsOfflineBlast() const { qDebug() << "isOfflineBlast value:" << isOfflineBlast; return isOfflineBlast; }
+
 qint64 HBlastRecord::getCreateBy() const { return createBy; }
 
 void HBlastRecord::setCreateBy(qint64 newCreateBy) { createBy = newCreateBy; }

+ 60 - 68
blastRecord/hblastrecorddao.cpp

@@ -1,42 +1,41 @@
 #include "hblastrecorddao.h"
 
-HBlastRecordDao::HBlastRecordDao(QSqlDatabase db) : database(db)
-{
-}
+HBlastRecordDao::HBlastRecordDao(QSqlDatabase db) : database(db) {}
 
-PaginatedHBlastRecordResult HBlastRecordDao::getAllHRecords(int page, int pageSize)
-{
+PaginatedHBlastRecordResult HBlastRecordDao::getAllHRecords(int page, int pageSize) {
     QList<QSharedPointer<HBlastRecord>> BlastRecords;
     QSqlQuery query(database);
     int offset = (page - 1) * pageSize;
-    query.prepare("SELECT * FROM h_blast_record ORDER BY created_at 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())
-    {
-        while (query.next())
-        {
+    if (query.exec()) {
+        while (query.next()) {
             BlastRecords.append(recordToBlastRecord(query.record()));
         }
-    }
-    else
-    {
+    } else {
         qWarning() << "Query execution failed: " << query.lastError().text();
     }
 
     query.prepare("SELECT COUNT(*) FROM h_blast_record");
     int totalCount = 0;
-    if (query.exec() && query.next())
-    {
+    if (query.exec() && query.next()) {
         totalCount = query.value(0).toInt();
     }
     return {BlastRecords, totalCount};
 }
-bool HBlastRecordDao::addHBlastRecord(const HBlastRecord &record)
-{
+bool HBlastRecordDao::addHBlastRecord(const HBlastRecord &record) {
     QSqlQuery query;
-    query.prepare("INSERT INTO h_blast_record (uuid, project_name, project_htid, project_xmbh, operator_name, phone, operator_identity, equipment_sn, company_code, app_version, longitude, latitude, equipment_count, reg_det_count, error_det_count, blast_at, created_at, updated_at, deleted_at, create_by, update_by) "
-                  "VALUES (:uuid, :project_name, :project_htid, :project_xmbh, :operator_name, :phone, :operator_identity, :equipment_sn, :company_code, :app_version, :longitude, :latitude, :equipment_count, :reg_det_count, :error_det_count, :blast_at, :created_at, :updated_at, :deleted_at, :create_by, :update_by)");
+    query.prepare(
+        "INSERT INTO h_blast_record (uuid, project_name, project_htid, project_xmbh, "
+        "operator_name, phone, operator_identity, equipment_sn, company_code, app_version, "
+        "longitude, latitude, equipment_count, reg_det_count, error_det_count, blast_at, "
+        "created_at, updated_at, deleted_at, create_by, update_by, is_offline_blast) "
+        "VALUES (:uuid, :project_name, :project_htid, :project_xmbh, :operator_name, :phone, "
+        ":operator_identity, :equipment_sn, :company_code, :app_version, :longitude, :latitude, "
+        ":equipment_count, :reg_det_count, :error_det_count, :blast_at, :created_at, :updated_at, "
+        ":deleted_at, :create_by, :update_by, :is_offline_blast)");
     query.bindValue(":uuid", record.getUuid());
     query.bindValue(":project_name", record.getProjectName());
     query.bindValue(":project_htid", record.getProjectHtid());
@@ -52,16 +51,13 @@ bool HBlastRecordDao::addHBlastRecord(const HBlastRecord &record)
     query.bindValue(":equipment_count", record.getEquipmentCount());
     query.bindValue(":reg_det_count", record.getRegDetCount());
     query.bindValue(":error_det_count", record.getErrorDetCount());
+    query.bindValue(":is_offline_blast", record.getIsOfflineBlast());
     query.bindValue(":blast_at", record.getBlastAt().toString(Qt::ISODateWithMs));
     query.bindValue(":created_at", record.getCreatedAt().toString(Qt::ISODateWithMs));
     query.bindValue(":create_by", record.getCreateBy());
-    qDebug() << "created_at:" << record.getCreatedAt() << "blast_at" << record.getBlastAt();
-    if (query.exec())
-    {
+    if (query.exec()) {
         return true;
-    }
-    else
-    {
+    } else {
         qDebug() << "Failed to insert blast record:" << query.lastError().text();
         return false;
     }
@@ -106,32 +102,31 @@ bool HBlastRecordDao::addHBlastRecord(const HBlastRecord &record)
 //     return record;
 // }
 
-bool HBlastRecordDao::updateHBlastRecord(const HBlastRecord &record)
-{
-
+bool HBlastRecordDao::updateHBlastRecord(const HBlastRecord &record) {
     QSqlQuery query;
-    query.prepare("UPDATE h_blast_record SET uuid = :uuid,"
-                  " project_name = :project_name, "
-                  "project_htid = :project_htid,"
-                  "project_xmbh = :project_xmbh,"
-                  "operator_name = :operator_name,"
-                  "phone = :phone,"
-                  "operator_identity = :operator_identity,"
-                  "equipment_sn = :equipment_sn,"
-                  "company_code = :company_code,"
-                  " app_version = :app_version,"
-                  "longitude = :longitude,"
-                  "latitude = :latitude,"
-                  "equipment_count = :equipment_count,"
-                  "reg_det_count = :reg_det_count,"
-                  "error_det_count = :error_det_count,"
-                  "blast_at = :blast_at,"
-                  "created_at = :created_at,"
-                  "updated_at = :updated_at,"
-                  "deleted_at = :deleted_at,"
-                  "create_by = :create_by,"
-                  "update_by = :update_by"
-                  "WHERE id = :id");
+    query.prepare(
+        "UPDATE h_blast_record SET uuid = :uuid,"
+        " project_name = :project_name, "
+        "project_htid = :project_htid,"
+        "project_xmbh = :project_xmbh,"
+        "operator_name = :operator_name,"
+        "phone = :phone,"
+        "operator_identity = :operator_identity,"
+        "equipment_sn = :equipment_sn,"
+        "company_code = :company_code,"
+        " app_version = :app_version,"
+        "longitude = :longitude,"
+        "latitude = :latitude,"
+        "equipment_count = :equipment_count,"
+        "reg_det_count = :reg_det_count,"
+        "error_det_count = :error_det_count,"
+        "blast_at = :blast_at,"
+        "created_at = :created_at,"
+        "updated_at = :updated_at,"
+        "deleted_at = :deleted_at,"
+        "create_by = :create_by,"
+        "update_by = :update_by"
+        "WHERE id = :id");
     query.bindValue(":id", record.getId());
     query.bindValue(":uuid", record.getUuid());
     query.bindValue(":project_name", record.getProjectName());
@@ -155,40 +150,33 @@ bool HBlastRecordDao::updateHBlastRecord(const HBlastRecord &record)
     query.bindValue(":create_by", record.getCreateBy());
     query.bindValue(":update_by", record.getUpdateBy());
 
-    if (query.exec())
-    {
+    if (query.exec()) {
         return true;
-    }
-    else
-    {
+    } else {
         qDebug() << "Failed to update record:" << query.lastError().text();
         return false;
     }
 }
 
-bool HBlastRecordDao::deleteHBlastRecord(const HBlastRecord &record)
-{
+bool HBlastRecordDao::deleteHBlastRecord(const HBlastRecord &record) {
     QSqlQuery query;
     query.prepare("DELETE FROM h_blast_record WHERE id = :id");
     query.bindValue(":id", record.getId());
 
-    if (query.exec())
-    {
+    if (query.exec()) {
         return true;
-    }
-    else
-    {
+    } else {
         qDebug() << "Failed to delete record:" << query.lastError().text();
         return false;
     }
 }
 
-QSharedPointer<HBlastRecord> HBlastRecordDao::recordToBlastRecord(const QSqlRecord &record)
-{
+QSharedPointer<HBlastRecord> HBlastRecordDao::recordToBlastRecord(const QSqlRecord &record) {
     QSharedPointer<HBlastRecord> blastRecord = QSharedPointer<HBlastRecord>::create();
     blastRecord->setId(record.value("id").toLongLong());
     blastRecord->setUuid(record.value("uuid").toString());
     blastRecord->setProjectName(record.value("project_name").toString());
+    blastRecord->setIsOfflineBlast(record.value("is_offline_blast").toBool());
     blastRecord->setProjectHtid(record.value("project_htid").toString());
     blastRecord->setProjectXmbh(record.value("project_xmbh").toString());
     blastRecord->setOperatorName(record.value("operator_name").toString());
@@ -202,10 +190,14 @@ 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;

+ 4 - 10
fireWidget/firingwidget.cpp

@@ -28,7 +28,7 @@ firingWidget::firingWidget(const int &row, const bool &select, const QString &uu
       m_uuid(uuid),
       m_row(row),
       m_select(select),
-      dao(DatabaseManager::getInstance().getDatabase()),
+      daoProj(DatabaseManager::getInstance().getDatabase()),
       daoDet(DatabaseManager::getInstance().getDatabase()),
       daoReg(DatabaseManager::getInstance().getDatabase()) {
     ui->setupUi(this);
@@ -74,6 +74,7 @@ void firingWidget::startBlasting() {
 
 void firingWidget::on_pushButton_2_clicked() { emit countdown(m_uuid, topic, "message"); }
 
+// NOTE: aborted, changed to upload in the smartmine server side.
 bool firingWidget::uploadToDanLing(const QJsonObject &jsonObj) {
     QString htid = jsonObj["project_htid"].toString();
     QString htm = "";  //
@@ -347,12 +348,6 @@ void firingWidget::onBlastSucess(const QJsonObject &jsonObj) {
     lon = labLon;
 
     saveAndUploadRecord(jsonObj);
-
-    if (lat == "定位失败" && lat == "未知" && lon == "定位失败" && lon == "未知") {
-        QMessageBox::critical(nullptr, "错误", "未获取有效定位数据,数据将暂不上传丹灵");
-    } else {
-        uploadToDanLing(jsonObj);
-    }
 }
 
 void firingWidget::saveAndUploadRecord(const QJsonObject &jsonObj) {
@@ -415,6 +410,7 @@ void firingWidget::uploadBlastRecordToServer(HBlastRecord *blastRecord) {
 
 HBlastRecord *firingWidget::recordBlastProject(const QJsonObject &jsonObj) {
     HBlastRecord *record = new HBlastRecord();
+    record->setIsOfflineBlast(jsonObj["is_offline_blast"].toString() == "true");
     record->setProjectName(jsonObj["project_name"].toString());
     record->setProjectHtid(jsonObj["project_htid"].toString());
     record->setProjectXmbh(jsonObj["project_xmbh"].toString());
@@ -428,8 +424,6 @@ HBlastRecord *firingWidget::recordBlastProject(const QJsonObject &jsonObj) {
     record->setLongitude(jsonObj["blast_longitude"].toString().left(10));  // TODO: 确认地址长度
     record->setLatitude(jsonObj["blast_latitude"].toString().left(10));
 
-    // record->setLongitude(lat);
-    // record->setLatitude(lon);
     record->setRegDetCount(jsonObj["reg_deto_count"].toString().toInt());
     record->setErrorDetCount(jsonObj["error_deto_count"].toString().toInt());
     QDateTime blastTime =
@@ -438,7 +432,7 @@ HBlastRecord *firingWidget::recordBlastProject(const QJsonObject &jsonObj) {
     record->setCreatedAt(QDateTime::currentDateTime());
     record->setUuid(blast_uuid);
 
-    if (dao.addHBlastRecord(*record)) {
+    if (daoProj.addHBlastRecord(*record)) {
         qDebug() << "Record inserted successfully.";
         return record;
     } else {

+ 1 - 1
fireWidget/firingwidget.h

@@ -70,7 +70,7 @@ class firingWidget : public QWidget {
    private:
     Ui::firingWidget *ui;
     MqttClient *pcPorjectBC;
-    HBlastRecordDao dao;
+    HBlastRecordDao daoProj;
     HBlastRecordDetDao daoDet;
     HBlastRegRecordDao daoReg;
     NavProgress *navProgress;

+ 1 - 1
global.cpp

@@ -6,6 +6,6 @@ QString labLon("未知");
 QString globalAuthority;
 QString firewidgetPort("COM1");
 QString gpsPort("COM3");
-QString databaseHost("127.0.0.1");
+QString databaseHost("192.168.0.241");
 QString mqttClientId("mqttclient_OnDevPC");
 bool isShowTriggeringWidget = true;