甲烷气体采集程序增加微信报警功能

DataProcessService/ytTBSN101Process/tbcore.cpp

@@ -276,6 +276,10 @@ void TBCore::AlarmReport(QString subtype, quint64 addr, quint64 insertid, QStrin
             name = QString::fromUtf8("燃气传感器故障");
         else if(Type==3)
             name = QString::fromUtf8("燃气传感器失效");
+
+        QString rep = QString("{\"SubType\":131,\"DeviceId\":\"%1\",\"InsertId\":%2,\"Confirmed\":false}").arg(addr).arg(insertid);
+        repThread[repcur&0x0f]->appendData(rep);
+        repcur = (repcur+1)&0x0f;
         QString rep2 = QString("{\"SubType\":131,\"DeviceId\":\"%1\",\"InsertId\":%2,\"Confirmed\":0,\"flag\":0,\"CompanyCode\":\"%3\",\"evt_name\":\"%4\",\"evt\":\"%5\",\"alarm_time\":\"%6\"}")
                 .arg(addr).arg(insertid).arg(companyCode).arg(name).arg(Type).arg(AlarmTime);
         tbThread[repcur&0x0f]->appendData(rep2);
@@ -298,6 +302,7 @@ void TBCore::AlarmReport(QString subtype, quint64 addr, quint64 insertid, QStrin
                         .replace(",","%2C").replace(":","%3A").replace(" ","+");
                 logThread->appendData(data);
                 wxThreads[0][wxcur&0x0f]->appendData(data);
+                wxThreads[2][wxcur&0x0f]->appendData(data);
                 wxcur++;
                 wxcur &= 0x0f;
             }
@@ -411,8 +416,8 @@ void TBCore::check_framedata(QString data, QString etime, QString ip)
                     quint8 type = Body.at(cur)&0xff;
                     int dLen = static_cast<int>(Body.at(cur+1)&0xff);
                     if(bodyLen>=(cur+2+dLen)){
-                        if((type==0x03)||(type==0x16))
-                            return;
+//                        if((type==0x03)||(type==0x16))
+//                            return;
                         if((type==0x65)&&(dLen==0x08)){
                             for(int i=0;i<8;i++){
                                 device_id =device_id*100+ ((Body.at(cur+2+i)>>4)&0x0f)*10+(Body.at(cur+2+i)&0x0f);
@@ -724,7 +729,7 @@ void TBCore::check_framedata(QString data, QString etime, QString ip)
                                 infoData.append(QString("{\"devId\":\"%1\",\"connType\":\"N\",\"deviceName\":\"%2\",\"devs\":[{\"dp\":[{\"property\":\"状态\",\"serial\":\"361\",\"value\":\"%3\"},{\"property\":\"剩余电量\",\"serial\":\"362\",\"value\":\"%4\"},{\"property\":\"无线信号\",\"serial\":\"363\",\"value\":\"%5\"}],\"deviceName\":\"%6\",\"timeStamp\":\"%7\",\"deviceModel\":\"\",\"deviceType\":\"%8\",\"devId\":\"%9\"}],\"type\":\"INFO\",\"timeStamp\":\"%10\"}").arg(QString(gasList->sensors[i].Device_Code)).arg(QString(gasList->sensors[i].Device_Name)).arg(alarm==0x01?1:(alarm==0x02?2:(alarm==0x03?3:0))).arg(100).arg(wsignal).arg(QString(gasList->sensors[i].Device_Name)).arg(stime.toTime_t()).arg(QString(gasList->sensors[i].Device_Type)).arg(QString(gasList->sensors[i].Device_Code)).arg(stime.toTime_t()));
 
                                 realtime_data(131,device_id, wsignal, vbattery,etime);
-                                if(gasList->sensors[i].UnUsed[0]!=alarm)
+//                                if(gasList->sensors[i].UnUsed[0]!=alarm)
                                 {
                                     if(alarm==0x01){
                                         sql = QString::fromUtf8("insert into `sp_gas2020` (`device_code`, `time`, `status`, `address`, `ncmd`, `data1`, `data2`, `data3`, `data4`, `data5`) values ('%1', '%2', '%3', '%4','%5','%6','%7','%8','%9','%10')")