作者 钟来

修改日志输出内容imei号为空的异常

... ... @@ -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;
}
... ...
... ... @@ -58,7 +58,7 @@ public abstract class BaseCallback<T> {
}
//解析和清洗body
ProtocolPurificationModel protocolPurificationModel = protocolParserAndPurificationFactory.analysisAndPurification( oldparserDeviceHostDto.getIotProduct(),s,payload);
ProtocolPurificationModel protocolPurificationModel = protocolParserAndPurificationFactory.analysisAndPurification(imei, oldparserDeviceHostDto.getIotProduct(),s,payload);
if (null == protocolPurificationModel)
{
return null;
... ...