diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/GenericProtocolParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/GenericProtocolParser.java index 92f501f..d7032ad 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/GenericProtocolParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/GenericProtocolParser.java @@ -98,6 +98,7 @@ byteBuf.resetReaderIndex(); byteBuf.readBytes(protocolConfig.getPreFix().length()); byteBuf.markReaderIndex(); + LeadingCodeMatcher.rematch(byteBuf,protocolConfigProvider.getMatchList()); return null; } return result; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/GenericProtocolParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/GenericProtocolParser.java index 92f501f..d7032ad 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/GenericProtocolParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/GenericProtocolParser.java @@ -98,6 +98,7 @@ byteBuf.resetReaderIndex(); byteBuf.readBytes(protocolConfig.getPreFix().length()); byteBuf.markReaderIndex(); + LeadingCodeMatcher.rematch(byteBuf,protocolConfigProvider.getMatchList()); return null; } return result; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/ProtocolParserSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/ProtocolParserSupport.java index f357d7e..957ece8 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/ProtocolParserSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/ProtocolParserSupport.java @@ -43,8 +43,7 @@ //获取该协议的字段配置,用于协议规则匹配 List protocolFieldConfigs = protocolFieldConfigProvider.getProtocolFieldConfigs(); //获取规则 - RuleConfig ruleConfig = ruleConfigProvider.doGetRule(parseFixedDataMap, - rulePrepareFields, protocolFieldConfigs); + RuleConfig ruleConfig = ruleConfigProvider.doGetRule(parseFixedDataMap,rulePrepareFields, protocolFieldConfigs); return ruleConfig; } return null; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/GenericProtocolParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/GenericProtocolParser.java index 92f501f..d7032ad 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/GenericProtocolParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/GenericProtocolParser.java @@ -98,6 +98,7 @@ byteBuf.resetReaderIndex(); byteBuf.readBytes(protocolConfig.getPreFix().length()); byteBuf.markReaderIndex(); + LeadingCodeMatcher.rematch(byteBuf,protocolConfigProvider.getMatchList()); return null; } return result; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/ProtocolParserSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/ProtocolParserSupport.java index f357d7e..957ece8 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/ProtocolParserSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/ProtocolParserSupport.java @@ -43,8 +43,7 @@ //获取该协议的字段配置,用于协议规则匹配 List protocolFieldConfigs = protocolFieldConfigProvider.getProtocolFieldConfigs(); //获取规则 - RuleConfig ruleConfig = ruleConfigProvider.doGetRule(parseFixedDataMap, - rulePrepareFields, protocolFieldConfigs); + RuleConfig ruleConfig = ruleConfigProvider.doGetRule(parseFixedDataMap,rulePrepareFields, protocolFieldConfigs); return ruleConfig; } return null; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/GenericCombinedFieldResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/GenericCombinedFieldResolver.java index 665386b..d867132 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/GenericCombinedFieldResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/GenericCombinedFieldResolver.java @@ -34,7 +34,7 @@ List> storeObjectList, Map fieldConfigsMap) { Map fieldFixedMap = combinedFieldLeadCodeMap(combinedFieldConfigList); Object median = null; - List abstractProcessorList = CreateSortAbstractProcessors(); + List abstractProcessorList = createSortAbstractProcessors(); CombinedFieldProcessorParam combinedFieldParam = build(byteBuf, fieldFixedMap, fieldConfigsMap, storeObjectList); while (byteBuf.readerIndex() < byteBuf.writerIndex()) { for (AbstractCombinedFieldProcessor abstractProcessor : abstractProcessorList) { @@ -64,7 +64,7 @@ /** * 创建有序的流程处理集合类 顺序为:前导码匹配->前置处理长度字段->业务字段解析 */ - private List CreateSortAbstractProcessors() { + private List createSortAbstractProcessors() { List abstractProcessorList = new ArrayList<>(); AbstractCombinedFieldProcessor preLeadCodeProcessor = new PreLeadCodeProcessor(); abstractProcessorList.add(preLeadCodeProcessor); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/GenericProtocolParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/GenericProtocolParser.java index 92f501f..d7032ad 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/GenericProtocolParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/GenericProtocolParser.java @@ -98,6 +98,7 @@ byteBuf.resetReaderIndex(); byteBuf.readBytes(protocolConfig.getPreFix().length()); byteBuf.markReaderIndex(); + LeadingCodeMatcher.rematch(byteBuf,protocolConfigProvider.getMatchList()); return null; } return result; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/ProtocolParserSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/ProtocolParserSupport.java index f357d7e..957ece8 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/ProtocolParserSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/ProtocolParserSupport.java @@ -43,8 +43,7 @@ //获取该协议的字段配置,用于协议规则匹配 List protocolFieldConfigs = protocolFieldConfigProvider.getProtocolFieldConfigs(); //获取规则 - RuleConfig ruleConfig = ruleConfigProvider.doGetRule(parseFixedDataMap, - rulePrepareFields, protocolFieldConfigs); + RuleConfig ruleConfig = ruleConfigProvider.doGetRule(parseFixedDataMap,rulePrepareFields, protocolFieldConfigs); return ruleConfig; } return null; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/GenericCombinedFieldResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/GenericCombinedFieldResolver.java index 665386b..d867132 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/GenericCombinedFieldResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/GenericCombinedFieldResolver.java @@ -34,7 +34,7 @@ List> storeObjectList, Map fieldConfigsMap) { Map fieldFixedMap = combinedFieldLeadCodeMap(combinedFieldConfigList); Object median = null; - List abstractProcessorList = CreateSortAbstractProcessors(); + List abstractProcessorList = createSortAbstractProcessors(); CombinedFieldProcessorParam combinedFieldParam = build(byteBuf, fieldFixedMap, fieldConfigsMap, storeObjectList); while (byteBuf.readerIndex() < byteBuf.writerIndex()) { for (AbstractCombinedFieldProcessor abstractProcessor : abstractProcessorList) { @@ -64,7 +64,7 @@ /** * 创建有序的流程处理集合类 顺序为:前导码匹配->前置处理长度字段->业务字段解析 */ - private List CreateSortAbstractProcessors() { + private List createSortAbstractProcessors() { List abstractProcessorList = new ArrayList<>(); AbstractCombinedFieldProcessor preLeadCodeProcessor = new PreLeadCodeProcessor(); abstractProcessorList.add(preLeadCodeProcessor); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/RuleResolverCore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/RuleResolverCore.java index 969dcf7..644d02c 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/RuleResolverCore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/RuleResolverCore.java @@ -39,9 +39,9 @@ return null; } String[] ruleFields = ruleConfigOptional.get().getDataFieldIds().split(","); - Map ruleMetaDataMap = getRuleFields(ruleFields, fixDataMap, fixDataFieldMap); //递归选定解析规则,进行规则解析 if (!("1".equals(ruleConfigOptional.get().getIsFinishMatch()))) { + Map ruleMetaDataMap = getRuleFields(ruleFields, fixDataMap, fixDataFieldMap); //递归选定规则 doMachRule(ruleConfigList, ruleMetaDataMap, fixDataMap, fixDataFieldMap); } diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/GenericProtocolParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/GenericProtocolParser.java index 92f501f..d7032ad 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/GenericProtocolParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/GenericProtocolParser.java @@ -98,6 +98,7 @@ byteBuf.resetReaderIndex(); byteBuf.readBytes(protocolConfig.getPreFix().length()); byteBuf.markReaderIndex(); + LeadingCodeMatcher.rematch(byteBuf,protocolConfigProvider.getMatchList()); return null; } return result; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/ProtocolParserSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/ProtocolParserSupport.java index f357d7e..957ece8 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/ProtocolParserSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/ProtocolParserSupport.java @@ -43,8 +43,7 @@ //获取该协议的字段配置,用于协议规则匹配 List protocolFieldConfigs = protocolFieldConfigProvider.getProtocolFieldConfigs(); //获取规则 - RuleConfig ruleConfig = ruleConfigProvider.doGetRule(parseFixedDataMap, - rulePrepareFields, protocolFieldConfigs); + RuleConfig ruleConfig = ruleConfigProvider.doGetRule(parseFixedDataMap,rulePrepareFields, protocolFieldConfigs); return ruleConfig; } return null; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/GenericCombinedFieldResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/GenericCombinedFieldResolver.java index 665386b..d867132 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/GenericCombinedFieldResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/GenericCombinedFieldResolver.java @@ -34,7 +34,7 @@ List> storeObjectList, Map fieldConfigsMap) { Map fieldFixedMap = combinedFieldLeadCodeMap(combinedFieldConfigList); Object median = null; - List abstractProcessorList = CreateSortAbstractProcessors(); + List abstractProcessorList = createSortAbstractProcessors(); CombinedFieldProcessorParam combinedFieldParam = build(byteBuf, fieldFixedMap, fieldConfigsMap, storeObjectList); while (byteBuf.readerIndex() < byteBuf.writerIndex()) { for (AbstractCombinedFieldProcessor abstractProcessor : abstractProcessorList) { @@ -64,7 +64,7 @@ /** * 创建有序的流程处理集合类 顺序为:前导码匹配->前置处理长度字段->业务字段解析 */ - private List CreateSortAbstractProcessors() { + private List createSortAbstractProcessors() { List abstractProcessorList = new ArrayList<>(); AbstractCombinedFieldProcessor preLeadCodeProcessor = new PreLeadCodeProcessor(); abstractProcessorList.add(preLeadCodeProcessor); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/RuleResolverCore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/RuleResolverCore.java index 969dcf7..644d02c 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/RuleResolverCore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/RuleResolverCore.java @@ -39,9 +39,9 @@ return null; } String[] ruleFields = ruleConfigOptional.get().getDataFieldIds().split(","); - Map ruleMetaDataMap = getRuleFields(ruleFields, fixDataMap, fixDataFieldMap); //递归选定解析规则,进行规则解析 if (!("1".equals(ruleConfigOptional.get().getIsFinishMatch()))) { + Map ruleMetaDataMap = getRuleFields(ruleFields, fixDataMap, fixDataFieldMap); //递归选定规则 doMachRule(ruleConfigList, ruleMetaDataMap, fixDataMap, fixDataFieldMap); } diff --git a/sensorhub-core/src/main/java/com/casic/missiles/replier/SensorhubReplier.java b/sensorhub-core/src/main/java/com/casic/missiles/replier/SensorhubReplier.java index 3d5cc26..b4a0f0a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/replier/SensorhubReplier.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/replier/SensorhubReplier.java @@ -14,12 +14,12 @@ public class SensorhubReplier extends SimpleChannelInboundHandler { /** - * 该类方法是回复内容构建的流程入口类 + * todo: 回复内容构建的流程入口方法 * 1、通过有标准协议解析器传来的结果进行命令的构建 * 2、构建命令有以下的命令内容 * (1)成功返回时间,并进行下发配置操作 * (2)版本升级 - * (3)下位机下发版本是否升级,是上版本,是升级,请求,回复升级等流程 + * (3)下位机下发版本是否升级,是上版本,是升级,请求,回复升级等流程 * (4)其他未知需求命令 */ @Override diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/GenericProtocolParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/GenericProtocolParser.java index 92f501f..d7032ad 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/GenericProtocolParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/GenericProtocolParser.java @@ -98,6 +98,7 @@ byteBuf.resetReaderIndex(); byteBuf.readBytes(protocolConfig.getPreFix().length()); byteBuf.markReaderIndex(); + LeadingCodeMatcher.rematch(byteBuf,protocolConfigProvider.getMatchList()); return null; } return result; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/ProtocolParserSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/ProtocolParserSupport.java index f357d7e..957ece8 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/ProtocolParserSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/ProtocolParserSupport.java @@ -43,8 +43,7 @@ //获取该协议的字段配置,用于协议规则匹配 List protocolFieldConfigs = protocolFieldConfigProvider.getProtocolFieldConfigs(); //获取规则 - RuleConfig ruleConfig = ruleConfigProvider.doGetRule(parseFixedDataMap, - rulePrepareFields, protocolFieldConfigs); + RuleConfig ruleConfig = ruleConfigProvider.doGetRule(parseFixedDataMap,rulePrepareFields, protocolFieldConfigs); return ruleConfig; } return null; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/GenericCombinedFieldResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/GenericCombinedFieldResolver.java index 665386b..d867132 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/GenericCombinedFieldResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/GenericCombinedFieldResolver.java @@ -34,7 +34,7 @@ List> storeObjectList, Map fieldConfigsMap) { Map fieldFixedMap = combinedFieldLeadCodeMap(combinedFieldConfigList); Object median = null; - List abstractProcessorList = CreateSortAbstractProcessors(); + List abstractProcessorList = createSortAbstractProcessors(); CombinedFieldProcessorParam combinedFieldParam = build(byteBuf, fieldFixedMap, fieldConfigsMap, storeObjectList); while (byteBuf.readerIndex() < byteBuf.writerIndex()) { for (AbstractCombinedFieldProcessor abstractProcessor : abstractProcessorList) { @@ -64,7 +64,7 @@ /** * 创建有序的流程处理集合类 顺序为:前导码匹配->前置处理长度字段->业务字段解析 */ - private List CreateSortAbstractProcessors() { + private List createSortAbstractProcessors() { List abstractProcessorList = new ArrayList<>(); AbstractCombinedFieldProcessor preLeadCodeProcessor = new PreLeadCodeProcessor(); abstractProcessorList.add(preLeadCodeProcessor); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/RuleResolverCore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/RuleResolverCore.java index 969dcf7..644d02c 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/RuleResolverCore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/RuleResolverCore.java @@ -39,9 +39,9 @@ return null; } String[] ruleFields = ruleConfigOptional.get().getDataFieldIds().split(","); - Map ruleMetaDataMap = getRuleFields(ruleFields, fixDataMap, fixDataFieldMap); //递归选定解析规则,进行规则解析 if (!("1".equals(ruleConfigOptional.get().getIsFinishMatch()))) { + Map ruleMetaDataMap = getRuleFields(ruleFields, fixDataMap, fixDataFieldMap); //递归选定规则 doMachRule(ruleConfigList, ruleMetaDataMap, fixDataMap, fixDataFieldMap); } diff --git a/sensorhub-core/src/main/java/com/casic/missiles/replier/SensorhubReplier.java b/sensorhub-core/src/main/java/com/casic/missiles/replier/SensorhubReplier.java index 3d5cc26..b4a0f0a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/replier/SensorhubReplier.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/replier/SensorhubReplier.java @@ -14,12 +14,12 @@ public class SensorhubReplier extends SimpleChannelInboundHandler { /** - * 该类方法是回复内容构建的流程入口类 + * todo: 回复内容构建的流程入口方法 * 1、通过有标准协议解析器传来的结果进行命令的构建 * 2、构建命令有以下的命令内容 * (1)成功返回时间,并进行下发配置操作 * (2)版本升级 - * (3)下位机下发版本是否升级,是上版本,是升级,请求,回复升级等流程 + * (3)下位机下发版本是否升级,是上版本,是升级,请求,回复升级等流程 * (4)其他未知需求命令 */ @Override diff --git a/sensorhub-core/src/main/java/com/casic/missiles/replier/command/DataReplyCommand.java b/sensorhub-core/src/main/java/com/casic/missiles/replier/command/DataReplyCommand.java index 9f116d6..a7bb1b8 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/replier/command/DataReplyCommand.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/replier/command/DataReplyCommand.java @@ -28,7 +28,7 @@ * todo: 报文构建命令 * 成功解析帧结构内容,进行下发成功回复命令的主要流程方法 * 其构建流程逻辑如下: - * 1、初始化反构配置 + * 1、初始化回复报文配置 * 2、进行业务内容的构建 * (1)默认为时间的构建 * (2) 查询redis,构建下发配置