配置187服务器上消防总队定时数据推送代码逻辑，在服务器本地数据库总队表中新增device_code字段，并在总队定时推送中增加这个字段值传值

ytServiceCore/core.cpp

@@ -72,7 +72,7 @@ Core::Core(QObject *parent) :
     ytShm->updatetime[CORE_MAIN] = time(static_cast<time_t *>(nullptr));
     ytShm->updatetime[DB_THREAD] = ytShm->updatetime[CORE_MAIN] ;
     db = QSqlDatabase::addDatabase("QSQLITE","dog_conf");
-    db.setDatabaseName("db/watchdog2.db");
+    db.setDatabaseName("/root/db/watchdog2.db");
     mdb = QSqlDatabase::addDatabase("QMYSQL","jdxf2_db");
     mdb.setDatabaseName("jdxf");
     mdb.setHostName("47.98.201.187");
@@ -419,7 +419,7 @@ void Core::subReport(quint16 subType, QString DeviceID, quint64 insertId, bool f
                             jdata.append(QString(",\"state\":\"%1\"").arg(2));
                         }
 
-                        XfzdSyncData(6,QUuid::createUuid().toString().replace("{","").replace("}",""), "{"+jdata+"}",xfzddev.devCategory);
+                        XfzdSyncData(6,QUuid::createUuid().toString().replace("{","").replace("}",""), "{"+jdata+"}",xfzddev.devCategory,DeviceID);
                     }else if(xfzdQry1.value(7).toString().compare("故障")==0){
                         logThread->appendData(QString("xfzdceshi4[%1, %2, %3, %4]").arg(subType).arg(DeviceID).arg(insertId).arg(flag));
                         jdata.append(QString("\"descript\":\"%1\"").arg(qry8.value(0).toString()));
@@ -447,7 +447,7 @@ void Core::subReport(quint16 subType, QString DeviceID, quint64 insertId, bool f
                         jdata.append(QString(",\"handleAlarmTime\":\"%1\"").arg(xfzdQry1.value(6).toDateTime().toString("yyyy-MM-dd hh:mm:ss")));
                         jdata.append(QString(",\"alarmTime\":\"%1\"").arg(xfzdQry1.value(5).toDateTime().toString("yyyy-MM-dd hh:mm:ss")));
                         jdata.append(QString(",\"state\":\"%1\"").arg(1));
-                        XfzdSyncData(7,QUuid::createUuid().toString().replace("{","").replace("}",""), "{"+jdata+"}",xfzddev.devCategory);
+                        XfzdSyncData(7,QUuid::createUuid().toString().replace("{","").replace("}",""), "{"+jdata+"}",xfzddev.devCategory,DeviceID);
                     }else if(xfzdQry1.value(7).toString().compare("手报")==0){
                         jdata.append(QString("\"descript\":\"%1\"").arg(qry8.value(0).toString()));
                         jdata.append(QString(",\"deviceName\":\"%1\"").arg(qry8.value(1).toString()));
@@ -478,7 +478,7 @@ void Core::subReport(quint16 subType, QString DeviceID, quint64 insertId, bool f
                         }else{
                             jdata.append(QString(",\"state\":\"%1\"").arg(2));
                         }
-                        XfzdSyncData(9,QUuid::createUuid().toString().replace("{","").replace("}",""), "{"+jdata+"}",xfzddev.devCategory);
+                        XfzdSyncData(9,QUuid::createUuid().toString().replace("{","").replace("}",""), "{"+jdata+"}",xfzddev.devCategory,DeviceID);
                     }
                     break;
                     }
@@ -806,7 +806,7 @@ void Core::subReport(quint16 subType, QString DeviceID, quint64 insertId, bool f
                           jdata.append(QString(",\"openEventId\":\"%1\"").arg(md5str));
                           jdata.append(QString(",\"alarmTime\":\"%1\"").arg(qry.value(4).toDateTime().toString("yyyy-MM-dd hh:mm:ss")));
                           jdata.append(QString(",\"state\":\"%1\"").arg(0));
-                          XfzdSyncData(6,QUuid::createUuid().toString().replace("{","").replace("}",""), "{"+jdata+"}",xfzddev.devCategory);
+                          XfzdSyncData(6,QUuid::createUuid().toString().replace("{","").replace("}",""), "{"+jdata+"}",xfzddev.devCategory,DeviceID);
                       }else if(qry.value(1).toString().compare("故障")==0){
                           jdata.append(QString("\"descript\":\"%1\"").arg(qry1.value(0).toString()));
                           jdata.append(QString(",\"deviceName\":\"%1\"").arg(qry1.value(1).toString()));
@@ -827,7 +827,7 @@ void Core::subReport(quint16 subType, QString DeviceID, quint64 insertId, bool f
                           jdata.append(QString(",\"openEventId\":\"%1\"").arg(md5str));
                           jdata.append(QString(",\"alarmTime\":\"%1\"").arg(qry.value(4).toDateTime().toString("yyyy-MM-dd hh:mm:ss")));
                           jdata.append(QString(",\"state\":\"%1\"").arg(0));
-                          XfzdSyncData(7,QUuid::createUuid().toString().replace("{","").replace("}",""), "{"+jdata+"}",xfzddev.devCategory);
+                          XfzdSyncData(7,QUuid::createUuid().toString().replace("{","").replace("}",""), "{"+jdata+"}",xfzddev.devCategory,DeviceID);
                       }else if(qry.value(1).toString().compare("监管")==0){
                           jdata.append(QString("\"descript\":\"%1\"").arg(qry1.value(0).toString()));
                           jdata.append(QString(",\"deviceName\":\"%1\"").arg(qry1.value(1).toString()));
@@ -848,7 +848,7 @@ void Core::subReport(quint16 subType, QString DeviceID, quint64 insertId, bool f
                           jdata.append(QString(",\"openEventId\":\"%1\"").arg(md5str));
                           jdata.append(QString(",\"reportTime\":\"%1\"").arg(qry.value(4).toDateTime().toString("yyyy-MM-dd hh:mm:ss")));
                           jdata.append(QString(",\"devStatus\":\"%1\"").arg("正常"));
-                          XfzdSyncData(8,QUuid::createUuid().toString().replace("{","").replace("}",""), "{"+jdata+"}",xfzddev.devCategory);
+                          XfzdSyncData(8,QUuid::createUuid().toString().replace("{","").replace("}",""), "{"+jdata+"}",xfzddev.devCategory,DeviceID);
                       }else if(qry.value(1).toString().compare("手报")==0){
                           jdata.append(QString("\"descript\":\"%1\"").arg(qry1.value(0).toString()));
                           jdata.append(QString(",\"deviceName\":\"%1\"").arg(qry1.value(1).toString()));
@@ -869,7 +869,7 @@ void Core::subReport(quint16 subType, QString DeviceID, quint64 insertId, bool f
                           jdata.append(QString(",\"openEventId\":\"%1\"").arg(md5str));
                           jdata.append(QString(",\"alarmTime\":\"%1\"").arg(qry.value(4).toDateTime().toString("yyyy-MM-dd hh:mm:ss")));
                           jdata.append(QString(",\"state\":\"%1\"").arg(0));
-                          XfzdSyncData(9,QUuid::createUuid().toString().replace("{","").replace("}",""), "{"+jdata+"}",xfzddev.devCategory);
+                          XfzdSyncData(9,QUuid::createUuid().toString().replace("{","").replace("}",""), "{"+jdata+"}",xfzddev.devCategory,DeviceID);
                       }else if(qry.value(1).toString().compare("复位")==0){
                           jdata.append(QString("\"descript\":\"%1\"").arg(qry1.value(0).toString()));
                           jdata.append(QString(",\"deviceName\":\"%1\"").arg(qry1.value(1).toString()));
@@ -889,7 +889,7 @@ void Core::subReport(quint16 subType, QString DeviceID, quint64 insertId, bool f
                           md5str[32]='\0';
                           jdata.append(QString(",\"openEventId\":\"%1\"").arg(md5str));
                           jdata.append(QString(",\"logTime\":\"%1\"").arg(qry.value(4).toDateTime().toString("yyyy-MM-dd hh:mm:ss")));
-                          XfzdSyncData(10,QUuid::createUuid().toString().replace("{","").replace("}",""), "{"+jdata+"}",xfzddev.devCategory);
+                          XfzdSyncData(10,QUuid::createUuid().toString().replace("{","").replace("}",""), "{"+jdata+"}",xfzddev.devCategory,DeviceID);
                       }else if(qry.value(1).toString().compare("反馈")==0){
                           jdata.append(QString("\"descript\":\"%1\"").arg(qry1.value(0).toString()));
                           jdata.append(QString(",\"deviceName\":\"%1\"").arg(qry1.value(1).toString()));
@@ -910,7 +910,7 @@ void Core::subReport(quint16 subType, QString DeviceID, quint64 insertId, bool f
                           jdata.append(QString(",\"openEventId\":\"%1\"").arg(md5str));
                           jdata.append(QString(",\"reportTime\":\"%1\"").arg(qry.value(4).toDateTime().toString("yyyy-MM-dd hh:mm:ss")));
                           jdata.append(QString(",\"devStatus\":\"%1\"").arg("正常"));
-                          XfzdSyncData(11,QUuid::createUuid().toString().replace("{","").replace("}",""), "{"+jdata+"}",xfzddev.devCategory);
+                          XfzdSyncData(11,QUuid::createUuid().toString().replace("{","").replace("}",""), "{"+jdata+"}",xfzddev.devCategory,DeviceID);
                       }
                       break;
                   }
@@ -1253,11 +1253,11 @@ void Core::subReport(quint16 subType, QString DeviceID, quint64 insertId, bool f
                             }
                         }
                         if(xfzddev.DeviceType==258){
-                            XfzdSyncData(4,QUuid::createUuid().toString().replace("{","").replace("}",""),"{"+jdata+"}",xfzddev.devCategory);
+                            XfzdSyncData(4,QUuid::createUuid().toString().replace("{","").replace("}",""),"{"+jdata+"}",xfzddev.devCategory,DeviceID);
                         }else if(xfzddev.DeviceType==256){
-                            XfzdSyncData(5,QUuid::createUuid().toString().replace("{","").replace("}",""),"{"+jdata+"}",xfzddev.devCategory);
+                            XfzdSyncData(5,QUuid::createUuid().toString().replace("{","").replace("}",""),"{"+jdata+"}",xfzddev.devCategory,DeviceID);
                         }else if(xfzddev.DeviceType==452){
-                            XfzdSyncData(12,QUuid::createUuid().toString().replace("{","").replace("}",""),"{"+jdata+"}",xfzddev.devCategory);
+                            XfzdSyncData(12,QUuid::createUuid().toString().replace("{","").replace("}",""),"{"+jdata+"}",xfzddev.devCategory,DeviceID);
                         }
                     }
                 }
@@ -2208,9 +2208,9 @@ void Core::NewcnSyncData(int xh,QString uuid, QString jsonstr, int devCategory)
     NewcnSyncdataLiet.append(NewCnSyncRep(xh,uuid,jsonstr,devCategory));
 }
 
-void Core::XfzdSyncData(int xh,QString uuid, QString jsonstr, int devCategory)
+void Core::XfzdSyncData(int xh,QString uuid, QString jsonstr, int devCategory, QString deviceCode)
 {
-    XfzdSyncdataLiet.append(XfzdSyncRep(xh,uuid,jsonstr,devCategory));
+    XfzdSyncdataLiet.append(XfzdSyncRep(xh,uuid,jsonstr,devCategory,deviceCode));
 }
 
 void Core::jaSyncData(int xh,QString uuid,QString jsonstr)
@@ -4386,10 +4386,10 @@ void Core::time_out()
         req->setHeader(QNetworkRequest::ContentTypeHeader,"application/json; charset=UTF-8");
         req->setRawHeader("appKey","850404889644236801");
         req->setHeader(QNetworkRequest::ContentLengthHeader,QString("%1").arg(Report.length()).toUtf8());
-        sqlList2.append(QString("insert into `xfzdsync_t_rec` (`id`,`uuid`,`data_str`, `send`, `store_time`) values (NULL,'%1','%2',0,'%3')")
+        sqlList2.append(QString("insert into `xfzdsync_t_rec` (`id`,`uuid`,`data_str`, `send`, `store_time`, `device_code`) values (NULL,'%1','%2',0,'%3','%4')")
                         .arg(rep.Id).arg(
                             req->url().toString()+"\r\n"+
-                            rep.JsonStr).arg(QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss")));
+                            rep.JsonStr).arg(QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss")).arg(rep.deviceCode));
         QNetworkReply *reply = XfzdnetAccessManager->post(*req,Report);
         QReplayTimeout *pTimeout = new QReplayTimeout(reply,10000);
         connect(pTimeout, SIGNAL(net_timeout()),this,SLOT(reply_timeout9()));
@@ -4411,7 +4411,7 @@ void Core::time_out()
         }else{
             recdb = QSqlDatabase::addDatabase("QSQLITE","rec_db");
         }
-        QString name = QString("db/watchdoglog%1.db").arg(QDate::currentDate().toString("yyyyMMdd"));
+        QString name = QString("/root/db/watchdoglog%1.db").arg(QDate::currentDate().toString("yyyyMMdd"));
         recdb.setDatabaseName(name);
         if(recdb.open()){
             if(!chk_table("ypsync_t_rec",recdb.tables()))
@@ -4442,7 +4442,7 @@ void Core::time_out()
                 recdb.exec("create table `ypywsync_t_rec` (`id` integer primary key autoincrement, `uuid` text(40), `data_str` text(1024), `send` integer , `store_time` text(20), `reply_str` text(1024), `reply_time` text(20))");
             }
             if(!chk_table("xfzdsync_t_rec",recdb.tables())){
-                recdb.exec("create table `xfzdsync_t_rec` (`id` integer primary key autoincrement, `uuid` text(40), `data_str` text(1024), `send` integer , `store_time` text(20), `reply_str` text(1024), `reply_time` text(20))");
+                recdb.exec("create table `xfzdsync_t_rec` (`id` integer primary key autoincrement, `uuid` text(40), `data_str` text(1024), `send` integer , `store_time` text(20), `reply_str` text(1024), `reply_time` text(20), `device_code` text(40))");
             }
             if(recdb.transaction()){
                 while(sqlList2.length()>0){

ytServiceCore/core.h

@@ -90,17 +90,19 @@ public:
 
 class XfzdSyncRep {
 public:
-    explicit XfzdSyncRep(int xh=0,QString id="", QString str="", int devcategory=0){
+    explicit XfzdSyncRep(int xh=0,QString id="", QString str="", int devcategory=0, QString devCode=""){
         Xh = xh;
         Id = id;
         JsonStr = str;
         devCategory =devcategory;
+        deviceCode = devCode;
     }
 
     int Xh;
     int devCategory;
     QString Id;
     QString JsonStr;
+    QString deviceCode;
 };
 
 class JaSyncRep {
@@ -148,7 +150,7 @@ public slots:
     void SyncXyData(int xh,QString uuid, QString jsonstr);
     void cnSyncData(int xh,QString uuid, QString jsonstr, int devCategory);
     void NewcnSyncData(int xh,QString uuid, QString jsonstr, int devCategory);
-    void XfzdSyncData(int xh,QString uuid, QString jsonstr, int devCategory);
+    void XfzdSyncData(int xh,QString uuid, QString jsonstr, int devCategory, QString deviceCode);
     void jaSyncData(int xh,QString uuid,QString jsonstr);
     void hpSyncData(int xh,QString uuid,QString jsonstr);
     void ypYwSyncData(int xh,QString uuid,QString jsonstr);