优化ytDataCollector消防物联网采集数据推送到data_collector公共设备采集topic的逻辑，将product_id中的值从单位编码改为产品编码值，以便usky-data数据库中的设备实时设备数据表和设备历史数据表与对应的产品属性进行一一映射，获取对应的属性名称和单位；

ytDataCollectorCore/datacollectorpub.cpp

@@ -28,7 +28,7 @@ void DataCollectorPub::run()
                 QString topic = devdata.topic;
                 QByteArray data = devdata.data;
                 QString devType = (topic.split("/")).at(2);
-                QString productId = (topic.split("/")).at(3);
+                QString productId = "";
                 QString deviceId = (topic.split("/")).at(4);
 
                 QString jsonStr = "";
@@ -74,28 +74,40 @@ void DataCollectorPub::run()
                         QString dt = dev_obj.value("deviceType").toString();
                         if(dt.compare("1")==0){
                             deviceType = "1-fhj";
+                            productId = "1_0001";
                         }else if(dt.compare("2")==0){
                             deviceType = "2-fsy";
+                            productId = "2_0001";
                         }else if(dt.compare("3")==0){
                             deviceType = "3-fyg";
+                            productId = "3_0001";
                         }else if(dt.compare("4")==0){
                             deviceType = "4-fxhs";
+                            productId = "4_0001";
                         }else if(dt.compare("5")==0){
                             deviceType = "5-fyw";
+                            productId = "5_0001";
                         }else if(dt.compare("6")==0){
                             deviceType = "6-frtu";
+                            productId = "6_0001";
                         }else if(dt.compare("7")==0){
                             deviceType = "7-fef";
+                            productId = "7_0001";
                         }else if(dt.compare("16")==0){
                             deviceType = "16-fvd";
+                            productId = "16_0001";
                         }else if(dt.compare("128")==0){
                             deviceType = "128-fiw";
+                            productId = "128_0001";
                         }else if(dt.compare("129")==0){
                             deviceType = "129-fdc";
+                            productId = "129_0001";
                         }else if(dt.compare("130")==0){
                             deviceType = "130-feg";
+                            productId = "130_0001";
                         }else if(dt.compare("131")==0){
                             deviceType = "131-fgas";
+                            productId = "131_0001";
                         }
                         QJsonValue dp_value = dev_obj.value("dp");
                         if(dp_value.isArray()){