|
@@ -71,7 +71,32 @@ void DataCollectorPub::run()
|
|
|
|
|
|
if(dev_value.isArray()){
|
|
|
QJsonObject dev_obj = dev_value.toArray().at(0).toObject();
|
|
|
- deviceType = dev_obj.value("deviceType").toString();
|
|
|
+ QString dt = dev_obj.value("deviceType").toString();
|
|
|
+ if(dt.compare("1")==0){
|
|
|
+ deviceType = "1-fhj";
|
|
|
+ }else if(dt.compare("2")==0){
|
|
|
+ deviceType = "2-fsy";
|
|
|
+ }else if(dt.compare("3")==0){
|
|
|
+ deviceType = "3-fyg";
|
|
|
+ }else if(dt.compare("4")==0){
|
|
|
+ deviceType = "4-fxhs";
|
|
|
+ }else if(dt.compare("5")==0){
|
|
|
+ deviceType = "5-fyw";
|
|
|
+ }else if(dt.compare("6")==0){
|
|
|
+ deviceType = "6-frtu";
|
|
|
+ }else if(dt.compare("7")==0){
|
|
|
+ deviceType = "7-fef";
|
|
|
+ }else if(dt.compare("16")==0){
|
|
|
+ deviceType = "16-fvd";
|
|
|
+ }else if(dt.compare("128")==0){
|
|
|
+ deviceType = "128-fiw";
|
|
|
+ }else if(dt.compare("129")==0){
|
|
|
+ deviceType = "129-fdc";
|
|
|
+ }else if(dt.compare("130")==0){
|
|
|
+ deviceType = "130-feg";
|
|
|
+ }else if(dt.compare("131")==0){
|
|
|
+ deviceType = "131-fgas";
|
|
|
+ }
|
|
|
QJsonValue dp_value = dev_obj.value("dp");
|
|
|
if(dp_value.isArray()){
|
|
|
QJsonArray dp_array = dp_value.toArray();
|