消防物联网程序mqtt消息(info和alarm)修改设备类型dwType字段取值

DataProcessService/ytElectricFire/databasethread.cpp

@@ -285,7 +285,7 @@ void DatabaseThread::check_devicelist()
         sprintf(eFireList->devs[nrow].Device_Code,"%s",qry.value(0).toString().toUtf8().data());
         sprintf(eFireList->devs[nrow].Device_Name,"%s",qry.value(1).toString().toUtf8().data());
         sprintf(eFireList->devs[nrow].Device_Info,"%s",qry.value(2).toString().toUtf8().data());
-        sprintf(eFireList->devs[nrow].Device_Type,"%s",qry.value(3).toString().toUtf8().data());
+        sprintf(eFireList->devs[nrow].Device_Source,"%s",qry.value(3).toString().toUtf8().data());
         sprintf(eFireList->devs[nrow].Company_Code,"%s",qry.value(4).toString().toUtf8().data());
         if((qry.value(5).isNull())||(qry.value(5).toString().length()==0))
             eFireList->devs[nrow].Ratio = static_cast<float>(1.0);
@@ -316,6 +316,7 @@ void DatabaseThread::check_devicelist()
 //            }
         }
     }
+    printf("t = %s, end status\n",((QDateTime::currentDateTime()).toString("yyyy-MM-dd HH:mm:ss")).toUtf8().data());
     qry.clear();
     for(int i=nrow;i<10240;i++)
         eFireList->devs[i].Enabled=0x00;
@@ -393,6 +394,7 @@ void DatabaseThread::run()
             if(!db.isOpen()){
                 w_count++;
                 db.open();
+                //printf("w_count = %d\n",w_count);
             }else{
                 w_count=0;
                 if((nowTime.hour()!=hour)&&(nowTime.minute()>12)){
@@ -415,6 +417,7 @@ void DatabaseThread::run()
                 }
                 if(sqlList.length()>0){
                     db.exec(sqlList.first());
+                    //printf("-----currenttime: %s sql = %s\n",(nowTime.toString("yyyy-MM-dd HH:mm:ss.zzz")).toUtf8().data(),(sqlList.first()).toUtf8().data());
     #ifdef sql_debug
                     emit SqlLog(QString("[ %1 sql ] ").arg(QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss.zzz"))+sqlList.first());
     #endif

DataProcessService/ytElectricFire/efcommthread2.cpp

@@ -220,7 +220,7 @@ void EFCommThread2::chk_data(QByteArray data, QDateTime t)
                     &&(d3.length()==9)&&((d3.at(2)&0xff)==4)){
                 float leakc = static_cast<float>((static_cast<qint16>(((d1.at(13)&0x00ff)<<8)|(d1.at(14)&0x00ff)))*0.1);
                 float temp1=0.00;
-                if(QString::compare(eFireList->devs[DevIdx].Device_Type,QString("ARCM300D"))==0){//吸收有功电能
+                if(QString::compare(eFireList->devs[DevIdx].Device_Source,QString("ARCM300D"))==0){//吸收有功电能
                     temp1 = static_cast<float>((static_cast<qint32>(((d3.at(3)&0x000000ff)<<24)|((d3.at(4)&0x000000ff)<<16)|((d3.at(5)&0x000000ff)<<8)|(d3.at(6)&0x000000ff)))*0.001*pt*ct);
                 }else{
                     temp1 = static_cast<float>((static_cast<qint16>(((d1.at(15)&0x00ff)<<8)|(d1.at(16)&0x00ff)))*0.1);

DataProcessService/ytElectricFire/elecfilecore.cpp

@@ -24,6 +24,7 @@ ElecFileCore::ElecFileCore(QObject *parent) : QObject(parent)
 //    connect(wssThread,&Tts2Thread::finished,this,&ElecFileCore::quit);
 //    wxThreads->start();
 //    wssThread->start();
+
     for(quint16 i=0;i<8;i++){
         wxThreads[i] = new WechartThreads(this,i,"47.98.201.73","/jdxf/wxapp2.php/Home/Waterwarn/message_electrical");
         connect(wxThreads[i],&WechartThreads::wxchart,this,&ElecFileCore::wxchart);
@@ -61,6 +62,7 @@ ElecFileCore::ElecFileCore(QObject *parent) : QObject(parent)
     wssServer = new WssServer(this);
     wssServer->start();
     timer->start(1000);
+
 }
 
 ElecFileCore::~ElecFileCore()
@@ -249,7 +251,7 @@ void ElecFileCore::getAlarm(int deviceidx, int point, bool aflag, float v1, floa
             default: break;
         }
 
-        msgList.append(QString("{\"devId\":\"%1\",\"connType\":\"G\",\"deviceName\":\"%2\",\"alarams\":[{\"dp\":[{\"property\":\"%3\",\"serial\":\"%4\",\"value\":\"%5\",\"status\":\"0\"}],\"deviceName\":\"%6\",\"timeStamp\":\"%7\",\"deviceModel\":\"\",\"deviceType\":\"%8\",\"devId\":\"%9\"}],\"type\":\"ALARM\",\"timeStamp\":\"%10\"}").arg(QString(eFireList->devs[deviceidx].Device_Code)).arg(QString(eFireList->devs[deviceidx].Device_Name)).arg(pointName).arg(point).arg(QString::number(static_cast<double>(v1),'f',3)).arg(QString(eFireList->devs[deviceidx].Device_Name)).arg(t.toTime_t()).arg(QString(eFireList->devs[deviceidx].Device_Type)).arg(QString(eFireList->devs[deviceidx].Device_Code)).arg(t.toTime_t()));
+        msgList.append(QString("{\"devId\":\"%1\",\"connType\":\"G\",\"deviceName\":\"%2\",\"alarams\":[{\"dp\":[{\"property\":\"%3\",\"serial\":\"%4\",\"value\":\"%5\",\"status\":\"0\"}],\"deviceName\":\"%6\",\"timeStamp\":\"%7\",\"deviceModel\":\"\",\"deviceType\":\"%8\",\"devId\":\"%9\"}],\"type\":\"ALARM\",\"timeStamp\":\"%10\"}").arg(QString(eFireList->devs[deviceidx].Device_Code)).arg(QString(eFireList->devs[deviceidx].Device_Name)).arg(pointName).arg(point).arg(QString::number(static_cast<double>(v1),'f',3)).arg(QString(eFireList->devs[deviceidx].Device_Name)).arg(t.toTime_t()).arg(QString("7")).arg(QString(eFireList->devs[deviceidx].Device_Code)).arg(t.toTime_t()));
 
         AlarmRep rep = AlarmRep(QString(eFireList->devs[deviceidx].Device_Code),
                                 QString("insert into sp_ef2017 (id, port, device_code, time, data1, data2, data3, data4) values (NULL,%1,'%2','%3','%4','%5','%6','%7')")
@@ -440,7 +442,7 @@ void ElecFileCore::getAnalogValue(int deviceidx, int point, float ave, float rtv
 
 //                    }
                     pointStr=pointStr.left(pointStr.length()-1);
-                    infoList.append(QString("{\"devId\":\"%1\",\"connType\":\"G\",\"deviceName\":\"%2\",\"devs\":[{\"dp\":[%3],\"deviceName\":\"%4\",\"timeStamp\":\"%5\",\"deviceModel\":\"\",\"deviceType\":\"%6\",\"devId\":\"%7\"}],\"type\":\"INFO\",\"timeStamp\":\"%8\"}").arg(QString(eFireList->devs[deviceidx].Device_Code)).arg(QString(eFireList->devs[deviceidx].Device_Name)).arg(pointStr).arg(QString(eFireList->devs[deviceidx].Device_Name)).arg(t.toTime_t()).arg(QString(eFireList->devs[deviceidx].Device_Type)).arg(QString(eFireList->devs[deviceidx].Device_Code)).arg(t.toTime_t()));
+                    infoList.append(QString("{\"devId\":\"%1\",\"connType\":\"G\",\"deviceName\":\"%2\",\"devs\":[{\"dp\":[%3],\"deviceName\":\"%4\",\"timeStamp\":\"%5\",\"deviceModel\":\"\",\"deviceType\":\"%6\",\"devId\":\"%7\"}],\"type\":\"INFO\",\"timeStamp\":\"%8\"}").arg(QString(eFireList->devs[deviceidx].Device_Code)).arg(QString(eFireList->devs[deviceidx].Device_Name)).arg(pointStr).arg(QString(eFireList->devs[deviceidx].Device_Name)).arg(t.toTime_t()).arg(QString("7")).arg(QString(eFireList->devs[deviceidx].Device_Code)).arg(t.toTime_t()));
 
                     QString infoTopic = QString("/usky/ytDP0007/%1/%2/info").arg(QString(eFireList->devs[deviceidx].Company_Code)).arg(QString(eFireList->devs[deviceidx].Device_Code));
 
@@ -516,7 +518,7 @@ void ElecFileCore::getYDAnalogValue(int deviceidx, int point, float ave, float r
             QString infoList;
 
             pointStr=pointStr.left(pointStr.length()-1);
-            infoList.append(QString("{\"devId\":\"%1\",\"connType\":\"G\",\"deviceName\":\"%2\",\"devs\":[{\"dp\":[%3],\"deviceName\":\"%4\",\"timeStamp\":\"%5\",\"deviceModel\":\"\",\"deviceType\":\"%6\",\"devId\":\"%7\"}],\"type\":\"INFO\",\"timeStamp\":\"%8\"}").arg(QString(eFireList->devs[deviceidx].Device_Code)).arg(QString(eFireList->devs[deviceidx].Device_Name)).arg(pointStr).arg(QString(eFireList->devs[deviceidx].Device_Name)).arg(t.toTime_t()).arg(QString(eFireList->devs[deviceidx].Device_Type)).arg(QString(eFireList->devs[deviceidx].Device_Code)).arg(t.toTime_t()));
+            infoList.append(QString("{\"devId\":\"%1\",\"connType\":\"G\",\"deviceName\":\"%2\",\"devs\":[{\"dp\":[%3],\"deviceName\":\"%4\",\"timeStamp\":\"%5\",\"deviceModel\":\"\",\"deviceType\":\"%6\",\"devId\":\"%7\"}],\"type\":\"INFO\",\"timeStamp\":\"%8\"}").arg(QString(eFireList->devs[deviceidx].Device_Code)).arg(QString(eFireList->devs[deviceidx].Device_Name)).arg(pointStr).arg(QString(eFireList->devs[deviceidx].Device_Name)).arg(t.toTime_t()).arg(QString("7")).arg(QString(eFireList->devs[deviceidx].Device_Code)).arg(t.toTime_t()));
 
             QString infoTopic = QString("/usky/ytDP0007/%1/%2/info").arg(QString(eFireList->devs[deviceidx].Company_Code)).arg(QString(eFireList->devs[deviceidx].Device_Code));
 

DataProcessService/ytElectricFire/electricfireshm.h

@@ -36,7 +36,7 @@ typedef struct {
     char Device_Code[80];
     char Device_Name[200];
     char Device_Info[500];
-    char Device_Type[100];
+    char Device_Source[100];
     char Company_Code[40];
     unsigned char Enabled;
     unsigned char Online_Flag;

DataProcessService/ytRTUProcess/databasethread.cpp

@@ -49,7 +49,7 @@ void DatabaseThread::check_devicelist()
     printf("database thread check_devicelist()\n");
     uint nowTime = QDateTime::currentDateTime().toTime_t();
     hour=QTime::currentTime().hour();
-    QString sql = QString("select owner_code, owner_name, unitinfo, owner_xh, company from sp_owner where dwtype=6");
+    QString sql = QString("select owner_code, owner_name, unitinfo, dwtype, company from sp_owner where dwtype=6");
     QSqlQuery qry = db.exec(sql);
     int nrow= 0;
     while(qry.next()){
@@ -100,16 +100,16 @@ void DatabaseThread::check_devicelist()
                     sprintf(rtuList->rtus[nrow].Port[portnum].NameOfIOon,"%s",qry2.value(8).toString().toUtf8().data());
                     sprintf(rtuList->rtus[nrow].Port[portnum].NameOfIOOff,"%s",qry2.value(7).toString().toUtf8().data());
                 }
-                //sp_owner_port ¶Ë¿ÚÅäÖñí systype¸ßµÍµçƽÏÖÔÚÖ»ÓÐ 1 ¸ßµçƽ״̬£»µ±É豸¶ÔӦ״̬µãλÅäÖñísp_owner_port
-                //¸ßµçƽÃû³ÆΪ "´ò¿ª"¡¢"¸æ¾¯"¡¢"±¨¾¯"¡¢"Áª¶¯"¡¢"ºÏÕ¢"¡¢"¿ªÆô"¡¢"Æô¶¯"¡¢"¶Ì·"¡¢"¹ÊÕÏ"¡¢"ÊÖ¶¯"¡¢"ÔËÐÐ"¡¢"½ÓÏß" ʱ£¬×´Ì¬Î»valueÖµÊÇ0¡¢1»¹ÊDZ£³ÖÒ»Ñù0¡¢1£¬
-                //·ñÔò״̬λvalueÖµ0¡¢1È¡Ïà·´Öµ1¡¢0£¬Í¬²½¸üРsp_owner_status É豸ʵʱÊý¾Ý±í ºÍ sp_owner_sync_dataÁ½¸ö±í£¬
-                //µ«sp_d É豸Êý¾Ý±í»¹ÊDZ£´æ´ÓÉ豸²É¼¯ÉÏÀ´µÄԭʼ״̬Êý¾ÝÖµ£¬²»²ÎÓë¸üУ»
+                //sp_owner_port 端��置表 systype高低电平现在�有 1 高电平状�；当设备对应状�点��置表sp_owner_port
+                //高电平�称为 "打开"�"告警"�"报警"�"�动"�"�闸"�"开�"�"�动"�"短路"�"故障"�"手动"�"�行"�"接线" 时，状��value值是0�1还是��一样0�1，
+                //�则状��value值0�1�相�值1�0，�步更新 sp_owner_status 设备实时数�表 和 sp_owner_sync_data两个表，
+                //但sp_d 设备数�表还是�存从设备采集上�的原始状�数�值，��与更新；
                 QString upName = "";
                 upName.append(qry2.value(7).toString().toUtf8().data());
-                if((upName.compare(QString::fromUtf8("´ò¿ª"))==0)||(upName.compare(QString::fromUtf8("¸æ¾¯"))==0)||(upName.compare(QString::fromUtf8("±¨¾¯"))==0)
-                 ||(upName.compare(QString::fromUtf8("Áª¶¯"))==0)||(upName.compare(QString::fromUtf8("ºÏÕ¢"))==0)||(upName.compare(QString::fromUtf8("¿ªÆô"))==0)
-                 ||(upName.compare(QString::fromUtf8("Æô¶¯"))==0)||(upName.compare(QString::fromUtf8("¶Ì·"))==0)||(upName.compare(QString::fromUtf8("¹ÊÕÏ"))==0)
-                 ||(upName.compare(QString::fromUtf8("ÊÖ¶¯"))==0)||(upName.compare(QString::fromUtf8("ÔËÐÐ"))==0)||(upName.compare(QString::fromUtf8("½ÓÏß"))==0)){
+                if((upName.compare(QString::fromUtf8("打开"))==0)||(upName.compare(QString::fromUtf8("告警"))==0)||(upName.compare(QString::fromUtf8("报警"))==0)
+                 ||(upName.compare(QString::fromUtf8("�动"))==0)||(upName.compare(QString::fromUtf8("�闸"))==0)||(upName.compare(QString::fromUtf8("开�"))==0)
+                 ||(upName.compare(QString::fromUtf8("�动"))==0)||(upName.compare(QString::fromUtf8("短路"))==0)||(upName.compare(QString::fromUtf8("故障"))==0)
+                 ||(upName.compare(QString::fromUtf8("手动"))==0)||(upName.compare(QString::fromUtf8("�行"))==0)||(upName.compare(QString::fromUtf8("接线"))==0)){
                     rtuList->rtus[nrow].Port[portnum].OffSet = 0.00;
                 }else{
                     rtuList->rtus[nrow].Port[portnum].OffSet = 1.00;

DataProcessService/ytRTUProcess/porcesscore.cpp

@@ -451,10 +451,10 @@ void PorcessCore::TableReport(QString deviceid,quint64 insertid,QString time,QSt
                                                                     .arg(time)
                                                                    .arg(content));
                 if(tempIdx > 0){
-                    dbThread->appendSql(QString::fromUtf8("update sp_owner_status set point_data='%1', data_time='%2', content='%3 %4',dwtype=%5 where device_id='%6' and point_code='%7';")
+                    dbThread->appendSql(QString::fromUtf8("update sp_owner_status set point_data='%1', data_time='%2', content='%3',dwtype=%4 where device_id='%5' and point_code='%6';")
                                                                         .arg(data1)
                                                                         .arg(time)
-                                                                        .arg(pname).arg(content)
+                                                                        .arg(content)
                                                                         .arg(6)
                                                                         .arg(deviceid)
                                                                         .arg(tempIdx+64));
@@ -484,6 +484,7 @@ void PorcessCore::getOnLine(int devIdx, bool sta)
         rtuList->rtus[devIdx].LastCommtime = QDateTime::currentDateTime().toTime_t();
         if(rtuList->rtus[devIdx].Online_Flag!=0x01){
             rtuList->rtus[devIdx].Online_Flag = 0x01;
+
             dbThread->appendSql(QString("update sp_devices_status set devicestatus=%1, true_status=%1, statustime='%2', lastcommtime='%2' where deviceid='%3'")
                                 .arg(0).arg(QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss")).arg(rtuList->rtus[devIdx].Device_Code));
 

DataProcessService/ytRTUProcess/rtucommthread.cpp

@@ -9,6 +9,7 @@ RtuCommThread::RtuCommThread(qintptr socketDescriptor, QObject *parent) : QThrea
     DevIdx = -1;
     keepcomm = false;
     this->SocketDescriptor = socketDescriptor;
+
 }
 
 void RtuCommThread::run()
@@ -186,14 +187,14 @@ void RtuCommThread::calculateAnalogValue(int v, int port, QByteArray data, QDate
 {
     QString point;
     switch (port&0x0f) {
-    case 1:point="665";break;
-    case 2:point="666";break;
-    case 3:point="667";break;
-    case 4:point="668";break;
-    case 5:point="669";break;
-    case 6:point="670";break;
-    case 7:point="671";break;
-    case 8:point="672";break;
+    case 1:point="617";break;
+    case 2:point="618";break;
+    case 3:point="619";break;
+    case 4:point="620";break;
+    case 5:point="621";break;
+    case 6:point="622";break;
+    case 7:point="623";break;
+    case 8:point="624";break;
     default:break;
 
     }

DataProcessService/ytTBSN101LoraProcess/databasethread.cpp

@@ -43,10 +43,11 @@ bool DatabaseThread::hadtb(QString tbname, QStringList tables){
 
 void DatabaseThread::check_devicelist()
 {
-    QSqlQuery qry = db.exec("select owner_code, owner_name, unitinfo, owner_xh, company, push_param1, push_param2, push_param3, push_param4 from sp_owner where dwtype=3 and push_param4=70");
+    QSqlQuery qry = db.exec("select owner_code, owner_name, unitinfo, dwtype, company, push_param1, push_param2, push_param3, push_param4 from sp_owner where dwtype=3 and push_param4=70");
     int nrow= 0;
     while(qry.next()){
         smokerList->sensors[nrow].Enabled=0x01;
+        printf("---nrow = %d, Device_Code = %s, Device_Name = %s,Company_Code = %s\n",nrow,qry.value(0).toString().toUtf8().data(),qry.value(1).toString().toUtf8().data(),qry.value(4).toString().toUtf8().data());
         sprintf(smokerList->sensors[nrow].Device_Code,"%s",qry.value(0).toString().toUtf8().data());
         sprintf(smokerList->sensors[nrow].Device_Name,"%s",qry.value(1).toString().toUtf8().data());
         sprintf(smokerList->sensors[nrow].Device_Info,"%s",qry.value(2).toString().toUtf8().data());

DataProcessService/ytTBSN101LoraProcess/tbcore.cpp

@@ -258,7 +258,7 @@ void TBCore::check_smokedata(QString data, QString ip){
                                     .arg(deviceId).arg(deviceId).arg(fcnt).arg(propertyNames.compare("thing.event.alarms")==0?1:(propertyNames.compare("thing.event.faults")==0?5:(propertyNames.compare("thing.event.heartbeat")==0?7:7))).arg(battery).arg(smoke_concentration).arg(t.toString("yyyy-MM-dd HH:mm:ss")).arg(t.toString("yyyy-MM-dd HH:mm:ss")).arg(temperature_value);
                             dbThread->appendSql(sql);
 
-                            infoData.append(QString("{\"devId\":\"%1\",\"connType\":\"L\",\"deviceName\":\"%2\",\"devs\":[{\"dp\":[{\"property\":\"状态\",\"serial\":\"301\",\"value\":\"%3\"},{\"property\":\"剩余电量\",\"serial\":\"302\",\"value\":\"%4\"},{\"property\":\"无线信号\",\"serial\":\"303\",\"value\":\"%5\"},{\"property\":\"温度\",\"serial\":\"304\",\"value\":\"%6\"},{\"property\":\"浓度\",\"serial\":\"305\",\"value\":\"%7\"}],\"deviceName\":\"%8\",\"timeStamp\":\"%9\",\"deviceModel\":\"\",\"deviceType\":\"%10\",\"devId\":\"%11\"}],\"type\":\"INFO\",\"timeStamp\":\"%12\"}").arg(deviceId).arg(deviceName).arg(propertyNames.compare("thing.event.alarms")==0?1:(propertyNames.compare("thing.event.faults")==0?5:(propertyNames.compare("thing.event.heartbeat")==0?7:7))).arg(battery).arg(fcnt).arg(temperature_value).arg(smoke_concentration).arg(deviceName).arg(t.toTime_t()).arg(deviceType).arg(deviceId).arg(t.toTime_t()));
+                            infoData.append(QString("{\"devId\":\"%1\",\"connType\":\"L\",\"deviceName\":\"%2\",\"devs\":[{\"dp\":[{\"property\":\"状态\",\"serial\":\"301\",\"value\":\"%3\"},{\"property\":\"剩余电量\",\"serial\":\"302\",\"value\":\"%4\"},{\"property\":\"无线信号\",\"serial\":\"303\",\"value\":\"%5\"},{\"property\":\"温度\",\"serial\":\"304\",\"value\":\"%6\"},{\"property\":\"浓度\",\"serial\":\"305\",\"value\":\"%7\"}],\"deviceName\":\"%8\",\"timeStamp\":\"%9\",\"deviceModel\":\"\",\"deviceType\":\"%10\",\"devId\":\"%11\"}],\"type\":\"INFO\",\"timeStamp\":\"%12\"}").arg(deviceId).arg(deviceName).arg(propertyNames.compare("thing.event.alarms")==0?1:(propertyNames.compare("thing.event.faults")==0?5:(propertyNames.compare("thing.event.heartbeat")==0?0:0))).arg(battery).arg(fcnt).arg(temperature_value).arg(smoke_concentration).arg(deviceName).arg(t.toTime_t()).arg(deviceType).arg(deviceId).arg(t.toTime_t()));
 
                             logThread->appendData(QString("++++++yanwu%1++++++++").arg(sql));
                             if(propertyNames.compare("thing.event.alarms")==0||propertyNames.compare("thing.event.faults")==0){

DataProcessService/ytTBSN101Process/databasethread.cpp

@@ -43,7 +43,7 @@ bool DatabaseThread::hadtb(QString tbname, QStringList tables){
 
 void DatabaseThread::check_devicelist()
 {
-    QSqlQuery qry = db.exec("select owner_code, owner_name, unitinfo, owner_xh, company, push_param1, push_param2, push_param3, push_param4 from sp_owner where dwtype=3 and push_param4=0");
+    QSqlQuery qry = db.exec("select owner_code, owner_name, unitinfo, dwtype, company, push_param1, push_param2, push_param3, push_param4 from sp_owner where dwtype=3 and push_param4=0");
     int nrow= 0;
     while(qry.next()){
         smokerList->sensors[nrow].Enabled=0x01;
@@ -65,7 +65,7 @@ void DatabaseThread::check_devicelist()
     for(int i=nrow;i<DEV_MAXCOUNT;i++)
         smokerList->sensors[i].Enabled=0x00;
     qry.clear();
-    qry = db.exec("select owner_code, owner_name, unitinfo, owner_xh, company, push_param1, push_param2, push_param3, push_param4 from sp_owner where dwtype=129");
+    qry = db.exec("select owner_code, owner_name, unitinfo, dwtype, company, push_param1, push_param2, push_param3, push_param4 from sp_owner where dwtype=129");
     nrow= 0;
     while(qry.next()){
         diciList->sensors[nrow].Enabled=0x01;
@@ -87,7 +87,7 @@ void DatabaseThread::check_devicelist()
    for(int i=nrow;i<DEV_MAXCOUNT;i++)
        diciList->sensors[i].Enabled=0x00;
    qry.clear();
-   qry = db.exec("select owner_code, owner_name, unitinfo, owner_xh, company, push_param1, push_param2, push_param3, push_param4 from sp_owner where dwtype=130");
+   qry = db.exec("select owner_code, owner_name, unitinfo, dwtype, company, push_param1, push_param2, push_param3, push_param4 from sp_owner where dwtype=130");
    nrow= 0;
    while(qry.next()){
        doorList->sensors[nrow].Enabled=0x01;
@@ -109,7 +109,7 @@ void DatabaseThread::check_devicelist()
   for(int i=nrow;i<DEV_MAXCOUNT;i++)
       doorList->sensors[i].Enabled=0x00;
   qry.clear();
-  qry = db.exec("select owner_code, owner_name, unitinfo, owner_xh, company, push_param1, push_param2, push_param3, push_param4 from sp_owner where dwtype=131");
+  qry = db.exec("select owner_code, owner_name, unitinfo, dwtype, company, push_param1, push_param2, push_param3, push_param4 from sp_owner where dwtype=131");
   nrow= 0;
   while(qry.next()){
       gasList->sensors[nrow].Enabled=0x01;

DataProcessService/ytTBSN101Process/tbcore.cpp

@@ -531,7 +531,7 @@ void TBCore::check_framedata(QString data, QString etime, QString ip)
                             infoTopic.append(QString("/usky/ytDP0003/%1/%2/info").arg(QString(smokerList->sensors[i].Company_Code)).arg(QString(smokerList->sensors[i].Device_Code)));
                             alarmTopic.append(QString("/usky/ytDP0003/%1/%2/alarm").arg(QString(smokerList->sensors[i].Company_Code)).arg(QString(smokerList->sensors[i].Device_Code)));
 
-                            infoData.append(QString("{\"devId\":\"%1\",\"connType\":\"N\",\"deviceName\":\"%2\",\"devs\":[{\"dp\":[{\"property\":\"状态\",\"serial\":\"301\",\"value\":\"%3\"},{\"property\":\"剩余电量\",\"serial\":\"302\",\"value\":\"%4\"},{\"property\":\"无线信号\",\"serial\":\"303\",\"value\":\"%5\"},{\"property\":\"温度\",\"serial\":\"304\",\"value\":\"%6\"},{\"property\":\"浓度\",\"serial\":\"305\",\"value\":\"%7\"}],\"deviceName\":\"%8\",\"timeStamp\":\"%9\",\"deviceModel\":\"\",\"deviceType\":\"%10\",\"devId\":\"%11\"}],\"type\":\"INFO\",\"timeStamp\":\"%12\"}").arg(QString(smokerList->sensors[i].Device_Code)).arg(QString(smokerList->sensors[i].Device_Name)).arg(alarm==0x01?1:(alarm==0x02?2:(alarm==0x03?3:7))).arg(vbattery).arg(wsignal).arg(temp).arg(vsmoke).arg(QString(smokerList->sensors[i].Device_Name)).arg(stime.toTime_t()).arg(QString(smokerList->sensors[i].Device_Type)).arg(QString(smokerList->sensors[i].Device_Code)).arg(stime.toTime_t()));
+                            infoData.append(QString("{\"devId\":\"%1\",\"connType\":\"N\",\"deviceName\":\"%2\",\"devs\":[{\"dp\":[{\"property\":\"状态\",\"serial\":\"301\",\"value\":\"%3\"},{\"property\":\"剩余电量\",\"serial\":\"302\",\"value\":\"%4\"},{\"property\":\"无线信号\",\"serial\":\"303\",\"value\":\"%5\"},{\"property\":\"温度\",\"serial\":\"304\",\"value\":\"%6\"},{\"property\":\"浓度\",\"serial\":\"305\",\"value\":\"%7\"}],\"deviceName\":\"%8\",\"timeStamp\":\"%9\",\"deviceModel\":\"\",\"deviceType\":\"%10\",\"devId\":\"%11\"}],\"type\":\"INFO\",\"timeStamp\":\"%12\"}").arg(QString(smokerList->sensors[i].Device_Code)).arg(QString(smokerList->sensors[i].Device_Name)).arg(alarm==0x01?1:(alarm==0x02?2:(alarm==0x03?3:0))).arg(vbattery).arg(wsignal).arg(temp).arg(vsmoke).arg(QString(smokerList->sensors[i].Device_Name)).arg(stime.toTime_t()).arg(QString(smokerList->sensors[i].Device_Type)).arg(QString(smokerList->sensors[i].Device_Code)).arg(stime.toTime_t()));
 
                             realtime_data(3,device_id, wsignal, vbattery,etime);
 //                            if(alarm!=smokerList->sensors[i].UnUsed[0])
@@ -591,7 +591,7 @@ void TBCore::check_framedata(QString data, QString etime, QString ip)
                                 infoTopic.append(QString("/usky/ytDP0003/%1/%2/info").arg(QString(diciList->sensors[i].Company_Code)).arg(QString(diciList->sensors[i].Device_Code)));
                                 alarmTopic.append(QString("/usky/ytDP0003/%1/%2/alarm").arg(QString(diciList->sensors[i].Company_Code)).arg(QString(diciList->sensors[i].Device_Code)));
 
-                                infoData.append(QString("{\"devId\":\"%1\",\"connType\":\"N\",\"deviceName\":\"%2\",\"devs\":[{\"dp\":[{\"property\":\"状态\",\"serial\":\"321\",\"value\":\"%3\"},{\"property\":\"剩余电量\",\"serial\":\"322\",\"value\":\"%4\"},{\"property\":\"无线信号\",\"serial\":\"323\",\"value\":\"%5\"}],\"deviceName\":\"%6\",\"timeStamp\":\"%7\",\"deviceModel\":\"\",\"deviceType\":\"%8\",\"devId\":\"%9\"}],\"type\":\"INFO\",\"timeStamp\":\"%10\"}").arg(QString(diciList->sensors[i].Device_Code)).arg(QString(diciList->sensors[i].Device_Name)).arg(alarm).arg(vbattery).arg(wsignal).arg(QString(diciList->sensors[i].Device_Name)).arg(stime.toTime_t()).arg(QString(diciList->sensors[i].Device_Type)).arg(QString(diciList->sensors[i].Device_Code)).arg(stime.toTime_t()));
+                                infoData.append(QString("{\"devId\":\"%1\",\"connType\":\"N\",\"deviceName\":\"%2\",\"devs\":[{\"dp\":[{\"property\":\"状态\",\"serial\":\"321\",\"value\":\"%3\"},{\"property\":\"剩余电量\",\"serial\":\"322\",\"value\":\"%4\"},{\"property\":\"无线信号\",\"serial\":\"323\",\"value\":\"%5\"}],\"deviceName\":\"%6\",\"timeStamp\":\"%7\",\"deviceModel\":\"\",\"deviceType\":\"%8\",\"devId\":\"%9\"}],\"type\":\"INFO\",\"timeStamp\":\"%10\"}").arg(QString(diciList->sensors[i].Device_Code)).arg(QString(diciList->sensors[i].Device_Name)).arg(alarm==0x01?1:(alarm==0x02?2:(alarm==0x03?3:0))).arg(vbattery).arg(wsignal).arg(QString(diciList->sensors[i].Device_Name)).arg(stime.toTime_t()).arg(QString(diciList->sensors[i].Device_Type)).arg(QString(diciList->sensors[i].Device_Code)).arg(stime.toTime_t()));
 
                                 realtime_data(129,device_id, wsignal, vbattery,etime);
                                 if(alarm==0x0b){
@@ -672,7 +672,7 @@ void TBCore::check_framedata(QString data, QString etime, QString ip)
                                 infoTopic.append(QString("/usky/ytDP0003/%1/%2/info").arg(QString(doorList->sensors[i].Company_Code)).arg(QString(doorList->sensors[i].Device_Code)));
                                 alarmTopic.append(QString("/usky/ytDP0003/%1/%2/alarm").arg(QString(doorList->sensors[i].Company_Code)).arg(QString(doorList->sensors[i].Device_Code)));
 
-                                infoData.append(QString("{\"devId\":\"%1\",\"connType\":\"N\",\"deviceName\":\"%2\",\"devs\":[{\"dp\":[{\"property\":\"状态\",\"serial\":\"341\",\"value\":\"%3\"},{\"property\":\"剩余电量\",\"serial\":\"342\",\"value\":\"%4\"},{\"property\":\"无线信号\",\"serial\":\"343\",\"value\":\"%5\"}],\"deviceName\":\"%6\",\"timeStamp\":\"%7\",\"deviceModel\":\"\",\"deviceType\":\"%8\",\"devId\":\"%9\"}],\"type\":\"INFO\",\"timeStamp\":\"%10\"}").arg(QString(doorList->sensors[i].Device_Code)).arg(QString(doorList->sensors[i].Device_Name)).arg(doorsta).arg(vbattery).arg(wsignal).arg(QString(doorList->sensors[i].Device_Name)).arg(stime.toTime_t()).arg(QString(doorList->sensors[i].Device_Type)).arg(QString(doorList->sensors[i].Device_Code)).arg(stime.toTime_t()));
+                                infoData.append(QString("{\"devId\":\"%1\",\"connType\":\"N\",\"deviceName\":\"%2\",\"devs\":[{\"dp\":[{\"property\":\"状态\",\"serial\":\"341\",\"value\":\"%3\"},{\"property\":\"剩余电量\",\"serial\":\"342\",\"value\":\"%4\"},{\"property\":\"无线信号\",\"serial\":\"343\",\"value\":\"%5\"}],\"deviceName\":\"%6\",\"timeStamp\":\"%7\",\"deviceModel\":\"\",\"deviceType\":\"%8\",\"devId\":\"%9\"}],\"type\":\"INFO\",\"timeStamp\":\"%10\"}").arg(QString(doorList->sensors[i].Device_Code)).arg(QString(doorList->sensors[i].Device_Name)).arg(doorsta==0x01?1:(doorsta==0x02?2:(doorsta==0x03?3:0))).arg(vbattery).arg(wsignal).arg(QString(doorList->sensors[i].Device_Name)).arg(stime.toTime_t()).arg(QString(doorList->sensors[i].Device_Type)).arg(QString(doorList->sensors[i].Device_Code)).arg(stime.toTime_t()));
 
                                 realtime_data(130,device_id, wsignal, vbattery,etime);
                                 if((doorsta==0x01)&&(doorList->sensors[i].UnUsed[0]!=0x01)){
@@ -727,7 +727,7 @@ void TBCore::check_framedata(QString data, QString etime, QString ip)
                         infoTopic.append(QString("/usky/ytDP0003/%1/%2/info").arg(QString(gasList->sensors[i].Company_Code)).arg(QString(gasList->sensors[i].Device_Code)));
                         alarmTopic.append(QString("/usky/ytDP0003/%1/%2/alarm").arg(QString(gasList->sensors[i].Company_Code)).arg(QString(gasList->sensors[i].Device_Code)));
 
-                        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).arg(vbattery).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()));
+                        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(vbattery).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)

DataProcessService/ytUserInfoProcess/databasethread.cpp

@@ -230,7 +230,7 @@ void DataBaseThread::check_sysconf()
 void DataBaseThread::check_mqttdev()
 {
     int nrow = 1;
-    QSqlQuery qry = db.exec("select id, owner_code, dwtype, company, owner_name from sp_owner order by id");
+    QSqlQuery qry = db.exec("select id, owner_code, dwtype, company, owner_name from sp_owner where dwtype = 1 order by id");
     while(qry.next()){
         if(nrow<10240){
             char *devId = qry.value(1).toString().toUtf8().data();
@@ -369,65 +369,65 @@ void DataBaseThread::run(){
             QString infoStr,alarmStr,statusStr,topic1,topic2,topic3;
                 topic1 = QString("/usky/ytDP0001/%1/%2/info").arg(companyCode).arg(rep.DeviceId);
                 topic3 = QString("/usky/ytDP0001/%1/%2/status").arg(companyCode).arg(rep.DeviceId);
-                if(AlarmName.compare("监测连线故障")==0)
+                if(AlarmName.compare("鐩戞祴杩炵嚎鏁呴殰")==0)
                 {
-                    infoStr.append(QString("{\"devId\":\"%1\",\"connType\":\"G\",\"deviceName\":\"%2\",\"devs\":[{\"dp\":[{\"property\":\"状态\",\"serial\":\"离线\",\"value\":\"0\"}],\"deviceName\":\"%3\",\"timeStamp\":\"%4\",\"deviceModel\":\"\",\"deviceType\":\"%5\",\"devId\":\"%6\"}],\"type\":\"INFO\",\"timeStamp\":\"%7\"}").arg(rep.DeviceId).arg(deviceName).arg(deviceName).arg(QDateTime::currentDateTime().toTime_t()).arg(deviceType).arg(rep.DeviceId).arg(QDateTime::currentDateTime().toTime_t()));
+                    infoStr.append(QString("{\"devId\":\"%1\",\"connType\":\"G\",\"deviceName\":\"%2\",\"devs\":[{\"dp\":[{\"property\":\"鐘舵€乗",\"serial\":\"绂荤嚎\",\"value\":\"0\"}],\"deviceName\":\"%3\",\"timeStamp\":\"%4\",\"deviceModel\":\"\",\"deviceType\":\"%5\",\"devId\":\"%6\"}],\"type\":\"INFO\",\"timeStamp\":\"%7\"}").arg(rep.DeviceId).arg(deviceName).arg(deviceName).arg(QDateTime::currentDateTime().toTime_t()).arg(deviceType).arg(rep.DeviceId).arg(QDateTime::currentDateTime().toTime_t()));
                     statusStr.append(QString("{\"devId\":\"%1\",\"devicestatus\":75,\"type\":\"STATUS\",\"timestamp\":\"%2\"}").arg(rep.DeviceId).arg(QDateTime::currentDateTime().toTime_t()));
                 }else{
-                    infoStr.append(QString("{\"devId\":\"%1\",\"connType\":\"G\",\"deviceName\":\"%2\",\"devs\":[{\"dp\":[{\"property\":\"状态\",\"serial\":\"在线\",\"value\":\"1\"}],\"deviceName\":\"%3\",\"timeStamp\":\"%4\",\"deviceModel\":\"\",\"deviceType\":\"%5\",\"devId\":\"%6\"}],\"type\":\"INFO\",\"timeStamp\":\"%7\"}").arg(rep.DeviceId).arg(deviceName).arg(deviceName).arg(QDateTime::currentDateTime().toTime_t()).arg(deviceType).arg(rep.DeviceId).arg(QDateTime::currentDateTime().toTime_t()));
+                    infoStr.append(QString("{\"devId\":\"%1\",\"connType\":\"G\",\"deviceName\":\"%2\",\"devs\":[{\"dp\":[{\"property\":\"鐘舵€乗",\"serial\":\"鍦ㄧ嚎\",\"value\":\"1\"}],\"deviceName\":\"%3\",\"timeStamp\":\"%4\",\"deviceModel\":\"\",\"deviceType\":\"%5\",\"devId\":\"%6\"}],\"type\":\"INFO\",\"timeStamp\":\"%7\"}").arg(rep.DeviceId).arg(deviceName).arg(deviceName).arg(QDateTime::currentDateTime().toTime_t()).arg(deviceType).arg(rep.DeviceId).arg(QDateTime::currentDateTime().toTime_t()));
                     statusStr.append(QString("{\"devId\":\"%1\",\"devicestatus\":0,\"type\":\"STATUS\",\"timestamp\":\"%2\"}").arg(rep.DeviceId).arg(QDateTime::currentDateTime().toTime_t()));
                 }
 
                 QString point;
-                if(AlarmName.compare("主电故障")==0){
+                if(AlarmName.compare("涓荤數鏁呴殰")==0){
                     point.append("801");
-                }else if(AlarmName.compare("主电故障撤销")==0){
+                }else if(AlarmName.compare("涓荤數鏁呴殰鎾ら攢")==0){
                     point.append("802");
-                }else if(AlarmName.compare("停止")==0){
+                }else if(AlarmName.compare("鍋滄�")==0){
                     point.append("803");
-                }else if(AlarmName.compare("反馈")==0){
+                }else if(AlarmName.compare("鍙嶉�")==0){
                     point.append("804");
-                }else if(AlarmName.compare("启动")==0){
+                }else if(AlarmName.compare("鍚�姩")==0){
                     point.append("805");
-                }else if(AlarmName.compare("备电故障")==0){
+                }else if(AlarmName.compare("澶囩數鏁呴殰")==0){
                     point.append("806");
-                }else if(AlarmName.compare("备电故障撤销")==0){
+                }else if(AlarmName.compare("澶囩數鏁呴殰鎾ら攢")==0){
                     point.append("807");
-                }else if(AlarmName.compare("复位")==0){
+                }else if(AlarmName.compare("澶嶄綅")==0){
                     point.append("808");
-                }else if(AlarmName.compare("屏蔽")==0){
+                }else if(AlarmName.compare("灞忚斀")==0){
                     point.append("809");
-                }else if(AlarmName.compare("屏蔽撤销")==0){
+                }else if(AlarmName.compare("灞忚斀鎾ら攢")==0){
                     point.append("810");
-                }else if(AlarmName.compare("恢复正常运行")==0){
+                }else if(AlarmName.compare("鎭㈠�姝ｅ父杩愯�")==0){
                     point.append("811");
-                }else if(AlarmName.compare("手报")==0){
+                }else if(AlarmName.compare("鎵嬫姤")==0){
                     point.append("812");
-                }else if(AlarmName.compare("报警")==0){
+                }else if(AlarmName.compare("鎶ヨ�")==0){
                     point.append("813");
-                }else if(AlarmName.compare("拆卸报警")==0){
+                }else if(AlarmName.compare("鎷嗗嵏鎶ヨ�")==0){
                     point.append("814");
-                }else if(AlarmName.compare("故障")==0){
+                }else if(AlarmName.compare("鏁呴殰")==0){
                     point.append("815");
-                }else if(AlarmName.compare("故障撤销")==0){
+                }else if(AlarmName.compare("鏁呴殰鎾ら攢")==0){
                     point.append("816");
-                }else if(AlarmName.compare("测试")==0){
+                }else if(AlarmName.compare("娴嬭瘯")==0){
                     point.append("817");
-                }else if(AlarmName.compare("火灾报警")==0){
+                }else if(AlarmName.compare("鐏�伨鎶ヨ�")==0){
                     point.append("818");
-                }else if(AlarmName.compare("火警")==0){
+                }else if(AlarmName.compare("鐏��")==0){
                     point.append("819");
-                }else if(AlarmName.compare("火警总告警")==0){
+                }else if(AlarmName.compare("鐏��鎬诲憡璀�")==0){
                     point.append("820");
-                }else if(AlarmName.compare("火警总告警撤销")==0){
+                }else if(AlarmName.compare("鐏��鎬诲憡璀︽挙閿€")==0){
                     point.append("821");
-                }else if(AlarmName.compare("监测连线故障")==0){
+                }else if(AlarmName.compare("鐩戞祴杩炵嚎鏁呴殰")==0){
                     point.append("822");
-                }else if(AlarmName.compare("监管")==0){
+                }else if(AlarmName.compare("鐩戠�")==0){
                     point.append("823");
-                }else if(AlarmName.compare("监管撤销")==0){
+                }else if(AlarmName.compare("鐩戠�鎾ら攢")==0){
                     point.append("824");
-                }else if(AlarmName.compare("自检")==0){
+                }else if(AlarmName.compare("鑷��")==0){
                     point.append("825");
                 }else{
                     point.append("800");

DataProcessService/ytWarterMkProcess/mkcore.cpp

@@ -501,7 +501,7 @@ void MKCore::check_cover_framedata(QJsonObject jPayload, QString deviceId, long
             hsData.insert("deviceName", mkList->sensors[i].Device_Name);
             QString dataTimeStamp1=QString("%1").arg(etime);
             hsData.insert("timeStamp", dataTimeStamp1);
-            hsData.insert("deviceType", "22");
+            hsData.insert("deviceType", mkList->sensors[i].Device_Type);
             hsData.insert("deviceModel", "AZ-M90118");
             hsData.insert("devId", deviceId);
             flucDatas.append(hsData);
@@ -666,7 +666,7 @@ void MKCore::check_framedata(QString data, QString jDevicecode, QString ip)
                          hsData.insert("deviceName", mkList->sensors[i].Device_Name);
                          QString dataTimeStamp1=QString("%1").arg(dataTimeStamp);
                          hsData.insert("timeStamp", dataTimeStamp1);
-                         hsData.insert("deviceType", "22");
+                         hsData.insert("deviceType", mkList->sensors[i].Device_Type);
                          hsData.insert("deviceModel", "MEOKON");
                          hsData.insert("devId", jDevicecode);
                          flucDatas.append(hsData);
@@ -856,7 +856,7 @@ void MKCore::check_framedata(QString data, QString jDevicecode, QString ip)
                          hsData.insert("deviceName", mkList->sensors[i].Device_Name);
                          QString dataTimeStamp1=QString("%1").arg(dataTimeStamp);
                          hsData.insert("timeStamp", dataTimeStamp1);
-                         hsData.insert("deviceType", "22");
+                         hsData.insert("deviceType", mkList->sensors[i].Device_Type);
                          hsData.insert("deviceModel", "MEOKON");
                          hsData.insert("devId", jDevicecode);
                          flucDatas.append(hsData);
@@ -1379,7 +1379,7 @@ void MKCore::check_coverdata(QString data, QString ip){
                     hsData.insert("deviceName", mkList->sensors[i].Device_Name);
                     QString dataTimeStamp1=QString("%1").arg(jEventTime);
                     hsData.insert("timeStamp", dataTimeStamp1);
-                    hsData.insert("deviceType", "22");
+                    hsData.insert("deviceType", mkList->sensors[i].Device_Type);
                     hsData.insert("deviceModel", "AZ-M90118");
                     hsData.insert("devId", jDevicecode);
                     flucDatas.append(hsData);
@@ -1437,7 +1437,7 @@ void MKCore::check_coverdata(QString data, QString ip){
                     hsData.insert("deviceName", mkList->sensors[i].Device_Name);
                     QString dataTimeStamp1=QString("%1").arg(jEventTime);
                     hsData.insert("timeStamp", dataTimeStamp1);
-                    hsData.insert("deviceType", "22");
+                    hsData.insert("deviceType", mkList->sensors[i].Device_Type);
                     hsData.insert("deviceModel", "AZ-M90118");
                     hsData.insert("devId", jDevicecode);
                     flucDatas.append(hsData);

DataProcessService/ytWaterProcess/databasethread.cpp

@@ -60,7 +60,7 @@ void DatabaseThread::check_devicelist()
 {
     uint nowTime = QDateTime::currentDateTime().toTime_t();
     hour=QTime::currentTime().hour();
-    QString sql = QString("select owner_code, owner_name, unitinfo, owner_xh, company, dwtype from sp_owner where dwtype in (2,5)");
+    QString sql = QString("select owner_code, owner_name, unitinfo, owner_xh, company, dwtype from sp_owner where dwtype in (2,4,5)");
     QSqlQuery qry = db.exec(sql);
     int nrow= 0;
     while(qry.next()){