|
...
|
...
|
@@ -36,7 +36,7 @@ public class ProtocolParserAndPurificationFactory<T> { |
|
|
|
* @param payload 数据信息
|
|
|
|
* @return
|
|
|
|
*/
|
|
|
|
public ProtocolPurificationModel analysisAndPurification(IotProduct iotProduct, String topicStr, T payload ) throws InstantiationException, IllegalAccessException {
|
|
|
|
public ProtocolPurificationModel analysisAndPurification(String imei,IotProduct iotProduct, String topicStr, T payload ) throws InstantiationException, IllegalAccessException {
|
|
|
|
Topic baseTopic = TopicUtil.initTopicFromModelStr(topicStr,"/{{roleid}}/{{username}}"); //我们定义的topic
|
|
|
|
|
|
|
|
//根据产品类型找到对应的解析服务
|
|
...
|
...
|
@@ -72,10 +72,10 @@ public class ProtocolParserAndPurificationFactory<T> { |
|
|
|
protocolPurificationModel.setAllUp(topic.isAllup());
|
|
|
|
return protocolPurificationModel;
|
|
|
|
}
|
|
|
|
DeviceDataLog.error(baseTopic.getClientid(), DataLogType.解析消息,"没有找到可以清洗的数据:"+ GsonConstructor.get().toJson(analysisResult));
|
|
|
|
DeviceDataLog.error(imei, DataLogType.解析消息,"没有找到可以清洗的数据:"+ GsonConstructor.get().toJson(analysisResult));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
DeviceDataLog.error(baseTopic.getClientid(), DataLogType.解析消息,"没有找到可以解析的服务:"+baseTopic.getUsername());
|
|
|
|
DeviceDataLog.error(imei, DataLogType.解析消息,"没有找到可以解析的服务:"+baseTopic.getUsername());
|
|
|
|
|
|
|
|
return null;
|
|
|
|
}
|
...
|
...
|
|