Merge branch 'dev-zyj' of hanzhengyi/DataProcessService into master

DataProcessService/ytWarterMkProcess/mkcore.cpp

@@ -279,7 +279,7 @@ void MKCore::AlarmReport(QString addr, quint64 insertid, QString type, QString t
                 QString rep = QString("{\"SubType\":128,\"DeviceId\":\"%1\",\"InsertId\":%2,\"Confirmed\":false}").arg(addr).arg(insertid);
                 repThread[repcur]->appendData(rep);
 
-                QString rep2 = QString("{\"SubType\":65535,\"DeviceId\":\"%1\",\"InsertId\":%2,\"Confirmed\":0,\"CompanyCode\":\"%3\",\"evt_name\":\"%4\",\"evt\":\"%6\",\"EventCode\":\"%6\",\"alarm_time\":\"%5\"}")
+                QString rep2 = QString("{\"SubType\":128,\"DeviceId\":\"%1\",\"InsertId\":%2,\"Confirmed\":0,\"CompanyCode\":\"%3\",\"evt_name\":\"%4\",\"evt\":\"%6\",\"EventCode\":\"%6\",\"alarm_time\":\"%5\"}")
                         .arg(addr).arg(insertid).arg(companyCode).arg(type).arg(time).arg(evt);
                 printf("rep2:%s\n",rep2.toUtf8().data());
                 wssThread[repcur++]->appendData(rep2);