Merge branch 'usky-zyj' of James/ytYP2InfoData into master

ytYP2InfoData/ytYP2Core/mqttthread.cpp

@@ -141,7 +141,7 @@ void MqttThread::run()
                     if(mqttInfoList.first().DevType.compare("YTFC")==0){
 
                             emit mqttsql(QString("update sp_yangpuywtg_share set rec_cur=%1 where object_code='%2'").arg(received_time).arg(mqttInfoList.first().ObjCode));
-                            jsonstr = QString("{\"dataCode\":\"a1FiRE7C2nT\",\"deviceId\":\"%1\",\"postTime\":\"%2\",\"data\":{\"device_id\":\"%3\",\"received_time\":\"%4\",\"PowerAlarm\":\"%5\",\"ManualAct\":\"%6\",\"DevWorking01\":\"%7\",\"DevWorking02\":\"%8\",\"DevAlarm01\":\"%9\",\"DevAlarm02\":\"%10\",\"FireAutoAct\":\"%11\"}}")
+                            jsonstr = QString("{\"dataCode\":\"DATA_FIRECONT\",\"deviceId\":\"%1\",\"postTime\":\"%2\",\"data\":{\"device_id\":\"%3\",\"received_time\":\"%4\",\"PowerAlarm\":\"%5\",\"ManualAct\":\"%6\",\"DevWorking01\":\"%7\",\"DevWorking02\":\"%8\",\"DevAlarm01\":\"%9\",\"DevAlarm02\":\"%10\",\"FireAutoAct\":\"%11\"}}")
                                     .arg(mqttInfoList.first().ObjCode).arg(receivetime).arg(mqttInfoList.first().ObjCode).arg(receivetime).arg(PowerAlarm).arg(ManualAct).arg(DevWorking01).arg(DevWorking02).arg(DevAlarm01).arg(DevAlarm02).arg(FireAutoAct);
 
                             uuid = QUuid::createUuid().toString().replace("{","").replace("}","");
@@ -167,7 +167,7 @@ void MqttThread::run()
                     }else if(mqttInfoList.first().DevType.compare("YTCI")==0){
 
                         emit mqttsql(QString("update sp_yangpuywtg_share set rec_cur=%1 where object_code='%2'").arg(received_time).arg(mqttInfoList.first().ObjCode));
-                        jsonstr = QString("{\"dataCode\":\"a1eNvIr7O3M\",\"deviceId\":\"%1\",\"postTime\":\"%2\",\"data\":{\"device_id\":\"%3\",\"received_time\":\"%4\",\"Temperature\":%5,\"Humidity\":%6}}")
+                        jsonstr = QString("{\"dataCode\":\"DATA_ENVIRONM\",\"deviceId\":\"%1\",\"postTime\":\"%2\",\"data\":{\"device_id\":\"%3\",\"received_time\":\"%4\",\"Temperature\":%5,\"Humidity\":%6}}")
                                     .arg(mqttInfoList.first().ObjCode).arg(receivetime).arg(mqttInfoList.first().ObjCode).arg(receivetime).arg(Temperature).arg(Humidity);
 
                         uuid = QUuid::createUuid().toString().replace("{","").replace("}","");
@@ -192,7 +192,7 @@ void MqttThread::run()
                     }else if(mqttInfoList.first().DevType.compare("YTWP")==0){
 
                         emit mqttsql(QString("update sp_yangpuywtg_share set rec_cur=%1 where object_code='%2'").arg(received_time).arg(mqttInfoList.first().ObjCode));
-                        jsonstr = QString("{\"dataCode\":\"a1WaTE7rpRE\",\"deviceId\":\"%1\",\"postTime\":\"%2\",\"data\":{\"device_id\":\"%3\",\"received_time\":\"%4\",\"WaterPressure\":%5}}")
+                        jsonstr = QString("{\"dataCode\":\"DATA_WATERPRE\",\"deviceId\":\"%1\",\"postTime\":\"%2\",\"data\":{\"device_id\":\"%3\",\"received_time\":\"%4\",\"WaterPressure\":%5}}")
                                         .arg(mqttInfoList.first().ObjCode).arg(receivetime).arg(mqttInfoList.first().ObjCode).arg(receivetime).arg(WaterPressure);
 
                         uuid = QUuid::createUuid().toString().replace("{","").replace("}","");
@@ -216,7 +216,7 @@ void MqttThread::run()
 
                     }else if(mqttInfoList.first().DevType.compare("YTLL")==0){
                         emit mqttsql(QString("update sp_yangpuywtg_share set rec_cur=%1 where object_code='%2'").arg(received_time).arg(mqttInfoList.first().ObjCode));
-                        jsonstr = QString("{\"dataCode\":\"a1LiQuI7LE5\",\"deviceId\":\"%1\",\"postTime\":\"%2\",\"data\":{\"device_id\":\"%3\",\"received_time\":\"%4\",\"LiquidLevel\":%5}}")
+                        jsonstr = QString("{\"dataCode\":\"DATA_LIQUIDLE\",\"deviceId\":\"%1\",\"postTime\":\"%2\",\"data\":{\"device_id\":\"%3\",\"received_time\":\"%4\",\"LiquidLevel\":%5}}")
                                         .arg(mqttInfoList.first().ObjCode).arg(receivetime).arg(mqttInfoList.first().ObjCode).arg(receivetime).arg(LiquidLevel);
 
                         uuid = QUuid::createUuid().toString().replace("{","").replace("}","");
@@ -241,7 +241,7 @@ void MqttThread::run()
                     }else if(mqttInfoList.first().DevType.compare("YTEF")==0){
 
                         emit mqttsql(QString("update sp_yangpuywtg_share set rec_cur=%1 where object_code='%2'").arg(received_time).arg(mqttInfoList.first().ObjCode));
-                        jsonstr = QString("{\"dataCode\":\"DATA_ElECTRIC_1\",\"deviceId\":\"%1\",\"postTime\":\"%2\",\"data\":{\"device_id\":\"%3\",\"received_time\":\"%4\",\"HighVoltageAlarm\":\"%5\",\"LowVoltageAlarm\":\"%6\",\"HighCurrentAlarm\":\"%7\",\"ElectricityLeakage\":\"%8\",\"HighTemperatureA\":\"%9\",\"HighTemperatureB\":\"%10\",\"HighTemperatureC\":\"%11\",\"VoltageA\":%12,\"VoltageB\":%13,\"VoltageC\":%14,\"CurrentA\":%15,\"CurrentB\":%16,\"CurrentC\":%17,\"TemperatureA\":%18,\"TemperatureB\":%19,\"TemperatureC\":%20}}")
+                        jsonstr = QString("{\"dataCode\":\"DATA_ElECTRIC\",\"deviceId\":\"%1\",\"postTime\":\"%2\",\"data\":{\"device_id\":\"%3\",\"received_time\":\"%4\",\"HighVoltageAlarm\":\"%5\",\"LowVoltageAlarm\":\"%6\",\"HighCurrentAlarm\":\"%7\",\"ElectricityLeakage\":\"%8\",\"HighTemperatureA\":\"%9\",\"HighTemperatureB\":\"%10\",\"HighTemperatureC\":\"%11\",\"VoltageA\":%12,\"VoltageB\":%13,\"VoltageC\":%14,\"CurrentA\":%15,\"CurrentB\":%16,\"CurrentC\":%17,\"TemperatureA\":%18,\"TemperatureB\":%19,\"TemperatureC\":%20}}")
                                     .arg(mqttInfoList.first().ObjCode).arg(receivetime).arg(mqttInfoList.first().ObjCode).arg(receivetime).arg(HighVoltageAlarm).arg(LowVoltageAlarm).arg(HighCurrentAlarm).arg(ElectricityLeakage).arg(HighTemperatureA).arg(HighTemperatureB).arg(HighTemperatureC).arg(VoltageA).arg(VoltageB).arg(VoltageC).arg(CurrentA).arg(CurrentB).arg(CurrentC).arg(TemperatureA).arg(TemperatureB).arg(TemperatureC);
 
                         uuid = QUuid::createUuid().toString().replace("{","").replace("}","");
@@ -266,7 +266,7 @@ void MqttThread::run()
                     }else if(mqttInfoList.first().DevType.compare("YTYW")==0){
 
                         emit mqttsql(QString("update sp_yangpuywtg_share set rec_cur=%1 where object_code='%2'").arg(received_time).arg(mqttInfoList.first().ObjCode));
-                        jsonstr = QString("{\"dataCode\":\"DATA_BQASZBVO_2\",\"deviceId\":\"%1\",\"postTime\":\"%2\",\"data\":{\"device_id\":\"%3\",\"received_time\":\"%4\",\"battery_voltage\":%5,\"status\":%6,\"smoke_concentration\":%7}}")
+                        jsonstr = QString("{\"dataCode\":\"DATA_SKWCGCCC_2\",\"deviceId\":\"%1\",\"postTime\":\"%2\",\"data\":{\"device_id\":\"%3\",\"received_time\":\"%4\",\"battery_voltage\":%5,\"status\":%6,\"smoke_concentration\":%7}}")
                                     .arg(mqttInfoList.first().ObjCode).arg(receivetime).arg(mqttInfoList.first().ObjCode).arg(receivetime).arg(battery).arg(status).arg(smoke);
 
                         uuid = QUuid::createUuid().toString().replace("{","").replace("}","");
@@ -291,7 +291,7 @@ void MqttThread::run()
                     }else if(mqttInfoList.first().DevType.compare("YTSJ")==0){
 
                         emit mqttsql(QString("update sp_yangpuywtg_share set rec_cur=%1 where object_code='%2'").arg(received_time).arg(mqttInfoList.first().ObjCode));
-                        jsonstr = QString("{\"dataCode\":\"DATA_HHXTIXTK_10\",\"deviceId\":\"%1\",\"postTime\":\"%2\",\"data\":{\"device_id\":\"%3\",\"received_time\":\"%4\",\"status\":%5}}")
+                        jsonstr = QString("{\"dataCode\":\"DATA_HHXTIXTK_15\",\"deviceId\":\"%1\",\"postTime\":\"%2\",\"data\":{\"device_id\":\"%3\",\"received_time\":\"%4\",\"status\":%5}}")
                                     .arg(mqttInfoList.first().ObjCode).arg(receivetime).arg(mqttInfoList.first().ObjCode).arg(receivetime).arg(sjstatus);
 
                         uuid = QUuid::createUuid().toString().replace("{","").replace("}","");

ytYP2InfoData/ytYP2Core/yp2infocore.cpp

@@ -145,7 +145,7 @@ void YP2InfoCore::time_out()
                 if(strcmp(devShm->dev[i].ObjType,"YTFC")==0){
 
                     dbthread->appendsql(QString("update sp_yangpuywtg_share set rec_cur=%1 where object_code='%2'").arg(time.toTime_t()).arg(devShm->dev[i].ObjCode));
-                    jsonstr = QString("{\"dataCode\":\"a1FiRE7C2nT\",\"deviceId\":\"%1\",\"postTime\":\"%2\",\"data\":{\"device_id\":\"%3\",\"received_time\":\"%4\",\"PowerAlarm\":\"%5\",\"ManualAct\":\"%6\",\"DevWorking01\":\"%7\",\"DevWorking02\":\"%8\",\"DevAlarm01\":\"%9\",\"DevAlarm02\":\"%10\",\"FireAutoAct\":\"%11\"}}")
+                    jsonstr = QString("{\"dataCode\":\"DATA_FIRECONT\",\"deviceId\":\"%1\",\"postTime\":\"%2\",\"data\":{\"device_id\":\"%3\",\"received_time\":\"%4\",\"PowerAlarm\":\"%5\",\"ManualAct\":\"%6\",\"DevWorking01\":\"%7\",\"DevWorking02\":\"%8\",\"DevAlarm01\":\"%9\",\"DevAlarm02\":\"%10\",\"FireAutoAct\":\"%11\"}}")
                                 .arg(devShm->dev[i].ObjCode).arg(time.toString("yyyy-MM-dd HH:mm:ss")).arg(devShm->dev[i].ObjCode).arg(time.toString("yyyy-MM-dd HH:mm:ss")).arg("off").arg("off").arg("off").arg("off").arg("off").arg("off").arg("off");
 
                     uuid = QUuid::createUuid().toString().replace("{","").replace("}","");
@@ -154,7 +154,7 @@ void YP2InfoCore::time_out()
                 }else if(strcmp(devShm->dev[i].ObjType,"YTCI")==0){
 
                     dbthread->appendsql(QString("update sp_yangpuywtg_share set rec_cur=%1 where object_code='%2'").arg(time.toTime_t()).arg(devShm->dev[i].ObjCode));
-                    jsonstr = QString("{\"dataCode\":\"a1eNvIr7O3M\",\"deviceId\":\"%1\",\"postTime\":\"%2\",\"data\":{\"device_id\":\"%3\",\"received_time\":\"%4\",\"Temperature\":%5,\"Humidity\":%6}}")
+                    jsonstr = QString("{\"dataCode\":\"DATA_ENVIRONM\",\"deviceId\":\"%1\",\"postTime\":\"%2\",\"data\":{\"device_id\":\"%3\",\"received_time\":\"%4\",\"Temperature\":%5,\"Humidity\":%6}}")
                                 .arg(devShm->dev[i].ObjCode).arg(time.toString("yyyy-MM-dd HH:mm:ss")).arg(devShm->dev[i].ObjCode).arg(time.toString("yyyy-MM-dd HH:mm:ss")).arg("17.33").arg("72.92");
 
                     uuid = QUuid::createUuid().toString().replace("{","").replace("}","");
@@ -163,7 +163,7 @@ void YP2InfoCore::time_out()
                 }else if(strcmp(devShm->dev[i].ObjType,"YTWP")==0){
 
                     dbthread->appendsql(QString("update sp_yangpuywtg_share set rec_cur=%1 where object_code='%2'").arg(time.toTime_t()).arg(devShm->dev[i].ObjCode));
-                    jsonstr = QString("{\"dataCode\":\"a1WaTE7rpRE\",\"deviceId\":\"%1\",\"postTime\":\"%2\",\"data\":{\"device_id\":\"%3\",\"received_time\":\"%4\",\"WaterPressure\":%5}}")
+                    jsonstr = QString("{\"dataCode\":\"DATA_WATERPRE\",\"deviceId\":\"%1\",\"postTime\":\"%2\",\"data\":{\"device_id\":\"%3\",\"received_time\":\"%4\",\"WaterPressure\":%5}}")
                                     .arg(devShm->dev[i].ObjCode).arg(time.toString("yyyy-MM-dd HH:mm:ss")).arg(devShm->dev[i].ObjCode).arg(time.toString("yyyy-MM-dd HH:mm:ss")).arg("0.5964");
 
                     uuid = QUuid::createUuid().toString().replace("{","").replace("}","");
@@ -171,7 +171,7 @@ void YP2InfoCore::time_out()
 
                 }else if(strcmp(devShm->dev[i].ObjType,"YTLL")==0){
                     dbthread->appendsql(QString("update sp_yangpuywtg_share set rec_cur=%1 where object_code='%2'").arg(time.toTime_t()).arg(devShm->dev[i].ObjCode));
-                    jsonstr = QString("{\"dataCode\":\"a1LiQuI7LE5\",\"deviceId\":\"%1\",\"postTime\":\"%2\",\"data\":{\"device_id\":\"%3\",\"received_time\":\"%4\",\"LiquidLevel\":%5}}")
+                    jsonstr = QString("{\"dataCode\":\"DATA_LIQUIDLE\",\"deviceId\":\"%1\",\"postTime\":\"%2\",\"data\":{\"device_id\":\"%3\",\"received_time\":\"%4\",\"LiquidLevel\":%5}}")
                                     .arg(devShm->dev[i].ObjCode).arg(time.toString("yyyy-MM-dd HH:mm:ss")).arg(devShm->dev[i].ObjCode).arg(time.toString("yyyy-MM-dd HH:mm:ss")).arg("0.7425");
 
                     uuid = QUuid::createUuid().toString().replace("{","").replace("}","");
@@ -180,7 +180,7 @@ void YP2InfoCore::time_out()
                 }else if(strcmp(devShm->dev[i].ObjType,"YTEF")==0){
 
                     dbthread->appendsql(QString("update sp_yangpuywtg_share set rec_cur=%1 where object_code='%2'").arg(time.toTime_t()).arg(devShm->dev[i].ObjCode));
-                    jsonstr = QString("{\"dataCode\":\"DATA_ElECTRIC_1\",\"deviceId\":\"%1\",\"postTime\":\"%2\",\"data\":{\"device_id\":\"%3\",\"received_time\":\"%4\",\"HighVoltageAlarm\":\"%5\",\"LowVoltageAlarm\":\"%6\",\"HighCurrentAlarm\":\"%7\",\"ElectricityLeakage\":\"%8\",\"HighTemperatureA\":\"%9\",\"HighTemperatureB\":\"%10\",\"HighTemperatureC\":\"%11\",\"VoltageA\":%12,\"VoltageB\":%13,\"VoltageC\":%14,\"CurrentA\":%15,\"CurrentB\":%16,\"CurrentC\":%17,\"TemperatureA\":%18,\"TemperatureB\":%19,\"TemperatureC\":%20}}")
+                    jsonstr = QString("{\"dataCode\":\"DATA_ElECTRIC\",\"deviceId\":\"%1\",\"postTime\":\"%2\",\"data\":{\"device_id\":\"%3\",\"received_time\":\"%4\",\"HighVoltageAlarm\":\"%5\",\"LowVoltageAlarm\":\"%6\",\"HighCurrentAlarm\":\"%7\",\"ElectricityLeakage\":\"%8\",\"HighTemperatureA\":\"%9\",\"HighTemperatureB\":\"%10\",\"HighTemperatureC\":\"%11\",\"VoltageA\":%12,\"VoltageB\":%13,\"VoltageC\":%14,\"CurrentA\":%15,\"CurrentB\":%16,\"CurrentC\":%17,\"TemperatureA\":%18,\"TemperatureB\":%19,\"TemperatureC\":%20}}")
                                 .arg(devShm->dev[i].ObjCode).arg(time.toString("yyyy-MM-dd HH:mm:ss")).arg(devShm->dev[i].ObjCode).arg(time.toString("yyyy-MM-dd HH:mm:ss")).arg("off").arg("off").arg("off").arg("off").arg("off").arg("off").arg("off").arg("223.800").arg("225.900").arg("226.200").arg("8.520").arg("14.700").arg("21.240").arg("15.500").arg("15.800").arg("16.000");
 
                     uuid = QUuid::createUuid().toString().replace("{","").replace("}","");
@@ -189,7 +189,7 @@ void YP2InfoCore::time_out()
                 }else if(strcmp(devShm->dev[i].ObjType,"YTYW")==0){
 
                     dbthread->appendsql(QString("update sp_yangpuywtg_share set rec_cur=%1 where object_code='%2'").arg(time.toTime_t()).arg(devShm->dev[i].ObjCode));
-                    jsonstr = QString("{\"dataCode\":\"DATA_BQASZBVO_2\",\"deviceId\":\"%1\",\"postTime\":\"%2\",\"data\":{\"device_id\":\"%3\",\"received_time\":\"%4\",\"battery_voltage\":%5,\"status\":%6,\"smoke_concentration\":%7}}")
+                    jsonstr = QString("{\"dataCode\":\"DATA_SKWCGCCC_2\",\"deviceId\":\"%1\",\"postTime\":\"%2\",\"data\":{\"device_id\":\"%3\",\"received_time\":\"%4\",\"battery_voltage\":%5,\"status\":%6,\"smoke_concentration\":%7}}")
                                 .arg(devShm->dev[i].ObjCode).arg(time.toString("yyyy-MM-dd HH:mm:ss")).arg(devShm->dev[i].ObjCode).arg(time.toString("yyyy-MM-dd HH:mm:ss")).arg("100").arg("7").arg("20");
 
                     uuid = QUuid::createUuid().toString().replace("{","").replace("}","");
@@ -198,7 +198,7 @@ void YP2InfoCore::time_out()
                 }else if(strcmp(devShm->dev[i].ObjType,"YTSJ")==0){
 
                     dbthread->appendsql(QString("update sp_yangpuywtg_share set rec_cur=%1 where object_code='%2'").arg(time.toTime_t()).arg(devShm->dev[i].ObjCode));
-                    jsonstr = QString("{\"dataCode\":\"DATA_HHXTIXTK_10\",\"deviceId\":\"%1\",\"postTime\":\"%2\",\"data\":{\"device_id\":\"%3\",\"received_time\":\"%4\",\"status\":%5}}")
+                    jsonstr = QString("{\"dataCode\":\"DATA_HHXTIXTK_15\",\"deviceId\":\"%1\",\"postTime\":\"%2\",\"data\":{\"device_id\":\"%3\",\"received_time\":\"%4\",\"status\":%5}}")
                                 .arg(devShm->dev[i].ObjCode).arg(time.toString("yyyy-MM-dd HH:mm:ss")).arg(devShm->dev[i].ObjCode).arg(time.toString("yyyy-MM-dd HH:mm:ss")).arg("1");
 
                     uuid = QUuid::createUuid().toString().replace("{","").replace("}","");
@@ -208,7 +208,7 @@ void YP2InfoCore::time_out()
 
                 if(strcmp(devShm->dev[i].ObjType,"YTVA")==0){
                     dbthread->appendsql(QString("update sp_yangpuywtg_share set rec_cur=%1 where object_code='%2'").arg(time.toTime_t()).arg(devShm->dev[i].ObjCode));
-                    jsonstr = QString("{\"dataCode\":\"a1VIdE7e1OA\",\"deviceId\":\"%1\",\"postTime\":\"%2\",\"data\":{\"device_id\":\"%3\",\"received_time\":\"%4\",\"VideoAlarm01\":\"%5\",\"VideoAlarm02\":\"%6\",\"VideoAlarm03\":\"%7\"}}")
+                    jsonstr = QString("{\"dataCode\":\"DATA_VIDEOALA\",\"deviceId\":\"%1\",\"postTime\":\"%2\",\"data\":{\"device_id\":\"%3\",\"received_time\":\"%4\",\"VideoAlarm01\":\"%5\",\"VideoAlarm02\":\"%6\",\"VideoAlarm03\":\"%7\"}}")
                             .arg(devShm->dev[i].ObjCode).arg(time.toString("yyyy-MM-dd HH:mm:ss")).arg(devShm->dev[i].ObjCode).arg(time.toString("yyyy-MM-dd HH:mm:ss")).arg("off").arg("off").arg("off");
                     //ret = system(QString("echo '%1' >> /root/heartbeat.log").arg(jsonstr).toUtf8().data());
                     uuid = QUuid::createUuid().toString().replace("{","").replace("}","");
@@ -231,7 +231,7 @@ void YP2InfoCore::time_out()
                 .arg(rep.Id).arg(rep.JsonStr).arg(QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss")));
         QByteArray Report = rep.JsonStr.toUtf8();
         QNetworkRequest *req = new QNetworkRequest();
-        req->setUrl(QUrl("http://220.196.241.22:8000/api-devicelog-collect/data/NonLoraData"));
+        req->setUrl(QUrl("https://gw.opg-iot.com/api-devicelog-collect/data/NonLoraData"));
         //req->setUrl(QUrl("http://iot.usky.cn:80/ytapi/admin/order/aepceshi"));
         req->setHeader(QNetworkRequest::ContentTypeHeader,"application/json; charset=UTF-8");
         req->setHeader(QNetworkRequest::ContentLengthHeader,QString("%1").arg(Report.length()).toUtf8());
@@ -252,7 +252,7 @@ void YP2InfoCore::time_out()
                 .arg(rep.Id).arg(rep.JsonStr).arg(QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss")));
         QByteArray Report = rep.JsonStr.toUtf8();
         QNetworkRequest *req = new QNetworkRequest();
-        req->setUrl(QUrl("http://220.196.241.22:8000/api-devicelog-collect/data/NonLoraData"));
+        req->setUrl(QUrl("https://gw.opg-iot.com/api-devicelog-collect/data/NonLoraData"));
         //req->setUrl(QUrl("http://iot.usky.cn:80/ytapi/admin/order/aepceshi"));
         req->setHeader(QNetworkRequest::ContentTypeHeader,"application/json; charset=UTF-8");
         req->setHeader(QNetworkRequest::ContentLengthHeader,QString("%1").arg(Report.length()).toUtf8());
@@ -273,7 +273,7 @@ void YP2InfoCore::time_out()
                 .arg(rep.Id).arg(rep.JsonStr).arg(QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss")));
         QByteArray Report = rep.JsonStr.toUtf8();
         QNetworkRequest *req = new QNetworkRequest();
-        req->setUrl(QUrl("http://220.196.241.22:8000/api-devicelog-collect/data/NonLoraData"));
+        req->setUrl(QUrl("https://gw.opg-iot.com/api-devicelog-collect/data/NonLoraData"));
         //req->setUrl(QUrl("http://iot.usky.cn:80/ytapi/admin/order/aepceshi"));
         req->setHeader(QNetworkRequest::ContentTypeHeader,"application/json; charset=UTF-8");
         req->setHeader(QNetworkRequest::ContentLengthHeader,QString("%1").arg(Report.length()).toUtf8());
@@ -294,7 +294,7 @@ void YP2InfoCore::time_out()
                 .arg(rep.Id).arg(rep.JsonStr).arg(QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss")));
         QByteArray Report = rep.JsonStr.toUtf8();
         QNetworkRequest *req = new QNetworkRequest();
-        req->setUrl(QUrl("http://220.196.241.22:8000/api-devicelog-collect/data/NonLoraData"));
+        req->setUrl(QUrl("https://gw.opg-iot.com/api-devicelog-collect/data/NonLoraData"));
         //req->setUrl(QUrl("http://iot.usky.cn:80/ytapi/admin/order/aepceshi"));
         req->setHeader(QNetworkRequest::ContentTypeHeader,"application/json; charset=UTF-8");
         req->setHeader(QNetworkRequest::ContentLengthHeader,QString("%1").arg(Report.length()).toUtf8());
@@ -315,7 +315,7 @@ void YP2InfoCore::time_out()
                 .arg(rep.Id).arg(rep.JsonStr).arg(QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss")));
         QByteArray Report = rep.JsonStr.toUtf8();
         QNetworkRequest *req = new QNetworkRequest();
-        req->setUrl(QUrl("http://220.196.241.22:8000/api-devicelog-collect/data/NonLoraData"));
+        req->setUrl(QUrl("https://gw.opg-iot.com/api-devicelog-collect/data/NonLoraData"));
         //req->setUrl(QUrl("http://iot.usky.cn:80/ytapi/admin/order/aepceshi"));
         req->setHeader(QNetworkRequest::ContentTypeHeader,"application/json; charset=UTF-8");
         req->setHeader(QNetworkRequest::ContentLengthHeader,QString("%1").arg(Report.length()).toUtf8());
@@ -336,7 +336,7 @@ void YP2InfoCore::time_out()
                 .arg(rep.Id).arg(rep.JsonStr).arg(QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss")));
         QByteArray Report = rep.JsonStr.toUtf8();
         QNetworkRequest *req = new QNetworkRequest();
-        req->setUrl(QUrl("http://220.196.241.22:8000/api-devicelog-collect/data/NonLoraData"));
+        req->setUrl(QUrl("https://gw.opg-iot.com/api-devicelog-collect/data/NonLoraData"));
         //req->setUrl(QUrl("http://iot.usky.cn:80/ytapi/admin/order/aepceshi"));
         req->setHeader(QNetworkRequest::ContentTypeHeader,"application/json; charset=UTF-8");
         req->setHeader(QNetworkRequest::ContentLengthHeader,QString("%1").arg(Report.length()).toUtf8());
@@ -357,7 +357,7 @@ void YP2InfoCore::time_out()
                 .arg(rep.Id).arg(rep.JsonStr).arg(QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss")));
         QByteArray Report = rep.JsonStr.toUtf8();
         QNetworkRequest *req = new QNetworkRequest();
-        req->setUrl(QUrl("http://220.196.241.22:8000/api-devicelog-collect/data/NonLoraData"));
+        req->setUrl(QUrl("https://gw.opg-iot.com/api-devicelog-collect/data/NonLoraData"));
         //req->setUrl(QUrl("http://iot.usky.cn:80/ytapi/admin/order/aepceshi"));
         req->setHeader(QNetworkRequest::ContentTypeHeader,"application/json; charset=UTF-8");
         req->setHeader(QNetworkRequest::ContentLengthHeader,QString("%1").arg(Report.length()).toUtf8());
@@ -378,7 +378,7 @@ void YP2InfoCore::time_out()
                 .arg(rep.Id).arg(rep.JsonStr).arg(QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss")));
         QByteArray Report = rep.JsonStr.toUtf8();
         QNetworkRequest *req = new QNetworkRequest();
-        req->setUrl(QUrl("http://220.196.241.22:8000/api-devicelog-collect/data/NonLoraData"));
+        req->setUrl(QUrl("https://gw.opg-iot.com/api-devicelog-collect/data/NonLoraData"));
         //req->setUrl(QUrl("http://iot.usky.cn:80/ytapi/admin/order/aepceshi"));
         req->setHeader(QNetworkRequest::ContentTypeHeader,"application/json; charset=UTF-8");
         req->setHeader(QNetworkRequest::ContentLengthHeader,QString("%1").arg(Report.length()).toUtf8());
@@ -399,7 +399,7 @@ void YP2InfoCore::time_out()
                 .arg(rep.Id).arg(rep.JsonStr).arg(QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss")));
         QByteArray Report = rep.JsonStr.toUtf8();
         QNetworkRequest *req = new QNetworkRequest();
-        req->setUrl(QUrl("http://220.196.241.22:8000/api-devicelog-collect/data/NonLoraData"));
+        req->setUrl(QUrl("https://gw.opg-iot.com/api-devicelog-collect/data/NonLoraData"));
         //req->setUrl(QUrl("http://iot.usky.cn:80/ytapi/admin/order/aepceshi"));
         req->setHeader(QNetworkRequest::ContentTypeHeader,"application/json; charset=UTF-8");
         req->setHeader(QNetworkRequest::ContentLengthHeader,QString("%1").arg(Report.length()).toUtf8());