优化消火栓末端、喷淋末端、液位、消火栓主管水压和喷淋泵主管水压推送数据同步模块的逻辑

ytServiceCore/core.cpp

@@ -2169,6 +2169,7 @@ void Core::subReport(quint16 subType, QString DeviceID, quint64 insertId, bool f
                                 jdata.append(QString(",\"alarmStatus\":\"%1\"").arg(2));
                             }
 
+
                         }
                         if(xfzddev.DeviceType==302){
                             XfzdSyncData(0,QUuid::createUuid().toString().replace("{","").replace("}",""), "{"+jdata+"}",xfzddev.devCategory,xfzddev.DeviceCode,xfzddev.OpenProjectId);
@@ -2276,6 +2277,50 @@ void Core::subReport(quint16 subType, QString DeviceID, quint64 insertId, bool f
                     ypYwSyncData(2,QUuid::createUuid().toString().replace("{","").replace("}",""),"{"+ypywdata+"}");
                 }
             }
+//            if(!found51){
+//                for(int i=0;i<XfzdDevList.length();i++){
+//                    XfzdSyncDev xfzddev = XfzdDevList.at(i);
+//                    if(xfzddev.DeviceCode==DeviceID){
+//                        found51=true;
+//                        QString jdata = "";
+//                        jdata.append(QString("\"descript\":\"%1\"").arg(xfzddev.Descript));
+//                        jdata.append(QString(",\"deviceName\":\"%1\"").arg(xfzddev.DeviceName));
+//                        if(xfzddev.devCategory==6){
+//                            jdata.append(QString(",\"deviceNo\":\"%1\"").arg(xfzddev.DeviceCode+xfzddev.Port));
+//                        }else{
+//                            jdata.append(QString(",\"deviceNo\":\"%1\"").arg(xfzddev.DeviceCode));
+//                        }
+//                        jdata.append(QString(",\"deviceType\":\"%1\"").arg(xfzddev.DeviceType));
+//                        jdata.append(QString(",\"deviceTypeName\":\"%1\"").arg(xfzddev.DeviceTypeName));
+//                        jdata.append(QString(",\"openProjectId\":\"%1\"").arg(xfzddev.OpenProjectId));
+//                        jdata.append(QString(",\"floor\":\"%1\"").arg(xfzddev.DeviceFloor));
+
+
+//                        printf("yw begin %s  openProjectId %s\n",QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss").toUtf8().data(),xfzddev.OpenProjectId.toUtf8().data());
+//                        QString xfzdsql5 = QString("select data1, data4, time from sp_sj2017 where id=%1").arg(insertId);
+//                        qry5 = mdb.exec(xfzdsql5);
+//                        printf("yw end %s \n",QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss").toUtf8().data());
+//                        while(qry5.next()){
+
+//                            printf("yw  %s  logTime11 [%s]\n",QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss").toUtf8().data(),qry5.value(2).toDateTime().toString("yyyy-MM-dd hh:mm:ss").toUtf8().data());
+//                            jdata.append(QString(",\"logTime\":\"%1\"").arg(qry5.value(2).toDateTime().toString("yyyy-MM-dd hh:mm:ss")));
+//                            jdata.append(QString(",\"level\":\"%1\"").arg(qry5.value(1).toString()));
+
+//                            if(qry5.value(0).toString().indexOf(QString::fromUtf8("LL1"))==0){
+//                                jdata.append(QString(",\"alarmStatus\":\"%1\"").arg(1));
+//                            }else if(qry5.value(0).toString().indexOf(QString::fromUtf8("LL2"))==0){
+//                                jdata.append(QString(",\"alarmStatus\":\"%1\"").arg(2));
+//                            }
+
+//                        }
+//                        if(xfzddev.DeviceType==402){
+//                            XfzdSyncData(2,QUuid::createUuid().toString().replace("{","").replace("}",""), "{"+jdata+"}",xfzddev.devCategory,xfzddev.DeviceCode,xfzddev.OpenProjectId);
+//                        }else{
+//                            XfzdSyncData(3,QUuid::createUuid().toString().replace("{","").replace("}",""), "{"+jdata+"}",xfzddev.devCategory,xfzddev.DeviceCode,xfzddev.OpenProjectId);
+//                        }
+//                    }
+//                }
+//            }
         }else{
             for(int i=0;i<ypYwDevList.length();i++){
                 QString ypywdata1 = "";