updates: 删除设备地址;添加采场地址

blastProject/blastprojectpage.cpp

@@ -210,8 +210,7 @@ void BlastProjectPage::insertPlan(const QMap<QString, QString> &data) {
     project.setAddressPath(data.value("addressPath"));
     project.setBlasterIdentity(data.value("blasterIdentity"));
     project.setOperatorIdentity(data.value("operatorIdentity"));
-    project.setLoraAddress(data.value("loraAddress"));
-    project.setLoraSn(data.value("loraSn"));
+    project.setLevel4Address(data.value("level4Address"));
     project.setBlastCount(data.value("blastCount"));
     project.setBlastStatus("1");
     project.setCompanyCode(COMPANY_CODE);

blastProject/hproject.cpp

@@ -91,17 +91,13 @@ qint64 HProject::getUpdateBy() const { return updateBy; }
 
 void HProject::setUpdateBy(qint64 newUpdateBy) { updateBy = newUpdateBy; }
 
-QString HProject::getLoraAddress() const { return loraAddress; }
-
-void HProject::setLoraAddress(const QString &newLoraAddress) { loraAddress = newLoraAddress; }
-
 QString HProject::getBlastCount() const { return blastCount; }
 
 void HProject::setBlastCount(const QString &newBlastCount) { blastCount = newBlastCount; }
 
-QString HProject::getLoraSn() const { return loraSn; }
+QString HProject::getLevel4Address() const { return level4Address; }
 
-void HProject::setLoraSn(const QString &newLoraSn) { loraSn = newLoraSn; }
+void HProject::setLevel4Address(const QString &newLevel4Address) { level4Address = newLevel4Address; }
 
 QByteArray HProject::ProjectToJson(const HProject &project) {
     QJsonObject jsonObject;
@@ -116,8 +112,7 @@ QByteArray HProject::ProjectToJson(const HProject &project) {
     jsonObject["address"] = project.getAddressUuid();
     jsonObject["blasterIdentity"] = project.getBlasterIdentity();
     jsonObject["operatorIdentity"] = project.getOperatorIdentity();
-    jsonObject["loraAddress"] = project.getLoraAddress();
-    jsonObject["loraSn"] = project.getLoraSn();
+    jsonObject["level4Address"] = project.getLevel4Address();
     jsonObject["blastCount"] = project.getBlastCount();
     QJsonDocument jsonDoc(jsonObject);
     return jsonDoc.toJson(QJsonDocument::Compact);

blastProject/hproject.h

@@ -28,8 +28,7 @@ class HProject : public QObject {
     Q_PROPERTY(QString blasterIdentity READ getBlasterIdentity WRITE setBlasterIdentity)
     Q_PROPERTY(QString addressUuid READ getAddressUuid WRITE setAddressUuid)
     Q_PROPERTY(QString addressPath READ getAddressPath WRITE setAddressPath)
-    Q_PROPERTY(QString loraAddress READ getLoraAddress WRITE setLoraAddress)
-    Q_PROPERTY(QString loraSn READ getLoraSn WRITE setLoraSn)
+    Q_PROPERTY(QString level4Address READ getLevel4Address WRITE setLevel4Address)
     Q_PROPERTY(QString pcSn READ getPcSn WRITE setPcSn)
     Q_PROPERTY(QString detSum READ getDetSum WRITE setDetSum)
     Q_PROPERTY(QString blastCount READ getBlastCount WRITE setBlastCount)
@@ -114,14 +113,11 @@ class HProject : public QObject {
 
     QByteArray ProjectToJson(const HProject &project);
 
-    QString getLoraAddress() const;
-    void setLoraAddress(const QString &newLoraAddress);
-
     QString getBlastCount() const;
     void setBlastCount(const QString &newBlastCount);
 
-    QString getLoraSn() const;
-    void setLoraSn(const QString &newLoraSn);
+    QString getLevel4Address() const;
+    void setLevel4Address(const QString &newLoraSn);
 
    private:
     qint64 id;
@@ -136,8 +132,7 @@ class HProject : public QObject {
     QString blasterIdentity;
     QString addressUuid;
     QString addressPath;
-    QString loraAddress;
-    QString loraSn;
+    QString level4Address;
     QString pcSn;
     QString detSum;
     QString blastCount;

blastProject/hprojectdao.cpp

@@ -9,11 +9,11 @@ bool HProjectDao::addHProject(const HProject &project) {
     query.prepare(
         "INSERT INTO h_project (uuid, name, company_code, htid, xmbh, operator_name, "
         "operator_identity, blaster_name, blaster_identity, address_uuid, address_path, "
-        "lora_address,pc_sn, "
+        "level4_address,pc_sn, "
         "det_sum, file_name, file_url, blast_status,blast_count,created_at, updated_at, "
         "deleted_at, create_by, update_by) "
         "VALUES (:uuid, :name, :companyCode, :htid, :xmbh, :operatorName, :operatorIdentity, "
-        ":blasterName, :blasterIdentity, :addressUuid, :addressPath, :loraAddress, :pcSn, :detSum, "
+        ":blasterName, :blasterIdentity, :addressUuid, :addressPath, :level4Address, :pcSn, :detSum, "
         ":fileName, "
         ":fileUrl, :blastStatus, :blastCount,:createdAt, :updatedAt, :deletedAt, :createBy, "
         ":updateBy)");
@@ -29,7 +29,7 @@ bool HProjectDao::addHProject(const HProject &project) {
     query.bindValue(":blasterIdentity", project.getBlasterIdentity());
     query.bindValue(":addressUuid", project.getAddressUuid());
     query.bindValue(":addressPath", project.getAddressPath());
-    query.bindValue(":loraAddress", project.getLoraAddress());
+    query.bindValue(":level4Address", project.getLevel4Address());
     query.bindValue(":blastCount", project.getBlastCount());
     query.bindValue(":pcSn", project.getPcSn());
     query.bindValue(":detSum", project.getDetSum());

blastProject/projectdialog.cpp

@@ -76,37 +76,6 @@ void ProjectDialog::updateL3AddressOptions() {
 
 void ProjectDialog::setChildOptions(const QJsonArray &newDataOptions) { dataOptions = newDataOptions; }
 
-void ProjectDialog::SetComboBoxLora(const QString &grandChildName) {
-    ui->comboBoxLora->clear();
-    for (const QJsonValue &item : dataOptions) {
-        const QJsonArray &childrenArray = item["children"].toArray();
-        for (const QJsonValue &child : childrenArray) {
-            const QJsonObject &childObj = child.toObject();
-            const QJsonArray &grandChildrenArray = childObj["children"].toArray();
-            for (const QJsonValue &grandChild : grandChildrenArray) {
-                const QJsonObject &grandChildObj = grandChild.toObject();
-                if (grandChildObj["name"].toString() == grandChildName) {
-                    const QJsonArray &greatGrandChildrenArray = grandChildObj["children"].toArray();
-                    for (const QJsonValue &greatGrandChild : greatGrandChildrenArray) {
-                        const QJsonObject &greatGrandChildObj = greatGrandChild.toObject();
-                        qDebug() << "greatGrandChildObj " << greatGrandChildObj;
-                        QString name = greatGrandChildObj["name"].toString();
-                        QString loraSn = greatGrandChildObj["loraSn"].toString();
-                        ui->comboBoxLora->addItem(name);
-                        nameLoraSnMap.insert(name, loraSn);
-                        QHash<QString, QString>::const_iterator i;
-                        for (i = nameLoraSnMap.constBegin(); i != nameLoraSnMap.constEnd(); ++i) {
-                            qDebug() << "Key:" << i.key() << ", Value:" << i.value();
-                        }
-                    }
-                    break;
-                }
-            }
-        }
-    }
-    ui->comboBoxLora->setCurrentIndex(-1);
-}
-
 void ProjectDialog::extractNames(const QJsonArray &array, QStringList &names) {
     for (const auto &item : array) {
         if (item.isObject()) {
@@ -150,13 +119,6 @@ void ProjectDialog::on_comboBoxAddr_2_currentIndexChanged(int index) {
     }
 }
 
-void ProjectDialog::on_comboBoxAddr_3_currentIndexChanged(int index) {
-    if (index >= 0 && index < L3AddressOptions.size()) {
-        QString grandChildName = L3AddressOptions[index].toObject()["uuid"].toString();
-        SetComboBoxLora(grandChildName);
-    }
-}
-
 void ProjectDialog::validateAndSaveProject() {
     QString detNum = ui->editDetNum->text().trimmed();
     QString blastCount = ui->editRegCount->text().trimmed();
@@ -169,7 +131,6 @@ void ProjectDialog::validateAndSaveProject() {
     QString l1AddressName = ui->comboBoxAddr->currentText().trimmed();
     QString l2AddressName = ui->comboBoxAddr_2->currentText().trimmed();
     QString l3AddressName = ui->comboBoxAddr_3->currentText().trimmed();
-    QString loraAddress = ui->comboBoxLora->currentText().trimmed();
     QString xmbh = ui->editXMBH->text().trimmed();
     QString htid = ui->editHTID->text().trimmed();
 
@@ -201,8 +162,6 @@ void ProjectDialog::validateAndSaveProject() {
     data["addressUuid"] = addressUuid;
     data["blasterIdentity"] = blasterId;
     data["operatorIdentity"] = operatorId;
-    data["loraAddress"] = loraAddress;
-    data["loraSn"] = nameLoraSnMap.value(loraAddress);
     data["blastCount"] = blastCount;
     if (operationStatus == 0) {
         emit validateDetNum(data);
@@ -228,6 +187,7 @@ void ProjectDialog::setFormData(const HProject &Project) {
         ui->editHTID->setText(Project.getHtid());
         ui->editXMBH->setText(Project.getXmbh());
         ui->editRegCount->setText(Project.getBlastCount());
+        ui->level4Address->setText(Project.getLevel4Address());
         int indexBlast = ui->comboBoxBlast->findText(Project.getBlasterName());
         if (indexBlast != -1) {
             ui->comboBoxBlast->setCurrentIndex(indexBlast);

blastProject/projectdialog.h

@@ -38,8 +38,6 @@ class ProjectDialog : public QDialog {
 
     void on_comboBoxBlast_currentIndexChanged(int index);
 
-    void on_comboBoxAddr_3_currentIndexChanged(int index);
-
    signals:
     void validateDetNum(const QMap<QString, QString> &data);
     void validateDetNumUpdate(const QMap<QString, QString> &data);
@@ -49,7 +47,6 @@ class ProjectDialog : public QDialog {
     void updateL2AddressOptions();
     void updateL3AddressOptions();
     void validateAndSaveProject();
-    void SetComboBoxLora(const QString &grandChildName);
     void extractNames(const QJsonArray &array, QStringList &names);
 
    private:
@@ -60,7 +57,6 @@ class ProjectDialog : public QDialog {
     QJsonArray operatorArray;
     QJsonArray dataOptions;
     QJsonArray parentOptions;
-    QStringList loraOptions;
     QJsonArray childOptions;
     QJsonArray grandChildOptions;
     QJsonArray L1AddressOptions;

blastProject/projectdialog.ui

@@ -96,16 +96,6 @@
      <item row="8" column="1">
       <widget class="QLineEdit" name="editDetNum"/>
      </item>
-     <item row="6" column="0">
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>定位器地址：</string>
-       </property>
-      </widget>
-     </item>
-     <item row="6" column="1">
-      <widget class="QComboBox" name="comboBoxLora"/>
-     </item>
      <item row="7" column="0">
       <widget class="QLabel" name="labRegCount">
        <property name="text">
@@ -116,6 +106,16 @@
      <item row="7" column="1">
       <widget class="QLineEdit" name="editRegCount"/>
      </item>
+     <item row="6" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>采场地址:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="1">
+      <widget class="QLineEdit" name="level4Address"/>
+     </item>
     </layout>
    </item>
    <item row="1" column="0">