diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java index 27f3c77..f5e671b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java @@ -10,7 +10,7 @@ public class PretreatmentSupport { /** - * todo: 取第一个大括号，对应的右括号下标值 + * 取第一个大括号，对应的右括号下标值 * 算法流程 * 1、初始化totalRightBracket为0 * 2、获取首个“{”压栈，totalRightBracket加偏移下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java index 27f3c77..f5e671b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java @@ -10,7 +10,7 @@ public class PretreatmentSupport { /** - * todo: 取第一个大括号，对应的右括号下标值 + * 取第一个大括号，对应的右括号下标值 * 算法流程 * 1、初始化totalRightBracket为0 * 2、获取首个“{”压栈，totalRightBracket加偏移下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java index 588d412..3e0fe74 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java @@ -35,7 +35,8 @@ } /** - * todo: 执行aep平台前的协议解析 预处理为标准的协议报文 + * 执行aep平台前的协议解析 预处理为标准的协议报文 + * ****有http的server */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java index 27f3c77..f5e671b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java @@ -10,7 +10,7 @@ public class PretreatmentSupport { /** - * todo: 取第一个大括号，对应的右括号下标值 + * 取第一个大括号，对应的右括号下标值 * 算法流程 * 1、初始化totalRightBracket为0 * 2、获取首个“{”压栈，totalRightBracket加偏移下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java index 588d412..3e0fe74 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java @@ -35,7 +35,8 @@ } /** - * todo: 执行aep平台前的协议解析 预处理为标准的协议报文 + * 执行aep平台前的协议解析 预处理为标准的协议报文 + * ****有http的server */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java index 43ee69d..4ae0495 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java @@ -31,7 +31,7 @@ } /** - * todo: 执行np平台前的协议解析 预处理为标准的协议报文 + * 执行np平台前的协议解析 预处理为标准的协议报文 */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java index 27f3c77..f5e671b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java @@ -10,7 +10,7 @@ public class PretreatmentSupport { /** - * todo: 取第一个大括号，对应的右括号下标值 + * 取第一个大括号，对应的右括号下标值 * 算法流程 * 1、初始化totalRightBracket为0 * 2、获取首个“{”压栈，totalRightBracket加偏移下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java index 588d412..3e0fe74 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java @@ -35,7 +35,8 @@ } /** - * todo: 执行aep平台前的协议解析 预处理为标准的协议报文 + * 执行aep平台前的协议解析 预处理为标准的协议报文 + * ****有http的server */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java index 43ee69d..4ae0495 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java @@ -31,7 +31,7 @@ } /** - * todo: 执行np平台前的协议解析 预处理为标准的协议报文 + * 执行np平台前的协议解析 预处理为标准的协议报文 */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java index 67ce2f3..63dd7de 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java @@ -12,7 +12,7 @@ * 可任意构建自己的命令 * * @author cz - * todo: 过滤筛选器抽象类，进行特定内容的指令下发 + * 过滤筛选器抽象类，进行特定内容的指令下发 */ public interface AbstractReplyCommandPostProcessing extends ReplyCommandEnum { @@ -20,7 +20,7 @@ /** * 走一层过滤，没有走默认配置，加自己默认的过滤 *

- * todo:回复命令构建 + * 回复命令构建 * * @param bizDataMap * @param ruleConfigFactory diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java index 27f3c77..f5e671b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java @@ -10,7 +10,7 @@ public class PretreatmentSupport { /** - * todo: 取第一个大括号，对应的右括号下标值 + * 取第一个大括号，对应的右括号下标值 * 算法流程 * 1、初始化totalRightBracket为0 * 2、获取首个“{”压栈，totalRightBracket加偏移下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java index 588d412..3e0fe74 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java @@ -35,7 +35,8 @@ } /** - * todo: 执行aep平台前的协议解析 预处理为标准的协议报文 + * 执行aep平台前的协议解析 预处理为标准的协议报文 + * ****有http的server */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java index 43ee69d..4ae0495 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java @@ -31,7 +31,7 @@ } /** - * todo: 执行np平台前的协议解析 预处理为标准的协议报文 + * 执行np平台前的协议解析 预处理为标准的协议报文 */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java index 67ce2f3..63dd7de 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java @@ -12,7 +12,7 @@ * 可任意构建自己的命令 * * @author cz - * todo: 过滤筛选器抽象类，进行特定内容的指令下发 + * 过滤筛选器抽象类，进行特定内容的指令下发 */ public interface AbstractReplyCommandPostProcessing extends ReplyCommandEnum { @@ -20,7 +20,7 @@ /** * 走一层过滤，没有走默认配置，加自己默认的过滤 *

- * todo:回复命令构建 + * 回复命令构建 * * @param bizDataMap * @param ruleConfigFactory diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java index cf0dba0..a5c51a6 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java @@ -8,7 +8,7 @@ import java.util.Map; /** - * todo:后置处理器，将散落解析的时间进行合并 + * 后置处理器，将散落解析的时间进行合并 * * @author cz */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java index 27f3c77..f5e671b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java @@ -10,7 +10,7 @@ public class PretreatmentSupport { /** - * todo: 取第一个大括号，对应的右括号下标值 + * 取第一个大括号，对应的右括号下标值 * 算法流程 * 1、初始化totalRightBracket为0 * 2、获取首个“{”压栈，totalRightBracket加偏移下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java index 588d412..3e0fe74 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java @@ -35,7 +35,8 @@ } /** - * todo: 执行aep平台前的协议解析 预处理为标准的协议报文 + * 执行aep平台前的协议解析 预处理为标准的协议报文 + * ****有http的server */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java index 43ee69d..4ae0495 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java @@ -31,7 +31,7 @@ } /** - * todo: 执行np平台前的协议解析 预处理为标准的协议报文 + * 执行np平台前的协议解析 预处理为标准的协议报文 */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java index 67ce2f3..63dd7de 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java @@ -12,7 +12,7 @@ * 可任意构建自己的命令 * * @author cz - * todo: 过滤筛选器抽象类，进行特定内容的指令下发 + * 过滤筛选器抽象类，进行特定内容的指令下发 */ public interface AbstractReplyCommandPostProcessing extends ReplyCommandEnum { @@ -20,7 +20,7 @@ /** * 走一层过滤，没有走默认配置，加自己默认的过滤 *

- * todo:回复命令构建 + * 回复命令构建 * * @param bizDataMap * @param ruleConfigFactory diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java index cf0dba0..a5c51a6 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java @@ -8,7 +8,7 @@ import java.util.Map; /** - * todo:后置处理器，将散落解析的时间进行合并 + * 后置处理器，将散落解析的时间进行合并 * * @author cz */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java index 8291f68..981d235 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java @@ -10,7 +10,7 @@ public class FieldParserSupport { /** - * todo: 计算协议配置字段的总长度 + * 计算协议配置字段的总长度 * 1、分别计算bit和byte长度 * 2、合并长度 */ @@ -29,7 +29,7 @@ } /** - * todo:最大固定位置下标 + * 最大固定位置下标 * * 1、获取没有指定起始位置的业务内容后的字段配置集合 * 2、分别计算固定值最大长度和业务内容后字段配置进行相减得到计算结果即是固定位置下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java index 27f3c77..f5e671b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java @@ -10,7 +10,7 @@ public class PretreatmentSupport { /** - * todo: 取第一个大括号，对应的右括号下标值 + * 取第一个大括号，对应的右括号下标值 * 算法流程 * 1、初始化totalRightBracket为0 * 2、获取首个“{”压栈，totalRightBracket加偏移下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java index 588d412..3e0fe74 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java @@ -35,7 +35,8 @@ } /** - * todo: 执行aep平台前的协议解析 预处理为标准的协议报文 + * 执行aep平台前的协议解析 预处理为标准的协议报文 + * ****有http的server */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java index 43ee69d..4ae0495 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java @@ -31,7 +31,7 @@ } /** - * todo: 执行np平台前的协议解析 预处理为标准的协议报文 + * 执行np平台前的协议解析 预处理为标准的协议报文 */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java index 67ce2f3..63dd7de 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java @@ -12,7 +12,7 @@ * 可任意构建自己的命令 * * @author cz - * todo: 过滤筛选器抽象类，进行特定内容的指令下发 + * 过滤筛选器抽象类，进行特定内容的指令下发 */ public interface AbstractReplyCommandPostProcessing extends ReplyCommandEnum { @@ -20,7 +20,7 @@ /** * 走一层过滤，没有走默认配置，加自己默认的过滤 *

- * todo:回复命令构建 + * 回复命令构建 * * @param bizDataMap * @param ruleConfigFactory diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java index cf0dba0..a5c51a6 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java @@ -8,7 +8,7 @@ import java.util.Map; /** - * todo:后置处理器，将散落解析的时间进行合并 + * 后置处理器，将散落解析的时间进行合并 * * @author cz */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java index 8291f68..981d235 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java @@ -10,7 +10,7 @@ public class FieldParserSupport { /** - * todo: 计算协议配置字段的总长度 + * 计算协议配置字段的总长度 * 1、分别计算bit和byte长度 * 2、合并长度 */ @@ -29,7 +29,7 @@ } /** - * todo:最大固定位置下标 + * 最大固定位置下标 * * 1、获取没有指定起始位置的业务内容后的字段配置集合 * 2、分别计算固定值最大长度和业务内容后字段配置进行相减得到计算结果即是固定位置下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java index 7901ce0..4047da9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java @@ -19,7 +19,7 @@ public class GenericFiledRuleResolver { /** - * todo: 拿到所有的值合并到一个值 + * 拿到所有的值合并到一个值 * 无论是bit位的解析，还是byte的解析，统一都转换成byte进行规则的换算解析 * 1、必须进行byte与值的类型转换 * 2、存在可能，对值进行运算 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java index 27f3c77..f5e671b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java @@ -10,7 +10,7 @@ public class PretreatmentSupport { /** - * todo: 取第一个大括号，对应的右括号下标值 + * 取第一个大括号，对应的右括号下标值 * 算法流程 * 1、初始化totalRightBracket为0 * 2、获取首个“{”压栈，totalRightBracket加偏移下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java index 588d412..3e0fe74 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java @@ -35,7 +35,8 @@ } /** - * todo: 执行aep平台前的协议解析 预处理为标准的协议报文 + * 执行aep平台前的协议解析 预处理为标准的协议报文 + * ****有http的server */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java index 43ee69d..4ae0495 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java @@ -31,7 +31,7 @@ } /** - * todo: 执行np平台前的协议解析 预处理为标准的协议报文 + * 执行np平台前的协议解析 预处理为标准的协议报文 */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java index 67ce2f3..63dd7de 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java @@ -12,7 +12,7 @@ * 可任意构建自己的命令 * * @author cz - * todo: 过滤筛选器抽象类，进行特定内容的指令下发 + * 过滤筛选器抽象类，进行特定内容的指令下发 */ public interface AbstractReplyCommandPostProcessing extends ReplyCommandEnum { @@ -20,7 +20,7 @@ /** * 走一层过滤，没有走默认配置，加自己默认的过滤 *

- * todo:回复命令构建 + * 回复命令构建 * * @param bizDataMap * @param ruleConfigFactory diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java index cf0dba0..a5c51a6 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java @@ -8,7 +8,7 @@ import java.util.Map; /** - * todo:后置处理器，将散落解析的时间进行合并 + * 后置处理器，将散落解析的时间进行合并 * * @author cz */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java index 8291f68..981d235 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java @@ -10,7 +10,7 @@ public class FieldParserSupport { /** - * todo: 计算协议配置字段的总长度 + * 计算协议配置字段的总长度 * 1、分别计算bit和byte长度 * 2、合并长度 */ @@ -29,7 +29,7 @@ } /** - * todo:最大固定位置下标 + * 最大固定位置下标 * * 1、获取没有指定起始位置的业务内容后的字段配置集合 * 2、分别计算固定值最大长度和业务内容后字段配置进行相减得到计算结果即是固定位置下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java index 7901ce0..4047da9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java @@ -19,7 +19,7 @@ public class GenericFiledRuleResolver { /** - * todo: 拿到所有的值合并到一个值 + * 拿到所有的值合并到一个值 * 无论是bit位的解析，还是byte的解析，统一都转换成byte进行规则的换算解析 * 1、必须进行byte与值的类型转换 * 2、存在可能，对值进行运算 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 338be3d..a9af4e8 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 @@ -28,7 +28,7 @@ public class GenericCombinedFieldResolver { /** - * todo: 组合字段解析主要流程类 + * 组合字段解析主要流程类 * 通过查询，字段长度长度随机 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java index 27f3c77..f5e671b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java @@ -10,7 +10,7 @@ public class PretreatmentSupport { /** - * todo: 取第一个大括号，对应的右括号下标值 + * 取第一个大括号，对应的右括号下标值 * 算法流程 * 1、初始化totalRightBracket为0 * 2、获取首个“{”压栈，totalRightBracket加偏移下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java index 588d412..3e0fe74 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java @@ -35,7 +35,8 @@ } /** - * todo: 执行aep平台前的协议解析 预处理为标准的协议报文 + * 执行aep平台前的协议解析 预处理为标准的协议报文 + * ****有http的server */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java index 43ee69d..4ae0495 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java @@ -31,7 +31,7 @@ } /** - * todo: 执行np平台前的协议解析 预处理为标准的协议报文 + * 执行np平台前的协议解析 预处理为标准的协议报文 */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java index 67ce2f3..63dd7de 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java @@ -12,7 +12,7 @@ * 可任意构建自己的命令 * * @author cz - * todo: 过滤筛选器抽象类，进行特定内容的指令下发 + * 过滤筛选器抽象类，进行特定内容的指令下发 */ public interface AbstractReplyCommandPostProcessing extends ReplyCommandEnum { @@ -20,7 +20,7 @@ /** * 走一层过滤，没有走默认配置，加自己默认的过滤 *

- * todo:回复命令构建 + * 回复命令构建 * * @param bizDataMap * @param ruleConfigFactory diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java index cf0dba0..a5c51a6 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java @@ -8,7 +8,7 @@ import java.util.Map; /** - * todo:后置处理器，将散落解析的时间进行合并 + * 后置处理器，将散落解析的时间进行合并 * * @author cz */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java index 8291f68..981d235 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java @@ -10,7 +10,7 @@ public class FieldParserSupport { /** - * todo: 计算协议配置字段的总长度 + * 计算协议配置字段的总长度 * 1、分别计算bit和byte长度 * 2、合并长度 */ @@ -29,7 +29,7 @@ } /** - * todo:最大固定位置下标 + * 最大固定位置下标 * * 1、获取没有指定起始位置的业务内容后的字段配置集合 * 2、分别计算固定值最大长度和业务内容后字段配置进行相减得到计算结果即是固定位置下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java index 7901ce0..4047da9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java @@ -19,7 +19,7 @@ public class GenericFiledRuleResolver { /** - * todo: 拿到所有的值合并到一个值 + * 拿到所有的值合并到一个值 * 无论是bit位的解析，还是byte的解析，统一都转换成byte进行规则的换算解析 * 1、必须进行byte与值的类型转换 * 2、存在可能，对值进行运算 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 338be3d..a9af4e8 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 @@ -28,7 +28,7 @@ public class GenericCombinedFieldResolver { /** - * todo: 组合字段解析主要流程类 + * 组合字段解析主要流程类 * 通过查询，字段长度长度随机 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java index 8eb3362..33d83ae 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class BizFieldParseProcessor implements AbstractCombinedFieldProcessor { /** - * todo: 业务字段解析 + * 业务字段解析 * * @param combinedFieldParam * @return @@ -50,7 +50,7 @@ } /** - * todo:计算处理后的偏移位置 + * 计算处理后的偏移位置 */ private Integer calculateAfterProcessPosition(AbstractFieldConfig newProtocolFieldConfig, CombinedFieldProcessorParam combinedFieldParam) { Integer originPositionIndex = newProtocolFieldConfig.getOriginPositionByte() - combinedFieldParam.getByteBuf().readerIndex(); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java index 27f3c77..f5e671b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java @@ -10,7 +10,7 @@ public class PretreatmentSupport { /** - * todo: 取第一个大括号，对应的右括号下标值 + * 取第一个大括号，对应的右括号下标值 * 算法流程 * 1、初始化totalRightBracket为0 * 2、获取首个“{”压栈，totalRightBracket加偏移下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java index 588d412..3e0fe74 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java @@ -35,7 +35,8 @@ } /** - * todo: 执行aep平台前的协议解析 预处理为标准的协议报文 + * 执行aep平台前的协议解析 预处理为标准的协议报文 + * ****有http的server */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java index 43ee69d..4ae0495 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java @@ -31,7 +31,7 @@ } /** - * todo: 执行np平台前的协议解析 预处理为标准的协议报文 + * 执行np平台前的协议解析 预处理为标准的协议报文 */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java index 67ce2f3..63dd7de 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java @@ -12,7 +12,7 @@ * 可任意构建自己的命令 * * @author cz - * todo: 过滤筛选器抽象类，进行特定内容的指令下发 + * 过滤筛选器抽象类，进行特定内容的指令下发 */ public interface AbstractReplyCommandPostProcessing extends ReplyCommandEnum { @@ -20,7 +20,7 @@ /** * 走一层过滤，没有走默认配置，加自己默认的过滤 *

- * todo:回复命令构建 + * 回复命令构建 * * @param bizDataMap * @param ruleConfigFactory diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java index cf0dba0..a5c51a6 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java @@ -8,7 +8,7 @@ import java.util.Map; /** - * todo:后置处理器，将散落解析的时间进行合并 + * 后置处理器，将散落解析的时间进行合并 * * @author cz */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java index 8291f68..981d235 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java @@ -10,7 +10,7 @@ public class FieldParserSupport { /** - * todo: 计算协议配置字段的总长度 + * 计算协议配置字段的总长度 * 1、分别计算bit和byte长度 * 2、合并长度 */ @@ -29,7 +29,7 @@ } /** - * todo:最大固定位置下标 + * 最大固定位置下标 * * 1、获取没有指定起始位置的业务内容后的字段配置集合 * 2、分别计算固定值最大长度和业务内容后字段配置进行相减得到计算结果即是固定位置下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java index 7901ce0..4047da9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java @@ -19,7 +19,7 @@ public class GenericFiledRuleResolver { /** - * todo: 拿到所有的值合并到一个值 + * 拿到所有的值合并到一个值 * 无论是bit位的解析，还是byte的解析，统一都转换成byte进行规则的换算解析 * 1、必须进行byte与值的类型转换 * 2、存在可能，对值进行运算 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 338be3d..a9af4e8 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 @@ -28,7 +28,7 @@ public class GenericCombinedFieldResolver { /** - * todo: 组合字段解析主要流程类 + * 组合字段解析主要流程类 * 通过查询，字段长度长度随机 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java index 8eb3362..33d83ae 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class BizFieldParseProcessor implements AbstractCombinedFieldProcessor { /** - * todo: 业务字段解析 + * 业务字段解析 * * @param combinedFieldParam * @return @@ -50,7 +50,7 @@ } /** - * todo:计算处理后的偏移位置 + * 计算处理后的偏移位置 */ private Integer calculateAfterProcessPosition(AbstractFieldConfig newProtocolFieldConfig, CombinedFieldProcessorParam combinedFieldParam) { Integer originPositionIndex = newProtocolFieldConfig.getOriginPositionByte() - combinedFieldParam.getByteBuf().readerIndex(); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java index 2f1f32a..8a28f6b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class PreBizFieldParseProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor { /** - * todo: 计算业务字段长度，同时拿到对应指定的字段解析配置 + * 计算业务字段长度，同时拿到对应指定的字段解析配置 * * @param combinedFieldParam * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java index 27f3c77..f5e671b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java @@ -10,7 +10,7 @@ public class PretreatmentSupport { /** - * todo: 取第一个大括号，对应的右括号下标值 + * 取第一个大括号，对应的右括号下标值 * 算法流程 * 1、初始化totalRightBracket为0 * 2、获取首个“{”压栈，totalRightBracket加偏移下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java index 588d412..3e0fe74 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java @@ -35,7 +35,8 @@ } /** - * todo: 执行aep平台前的协议解析 预处理为标准的协议报文 + * 执行aep平台前的协议解析 预处理为标准的协议报文 + * ****有http的server */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java index 43ee69d..4ae0495 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java @@ -31,7 +31,7 @@ } /** - * todo: 执行np平台前的协议解析 预处理为标准的协议报文 + * 执行np平台前的协议解析 预处理为标准的协议报文 */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java index 67ce2f3..63dd7de 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java @@ -12,7 +12,7 @@ * 可任意构建自己的命令 * * @author cz - * todo: 过滤筛选器抽象类，进行特定内容的指令下发 + * 过滤筛选器抽象类，进行特定内容的指令下发 */ public interface AbstractReplyCommandPostProcessing extends ReplyCommandEnum { @@ -20,7 +20,7 @@ /** * 走一层过滤，没有走默认配置，加自己默认的过滤 *

- * todo:回复命令构建 + * 回复命令构建 * * @param bizDataMap * @param ruleConfigFactory diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java index cf0dba0..a5c51a6 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java @@ -8,7 +8,7 @@ import java.util.Map; /** - * todo:后置处理器，将散落解析的时间进行合并 + * 后置处理器，将散落解析的时间进行合并 * * @author cz */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java index 8291f68..981d235 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java @@ -10,7 +10,7 @@ public class FieldParserSupport { /** - * todo: 计算协议配置字段的总长度 + * 计算协议配置字段的总长度 * 1、分别计算bit和byte长度 * 2、合并长度 */ @@ -29,7 +29,7 @@ } /** - * todo:最大固定位置下标 + * 最大固定位置下标 * * 1、获取没有指定起始位置的业务内容后的字段配置集合 * 2、分别计算固定值最大长度和业务内容后字段配置进行相减得到计算结果即是固定位置下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java index 7901ce0..4047da9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java @@ -19,7 +19,7 @@ public class GenericFiledRuleResolver { /** - * todo: 拿到所有的值合并到一个值 + * 拿到所有的值合并到一个值 * 无论是bit位的解析，还是byte的解析，统一都转换成byte进行规则的换算解析 * 1、必须进行byte与值的类型转换 * 2、存在可能，对值进行运算 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 338be3d..a9af4e8 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 @@ -28,7 +28,7 @@ public class GenericCombinedFieldResolver { /** - * todo: 组合字段解析主要流程类 + * 组合字段解析主要流程类 * 通过查询，字段长度长度随机 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java index 8eb3362..33d83ae 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class BizFieldParseProcessor implements AbstractCombinedFieldProcessor { /** - * todo: 业务字段解析 + * 业务字段解析 * * @param combinedFieldParam * @return @@ -50,7 +50,7 @@ } /** - * todo:计算处理后的偏移位置 + * 计算处理后的偏移位置 */ private Integer calculateAfterProcessPosition(AbstractFieldConfig newProtocolFieldConfig, CombinedFieldProcessorParam combinedFieldParam) { Integer originPositionIndex = newProtocolFieldConfig.getOriginPositionByte() - combinedFieldParam.getByteBuf().readerIndex(); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java index 2f1f32a..8a28f6b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class PreBizFieldParseProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor { /** - * todo: 计算业务字段长度，同时拿到对应指定的字段解析配置 + * 计算业务字段长度，同时拿到对应指定的字段解析配置 * * @param combinedFieldParam * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java index 515d988..e64f0da 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java @@ -22,7 +22,7 @@ public class PreLeadCodeProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor, PreLeadCodeParseStatus { /** - * todo:前导码匹配 + * 前导码匹配 * 匹配获取前导码，找到对应的组合字段配置，并将报文读位置前移 * * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java index 27f3c77..f5e671b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java @@ -10,7 +10,7 @@ public class PretreatmentSupport { /** - * todo: 取第一个大括号，对应的右括号下标值 + * 取第一个大括号，对应的右括号下标值 * 算法流程 * 1、初始化totalRightBracket为0 * 2、获取首个“{”压栈，totalRightBracket加偏移下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java index 588d412..3e0fe74 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java @@ -35,7 +35,8 @@ } /** - * todo: 执行aep平台前的协议解析 预处理为标准的协议报文 + * 执行aep平台前的协议解析 预处理为标准的协议报文 + * ****有http的server */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java index 43ee69d..4ae0495 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java @@ -31,7 +31,7 @@ } /** - * todo: 执行np平台前的协议解析 预处理为标准的协议报文 + * 执行np平台前的协议解析 预处理为标准的协议报文 */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java index 67ce2f3..63dd7de 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java @@ -12,7 +12,7 @@ * 可任意构建自己的命令 * * @author cz - * todo: 过滤筛选器抽象类，进行特定内容的指令下发 + * 过滤筛选器抽象类，进行特定内容的指令下发 */ public interface AbstractReplyCommandPostProcessing extends ReplyCommandEnum { @@ -20,7 +20,7 @@ /** * 走一层过滤，没有走默认配置，加自己默认的过滤 *

- * todo:回复命令构建 + * 回复命令构建 * * @param bizDataMap * @param ruleConfigFactory diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java index cf0dba0..a5c51a6 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java @@ -8,7 +8,7 @@ import java.util.Map; /** - * todo:后置处理器，将散落解析的时间进行合并 + * 后置处理器，将散落解析的时间进行合并 * * @author cz */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java index 8291f68..981d235 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java @@ -10,7 +10,7 @@ public class FieldParserSupport { /** - * todo: 计算协议配置字段的总长度 + * 计算协议配置字段的总长度 * 1、分别计算bit和byte长度 * 2、合并长度 */ @@ -29,7 +29,7 @@ } /** - * todo:最大固定位置下标 + * 最大固定位置下标 * * 1、获取没有指定起始位置的业务内容后的字段配置集合 * 2、分别计算固定值最大长度和业务内容后字段配置进行相减得到计算结果即是固定位置下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java index 7901ce0..4047da9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java @@ -19,7 +19,7 @@ public class GenericFiledRuleResolver { /** - * todo: 拿到所有的值合并到一个值 + * 拿到所有的值合并到一个值 * 无论是bit位的解析，还是byte的解析，统一都转换成byte进行规则的换算解析 * 1、必须进行byte与值的类型转换 * 2、存在可能，对值进行运算 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 338be3d..a9af4e8 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 @@ -28,7 +28,7 @@ public class GenericCombinedFieldResolver { /** - * todo: 组合字段解析主要流程类 + * 组合字段解析主要流程类 * 通过查询，字段长度长度随机 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java index 8eb3362..33d83ae 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class BizFieldParseProcessor implements AbstractCombinedFieldProcessor { /** - * todo: 业务字段解析 + * 业务字段解析 * * @param combinedFieldParam * @return @@ -50,7 +50,7 @@ } /** - * todo:计算处理后的偏移位置 + * 计算处理后的偏移位置 */ private Integer calculateAfterProcessPosition(AbstractFieldConfig newProtocolFieldConfig, CombinedFieldProcessorParam combinedFieldParam) { Integer originPositionIndex = newProtocolFieldConfig.getOriginPositionByte() - combinedFieldParam.getByteBuf().readerIndex(); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java index 2f1f32a..8a28f6b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class PreBizFieldParseProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor { /** - * todo: 计算业务字段长度，同时拿到对应指定的字段解析配置 + * 计算业务字段长度，同时拿到对应指定的字段解析配置 * * @param combinedFieldParam * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java index 515d988..e64f0da 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java @@ -22,7 +22,7 @@ public class PreLeadCodeProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor, PreLeadCodeParseStatus { /** - * todo:前导码匹配 + * 前导码匹配 * 匹配获取前导码，找到对应的组合字段配置，并将报文读位置前移 * * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java index 2e374bb..0375b81 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java @@ -22,7 +22,7 @@ public class BitFieldParser extends GenericFiledRuleResolver { /** - * todo: 位字段解析 + * 位字段解析 * 1、单个字节情况表示字段 * 2、多字节情况表示字段（暂未处理） */ @@ -91,7 +91,7 @@ /** - * todo: 从二进制字符串转为byte[] + * 从二进制字符串转为byte[] * * @param binaryStr * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java index 27f3c77..f5e671b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java @@ -10,7 +10,7 @@ public class PretreatmentSupport { /** - * todo: 取第一个大括号，对应的右括号下标值 + * 取第一个大括号，对应的右括号下标值 * 算法流程 * 1、初始化totalRightBracket为0 * 2、获取首个“{”压栈，totalRightBracket加偏移下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java index 588d412..3e0fe74 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java @@ -35,7 +35,8 @@ } /** - * todo: 执行aep平台前的协议解析 预处理为标准的协议报文 + * 执行aep平台前的协议解析 预处理为标准的协议报文 + * ****有http的server */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java index 43ee69d..4ae0495 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java @@ -31,7 +31,7 @@ } /** - * todo: 执行np平台前的协议解析 预处理为标准的协议报文 + * 执行np平台前的协议解析 预处理为标准的协议报文 */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java index 67ce2f3..63dd7de 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java @@ -12,7 +12,7 @@ * 可任意构建自己的命令 * * @author cz - * todo: 过滤筛选器抽象类，进行特定内容的指令下发 + * 过滤筛选器抽象类，进行特定内容的指令下发 */ public interface AbstractReplyCommandPostProcessing extends ReplyCommandEnum { @@ -20,7 +20,7 @@ /** * 走一层过滤，没有走默认配置，加自己默认的过滤 *

- * todo:回复命令构建 + * 回复命令构建 * * @param bizDataMap * @param ruleConfigFactory diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java index cf0dba0..a5c51a6 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java @@ -8,7 +8,7 @@ import java.util.Map; /** - * todo:后置处理器，将散落解析的时间进行合并 + * 后置处理器，将散落解析的时间进行合并 * * @author cz */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java index 8291f68..981d235 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java @@ -10,7 +10,7 @@ public class FieldParserSupport { /** - * todo: 计算协议配置字段的总长度 + * 计算协议配置字段的总长度 * 1、分别计算bit和byte长度 * 2、合并长度 */ @@ -29,7 +29,7 @@ } /** - * todo:最大固定位置下标 + * 最大固定位置下标 * * 1、获取没有指定起始位置的业务内容后的字段配置集合 * 2、分别计算固定值最大长度和业务内容后字段配置进行相减得到计算结果即是固定位置下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java index 7901ce0..4047da9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java @@ -19,7 +19,7 @@ public class GenericFiledRuleResolver { /** - * todo: 拿到所有的值合并到一个值 + * 拿到所有的值合并到一个值 * 无论是bit位的解析，还是byte的解析，统一都转换成byte进行规则的换算解析 * 1、必须进行byte与值的类型转换 * 2、存在可能，对值进行运算 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 338be3d..a9af4e8 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 @@ -28,7 +28,7 @@ public class GenericCombinedFieldResolver { /** - * todo: 组合字段解析主要流程类 + * 组合字段解析主要流程类 * 通过查询，字段长度长度随机 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java index 8eb3362..33d83ae 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class BizFieldParseProcessor implements AbstractCombinedFieldProcessor { /** - * todo: 业务字段解析 + * 业务字段解析 * * @param combinedFieldParam * @return @@ -50,7 +50,7 @@ } /** - * todo:计算处理后的偏移位置 + * 计算处理后的偏移位置 */ private Integer calculateAfterProcessPosition(AbstractFieldConfig newProtocolFieldConfig, CombinedFieldProcessorParam combinedFieldParam) { Integer originPositionIndex = newProtocolFieldConfig.getOriginPositionByte() - combinedFieldParam.getByteBuf().readerIndex(); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java index 2f1f32a..8a28f6b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class PreBizFieldParseProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor { /** - * todo: 计算业务字段长度，同时拿到对应指定的字段解析配置 + * 计算业务字段长度，同时拿到对应指定的字段解析配置 * * @param combinedFieldParam * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java index 515d988..e64f0da 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java @@ -22,7 +22,7 @@ public class PreLeadCodeProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor, PreLeadCodeParseStatus { /** - * todo:前导码匹配 + * 前导码匹配 * 匹配获取前导码，找到对应的组合字段配置，并将报文读位置前移 * * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java index 2e374bb..0375b81 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java @@ -22,7 +22,7 @@ public class BitFieldParser extends GenericFiledRuleResolver { /** - * todo: 位字段解析 + * 位字段解析 * 1、单个字节情况表示字段 * 2、多字节情况表示字段（暂未处理） */ @@ -91,7 +91,7 @@ /** - * todo: 从二进制字符串转为byte[] + * 从二进制字符串转为byte[] * * @param binaryStr * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java index c1ca720..8999afc 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java @@ -19,7 +19,7 @@ /** - * todo: 字节字段解析核心类 + * 字节字段解析核心类 * 存在rule_json走自定义的规则设置，没有则支持默认配置的规则设置 * * @param byteBuf @@ -37,7 +37,7 @@ } /** - * todo: 默认解析方法 + * 默认解析方法 * * @param byteBuf * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java index 27f3c77..f5e671b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java @@ -10,7 +10,7 @@ public class PretreatmentSupport { /** - * todo: 取第一个大括号，对应的右括号下标值 + * 取第一个大括号，对应的右括号下标值 * 算法流程 * 1、初始化totalRightBracket为0 * 2、获取首个“{”压栈，totalRightBracket加偏移下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java index 588d412..3e0fe74 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java @@ -35,7 +35,8 @@ } /** - * todo: 执行aep平台前的协议解析 预处理为标准的协议报文 + * 执行aep平台前的协议解析 预处理为标准的协议报文 + * ****有http的server */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java index 43ee69d..4ae0495 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java @@ -31,7 +31,7 @@ } /** - * todo: 执行np平台前的协议解析 预处理为标准的协议报文 + * 执行np平台前的协议解析 预处理为标准的协议报文 */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java index 67ce2f3..63dd7de 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java @@ -12,7 +12,7 @@ * 可任意构建自己的命令 * * @author cz - * todo: 过滤筛选器抽象类，进行特定内容的指令下发 + * 过滤筛选器抽象类，进行特定内容的指令下发 */ public interface AbstractReplyCommandPostProcessing extends ReplyCommandEnum { @@ -20,7 +20,7 @@ /** * 走一层过滤，没有走默认配置，加自己默认的过滤 *

- * todo:回复命令构建 + * 回复命令构建 * * @param bizDataMap * @param ruleConfigFactory diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java index cf0dba0..a5c51a6 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java @@ -8,7 +8,7 @@ import java.util.Map; /** - * todo:后置处理器，将散落解析的时间进行合并 + * 后置处理器，将散落解析的时间进行合并 * * @author cz */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java index 8291f68..981d235 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java @@ -10,7 +10,7 @@ public class FieldParserSupport { /** - * todo: 计算协议配置字段的总长度 + * 计算协议配置字段的总长度 * 1、分别计算bit和byte长度 * 2、合并长度 */ @@ -29,7 +29,7 @@ } /** - * todo:最大固定位置下标 + * 最大固定位置下标 * * 1、获取没有指定起始位置的业务内容后的字段配置集合 * 2、分别计算固定值最大长度和业务内容后字段配置进行相减得到计算结果即是固定位置下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java index 7901ce0..4047da9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java @@ -19,7 +19,7 @@ public class GenericFiledRuleResolver { /** - * todo: 拿到所有的值合并到一个值 + * 拿到所有的值合并到一个值 * 无论是bit位的解析，还是byte的解析，统一都转换成byte进行规则的换算解析 * 1、必须进行byte与值的类型转换 * 2、存在可能，对值进行运算 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 338be3d..a9af4e8 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 @@ -28,7 +28,7 @@ public class GenericCombinedFieldResolver { /** - * todo: 组合字段解析主要流程类 + * 组合字段解析主要流程类 * 通过查询，字段长度长度随机 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java index 8eb3362..33d83ae 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class BizFieldParseProcessor implements AbstractCombinedFieldProcessor { /** - * todo: 业务字段解析 + * 业务字段解析 * * @param combinedFieldParam * @return @@ -50,7 +50,7 @@ } /** - * todo:计算处理后的偏移位置 + * 计算处理后的偏移位置 */ private Integer calculateAfterProcessPosition(AbstractFieldConfig newProtocolFieldConfig, CombinedFieldProcessorParam combinedFieldParam) { Integer originPositionIndex = newProtocolFieldConfig.getOriginPositionByte() - combinedFieldParam.getByteBuf().readerIndex(); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java index 2f1f32a..8a28f6b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class PreBizFieldParseProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor { /** - * todo: 计算业务字段长度，同时拿到对应指定的字段解析配置 + * 计算业务字段长度，同时拿到对应指定的字段解析配置 * * @param combinedFieldParam * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java index 515d988..e64f0da 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java @@ -22,7 +22,7 @@ public class PreLeadCodeProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor, PreLeadCodeParseStatus { /** - * todo:前导码匹配 + * 前导码匹配 * 匹配获取前导码，找到对应的组合字段配置，并将报文读位置前移 * * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java index 2e374bb..0375b81 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java @@ -22,7 +22,7 @@ public class BitFieldParser extends GenericFiledRuleResolver { /** - * todo: 位字段解析 + * 位字段解析 * 1、单个字节情况表示字段 * 2、多字节情况表示字段（暂未处理） */ @@ -91,7 +91,7 @@ /** - * todo: 从二进制字符串转为byte[] + * 从二进制字符串转为byte[] * * @param binaryStr * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java index c1ca720..8999afc 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java @@ -19,7 +19,7 @@ /** - * todo: 字节字段解析核心类 + * 字节字段解析核心类 * 存在rule_json走自定义的规则设置，没有则支持默认配置的规则设置 * * @param byteBuf @@ -37,7 +37,7 @@ } /** - * todo: 默认解析方法 + * 默认解析方法 * * @param byteBuf * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java index 687e786..d6bf1c2 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java @@ -24,7 +24,7 @@ public class DefaultProtocolFieldParser extends FieldParserSupport implements FieldParser, FrameStructEnum { /** - * todo:按照配置和待解析的缓冲池解析字段 + * 按照配置和待解析的缓冲池解析字段 * * @param protocolFieldConfigs 字段配置集合 * @param storeObjectMap 待存储的字段集合 @@ -46,7 +46,7 @@ } /** - * todo: 解析和协议帧结构相关的协议字段结合（位置、长度等信息） + * 解析和协议帧结构相关的协议字段结合（位置、长度等信息） * * @param protocolFieldConfigs * @param totalLength @@ -65,7 +65,7 @@ } /** - * todo: 获取业务内容的byteBuf + * 获取业务内容的byteBuf * 主要流程如下所示 * 1、通过协议配置计算固定长度 * 2、固定字段列表=> 计算固定字段长度=> 计算业务内容起始位置=>结合总长度，计算业务内容长度=>得到业务内容 @@ -87,7 +87,7 @@ } /** - * todo:获取过滤字段的长度 + * 获取过滤字段的长度 */ @Override public Integer totalFilterLength(ProtocolConfig protocolConfig, diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java index 27f3c77..f5e671b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java @@ -10,7 +10,7 @@ public class PretreatmentSupport { /** - * todo: 取第一个大括号，对应的右括号下标值 + * 取第一个大括号，对应的右括号下标值 * 算法流程 * 1、初始化totalRightBracket为0 * 2、获取首个“{”压栈，totalRightBracket加偏移下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java index 588d412..3e0fe74 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java @@ -35,7 +35,8 @@ } /** - * todo: 执行aep平台前的协议解析 预处理为标准的协议报文 + * 执行aep平台前的协议解析 预处理为标准的协议报文 + * ****有http的server */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java index 43ee69d..4ae0495 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java @@ -31,7 +31,7 @@ } /** - * todo: 执行np平台前的协议解析 预处理为标准的协议报文 + * 执行np平台前的协议解析 预处理为标准的协议报文 */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java index 67ce2f3..63dd7de 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java @@ -12,7 +12,7 @@ * 可任意构建自己的命令 * * @author cz - * todo: 过滤筛选器抽象类，进行特定内容的指令下发 + * 过滤筛选器抽象类，进行特定内容的指令下发 */ public interface AbstractReplyCommandPostProcessing extends ReplyCommandEnum { @@ -20,7 +20,7 @@ /** * 走一层过滤，没有走默认配置，加自己默认的过滤 *

- * todo:回复命令构建 + * 回复命令构建 * * @param bizDataMap * @param ruleConfigFactory diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java index cf0dba0..a5c51a6 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java @@ -8,7 +8,7 @@ import java.util.Map; /** - * todo:后置处理器，将散落解析的时间进行合并 + * 后置处理器，将散落解析的时间进行合并 * * @author cz */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java index 8291f68..981d235 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java @@ -10,7 +10,7 @@ public class FieldParserSupport { /** - * todo: 计算协议配置字段的总长度 + * 计算协议配置字段的总长度 * 1、分别计算bit和byte长度 * 2、合并长度 */ @@ -29,7 +29,7 @@ } /** - * todo:最大固定位置下标 + * 最大固定位置下标 * * 1、获取没有指定起始位置的业务内容后的字段配置集合 * 2、分别计算固定值最大长度和业务内容后字段配置进行相减得到计算结果即是固定位置下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java index 7901ce0..4047da9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java @@ -19,7 +19,7 @@ public class GenericFiledRuleResolver { /** - * todo: 拿到所有的值合并到一个值 + * 拿到所有的值合并到一个值 * 无论是bit位的解析，还是byte的解析，统一都转换成byte进行规则的换算解析 * 1、必须进行byte与值的类型转换 * 2、存在可能，对值进行运算 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 338be3d..a9af4e8 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 @@ -28,7 +28,7 @@ public class GenericCombinedFieldResolver { /** - * todo: 组合字段解析主要流程类 + * 组合字段解析主要流程类 * 通过查询，字段长度长度随机 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java index 8eb3362..33d83ae 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class BizFieldParseProcessor implements AbstractCombinedFieldProcessor { /** - * todo: 业务字段解析 + * 业务字段解析 * * @param combinedFieldParam * @return @@ -50,7 +50,7 @@ } /** - * todo:计算处理后的偏移位置 + * 计算处理后的偏移位置 */ private Integer calculateAfterProcessPosition(AbstractFieldConfig newProtocolFieldConfig, CombinedFieldProcessorParam combinedFieldParam) { Integer originPositionIndex = newProtocolFieldConfig.getOriginPositionByte() - combinedFieldParam.getByteBuf().readerIndex(); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java index 2f1f32a..8a28f6b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class PreBizFieldParseProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor { /** - * todo: 计算业务字段长度，同时拿到对应指定的字段解析配置 + * 计算业务字段长度，同时拿到对应指定的字段解析配置 * * @param combinedFieldParam * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java index 515d988..e64f0da 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java @@ -22,7 +22,7 @@ public class PreLeadCodeProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor, PreLeadCodeParseStatus { /** - * todo:前导码匹配 + * 前导码匹配 * 匹配获取前导码，找到对应的组合字段配置，并将报文读位置前移 * * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java index 2e374bb..0375b81 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java @@ -22,7 +22,7 @@ public class BitFieldParser extends GenericFiledRuleResolver { /** - * todo: 位字段解析 + * 位字段解析 * 1、单个字节情况表示字段 * 2、多字节情况表示字段（暂未处理） */ @@ -91,7 +91,7 @@ /** - * todo: 从二进制字符串转为byte[] + * 从二进制字符串转为byte[] * * @param binaryStr * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java index c1ca720..8999afc 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java @@ -19,7 +19,7 @@ /** - * todo: 字节字段解析核心类 + * 字节字段解析核心类 * 存在rule_json走自定义的规则设置，没有则支持默认配置的规则设置 * * @param byteBuf @@ -37,7 +37,7 @@ } /** - * todo: 默认解析方法 + * 默认解析方法 * * @param byteBuf * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java index 687e786..d6bf1c2 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java @@ -24,7 +24,7 @@ public class DefaultProtocolFieldParser extends FieldParserSupport implements FieldParser, FrameStructEnum { /** - * todo:按照配置和待解析的缓冲池解析字段 + * 按照配置和待解析的缓冲池解析字段 * * @param protocolFieldConfigs 字段配置集合 * @param storeObjectMap 待存储的字段集合 @@ -46,7 +46,7 @@ } /** - * todo: 解析和协议帧结构相关的协议字段结合（位置、长度等信息） + * 解析和协议帧结构相关的协议字段结合（位置、长度等信息） * * @param protocolFieldConfigs * @param totalLength @@ -65,7 +65,7 @@ } /** - * todo: 获取业务内容的byteBuf + * 获取业务内容的byteBuf * 主要流程如下所示 * 1、通过协议配置计算固定长度 * 2、固定字段列表=> 计算固定字段长度=> 计算业务内容起始位置=>结合总长度，计算业务内容长度=>得到业务内容 @@ -87,7 +87,7 @@ } /** - * todo:获取过滤字段的长度 + * 获取过滤字段的长度 */ @Override public Integer totalFilterLength(ProtocolConfig protocolConfig, diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java index f8a359e..7023028 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java @@ -12,7 +12,7 @@ public class GenericRuleResolver { /** - * todo: 匹配规则 + * 匹配规则 * * 1、准备前置规则字段集合 * 2、准备固定字段集合 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java index 27f3c77..f5e671b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java @@ -10,7 +10,7 @@ public class PretreatmentSupport { /** - * todo: 取第一个大括号，对应的右括号下标值 + * 取第一个大括号，对应的右括号下标值 * 算法流程 * 1、初始化totalRightBracket为0 * 2、获取首个“{”压栈，totalRightBracket加偏移下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java index 588d412..3e0fe74 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java @@ -35,7 +35,8 @@ } /** - * todo: 执行aep平台前的协议解析 预处理为标准的协议报文 + * 执行aep平台前的协议解析 预处理为标准的协议报文 + * ****有http的server */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java index 43ee69d..4ae0495 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java @@ -31,7 +31,7 @@ } /** - * todo: 执行np平台前的协议解析 预处理为标准的协议报文 + * 执行np平台前的协议解析 预处理为标准的协议报文 */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java index 67ce2f3..63dd7de 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java @@ -12,7 +12,7 @@ * 可任意构建自己的命令 * * @author cz - * todo: 过滤筛选器抽象类，进行特定内容的指令下发 + * 过滤筛选器抽象类，进行特定内容的指令下发 */ public interface AbstractReplyCommandPostProcessing extends ReplyCommandEnum { @@ -20,7 +20,7 @@ /** * 走一层过滤，没有走默认配置，加自己默认的过滤 *

- * todo:回复命令构建 + * 回复命令构建 * * @param bizDataMap * @param ruleConfigFactory diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java index cf0dba0..a5c51a6 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java @@ -8,7 +8,7 @@ import java.util.Map; /** - * todo:后置处理器，将散落解析的时间进行合并 + * 后置处理器，将散落解析的时间进行合并 * * @author cz */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java index 8291f68..981d235 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java @@ -10,7 +10,7 @@ public class FieldParserSupport { /** - * todo: 计算协议配置字段的总长度 + * 计算协议配置字段的总长度 * 1、分别计算bit和byte长度 * 2、合并长度 */ @@ -29,7 +29,7 @@ } /** - * todo:最大固定位置下标 + * 最大固定位置下标 * * 1、获取没有指定起始位置的业务内容后的字段配置集合 * 2、分别计算固定值最大长度和业务内容后字段配置进行相减得到计算结果即是固定位置下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java index 7901ce0..4047da9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java @@ -19,7 +19,7 @@ public class GenericFiledRuleResolver { /** - * todo: 拿到所有的值合并到一个值 + * 拿到所有的值合并到一个值 * 无论是bit位的解析，还是byte的解析，统一都转换成byte进行规则的换算解析 * 1、必须进行byte与值的类型转换 * 2、存在可能，对值进行运算 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 338be3d..a9af4e8 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 @@ -28,7 +28,7 @@ public class GenericCombinedFieldResolver { /** - * todo: 组合字段解析主要流程类 + * 组合字段解析主要流程类 * 通过查询，字段长度长度随机 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java index 8eb3362..33d83ae 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class BizFieldParseProcessor implements AbstractCombinedFieldProcessor { /** - * todo: 业务字段解析 + * 业务字段解析 * * @param combinedFieldParam * @return @@ -50,7 +50,7 @@ } /** - * todo:计算处理后的偏移位置 + * 计算处理后的偏移位置 */ private Integer calculateAfterProcessPosition(AbstractFieldConfig newProtocolFieldConfig, CombinedFieldProcessorParam combinedFieldParam) { Integer originPositionIndex = newProtocolFieldConfig.getOriginPositionByte() - combinedFieldParam.getByteBuf().readerIndex(); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java index 2f1f32a..8a28f6b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class PreBizFieldParseProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor { /** - * todo: 计算业务字段长度，同时拿到对应指定的字段解析配置 + * 计算业务字段长度，同时拿到对应指定的字段解析配置 * * @param combinedFieldParam * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java index 515d988..e64f0da 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java @@ -22,7 +22,7 @@ public class PreLeadCodeProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor, PreLeadCodeParseStatus { /** - * todo:前导码匹配 + * 前导码匹配 * 匹配获取前导码，找到对应的组合字段配置，并将报文读位置前移 * * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java index 2e374bb..0375b81 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java @@ -22,7 +22,7 @@ public class BitFieldParser extends GenericFiledRuleResolver { /** - * todo: 位字段解析 + * 位字段解析 * 1、单个字节情况表示字段 * 2、多字节情况表示字段（暂未处理） */ @@ -91,7 +91,7 @@ /** - * todo: 从二进制字符串转为byte[] + * 从二进制字符串转为byte[] * * @param binaryStr * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java index c1ca720..8999afc 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java @@ -19,7 +19,7 @@ /** - * todo: 字节字段解析核心类 + * 字节字段解析核心类 * 存在rule_json走自定义的规则设置，没有则支持默认配置的规则设置 * * @param byteBuf @@ -37,7 +37,7 @@ } /** - * todo: 默认解析方法 + * 默认解析方法 * * @param byteBuf * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java index 687e786..d6bf1c2 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java @@ -24,7 +24,7 @@ public class DefaultProtocolFieldParser extends FieldParserSupport implements FieldParser, FrameStructEnum { /** - * todo:按照配置和待解析的缓冲池解析字段 + * 按照配置和待解析的缓冲池解析字段 * * @param protocolFieldConfigs 字段配置集合 * @param storeObjectMap 待存储的字段集合 @@ -46,7 +46,7 @@ } /** - * todo: 解析和协议帧结构相关的协议字段结合（位置、长度等信息） + * 解析和协议帧结构相关的协议字段结合（位置、长度等信息） * * @param protocolFieldConfigs * @param totalLength @@ -65,7 +65,7 @@ } /** - * todo: 获取业务内容的byteBuf + * 获取业务内容的byteBuf * 主要流程如下所示 * 1、通过协议配置计算固定长度 * 2、固定字段列表=> 计算固定字段长度=> 计算业务内容起始位置=>结合总长度，计算业务内容长度=>得到业务内容 @@ -87,7 +87,7 @@ } /** - * todo:获取过滤字段的长度 + * 获取过滤字段的长度 */ @Override public Integer totalFilterLength(ProtocolConfig protocolConfig, diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java index f8a359e..7023028 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java @@ -12,7 +12,7 @@ public class GenericRuleResolver { /** - * todo: 匹配规则 + * 匹配规则 * * 1、准备前置规则字段集合 * 2、准备固定字段集合 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 04e4e36..204b4dc 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 @@ -8,7 +8,7 @@ import java.util.*; /** - * todo: 规则匹配的核心类 + * 规则匹配的核心类 * * @author cz * @date 2023-6-12 @@ -18,7 +18,7 @@ /** - * todo: 规则匹配核心方法 + * 规则匹配核心方法 * 1、通过前置字段集合匹配规则 * 2、判断规则终止标记字段是否已经完成匹配 * （1）完成匹配，返回当前的规则 @@ -58,7 +58,7 @@ /** - * todo: 获取规则字段列表 + * 获取规则字段列表 * * @param preRuleConfigList * @param fixedDataMap @@ -79,7 +79,7 @@ /** - * todo:匹配规则配置 + * 匹配规则配置 * * @param ruleMap * @param metaDataMap diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java index 27f3c77..f5e671b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java @@ -10,7 +10,7 @@ public class PretreatmentSupport { /** - * todo: 取第一个大括号，对应的右括号下标值 + * 取第一个大括号，对应的右括号下标值 * 算法流程 * 1、初始化totalRightBracket为0 * 2、获取首个“{”压栈，totalRightBracket加偏移下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java index 588d412..3e0fe74 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java @@ -35,7 +35,8 @@ } /** - * todo: 执行aep平台前的协议解析 预处理为标准的协议报文 + * 执行aep平台前的协议解析 预处理为标准的协议报文 + * ****有http的server */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java index 43ee69d..4ae0495 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java @@ -31,7 +31,7 @@ } /** - * todo: 执行np平台前的协议解析 预处理为标准的协议报文 + * 执行np平台前的协议解析 预处理为标准的协议报文 */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java index 67ce2f3..63dd7de 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java @@ -12,7 +12,7 @@ * 可任意构建自己的命令 * * @author cz - * todo: 过滤筛选器抽象类，进行特定内容的指令下发 + * 过滤筛选器抽象类，进行特定内容的指令下发 */ public interface AbstractReplyCommandPostProcessing extends ReplyCommandEnum { @@ -20,7 +20,7 @@ /** * 走一层过滤，没有走默认配置，加自己默认的过滤 *

- * todo:回复命令构建 + * 回复命令构建 * * @param bizDataMap * @param ruleConfigFactory diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java index cf0dba0..a5c51a6 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java @@ -8,7 +8,7 @@ import java.util.Map; /** - * todo:后置处理器，将散落解析的时间进行合并 + * 后置处理器，将散落解析的时间进行合并 * * @author cz */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java index 8291f68..981d235 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java @@ -10,7 +10,7 @@ public class FieldParserSupport { /** - * todo: 计算协议配置字段的总长度 + * 计算协议配置字段的总长度 * 1、分别计算bit和byte长度 * 2、合并长度 */ @@ -29,7 +29,7 @@ } /** - * todo:最大固定位置下标 + * 最大固定位置下标 * * 1、获取没有指定起始位置的业务内容后的字段配置集合 * 2、分别计算固定值最大长度和业务内容后字段配置进行相减得到计算结果即是固定位置下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java index 7901ce0..4047da9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java @@ -19,7 +19,7 @@ public class GenericFiledRuleResolver { /** - * todo: 拿到所有的值合并到一个值 + * 拿到所有的值合并到一个值 * 无论是bit位的解析，还是byte的解析，统一都转换成byte进行规则的换算解析 * 1、必须进行byte与值的类型转换 * 2、存在可能，对值进行运算 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 338be3d..a9af4e8 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 @@ -28,7 +28,7 @@ public class GenericCombinedFieldResolver { /** - * todo: 组合字段解析主要流程类 + * 组合字段解析主要流程类 * 通过查询，字段长度长度随机 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java index 8eb3362..33d83ae 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class BizFieldParseProcessor implements AbstractCombinedFieldProcessor { /** - * todo: 业务字段解析 + * 业务字段解析 * * @param combinedFieldParam * @return @@ -50,7 +50,7 @@ } /** - * todo:计算处理后的偏移位置 + * 计算处理后的偏移位置 */ private Integer calculateAfterProcessPosition(AbstractFieldConfig newProtocolFieldConfig, CombinedFieldProcessorParam combinedFieldParam) { Integer originPositionIndex = newProtocolFieldConfig.getOriginPositionByte() - combinedFieldParam.getByteBuf().readerIndex(); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java index 2f1f32a..8a28f6b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class PreBizFieldParseProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor { /** - * todo: 计算业务字段长度，同时拿到对应指定的字段解析配置 + * 计算业务字段长度，同时拿到对应指定的字段解析配置 * * @param combinedFieldParam * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java index 515d988..e64f0da 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java @@ -22,7 +22,7 @@ public class PreLeadCodeProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor, PreLeadCodeParseStatus { /** - * todo:前导码匹配 + * 前导码匹配 * 匹配获取前导码，找到对应的组合字段配置，并将报文读位置前移 * * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java index 2e374bb..0375b81 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java @@ -22,7 +22,7 @@ public class BitFieldParser extends GenericFiledRuleResolver { /** - * todo: 位字段解析 + * 位字段解析 * 1、单个字节情况表示字段 * 2、多字节情况表示字段（暂未处理） */ @@ -91,7 +91,7 @@ /** - * todo: 从二进制字符串转为byte[] + * 从二进制字符串转为byte[] * * @param binaryStr * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java index c1ca720..8999afc 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java @@ -19,7 +19,7 @@ /** - * todo: 字节字段解析核心类 + * 字节字段解析核心类 * 存在rule_json走自定义的规则设置，没有则支持默认配置的规则设置 * * @param byteBuf @@ -37,7 +37,7 @@ } /** - * todo: 默认解析方法 + * 默认解析方法 * * @param byteBuf * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java index 687e786..d6bf1c2 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java @@ -24,7 +24,7 @@ public class DefaultProtocolFieldParser extends FieldParserSupport implements FieldParser, FrameStructEnum { /** - * todo:按照配置和待解析的缓冲池解析字段 + * 按照配置和待解析的缓冲池解析字段 * * @param protocolFieldConfigs 字段配置集合 * @param storeObjectMap 待存储的字段集合 @@ -46,7 +46,7 @@ } /** - * todo: 解析和协议帧结构相关的协议字段结合（位置、长度等信息） + * 解析和协议帧结构相关的协议字段结合（位置、长度等信息） * * @param protocolFieldConfigs * @param totalLength @@ -65,7 +65,7 @@ } /** - * todo: 获取业务内容的byteBuf + * 获取业务内容的byteBuf * 主要流程如下所示 * 1、通过协议配置计算固定长度 * 2、固定字段列表=> 计算固定字段长度=> 计算业务内容起始位置=>结合总长度，计算业务内容长度=>得到业务内容 @@ -87,7 +87,7 @@ } /** - * todo:获取过滤字段的长度 + * 获取过滤字段的长度 */ @Override public Integer totalFilterLength(ProtocolConfig protocolConfig, diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java index f8a359e..7023028 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java @@ -12,7 +12,7 @@ public class GenericRuleResolver { /** - * todo: 匹配规则 + * 匹配规则 * * 1、准备前置规则字段集合 * 2、准备固定字段集合 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 04e4e36..204b4dc 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 @@ -8,7 +8,7 @@ import java.util.*; /** - * todo: 规则匹配的核心类 + * 规则匹配的核心类 * * @author cz * @date 2023-6-12 @@ -18,7 +18,7 @@ /** - * todo: 规则匹配核心方法 + * 规则匹配核心方法 * 1、通过前置字段集合匹配规则 * 2、判断规则终止标记字段是否已经完成匹配 * （1）完成匹配，返回当前的规则 @@ -58,7 +58,7 @@ /** - * todo: 获取规则字段列表 + * 获取规则字段列表 * * @param preRuleConfigList * @param fixedDataMap @@ -79,7 +79,7 @@ /** - * todo:匹配规则配置 + * 匹配规则配置 * * @param ruleMap * @param metaDataMap diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java index 8652ef0..787874a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java @@ -27,7 +27,7 @@ } /** - * todo:通过post方法执行方法回调 + * 通过post方法执行方法回调 * * @param json * @param url diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java index 27f3c77..f5e671b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java @@ -10,7 +10,7 @@ public class PretreatmentSupport { /** - * todo: 取第一个大括号，对应的右括号下标值 + * 取第一个大括号，对应的右括号下标值 * 算法流程 * 1、初始化totalRightBracket为0 * 2、获取首个“{”压栈，totalRightBracket加偏移下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java index 588d412..3e0fe74 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java @@ -35,7 +35,8 @@ } /** - * todo: 执行aep平台前的协议解析 预处理为标准的协议报文 + * 执行aep平台前的协议解析 预处理为标准的协议报文 + * ****有http的server */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java index 43ee69d..4ae0495 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java @@ -31,7 +31,7 @@ } /** - * todo: 执行np平台前的协议解析 预处理为标准的协议报文 + * 执行np平台前的协议解析 预处理为标准的协议报文 */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java index 67ce2f3..63dd7de 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java @@ -12,7 +12,7 @@ * 可任意构建自己的命令 * * @author cz - * todo: 过滤筛选器抽象类，进行特定内容的指令下发 + * 过滤筛选器抽象类，进行特定内容的指令下发 */ public interface AbstractReplyCommandPostProcessing extends ReplyCommandEnum { @@ -20,7 +20,7 @@ /** * 走一层过滤，没有走默认配置，加自己默认的过滤 *

- * todo:回复命令构建 + * 回复命令构建 * * @param bizDataMap * @param ruleConfigFactory diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java index cf0dba0..a5c51a6 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java @@ -8,7 +8,7 @@ import java.util.Map; /** - * todo:后置处理器，将散落解析的时间进行合并 + * 后置处理器，将散落解析的时间进行合并 * * @author cz */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java index 8291f68..981d235 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java @@ -10,7 +10,7 @@ public class FieldParserSupport { /** - * todo: 计算协议配置字段的总长度 + * 计算协议配置字段的总长度 * 1、分别计算bit和byte长度 * 2、合并长度 */ @@ -29,7 +29,7 @@ } /** - * todo:最大固定位置下标 + * 最大固定位置下标 * * 1、获取没有指定起始位置的业务内容后的字段配置集合 * 2、分别计算固定值最大长度和业务内容后字段配置进行相减得到计算结果即是固定位置下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java index 7901ce0..4047da9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java @@ -19,7 +19,7 @@ public class GenericFiledRuleResolver { /** - * todo: 拿到所有的值合并到一个值 + * 拿到所有的值合并到一个值 * 无论是bit位的解析，还是byte的解析，统一都转换成byte进行规则的换算解析 * 1、必须进行byte与值的类型转换 * 2、存在可能，对值进行运算 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 338be3d..a9af4e8 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 @@ -28,7 +28,7 @@ public class GenericCombinedFieldResolver { /** - * todo: 组合字段解析主要流程类 + * 组合字段解析主要流程类 * 通过查询，字段长度长度随机 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java index 8eb3362..33d83ae 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class BizFieldParseProcessor implements AbstractCombinedFieldProcessor { /** - * todo: 业务字段解析 + * 业务字段解析 * * @param combinedFieldParam * @return @@ -50,7 +50,7 @@ } /** - * todo:计算处理后的偏移位置 + * 计算处理后的偏移位置 */ private Integer calculateAfterProcessPosition(AbstractFieldConfig newProtocolFieldConfig, CombinedFieldProcessorParam combinedFieldParam) { Integer originPositionIndex = newProtocolFieldConfig.getOriginPositionByte() - combinedFieldParam.getByteBuf().readerIndex(); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java index 2f1f32a..8a28f6b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class PreBizFieldParseProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor { /** - * todo: 计算业务字段长度，同时拿到对应指定的字段解析配置 + * 计算业务字段长度，同时拿到对应指定的字段解析配置 * * @param combinedFieldParam * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java index 515d988..e64f0da 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java @@ -22,7 +22,7 @@ public class PreLeadCodeProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor, PreLeadCodeParseStatus { /** - * todo:前导码匹配 + * 前导码匹配 * 匹配获取前导码，找到对应的组合字段配置，并将报文读位置前移 * * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java index 2e374bb..0375b81 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java @@ -22,7 +22,7 @@ public class BitFieldParser extends GenericFiledRuleResolver { /** - * todo: 位字段解析 + * 位字段解析 * 1、单个字节情况表示字段 * 2、多字节情况表示字段（暂未处理） */ @@ -91,7 +91,7 @@ /** - * todo: 从二进制字符串转为byte[] + * 从二进制字符串转为byte[] * * @param binaryStr * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java index c1ca720..8999afc 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java @@ -19,7 +19,7 @@ /** - * todo: 字节字段解析核心类 + * 字节字段解析核心类 * 存在rule_json走自定义的规则设置，没有则支持默认配置的规则设置 * * @param byteBuf @@ -37,7 +37,7 @@ } /** - * todo: 默认解析方法 + * 默认解析方法 * * @param byteBuf * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java index 687e786..d6bf1c2 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java @@ -24,7 +24,7 @@ public class DefaultProtocolFieldParser extends FieldParserSupport implements FieldParser, FrameStructEnum { /** - * todo:按照配置和待解析的缓冲池解析字段 + * 按照配置和待解析的缓冲池解析字段 * * @param protocolFieldConfigs 字段配置集合 * @param storeObjectMap 待存储的字段集合 @@ -46,7 +46,7 @@ } /** - * todo: 解析和协议帧结构相关的协议字段结合（位置、长度等信息） + * 解析和协议帧结构相关的协议字段结合（位置、长度等信息） * * @param protocolFieldConfigs * @param totalLength @@ -65,7 +65,7 @@ } /** - * todo: 获取业务内容的byteBuf + * 获取业务内容的byteBuf * 主要流程如下所示 * 1、通过协议配置计算固定长度 * 2、固定字段列表=> 计算固定字段长度=> 计算业务内容起始位置=>结合总长度，计算业务内容长度=>得到业务内容 @@ -87,7 +87,7 @@ } /** - * todo:获取过滤字段的长度 + * 获取过滤字段的长度 */ @Override public Integer totalFilterLength(ProtocolConfig protocolConfig, diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java index f8a359e..7023028 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java @@ -12,7 +12,7 @@ public class GenericRuleResolver { /** - * todo: 匹配规则 + * 匹配规则 * * 1、准备前置规则字段集合 * 2、准备固定字段集合 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 04e4e36..204b4dc 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 @@ -8,7 +8,7 @@ import java.util.*; /** - * todo: 规则匹配的核心类 + * 规则匹配的核心类 * * @author cz * @date 2023-6-12 @@ -18,7 +18,7 @@ /** - * todo: 规则匹配核心方法 + * 规则匹配核心方法 * 1、通过前置字段集合匹配规则 * 2、判断规则终止标记字段是否已经完成匹配 * （1）完成匹配，返回当前的规则 @@ -58,7 +58,7 @@ /** - * todo: 获取规则字段列表 + * 获取规则字段列表 * * @param preRuleConfigList * @param fixedDataMap @@ -79,7 +79,7 @@ /** - * todo:匹配规则配置 + * 匹配规则配置 * * @param ruleMap * @param metaDataMap diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java index 8652ef0..787874a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java @@ -27,7 +27,7 @@ } /** - * todo:通过post方法执行方法回调 + * 通过post方法执行方法回调 * * @param json * @param url diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java index 514f88e..d7ed3e7 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java @@ -34,7 +34,7 @@ /** - * todo: 解析数据字段 + * 解析数据字段 * * @param ruleConfig * @param byteBuf @@ -54,7 +54,7 @@ } /** - * todo：查询规则对应的组合配合 + * 查询规则对应的组合配合 * 准备，过滤字段列表，选取所需的值 * * @param ruleConfig diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java index 27f3c77..f5e671b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java @@ -10,7 +10,7 @@ public class PretreatmentSupport { /** - * todo: 取第一个大括号，对应的右括号下标值 + * 取第一个大括号，对应的右括号下标值 * 算法流程 * 1、初始化totalRightBracket为0 * 2、获取首个“{”压栈，totalRightBracket加偏移下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java index 588d412..3e0fe74 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java @@ -35,7 +35,8 @@ } /** - * todo: 执行aep平台前的协议解析 预处理为标准的协议报文 + * 执行aep平台前的协议解析 预处理为标准的协议报文 + * ****有http的server */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java index 43ee69d..4ae0495 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java @@ -31,7 +31,7 @@ } /** - * todo: 执行np平台前的协议解析 预处理为标准的协议报文 + * 执行np平台前的协议解析 预处理为标准的协议报文 */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java index 67ce2f3..63dd7de 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java @@ -12,7 +12,7 @@ * 可任意构建自己的命令 * * @author cz - * todo: 过滤筛选器抽象类，进行特定内容的指令下发 + * 过滤筛选器抽象类，进行特定内容的指令下发 */ public interface AbstractReplyCommandPostProcessing extends ReplyCommandEnum { @@ -20,7 +20,7 @@ /** * 走一层过滤，没有走默认配置，加自己默认的过滤 *

- * todo:回复命令构建 + * 回复命令构建 * * @param bizDataMap * @param ruleConfigFactory diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java index cf0dba0..a5c51a6 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java @@ -8,7 +8,7 @@ import java.util.Map; /** - * todo:后置处理器，将散落解析的时间进行合并 + * 后置处理器，将散落解析的时间进行合并 * * @author cz */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java index 8291f68..981d235 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java @@ -10,7 +10,7 @@ public class FieldParserSupport { /** - * todo: 计算协议配置字段的总长度 + * 计算协议配置字段的总长度 * 1、分别计算bit和byte长度 * 2、合并长度 */ @@ -29,7 +29,7 @@ } /** - * todo:最大固定位置下标 + * 最大固定位置下标 * * 1、获取没有指定起始位置的业务内容后的字段配置集合 * 2、分别计算固定值最大长度和业务内容后字段配置进行相减得到计算结果即是固定位置下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java index 7901ce0..4047da9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java @@ -19,7 +19,7 @@ public class GenericFiledRuleResolver { /** - * todo: 拿到所有的值合并到一个值 + * 拿到所有的值合并到一个值 * 无论是bit位的解析，还是byte的解析，统一都转换成byte进行规则的换算解析 * 1、必须进行byte与值的类型转换 * 2、存在可能，对值进行运算 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 338be3d..a9af4e8 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 @@ -28,7 +28,7 @@ public class GenericCombinedFieldResolver { /** - * todo: 组合字段解析主要流程类 + * 组合字段解析主要流程类 * 通过查询，字段长度长度随机 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java index 8eb3362..33d83ae 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class BizFieldParseProcessor implements AbstractCombinedFieldProcessor { /** - * todo: 业务字段解析 + * 业务字段解析 * * @param combinedFieldParam * @return @@ -50,7 +50,7 @@ } /** - * todo:计算处理后的偏移位置 + * 计算处理后的偏移位置 */ private Integer calculateAfterProcessPosition(AbstractFieldConfig newProtocolFieldConfig, CombinedFieldProcessorParam combinedFieldParam) { Integer originPositionIndex = newProtocolFieldConfig.getOriginPositionByte() - combinedFieldParam.getByteBuf().readerIndex(); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java index 2f1f32a..8a28f6b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class PreBizFieldParseProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor { /** - * todo: 计算业务字段长度，同时拿到对应指定的字段解析配置 + * 计算业务字段长度，同时拿到对应指定的字段解析配置 * * @param combinedFieldParam * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java index 515d988..e64f0da 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java @@ -22,7 +22,7 @@ public class PreLeadCodeProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor, PreLeadCodeParseStatus { /** - * todo:前导码匹配 + * 前导码匹配 * 匹配获取前导码，找到对应的组合字段配置，并将报文读位置前移 * * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java index 2e374bb..0375b81 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java @@ -22,7 +22,7 @@ public class BitFieldParser extends GenericFiledRuleResolver { /** - * todo: 位字段解析 + * 位字段解析 * 1、单个字节情况表示字段 * 2、多字节情况表示字段（暂未处理） */ @@ -91,7 +91,7 @@ /** - * todo: 从二进制字符串转为byte[] + * 从二进制字符串转为byte[] * * @param binaryStr * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java index c1ca720..8999afc 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java @@ -19,7 +19,7 @@ /** - * todo: 字节字段解析核心类 + * 字节字段解析核心类 * 存在rule_json走自定义的规则设置，没有则支持默认配置的规则设置 * * @param byteBuf @@ -37,7 +37,7 @@ } /** - * todo: 默认解析方法 + * 默认解析方法 * * @param byteBuf * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java index 687e786..d6bf1c2 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java @@ -24,7 +24,7 @@ public class DefaultProtocolFieldParser extends FieldParserSupport implements FieldParser, FrameStructEnum { /** - * todo:按照配置和待解析的缓冲池解析字段 + * 按照配置和待解析的缓冲池解析字段 * * @param protocolFieldConfigs 字段配置集合 * @param storeObjectMap 待存储的字段集合 @@ -46,7 +46,7 @@ } /** - * todo: 解析和协议帧结构相关的协议字段结合（位置、长度等信息） + * 解析和协议帧结构相关的协议字段结合（位置、长度等信息） * * @param protocolFieldConfigs * @param totalLength @@ -65,7 +65,7 @@ } /** - * todo: 获取业务内容的byteBuf + * 获取业务内容的byteBuf * 主要流程如下所示 * 1、通过协议配置计算固定长度 * 2、固定字段列表=> 计算固定字段长度=> 计算业务内容起始位置=>结合总长度，计算业务内容长度=>得到业务内容 @@ -87,7 +87,7 @@ } /** - * todo:获取过滤字段的长度 + * 获取过滤字段的长度 */ @Override public Integer totalFilterLength(ProtocolConfig protocolConfig, diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java index f8a359e..7023028 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java @@ -12,7 +12,7 @@ public class GenericRuleResolver { /** - * todo: 匹配规则 + * 匹配规则 * * 1、准备前置规则字段集合 * 2、准备固定字段集合 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 04e4e36..204b4dc 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 @@ -8,7 +8,7 @@ import java.util.*; /** - * todo: 规则匹配的核心类 + * 规则匹配的核心类 * * @author cz * @date 2023-6-12 @@ -18,7 +18,7 @@ /** - * todo: 规则匹配核心方法 + * 规则匹配核心方法 * 1、通过前置字段集合匹配规则 * 2、判断规则终止标记字段是否已经完成匹配 * （1）完成匹配，返回当前的规则 @@ -58,7 +58,7 @@ /** - * todo: 获取规则字段列表 + * 获取规则字段列表 * * @param preRuleConfigList * @param fixedDataMap @@ -79,7 +79,7 @@ /** - * todo:匹配规则配置 + * 匹配规则配置 * * @param ruleMap * @param metaDataMap diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java index 8652ef0..787874a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java @@ -27,7 +27,7 @@ } /** - * todo:通过post方法执行方法回调 + * 通过post方法执行方法回调 * * @param json * @param url diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java index 514f88e..d7ed3e7 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java @@ -34,7 +34,7 @@ /** - * todo: 解析数据字段 + * 解析数据字段 * * @param ruleConfig * @param byteBuf @@ -54,7 +54,7 @@ } /** - * todo：查询规则对应的组合配合 + * 查询规则对应的组合配合 * 准备，过滤字段列表，选取所需的值 * * @param ruleConfig diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java index 1c96040..97a78ad 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java @@ -41,7 +41,7 @@ } /** - * todo:解析数据字段 + * 解析数据字段 * * @param ruleConfig * @param byteBuf @@ -66,7 +66,7 @@ } /** - * todo: 根据规则查询业务字段 + * 根据规则查询业务字段 * * 得到需要处理的业务内容 * diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java index 27f3c77..f5e671b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java @@ -10,7 +10,7 @@ public class PretreatmentSupport { /** - * todo: 取第一个大括号，对应的右括号下标值 + * 取第一个大括号，对应的右括号下标值 * 算法流程 * 1、初始化totalRightBracket为0 * 2、获取首个“{”压栈，totalRightBracket加偏移下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java index 588d412..3e0fe74 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java @@ -35,7 +35,8 @@ } /** - * todo: 执行aep平台前的协议解析 预处理为标准的协议报文 + * 执行aep平台前的协议解析 预处理为标准的协议报文 + * ****有http的server */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java index 43ee69d..4ae0495 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java @@ -31,7 +31,7 @@ } /** - * todo: 执行np平台前的协议解析 预处理为标准的协议报文 + * 执行np平台前的协议解析 预处理为标准的协议报文 */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java index 67ce2f3..63dd7de 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java @@ -12,7 +12,7 @@ * 可任意构建自己的命令 * * @author cz - * todo: 过滤筛选器抽象类，进行特定内容的指令下发 + * 过滤筛选器抽象类，进行特定内容的指令下发 */ public interface AbstractReplyCommandPostProcessing extends ReplyCommandEnum { @@ -20,7 +20,7 @@ /** * 走一层过滤，没有走默认配置，加自己默认的过滤 *

- * todo:回复命令构建 + * 回复命令构建 * * @param bizDataMap * @param ruleConfigFactory diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java index cf0dba0..a5c51a6 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java @@ -8,7 +8,7 @@ import java.util.Map; /** - * todo:后置处理器，将散落解析的时间进行合并 + * 后置处理器，将散落解析的时间进行合并 * * @author cz */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java index 8291f68..981d235 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java @@ -10,7 +10,7 @@ public class FieldParserSupport { /** - * todo: 计算协议配置字段的总长度 + * 计算协议配置字段的总长度 * 1、分别计算bit和byte长度 * 2、合并长度 */ @@ -29,7 +29,7 @@ } /** - * todo:最大固定位置下标 + * 最大固定位置下标 * * 1、获取没有指定起始位置的业务内容后的字段配置集合 * 2、分别计算固定值最大长度和业务内容后字段配置进行相减得到计算结果即是固定位置下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java index 7901ce0..4047da9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java @@ -19,7 +19,7 @@ public class GenericFiledRuleResolver { /** - * todo: 拿到所有的值合并到一个值 + * 拿到所有的值合并到一个值 * 无论是bit位的解析，还是byte的解析，统一都转换成byte进行规则的换算解析 * 1、必须进行byte与值的类型转换 * 2、存在可能，对值进行运算 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 338be3d..a9af4e8 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 @@ -28,7 +28,7 @@ public class GenericCombinedFieldResolver { /** - * todo: 组合字段解析主要流程类 + * 组合字段解析主要流程类 * 通过查询，字段长度长度随机 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java index 8eb3362..33d83ae 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class BizFieldParseProcessor implements AbstractCombinedFieldProcessor { /** - * todo: 业务字段解析 + * 业务字段解析 * * @param combinedFieldParam * @return @@ -50,7 +50,7 @@ } /** - * todo:计算处理后的偏移位置 + * 计算处理后的偏移位置 */ private Integer calculateAfterProcessPosition(AbstractFieldConfig newProtocolFieldConfig, CombinedFieldProcessorParam combinedFieldParam) { Integer originPositionIndex = newProtocolFieldConfig.getOriginPositionByte() - combinedFieldParam.getByteBuf().readerIndex(); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java index 2f1f32a..8a28f6b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class PreBizFieldParseProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor { /** - * todo: 计算业务字段长度，同时拿到对应指定的字段解析配置 + * 计算业务字段长度，同时拿到对应指定的字段解析配置 * * @param combinedFieldParam * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java index 515d988..e64f0da 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java @@ -22,7 +22,7 @@ public class PreLeadCodeProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor, PreLeadCodeParseStatus { /** - * todo:前导码匹配 + * 前导码匹配 * 匹配获取前导码，找到对应的组合字段配置，并将报文读位置前移 * * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java index 2e374bb..0375b81 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java @@ -22,7 +22,7 @@ public class BitFieldParser extends GenericFiledRuleResolver { /** - * todo: 位字段解析 + * 位字段解析 * 1、单个字节情况表示字段 * 2、多字节情况表示字段（暂未处理） */ @@ -91,7 +91,7 @@ /** - * todo: 从二进制字符串转为byte[] + * 从二进制字符串转为byte[] * * @param binaryStr * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java index c1ca720..8999afc 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java @@ -19,7 +19,7 @@ /** - * todo: 字节字段解析核心类 + * 字节字段解析核心类 * 存在rule_json走自定义的规则设置，没有则支持默认配置的规则设置 * * @param byteBuf @@ -37,7 +37,7 @@ } /** - * todo: 默认解析方法 + * 默认解析方法 * * @param byteBuf * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java index 687e786..d6bf1c2 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java @@ -24,7 +24,7 @@ public class DefaultProtocolFieldParser extends FieldParserSupport implements FieldParser, FrameStructEnum { /** - * todo:按照配置和待解析的缓冲池解析字段 + * 按照配置和待解析的缓冲池解析字段 * * @param protocolFieldConfigs 字段配置集合 * @param storeObjectMap 待存储的字段集合 @@ -46,7 +46,7 @@ } /** - * todo: 解析和协议帧结构相关的协议字段结合（位置、长度等信息） + * 解析和协议帧结构相关的协议字段结合（位置、长度等信息） * * @param protocolFieldConfigs * @param totalLength @@ -65,7 +65,7 @@ } /** - * todo: 获取业务内容的byteBuf + * 获取业务内容的byteBuf * 主要流程如下所示 * 1、通过协议配置计算固定长度 * 2、固定字段列表=> 计算固定字段长度=> 计算业务内容起始位置=>结合总长度，计算业务内容长度=>得到业务内容 @@ -87,7 +87,7 @@ } /** - * todo:获取过滤字段的长度 + * 获取过滤字段的长度 */ @Override public Integer totalFilterLength(ProtocolConfig protocolConfig, diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java index f8a359e..7023028 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java @@ -12,7 +12,7 @@ public class GenericRuleResolver { /** - * todo: 匹配规则 + * 匹配规则 * * 1、准备前置规则字段集合 * 2、准备固定字段集合 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 04e4e36..204b4dc 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 @@ -8,7 +8,7 @@ import java.util.*; /** - * todo: 规则匹配的核心类 + * 规则匹配的核心类 * * @author cz * @date 2023-6-12 @@ -18,7 +18,7 @@ /** - * todo: 规则匹配核心方法 + * 规则匹配核心方法 * 1、通过前置字段集合匹配规则 * 2、判断规则终止标记字段是否已经完成匹配 * （1）完成匹配，返回当前的规则 @@ -58,7 +58,7 @@ /** - * todo: 获取规则字段列表 + * 获取规则字段列表 * * @param preRuleConfigList * @param fixedDataMap @@ -79,7 +79,7 @@ /** - * todo:匹配规则配置 + * 匹配规则配置 * * @param ruleMap * @param metaDataMap diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java index 8652ef0..787874a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java @@ -27,7 +27,7 @@ } /** - * todo:通过post方法执行方法回调 + * 通过post方法执行方法回调 * * @param json * @param url diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java index 514f88e..d7ed3e7 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java @@ -34,7 +34,7 @@ /** - * todo: 解析数据字段 + * 解析数据字段 * * @param ruleConfig * @param byteBuf @@ -54,7 +54,7 @@ } /** - * todo：查询规则对应的组合配合 + * 查询规则对应的组合配合 * 准备，过滤字段列表，选取所需的值 * * @param ruleConfig diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java index 1c96040..97a78ad 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java @@ -41,7 +41,7 @@ } /** - * todo:解析数据字段 + * 解析数据字段 * * @param ruleConfig * @param byteBuf @@ -66,7 +66,7 @@ } /** - * todo: 根据规则查询业务字段 + * 根据规则查询业务字段 * * 得到需要处理的业务内容 * diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java index dceeb89..b2974a5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java @@ -49,7 +49,7 @@ } /** - * todo: 报文解密 + * 报文解密 * 1、否有动态bean,没有去设置的bean,有则取之 * 2、bean不为空，进行解密操作，否则返回原文 * @@ -72,7 +72,7 @@ /** - * todo: 报文加密 + * 报文加密 *

* 如果进行过解密操作，那么回复自动判定密文需要加密并按照同样的加密的方式进行回复 */ @@ -93,7 +93,7 @@ } /** - * todo:解密清零操作 + * 解密清零操作 * * @param plainBuf * @return @@ -108,7 +108,7 @@ } /** - * todo: 加密补零操作 + * 加密补零操作 */ private ByteBuf fillFrameStructZero(ByteBuf replyBytes) { while (ByteBufUtil.hexDump(replyBytes).length() % 32 == 0) { @@ -119,7 +119,7 @@ /** - * todo: 数据订阅 + * 数据订阅 */ public void storeData(List> bizDataMap) { // DataSubscribeProvider dataSubscribeProvider = SpringContextUtil.getBean(processorInstance.getSubscribeBean()); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java index 27f3c77..f5e671b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java @@ -10,7 +10,7 @@ public class PretreatmentSupport { /** - * todo: 取第一个大括号，对应的右括号下标值 + * 取第一个大括号，对应的右括号下标值 * 算法流程 * 1、初始化totalRightBracket为0 * 2、获取首个“{”压栈，totalRightBracket加偏移下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java index 588d412..3e0fe74 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java @@ -35,7 +35,8 @@ } /** - * todo: 执行aep平台前的协议解析 预处理为标准的协议报文 + * 执行aep平台前的协议解析 预处理为标准的协议报文 + * ****有http的server */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java index 43ee69d..4ae0495 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java @@ -31,7 +31,7 @@ } /** - * todo: 执行np平台前的协议解析 预处理为标准的协议报文 + * 执行np平台前的协议解析 预处理为标准的协议报文 */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java index 67ce2f3..63dd7de 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java @@ -12,7 +12,7 @@ * 可任意构建自己的命令 * * @author cz - * todo: 过滤筛选器抽象类，进行特定内容的指令下发 + * 过滤筛选器抽象类，进行特定内容的指令下发 */ public interface AbstractReplyCommandPostProcessing extends ReplyCommandEnum { @@ -20,7 +20,7 @@ /** * 走一层过滤，没有走默认配置，加自己默认的过滤 *

- * todo:回复命令构建 + * 回复命令构建 * * @param bizDataMap * @param ruleConfigFactory diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java index cf0dba0..a5c51a6 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java @@ -8,7 +8,7 @@ import java.util.Map; /** - * todo:后置处理器，将散落解析的时间进行合并 + * 后置处理器，将散落解析的时间进行合并 * * @author cz */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java index 8291f68..981d235 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java @@ -10,7 +10,7 @@ public class FieldParserSupport { /** - * todo: 计算协议配置字段的总长度 + * 计算协议配置字段的总长度 * 1、分别计算bit和byte长度 * 2、合并长度 */ @@ -29,7 +29,7 @@ } /** - * todo:最大固定位置下标 + * 最大固定位置下标 * * 1、获取没有指定起始位置的业务内容后的字段配置集合 * 2、分别计算固定值最大长度和业务内容后字段配置进行相减得到计算结果即是固定位置下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java index 7901ce0..4047da9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java @@ -19,7 +19,7 @@ public class GenericFiledRuleResolver { /** - * todo: 拿到所有的值合并到一个值 + * 拿到所有的值合并到一个值 * 无论是bit位的解析，还是byte的解析，统一都转换成byte进行规则的换算解析 * 1、必须进行byte与值的类型转换 * 2、存在可能，对值进行运算 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 338be3d..a9af4e8 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 @@ -28,7 +28,7 @@ public class GenericCombinedFieldResolver { /** - * todo: 组合字段解析主要流程类 + * 组合字段解析主要流程类 * 通过查询，字段长度长度随机 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java index 8eb3362..33d83ae 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class BizFieldParseProcessor implements AbstractCombinedFieldProcessor { /** - * todo: 业务字段解析 + * 业务字段解析 * * @param combinedFieldParam * @return @@ -50,7 +50,7 @@ } /** - * todo:计算处理后的偏移位置 + * 计算处理后的偏移位置 */ private Integer calculateAfterProcessPosition(AbstractFieldConfig newProtocolFieldConfig, CombinedFieldProcessorParam combinedFieldParam) { Integer originPositionIndex = newProtocolFieldConfig.getOriginPositionByte() - combinedFieldParam.getByteBuf().readerIndex(); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java index 2f1f32a..8a28f6b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class PreBizFieldParseProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor { /** - * todo: 计算业务字段长度，同时拿到对应指定的字段解析配置 + * 计算业务字段长度，同时拿到对应指定的字段解析配置 * * @param combinedFieldParam * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java index 515d988..e64f0da 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java @@ -22,7 +22,7 @@ public class PreLeadCodeProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor, PreLeadCodeParseStatus { /** - * todo:前导码匹配 + * 前导码匹配 * 匹配获取前导码，找到对应的组合字段配置，并将报文读位置前移 * * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java index 2e374bb..0375b81 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java @@ -22,7 +22,7 @@ public class BitFieldParser extends GenericFiledRuleResolver { /** - * todo: 位字段解析 + * 位字段解析 * 1、单个字节情况表示字段 * 2、多字节情况表示字段（暂未处理） */ @@ -91,7 +91,7 @@ /** - * todo: 从二进制字符串转为byte[] + * 从二进制字符串转为byte[] * * @param binaryStr * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java index c1ca720..8999afc 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java @@ -19,7 +19,7 @@ /** - * todo: 字节字段解析核心类 + * 字节字段解析核心类 * 存在rule_json走自定义的规则设置，没有则支持默认配置的规则设置 * * @param byteBuf @@ -37,7 +37,7 @@ } /** - * todo: 默认解析方法 + * 默认解析方法 * * @param byteBuf * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java index 687e786..d6bf1c2 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java @@ -24,7 +24,7 @@ public class DefaultProtocolFieldParser extends FieldParserSupport implements FieldParser, FrameStructEnum { /** - * todo:按照配置和待解析的缓冲池解析字段 + * 按照配置和待解析的缓冲池解析字段 * * @param protocolFieldConfigs 字段配置集合 * @param storeObjectMap 待存储的字段集合 @@ -46,7 +46,7 @@ } /** - * todo: 解析和协议帧结构相关的协议字段结合（位置、长度等信息） + * 解析和协议帧结构相关的协议字段结合（位置、长度等信息） * * @param protocolFieldConfigs * @param totalLength @@ -65,7 +65,7 @@ } /** - * todo: 获取业务内容的byteBuf + * 获取业务内容的byteBuf * 主要流程如下所示 * 1、通过协议配置计算固定长度 * 2、固定字段列表=> 计算固定字段长度=> 计算业务内容起始位置=>结合总长度，计算业务内容长度=>得到业务内容 @@ -87,7 +87,7 @@ } /** - * todo:获取过滤字段的长度 + * 获取过滤字段的长度 */ @Override public Integer totalFilterLength(ProtocolConfig protocolConfig, diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java index f8a359e..7023028 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java @@ -12,7 +12,7 @@ public class GenericRuleResolver { /** - * todo: 匹配规则 + * 匹配规则 * * 1、准备前置规则字段集合 * 2、准备固定字段集合 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 04e4e36..204b4dc 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 @@ -8,7 +8,7 @@ import java.util.*; /** - * todo: 规则匹配的核心类 + * 规则匹配的核心类 * * @author cz * @date 2023-6-12 @@ -18,7 +18,7 @@ /** - * todo: 规则匹配核心方法 + * 规则匹配核心方法 * 1、通过前置字段集合匹配规则 * 2、判断规则终止标记字段是否已经完成匹配 * （1）完成匹配，返回当前的规则 @@ -58,7 +58,7 @@ /** - * todo: 获取规则字段列表 + * 获取规则字段列表 * * @param preRuleConfigList * @param fixedDataMap @@ -79,7 +79,7 @@ /** - * todo:匹配规则配置 + * 匹配规则配置 * * @param ruleMap * @param metaDataMap diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java index 8652ef0..787874a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java @@ -27,7 +27,7 @@ } /** - * todo:通过post方法执行方法回调 + * 通过post方法执行方法回调 * * @param json * @param url diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java index 514f88e..d7ed3e7 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java @@ -34,7 +34,7 @@ /** - * todo: 解析数据字段 + * 解析数据字段 * * @param ruleConfig * @param byteBuf @@ -54,7 +54,7 @@ } /** - * todo：查询规则对应的组合配合 + * 查询规则对应的组合配合 * 准备，过滤字段列表，选取所需的值 * * @param ruleConfig diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java index 1c96040..97a78ad 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java @@ -41,7 +41,7 @@ } /** - * todo:解析数据字段 + * 解析数据字段 * * @param ruleConfig * @param byteBuf @@ -66,7 +66,7 @@ } /** - * todo: 根据规则查询业务字段 + * 根据规则查询业务字段 * * 得到需要处理的业务内容 * diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java index dceeb89..b2974a5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java @@ -49,7 +49,7 @@ } /** - * todo: 报文解密 + * 报文解密 * 1、否有动态bean,没有去设置的bean,有则取之 * 2、bean不为空，进行解密操作，否则返回原文 * @@ -72,7 +72,7 @@ /** - * todo: 报文加密 + * 报文加密 *

* 如果进行过解密操作，那么回复自动判定密文需要加密并按照同样的加密的方式进行回复 */ @@ -93,7 +93,7 @@ } /** - * todo:解密清零操作 + * 解密清零操作 * * @param plainBuf * @return @@ -108,7 +108,7 @@ } /** - * todo: 加密补零操作 + * 加密补零操作 */ private ByteBuf fillFrameStructZero(ByteBuf replyBytes) { while (ByteBufUtil.hexDump(replyBytes).length() % 32 == 0) { @@ -119,7 +119,7 @@ /** - * todo: 数据订阅 + * 数据订阅 */ public void storeData(List> bizDataMap) { // DataSubscribeProvider dataSubscribeProvider = SpringContextUtil.getBean(processorInstance.getSubscribeBean()); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java index 90e4b18..5ffdcaa 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java @@ -46,7 +46,7 @@ } /** - * todo:初始化获取对应协议的配置字段列表 + * 初始化获取对应协议的配置字段列表 * * @param protocolId */ @@ -69,7 +69,7 @@ } /** - * todo:通过协议字段id和协议报文获取该配置实例化内容的值 + * 通过协议字段id和协议报文获取该配置实例化内容的值 * * @param protocolFieldId * @param byteBuf @@ -114,7 +114,7 @@ } /** - * todo:获取帧固定位置字段配置信息 + * 获取帧固定位置字段配置信息 * * @param byteBuf * @param protocolConfig @@ -141,7 +141,7 @@ /** - * todo:获取帧固定位置字段配置信息 + * 获取帧固定位置字段配置信息 * * @param byteBuf * @param protocolConfig @@ -166,7 +166,7 @@ } /** - * todo:获取过滤字段的长度 + * 获取过滤字段的长度 */ public Integer getTotalFilterLength(ProtocolConfig protocolConfig) { if (showSkip()) { @@ -185,7 +185,7 @@ /** - * todo:获取帧结构应有的总长度 + * 获取帧结构应有的总长度 */ public Integer getTotalLength(ByteBuf byteBuf, ProtocolConfig protocolConfig) { if (showSkip()) { @@ -211,7 +211,7 @@ } /** - * todo:获取协议有关字段解析内容 + * 获取协议有关字段解析内容 * storeObjectMap存储代转存的数据 * * @return @@ -237,7 +237,7 @@ } /** - * todo:获取业务报文内容的content字节 + * 获取业务报文内容的content字节 * * @param wholeDatagramByte * @return @@ -261,7 +261,7 @@ } /** - * todo:对解密的内容进行尾部清零操作 + * 对解密的内容进行尾部清零操作 *

* 根据解析后的业务内容，通过存储的帧结构，创建完整完整的数据报文， * 这里对帧结构的可变报文没有处理，只是简单的组装,保证提前解密，为帧结构检验做准备 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java index 27f3c77..f5e671b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java @@ -10,7 +10,7 @@ public class PretreatmentSupport { /** - * todo: 取第一个大括号，对应的右括号下标值 + * 取第一个大括号，对应的右括号下标值 * 算法流程 * 1、初始化totalRightBracket为0 * 2、获取首个“{”压栈，totalRightBracket加偏移下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java index 588d412..3e0fe74 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java @@ -35,7 +35,8 @@ } /** - * todo: 执行aep平台前的协议解析 预处理为标准的协议报文 + * 执行aep平台前的协议解析 预处理为标准的协议报文 + * ****有http的server */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java index 43ee69d..4ae0495 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java @@ -31,7 +31,7 @@ } /** - * todo: 执行np平台前的协议解析 预处理为标准的协议报文 + * 执行np平台前的协议解析 预处理为标准的协议报文 */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java index 67ce2f3..63dd7de 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java @@ -12,7 +12,7 @@ * 可任意构建自己的命令 * * @author cz - * todo: 过滤筛选器抽象类，进行特定内容的指令下发 + * 过滤筛选器抽象类，进行特定内容的指令下发 */ public interface AbstractReplyCommandPostProcessing extends ReplyCommandEnum { @@ -20,7 +20,7 @@ /** * 走一层过滤，没有走默认配置，加自己默认的过滤 *

- * todo:回复命令构建 + * 回复命令构建 * * @param bizDataMap * @param ruleConfigFactory diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java index cf0dba0..a5c51a6 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java @@ -8,7 +8,7 @@ import java.util.Map; /** - * todo:后置处理器，将散落解析的时间进行合并 + * 后置处理器，将散落解析的时间进行合并 * * @author cz */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java index 8291f68..981d235 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java @@ -10,7 +10,7 @@ public class FieldParserSupport { /** - * todo: 计算协议配置字段的总长度 + * 计算协议配置字段的总长度 * 1、分别计算bit和byte长度 * 2、合并长度 */ @@ -29,7 +29,7 @@ } /** - * todo:最大固定位置下标 + * 最大固定位置下标 * * 1、获取没有指定起始位置的业务内容后的字段配置集合 * 2、分别计算固定值最大长度和业务内容后字段配置进行相减得到计算结果即是固定位置下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java index 7901ce0..4047da9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java @@ -19,7 +19,7 @@ public class GenericFiledRuleResolver { /** - * todo: 拿到所有的值合并到一个值 + * 拿到所有的值合并到一个值 * 无论是bit位的解析，还是byte的解析，统一都转换成byte进行规则的换算解析 * 1、必须进行byte与值的类型转换 * 2、存在可能，对值进行运算 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 338be3d..a9af4e8 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 @@ -28,7 +28,7 @@ public class GenericCombinedFieldResolver { /** - * todo: 组合字段解析主要流程类 + * 组合字段解析主要流程类 * 通过查询，字段长度长度随机 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java index 8eb3362..33d83ae 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class BizFieldParseProcessor implements AbstractCombinedFieldProcessor { /** - * todo: 业务字段解析 + * 业务字段解析 * * @param combinedFieldParam * @return @@ -50,7 +50,7 @@ } /** - * todo:计算处理后的偏移位置 + * 计算处理后的偏移位置 */ private Integer calculateAfterProcessPosition(AbstractFieldConfig newProtocolFieldConfig, CombinedFieldProcessorParam combinedFieldParam) { Integer originPositionIndex = newProtocolFieldConfig.getOriginPositionByte() - combinedFieldParam.getByteBuf().readerIndex(); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java index 2f1f32a..8a28f6b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class PreBizFieldParseProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor { /** - * todo: 计算业务字段长度，同时拿到对应指定的字段解析配置 + * 计算业务字段长度，同时拿到对应指定的字段解析配置 * * @param combinedFieldParam * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java index 515d988..e64f0da 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java @@ -22,7 +22,7 @@ public class PreLeadCodeProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor, PreLeadCodeParseStatus { /** - * todo:前导码匹配 + * 前导码匹配 * 匹配获取前导码，找到对应的组合字段配置，并将报文读位置前移 * * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java index 2e374bb..0375b81 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java @@ -22,7 +22,7 @@ public class BitFieldParser extends GenericFiledRuleResolver { /** - * todo: 位字段解析 + * 位字段解析 * 1、单个字节情况表示字段 * 2、多字节情况表示字段（暂未处理） */ @@ -91,7 +91,7 @@ /** - * todo: 从二进制字符串转为byte[] + * 从二进制字符串转为byte[] * * @param binaryStr * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java index c1ca720..8999afc 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java @@ -19,7 +19,7 @@ /** - * todo: 字节字段解析核心类 + * 字节字段解析核心类 * 存在rule_json走自定义的规则设置，没有则支持默认配置的规则设置 * * @param byteBuf @@ -37,7 +37,7 @@ } /** - * todo: 默认解析方法 + * 默认解析方法 * * @param byteBuf * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java index 687e786..d6bf1c2 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java @@ -24,7 +24,7 @@ public class DefaultProtocolFieldParser extends FieldParserSupport implements FieldParser, FrameStructEnum { /** - * todo:按照配置和待解析的缓冲池解析字段 + * 按照配置和待解析的缓冲池解析字段 * * @param protocolFieldConfigs 字段配置集合 * @param storeObjectMap 待存储的字段集合 @@ -46,7 +46,7 @@ } /** - * todo: 解析和协议帧结构相关的协议字段结合（位置、长度等信息） + * 解析和协议帧结构相关的协议字段结合（位置、长度等信息） * * @param protocolFieldConfigs * @param totalLength @@ -65,7 +65,7 @@ } /** - * todo: 获取业务内容的byteBuf + * 获取业务内容的byteBuf * 主要流程如下所示 * 1、通过协议配置计算固定长度 * 2、固定字段列表=> 计算固定字段长度=> 计算业务内容起始位置=>结合总长度，计算业务内容长度=>得到业务内容 @@ -87,7 +87,7 @@ } /** - * todo:获取过滤字段的长度 + * 获取过滤字段的长度 */ @Override public Integer totalFilterLength(ProtocolConfig protocolConfig, diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java index f8a359e..7023028 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java @@ -12,7 +12,7 @@ public class GenericRuleResolver { /** - * todo: 匹配规则 + * 匹配规则 * * 1、准备前置规则字段集合 * 2、准备固定字段集合 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 04e4e36..204b4dc 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 @@ -8,7 +8,7 @@ import java.util.*; /** - * todo: 规则匹配的核心类 + * 规则匹配的核心类 * * @author cz * @date 2023-6-12 @@ -18,7 +18,7 @@ /** - * todo: 规则匹配核心方法 + * 规则匹配核心方法 * 1、通过前置字段集合匹配规则 * 2、判断规则终止标记字段是否已经完成匹配 * （1）完成匹配，返回当前的规则 @@ -58,7 +58,7 @@ /** - * todo: 获取规则字段列表 + * 获取规则字段列表 * * @param preRuleConfigList * @param fixedDataMap @@ -79,7 +79,7 @@ /** - * todo:匹配规则配置 + * 匹配规则配置 * * @param ruleMap * @param metaDataMap diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java index 8652ef0..787874a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java @@ -27,7 +27,7 @@ } /** - * todo:通过post方法执行方法回调 + * 通过post方法执行方法回调 * * @param json * @param url diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java index 514f88e..d7ed3e7 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java @@ -34,7 +34,7 @@ /** - * todo: 解析数据字段 + * 解析数据字段 * * @param ruleConfig * @param byteBuf @@ -54,7 +54,7 @@ } /** - * todo：查询规则对应的组合配合 + * 查询规则对应的组合配合 * 准备，过滤字段列表，选取所需的值 * * @param ruleConfig diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java index 1c96040..97a78ad 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java @@ -41,7 +41,7 @@ } /** - * todo:解析数据字段 + * 解析数据字段 * * @param ruleConfig * @param byteBuf @@ -66,7 +66,7 @@ } /** - * todo: 根据规则查询业务字段 + * 根据规则查询业务字段 * * 得到需要处理的业务内容 * diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java index dceeb89..b2974a5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java @@ -49,7 +49,7 @@ } /** - * todo: 报文解密 + * 报文解密 * 1、否有动态bean,没有去设置的bean,有则取之 * 2、bean不为空，进行解密操作，否则返回原文 * @@ -72,7 +72,7 @@ /** - * todo: 报文加密 + * 报文加密 *

* 如果进行过解密操作，那么回复自动判定密文需要加密并按照同样的加密的方式进行回复 */ @@ -93,7 +93,7 @@ } /** - * todo:解密清零操作 + * 解密清零操作 * * @param plainBuf * @return @@ -108,7 +108,7 @@ } /** - * todo: 加密补零操作 + * 加密补零操作 */ private ByteBuf fillFrameStructZero(ByteBuf replyBytes) { while (ByteBufUtil.hexDump(replyBytes).length() % 32 == 0) { @@ -119,7 +119,7 @@ /** - * todo: 数据订阅 + * 数据订阅 */ public void storeData(List> bizDataMap) { // DataSubscribeProvider dataSubscribeProvider = SpringContextUtil.getBean(processorInstance.getSubscribeBean()); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java index 90e4b18..5ffdcaa 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java @@ -46,7 +46,7 @@ } /** - * todo:初始化获取对应协议的配置字段列表 + * 初始化获取对应协议的配置字段列表 * * @param protocolId */ @@ -69,7 +69,7 @@ } /** - * todo:通过协议字段id和协议报文获取该配置实例化内容的值 + * 通过协议字段id和协议报文获取该配置实例化内容的值 * * @param protocolFieldId * @param byteBuf @@ -114,7 +114,7 @@ } /** - * todo:获取帧固定位置字段配置信息 + * 获取帧固定位置字段配置信息 * * @param byteBuf * @param protocolConfig @@ -141,7 +141,7 @@ /** - * todo:获取帧固定位置字段配置信息 + * 获取帧固定位置字段配置信息 * * @param byteBuf * @param protocolConfig @@ -166,7 +166,7 @@ } /** - * todo:获取过滤字段的长度 + * 获取过滤字段的长度 */ public Integer getTotalFilterLength(ProtocolConfig protocolConfig) { if (showSkip()) { @@ -185,7 +185,7 @@ /** - * todo:获取帧结构应有的总长度 + * 获取帧结构应有的总长度 */ public Integer getTotalLength(ByteBuf byteBuf, ProtocolConfig protocolConfig) { if (showSkip()) { @@ -211,7 +211,7 @@ } /** - * todo:获取协议有关字段解析内容 + * 获取协议有关字段解析内容 * storeObjectMap存储代转存的数据 * * @return @@ -237,7 +237,7 @@ } /** - * todo:获取业务报文内容的content字节 + * 获取业务报文内容的content字节 * * @param wholeDatagramByte * @return @@ -261,7 +261,7 @@ } /** - * todo:对解密的内容进行尾部清零操作 + * 对解密的内容进行尾部清零操作 *

* 根据解析后的业务内容，通过存储的帧结构，创建完整完整的数据报文， * 这里对帧结构的可变报文没有处理，只是简单的组装,保证提前解密，为帧结构检验做准备 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java index 7872a3c..4981167 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java @@ -36,7 +36,7 @@ } /** - * todo: 获取规则匹配结果 + * 获取规则匹配结果 * * @param parseFixedDataMap * @param protocolFieldConfigs diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java index 27f3c77..f5e671b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java @@ -10,7 +10,7 @@ public class PretreatmentSupport { /** - * todo: 取第一个大括号，对应的右括号下标值 + * 取第一个大括号，对应的右括号下标值 * 算法流程 * 1、初始化totalRightBracket为0 * 2、获取首个“{”压栈，totalRightBracket加偏移下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java index 588d412..3e0fe74 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java @@ -35,7 +35,8 @@ } /** - * todo: 执行aep平台前的协议解析 预处理为标准的协议报文 + * 执行aep平台前的协议解析 预处理为标准的协议报文 + * ****有http的server */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java index 43ee69d..4ae0495 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java @@ -31,7 +31,7 @@ } /** - * todo: 执行np平台前的协议解析 预处理为标准的协议报文 + * 执行np平台前的协议解析 预处理为标准的协议报文 */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java index 67ce2f3..63dd7de 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java @@ -12,7 +12,7 @@ * 可任意构建自己的命令 * * @author cz - * todo: 过滤筛选器抽象类，进行特定内容的指令下发 + * 过滤筛选器抽象类，进行特定内容的指令下发 */ public interface AbstractReplyCommandPostProcessing extends ReplyCommandEnum { @@ -20,7 +20,7 @@ /** * 走一层过滤，没有走默认配置，加自己默认的过滤 *

- * todo:回复命令构建 + * 回复命令构建 * * @param bizDataMap * @param ruleConfigFactory diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java index cf0dba0..a5c51a6 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java @@ -8,7 +8,7 @@ import java.util.Map; /** - * todo:后置处理器，将散落解析的时间进行合并 + * 后置处理器，将散落解析的时间进行合并 * * @author cz */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java index 8291f68..981d235 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java @@ -10,7 +10,7 @@ public class FieldParserSupport { /** - * todo: 计算协议配置字段的总长度 + * 计算协议配置字段的总长度 * 1、分别计算bit和byte长度 * 2、合并长度 */ @@ -29,7 +29,7 @@ } /** - * todo:最大固定位置下标 + * 最大固定位置下标 * * 1、获取没有指定起始位置的业务内容后的字段配置集合 * 2、分别计算固定值最大长度和业务内容后字段配置进行相减得到计算结果即是固定位置下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java index 7901ce0..4047da9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java @@ -19,7 +19,7 @@ public class GenericFiledRuleResolver { /** - * todo: 拿到所有的值合并到一个值 + * 拿到所有的值合并到一个值 * 无论是bit位的解析，还是byte的解析，统一都转换成byte进行规则的换算解析 * 1、必须进行byte与值的类型转换 * 2、存在可能，对值进行运算 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 338be3d..a9af4e8 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 @@ -28,7 +28,7 @@ public class GenericCombinedFieldResolver { /** - * todo: 组合字段解析主要流程类 + * 组合字段解析主要流程类 * 通过查询，字段长度长度随机 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java index 8eb3362..33d83ae 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class BizFieldParseProcessor implements AbstractCombinedFieldProcessor { /** - * todo: 业务字段解析 + * 业务字段解析 * * @param combinedFieldParam * @return @@ -50,7 +50,7 @@ } /** - * todo:计算处理后的偏移位置 + * 计算处理后的偏移位置 */ private Integer calculateAfterProcessPosition(AbstractFieldConfig newProtocolFieldConfig, CombinedFieldProcessorParam combinedFieldParam) { Integer originPositionIndex = newProtocolFieldConfig.getOriginPositionByte() - combinedFieldParam.getByteBuf().readerIndex(); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java index 2f1f32a..8a28f6b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class PreBizFieldParseProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor { /** - * todo: 计算业务字段长度，同时拿到对应指定的字段解析配置 + * 计算业务字段长度，同时拿到对应指定的字段解析配置 * * @param combinedFieldParam * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java index 515d988..e64f0da 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java @@ -22,7 +22,7 @@ public class PreLeadCodeProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor, PreLeadCodeParseStatus { /** - * todo:前导码匹配 + * 前导码匹配 * 匹配获取前导码，找到对应的组合字段配置，并将报文读位置前移 * * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java index 2e374bb..0375b81 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java @@ -22,7 +22,7 @@ public class BitFieldParser extends GenericFiledRuleResolver { /** - * todo: 位字段解析 + * 位字段解析 * 1、单个字节情况表示字段 * 2、多字节情况表示字段（暂未处理） */ @@ -91,7 +91,7 @@ /** - * todo: 从二进制字符串转为byte[] + * 从二进制字符串转为byte[] * * @param binaryStr * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java index c1ca720..8999afc 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java @@ -19,7 +19,7 @@ /** - * todo: 字节字段解析核心类 + * 字节字段解析核心类 * 存在rule_json走自定义的规则设置，没有则支持默认配置的规则设置 * * @param byteBuf @@ -37,7 +37,7 @@ } /** - * todo: 默认解析方法 + * 默认解析方法 * * @param byteBuf * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java index 687e786..d6bf1c2 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java @@ -24,7 +24,7 @@ public class DefaultProtocolFieldParser extends FieldParserSupport implements FieldParser, FrameStructEnum { /** - * todo:按照配置和待解析的缓冲池解析字段 + * 按照配置和待解析的缓冲池解析字段 * * @param protocolFieldConfigs 字段配置集合 * @param storeObjectMap 待存储的字段集合 @@ -46,7 +46,7 @@ } /** - * todo: 解析和协议帧结构相关的协议字段结合（位置、长度等信息） + * 解析和协议帧结构相关的协议字段结合（位置、长度等信息） * * @param protocolFieldConfigs * @param totalLength @@ -65,7 +65,7 @@ } /** - * todo: 获取业务内容的byteBuf + * 获取业务内容的byteBuf * 主要流程如下所示 * 1、通过协议配置计算固定长度 * 2、固定字段列表=> 计算固定字段长度=> 计算业务内容起始位置=>结合总长度，计算业务内容长度=>得到业务内容 @@ -87,7 +87,7 @@ } /** - * todo:获取过滤字段的长度 + * 获取过滤字段的长度 */ @Override public Integer totalFilterLength(ProtocolConfig protocolConfig, diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java index f8a359e..7023028 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java @@ -12,7 +12,7 @@ public class GenericRuleResolver { /** - * todo: 匹配规则 + * 匹配规则 * * 1、准备前置规则字段集合 * 2、准备固定字段集合 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 04e4e36..204b4dc 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 @@ -8,7 +8,7 @@ import java.util.*; /** - * todo: 规则匹配的核心类 + * 规则匹配的核心类 * * @author cz * @date 2023-6-12 @@ -18,7 +18,7 @@ /** - * todo: 规则匹配核心方法 + * 规则匹配核心方法 * 1、通过前置字段集合匹配规则 * 2、判断规则终止标记字段是否已经完成匹配 * （1）完成匹配，返回当前的规则 @@ -58,7 +58,7 @@ /** - * todo: 获取规则字段列表 + * 获取规则字段列表 * * @param preRuleConfigList * @param fixedDataMap @@ -79,7 +79,7 @@ /** - * todo:匹配规则配置 + * 匹配规则配置 * * @param ruleMap * @param metaDataMap diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java index 8652ef0..787874a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java @@ -27,7 +27,7 @@ } /** - * todo:通过post方法执行方法回调 + * 通过post方法执行方法回调 * * @param json * @param url diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java index 514f88e..d7ed3e7 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java @@ -34,7 +34,7 @@ /** - * todo: 解析数据字段 + * 解析数据字段 * * @param ruleConfig * @param byteBuf @@ -54,7 +54,7 @@ } /** - * todo：查询规则对应的组合配合 + * 查询规则对应的组合配合 * 准备，过滤字段列表，选取所需的值 * * @param ruleConfig diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java index 1c96040..97a78ad 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java @@ -41,7 +41,7 @@ } /** - * todo:解析数据字段 + * 解析数据字段 * * @param ruleConfig * @param byteBuf @@ -66,7 +66,7 @@ } /** - * todo: 根据规则查询业务字段 + * 根据规则查询业务字段 * * 得到需要处理的业务内容 * diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java index dceeb89..b2974a5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java @@ -49,7 +49,7 @@ } /** - * todo: 报文解密 + * 报文解密 * 1、否有动态bean,没有去设置的bean,有则取之 * 2、bean不为空，进行解密操作，否则返回原文 * @@ -72,7 +72,7 @@ /** - * todo: 报文加密 + * 报文加密 *

* 如果进行过解密操作，那么回复自动判定密文需要加密并按照同样的加密的方式进行回复 */ @@ -93,7 +93,7 @@ } /** - * todo:解密清零操作 + * 解密清零操作 * * @param plainBuf * @return @@ -108,7 +108,7 @@ } /** - * todo: 加密补零操作 + * 加密补零操作 */ private ByteBuf fillFrameStructZero(ByteBuf replyBytes) { while (ByteBufUtil.hexDump(replyBytes).length() % 32 == 0) { @@ -119,7 +119,7 @@ /** - * todo: 数据订阅 + * 数据订阅 */ public void storeData(List> bizDataMap) { // DataSubscribeProvider dataSubscribeProvider = SpringContextUtil.getBean(processorInstance.getSubscribeBean()); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java index 90e4b18..5ffdcaa 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java @@ -46,7 +46,7 @@ } /** - * todo:初始化获取对应协议的配置字段列表 + * 初始化获取对应协议的配置字段列表 * * @param protocolId */ @@ -69,7 +69,7 @@ } /** - * todo:通过协议字段id和协议报文获取该配置实例化内容的值 + * 通过协议字段id和协议报文获取该配置实例化内容的值 * * @param protocolFieldId * @param byteBuf @@ -114,7 +114,7 @@ } /** - * todo:获取帧固定位置字段配置信息 + * 获取帧固定位置字段配置信息 * * @param byteBuf * @param protocolConfig @@ -141,7 +141,7 @@ /** - * todo:获取帧固定位置字段配置信息 + * 获取帧固定位置字段配置信息 * * @param byteBuf * @param protocolConfig @@ -166,7 +166,7 @@ } /** - * todo:获取过滤字段的长度 + * 获取过滤字段的长度 */ public Integer getTotalFilterLength(ProtocolConfig protocolConfig) { if (showSkip()) { @@ -185,7 +185,7 @@ /** - * todo:获取帧结构应有的总长度 + * 获取帧结构应有的总长度 */ public Integer getTotalLength(ByteBuf byteBuf, ProtocolConfig protocolConfig) { if (showSkip()) { @@ -211,7 +211,7 @@ } /** - * todo:获取协议有关字段解析内容 + * 获取协议有关字段解析内容 * storeObjectMap存储代转存的数据 * * @return @@ -237,7 +237,7 @@ } /** - * todo:获取业务报文内容的content字节 + * 获取业务报文内容的content字节 * * @param wholeDatagramByte * @return @@ -261,7 +261,7 @@ } /** - * todo:对解密的内容进行尾部清零操作 + * 对解密的内容进行尾部清零操作 *

* 根据解析后的业务内容，通过存储的帧结构，创建完整完整的数据报文， * 这里对帧结构的可变报文没有处理，只是简单的组装,保证提前解密，为帧结构检验做准备 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java index 7872a3c..4981167 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java @@ -36,7 +36,7 @@ } /** - * todo: 获取规则匹配结果 + * 获取规则匹配结果 * * @param parseFixedDataMap * @param protocolFieldConfigs 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 b4a0f0a..8e6b55e 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,7 +14,7 @@ public class SensorhubReplier extends SimpleChannelInboundHandler { /** - * todo: 回复内容构建的流程入口方法 + * 回复内容构建的流程入口方法 * 1、通过有标准协议解析器传来的结果进行命令的构建 * 2、构建命令有以下的命令内容 * （1）成功返回时间，并进行下发配置操作 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java index 27f3c77..f5e671b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java @@ -10,7 +10,7 @@ public class PretreatmentSupport { /** - * todo: 取第一个大括号，对应的右括号下标值 + * 取第一个大括号，对应的右括号下标值 * 算法流程 * 1、初始化totalRightBracket为0 * 2、获取首个“{”压栈，totalRightBracket加偏移下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java index 588d412..3e0fe74 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java @@ -35,7 +35,8 @@ } /** - * todo: 执行aep平台前的协议解析 预处理为标准的协议报文 + * 执行aep平台前的协议解析 预处理为标准的协议报文 + * ****有http的server */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java index 43ee69d..4ae0495 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java @@ -31,7 +31,7 @@ } /** - * todo: 执行np平台前的协议解析 预处理为标准的协议报文 + * 执行np平台前的协议解析 预处理为标准的协议报文 */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java index 67ce2f3..63dd7de 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java @@ -12,7 +12,7 @@ * 可任意构建自己的命令 * * @author cz - * todo: 过滤筛选器抽象类，进行特定内容的指令下发 + * 过滤筛选器抽象类，进行特定内容的指令下发 */ public interface AbstractReplyCommandPostProcessing extends ReplyCommandEnum { @@ -20,7 +20,7 @@ /** * 走一层过滤，没有走默认配置，加自己默认的过滤 *

- * todo:回复命令构建 + * 回复命令构建 * * @param bizDataMap * @param ruleConfigFactory diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java index cf0dba0..a5c51a6 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java @@ -8,7 +8,7 @@ import java.util.Map; /** - * todo:后置处理器，将散落解析的时间进行合并 + * 后置处理器，将散落解析的时间进行合并 * * @author cz */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java index 8291f68..981d235 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java @@ -10,7 +10,7 @@ public class FieldParserSupport { /** - * todo: 计算协议配置字段的总长度 + * 计算协议配置字段的总长度 * 1、分别计算bit和byte长度 * 2、合并长度 */ @@ -29,7 +29,7 @@ } /** - * todo:最大固定位置下标 + * 最大固定位置下标 * * 1、获取没有指定起始位置的业务内容后的字段配置集合 * 2、分别计算固定值最大长度和业务内容后字段配置进行相减得到计算结果即是固定位置下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java index 7901ce0..4047da9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java @@ -19,7 +19,7 @@ public class GenericFiledRuleResolver { /** - * todo: 拿到所有的值合并到一个值 + * 拿到所有的值合并到一个值 * 无论是bit位的解析，还是byte的解析，统一都转换成byte进行规则的换算解析 * 1、必须进行byte与值的类型转换 * 2、存在可能，对值进行运算 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 338be3d..a9af4e8 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 @@ -28,7 +28,7 @@ public class GenericCombinedFieldResolver { /** - * todo: 组合字段解析主要流程类 + * 组合字段解析主要流程类 * 通过查询，字段长度长度随机 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java index 8eb3362..33d83ae 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class BizFieldParseProcessor implements AbstractCombinedFieldProcessor { /** - * todo: 业务字段解析 + * 业务字段解析 * * @param combinedFieldParam * @return @@ -50,7 +50,7 @@ } /** - * todo:计算处理后的偏移位置 + * 计算处理后的偏移位置 */ private Integer calculateAfterProcessPosition(AbstractFieldConfig newProtocolFieldConfig, CombinedFieldProcessorParam combinedFieldParam) { Integer originPositionIndex = newProtocolFieldConfig.getOriginPositionByte() - combinedFieldParam.getByteBuf().readerIndex(); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java index 2f1f32a..8a28f6b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class PreBizFieldParseProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor { /** - * todo: 计算业务字段长度，同时拿到对应指定的字段解析配置 + * 计算业务字段长度，同时拿到对应指定的字段解析配置 * * @param combinedFieldParam * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java index 515d988..e64f0da 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java @@ -22,7 +22,7 @@ public class PreLeadCodeProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor, PreLeadCodeParseStatus { /** - * todo:前导码匹配 + * 前导码匹配 * 匹配获取前导码，找到对应的组合字段配置，并将报文读位置前移 * * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java index 2e374bb..0375b81 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java @@ -22,7 +22,7 @@ public class BitFieldParser extends GenericFiledRuleResolver { /** - * todo: 位字段解析 + * 位字段解析 * 1、单个字节情况表示字段 * 2、多字节情况表示字段（暂未处理） */ @@ -91,7 +91,7 @@ /** - * todo: 从二进制字符串转为byte[] + * 从二进制字符串转为byte[] * * @param binaryStr * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java index c1ca720..8999afc 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java @@ -19,7 +19,7 @@ /** - * todo: 字节字段解析核心类 + * 字节字段解析核心类 * 存在rule_json走自定义的规则设置，没有则支持默认配置的规则设置 * * @param byteBuf @@ -37,7 +37,7 @@ } /** - * todo: 默认解析方法 + * 默认解析方法 * * @param byteBuf * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java index 687e786..d6bf1c2 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java @@ -24,7 +24,7 @@ public class DefaultProtocolFieldParser extends FieldParserSupport implements FieldParser, FrameStructEnum { /** - * todo:按照配置和待解析的缓冲池解析字段 + * 按照配置和待解析的缓冲池解析字段 * * @param protocolFieldConfigs 字段配置集合 * @param storeObjectMap 待存储的字段集合 @@ -46,7 +46,7 @@ } /** - * todo: 解析和协议帧结构相关的协议字段结合（位置、长度等信息） + * 解析和协议帧结构相关的协议字段结合（位置、长度等信息） * * @param protocolFieldConfigs * @param totalLength @@ -65,7 +65,7 @@ } /** - * todo: 获取业务内容的byteBuf + * 获取业务内容的byteBuf * 主要流程如下所示 * 1、通过协议配置计算固定长度 * 2、固定字段列表=> 计算固定字段长度=> 计算业务内容起始位置=>结合总长度，计算业务内容长度=>得到业务内容 @@ -87,7 +87,7 @@ } /** - * todo:获取过滤字段的长度 + * 获取过滤字段的长度 */ @Override public Integer totalFilterLength(ProtocolConfig protocolConfig, diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java index f8a359e..7023028 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java @@ -12,7 +12,7 @@ public class GenericRuleResolver { /** - * todo: 匹配规则 + * 匹配规则 * * 1、准备前置规则字段集合 * 2、准备固定字段集合 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 04e4e36..204b4dc 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 @@ -8,7 +8,7 @@ import java.util.*; /** - * todo: 规则匹配的核心类 + * 规则匹配的核心类 * * @author cz * @date 2023-6-12 @@ -18,7 +18,7 @@ /** - * todo: 规则匹配核心方法 + * 规则匹配核心方法 * 1、通过前置字段集合匹配规则 * 2、判断规则终止标记字段是否已经完成匹配 * （1）完成匹配，返回当前的规则 @@ -58,7 +58,7 @@ /** - * todo: 获取规则字段列表 + * 获取规则字段列表 * * @param preRuleConfigList * @param fixedDataMap @@ -79,7 +79,7 @@ /** - * todo:匹配规则配置 + * 匹配规则配置 * * @param ruleMap * @param metaDataMap diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java index 8652ef0..787874a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java @@ -27,7 +27,7 @@ } /** - * todo:通过post方法执行方法回调 + * 通过post方法执行方法回调 * * @param json * @param url diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java index 514f88e..d7ed3e7 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java @@ -34,7 +34,7 @@ /** - * todo: 解析数据字段 + * 解析数据字段 * * @param ruleConfig * @param byteBuf @@ -54,7 +54,7 @@ } /** - * todo：查询规则对应的组合配合 + * 查询规则对应的组合配合 * 准备，过滤字段列表，选取所需的值 * * @param ruleConfig diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java index 1c96040..97a78ad 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java @@ -41,7 +41,7 @@ } /** - * todo:解析数据字段 + * 解析数据字段 * * @param ruleConfig * @param byteBuf @@ -66,7 +66,7 @@ } /** - * todo: 根据规则查询业务字段 + * 根据规则查询业务字段 * * 得到需要处理的业务内容 * diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java index dceeb89..b2974a5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java @@ -49,7 +49,7 @@ } /** - * todo: 报文解密 + * 报文解密 * 1、否有动态bean,没有去设置的bean,有则取之 * 2、bean不为空，进行解密操作，否则返回原文 * @@ -72,7 +72,7 @@ /** - * todo: 报文加密 + * 报文加密 *

* 如果进行过解密操作，那么回复自动判定密文需要加密并按照同样的加密的方式进行回复 */ @@ -93,7 +93,7 @@ } /** - * todo:解密清零操作 + * 解密清零操作 * * @param plainBuf * @return @@ -108,7 +108,7 @@ } /** - * todo: 加密补零操作 + * 加密补零操作 */ private ByteBuf fillFrameStructZero(ByteBuf replyBytes) { while (ByteBufUtil.hexDump(replyBytes).length() % 32 == 0) { @@ -119,7 +119,7 @@ /** - * todo: 数据订阅 + * 数据订阅 */ public void storeData(List> bizDataMap) { // DataSubscribeProvider dataSubscribeProvider = SpringContextUtil.getBean(processorInstance.getSubscribeBean()); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java index 90e4b18..5ffdcaa 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java @@ -46,7 +46,7 @@ } /** - * todo:初始化获取对应协议的配置字段列表 + * 初始化获取对应协议的配置字段列表 * * @param protocolId */ @@ -69,7 +69,7 @@ } /** - * todo:通过协议字段id和协议报文获取该配置实例化内容的值 + * 通过协议字段id和协议报文获取该配置实例化内容的值 * * @param protocolFieldId * @param byteBuf @@ -114,7 +114,7 @@ } /** - * todo:获取帧固定位置字段配置信息 + * 获取帧固定位置字段配置信息 * * @param byteBuf * @param protocolConfig @@ -141,7 +141,7 @@ /** - * todo:获取帧固定位置字段配置信息 + * 获取帧固定位置字段配置信息 * * @param byteBuf * @param protocolConfig @@ -166,7 +166,7 @@ } /** - * todo:获取过滤字段的长度 + * 获取过滤字段的长度 */ public Integer getTotalFilterLength(ProtocolConfig protocolConfig) { if (showSkip()) { @@ -185,7 +185,7 @@ /** - * todo:获取帧结构应有的总长度 + * 获取帧结构应有的总长度 */ public Integer getTotalLength(ByteBuf byteBuf, ProtocolConfig protocolConfig) { if (showSkip()) { @@ -211,7 +211,7 @@ } /** - * todo:获取协议有关字段解析内容 + * 获取协议有关字段解析内容 * storeObjectMap存储代转存的数据 * * @return @@ -237,7 +237,7 @@ } /** - * todo:获取业务报文内容的content字节 + * 获取业务报文内容的content字节 * * @param wholeDatagramByte * @return @@ -261,7 +261,7 @@ } /** - * todo:对解密的内容进行尾部清零操作 + * 对解密的内容进行尾部清零操作 *

* 根据解析后的业务内容，通过存储的帧结构，创建完整完整的数据报文， * 这里对帧结构的可变报文没有处理，只是简单的组装,保证提前解密，为帧结构检验做准备 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java index 7872a3c..4981167 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java @@ -36,7 +36,7 @@ } /** - * todo: 获取规则匹配结果 + * 获取规则匹配结果 * * @param parseFixedDataMap * @param protocolFieldConfigs 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 b4a0f0a..8e6b55e 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,7 +14,7 @@ public class SensorhubReplier extends SimpleChannelInboundHandler { /** - * todo: 回复内容构建的流程入口方法 + * 回复内容构建的流程入口方法 * 1、通过有标准协议解析器传来的结果进行命令的构建 * 2、构建命令有以下的命令内容 * （1）成功返回时间，并进行下发配置操作 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 a7bb1b8..b4dd1ba 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 @@ -25,7 +25,7 @@ public class DataReplyCommand extends ReplyCommandSupport implements AbstractBuildReplyCommand { /** - * todo: 报文构建命令 + * 报文构建命令 * 成功解析帧结构内容，进行下发成功回复命令的主要流程方法 * 其构建流程逻辑如下: * 1、初始化回复报文配置 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java index 27f3c77..f5e671b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java @@ -10,7 +10,7 @@ public class PretreatmentSupport { /** - * todo: 取第一个大括号，对应的右括号下标值 + * 取第一个大括号，对应的右括号下标值 * 算法流程 * 1、初始化totalRightBracket为0 * 2、获取首个“{”压栈，totalRightBracket加偏移下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java index 588d412..3e0fe74 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java @@ -35,7 +35,8 @@ } /** - * todo: 执行aep平台前的协议解析 预处理为标准的协议报文 + * 执行aep平台前的协议解析 预处理为标准的协议报文 + * ****有http的server */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java index 43ee69d..4ae0495 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java @@ -31,7 +31,7 @@ } /** - * todo: 执行np平台前的协议解析 预处理为标准的协议报文 + * 执行np平台前的协议解析 预处理为标准的协议报文 */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java index 67ce2f3..63dd7de 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java @@ -12,7 +12,7 @@ * 可任意构建自己的命令 * * @author cz - * todo: 过滤筛选器抽象类，进行特定内容的指令下发 + * 过滤筛选器抽象类，进行特定内容的指令下发 */ public interface AbstractReplyCommandPostProcessing extends ReplyCommandEnum { @@ -20,7 +20,7 @@ /** * 走一层过滤，没有走默认配置，加自己默认的过滤 *

- * todo:回复命令构建 + * 回复命令构建 * * @param bizDataMap * @param ruleConfigFactory diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java index cf0dba0..a5c51a6 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java @@ -8,7 +8,7 @@ import java.util.Map; /** - * todo:后置处理器，将散落解析的时间进行合并 + * 后置处理器，将散落解析的时间进行合并 * * @author cz */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java index 8291f68..981d235 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java @@ -10,7 +10,7 @@ public class FieldParserSupport { /** - * todo: 计算协议配置字段的总长度 + * 计算协议配置字段的总长度 * 1、分别计算bit和byte长度 * 2、合并长度 */ @@ -29,7 +29,7 @@ } /** - * todo:最大固定位置下标 + * 最大固定位置下标 * * 1、获取没有指定起始位置的业务内容后的字段配置集合 * 2、分别计算固定值最大长度和业务内容后字段配置进行相减得到计算结果即是固定位置下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java index 7901ce0..4047da9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java @@ -19,7 +19,7 @@ public class GenericFiledRuleResolver { /** - * todo: 拿到所有的值合并到一个值 + * 拿到所有的值合并到一个值 * 无论是bit位的解析，还是byte的解析，统一都转换成byte进行规则的换算解析 * 1、必须进行byte与值的类型转换 * 2、存在可能，对值进行运算 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 338be3d..a9af4e8 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 @@ -28,7 +28,7 @@ public class GenericCombinedFieldResolver { /** - * todo: 组合字段解析主要流程类 + * 组合字段解析主要流程类 * 通过查询，字段长度长度随机 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java index 8eb3362..33d83ae 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class BizFieldParseProcessor implements AbstractCombinedFieldProcessor { /** - * todo: 业务字段解析 + * 业务字段解析 * * @param combinedFieldParam * @return @@ -50,7 +50,7 @@ } /** - * todo:计算处理后的偏移位置 + * 计算处理后的偏移位置 */ private Integer calculateAfterProcessPosition(AbstractFieldConfig newProtocolFieldConfig, CombinedFieldProcessorParam combinedFieldParam) { Integer originPositionIndex = newProtocolFieldConfig.getOriginPositionByte() - combinedFieldParam.getByteBuf().readerIndex(); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java index 2f1f32a..8a28f6b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class PreBizFieldParseProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor { /** - * todo: 计算业务字段长度，同时拿到对应指定的字段解析配置 + * 计算业务字段长度，同时拿到对应指定的字段解析配置 * * @param combinedFieldParam * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java index 515d988..e64f0da 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java @@ -22,7 +22,7 @@ public class PreLeadCodeProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor, PreLeadCodeParseStatus { /** - * todo:前导码匹配 + * 前导码匹配 * 匹配获取前导码，找到对应的组合字段配置，并将报文读位置前移 * * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java index 2e374bb..0375b81 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java @@ -22,7 +22,7 @@ public class BitFieldParser extends GenericFiledRuleResolver { /** - * todo: 位字段解析 + * 位字段解析 * 1、单个字节情况表示字段 * 2、多字节情况表示字段（暂未处理） */ @@ -91,7 +91,7 @@ /** - * todo: 从二进制字符串转为byte[] + * 从二进制字符串转为byte[] * * @param binaryStr * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java index c1ca720..8999afc 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java @@ -19,7 +19,7 @@ /** - * todo: 字节字段解析核心类 + * 字节字段解析核心类 * 存在rule_json走自定义的规则设置，没有则支持默认配置的规则设置 * * @param byteBuf @@ -37,7 +37,7 @@ } /** - * todo: 默认解析方法 + * 默认解析方法 * * @param byteBuf * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java index 687e786..d6bf1c2 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java @@ -24,7 +24,7 @@ public class DefaultProtocolFieldParser extends FieldParserSupport implements FieldParser, FrameStructEnum { /** - * todo:按照配置和待解析的缓冲池解析字段 + * 按照配置和待解析的缓冲池解析字段 * * @param protocolFieldConfigs 字段配置集合 * @param storeObjectMap 待存储的字段集合 @@ -46,7 +46,7 @@ } /** - * todo: 解析和协议帧结构相关的协议字段结合（位置、长度等信息） + * 解析和协议帧结构相关的协议字段结合（位置、长度等信息） * * @param protocolFieldConfigs * @param totalLength @@ -65,7 +65,7 @@ } /** - * todo: 获取业务内容的byteBuf + * 获取业务内容的byteBuf * 主要流程如下所示 * 1、通过协议配置计算固定长度 * 2、固定字段列表=> 计算固定字段长度=> 计算业务内容起始位置=>结合总长度，计算业务内容长度=>得到业务内容 @@ -87,7 +87,7 @@ } /** - * todo:获取过滤字段的长度 + * 获取过滤字段的长度 */ @Override public Integer totalFilterLength(ProtocolConfig protocolConfig, diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java index f8a359e..7023028 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java @@ -12,7 +12,7 @@ public class GenericRuleResolver { /** - * todo: 匹配规则 + * 匹配规则 * * 1、准备前置规则字段集合 * 2、准备固定字段集合 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 04e4e36..204b4dc 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 @@ -8,7 +8,7 @@ import java.util.*; /** - * todo: 规则匹配的核心类 + * 规则匹配的核心类 * * @author cz * @date 2023-6-12 @@ -18,7 +18,7 @@ /** - * todo: 规则匹配核心方法 + * 规则匹配核心方法 * 1、通过前置字段集合匹配规则 * 2、判断规则终止标记字段是否已经完成匹配 * （1）完成匹配，返回当前的规则 @@ -58,7 +58,7 @@ /** - * todo: 获取规则字段列表 + * 获取规则字段列表 * * @param preRuleConfigList * @param fixedDataMap @@ -79,7 +79,7 @@ /** - * todo:匹配规则配置 + * 匹配规则配置 * * @param ruleMap * @param metaDataMap diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java index 8652ef0..787874a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java @@ -27,7 +27,7 @@ } /** - * todo:通过post方法执行方法回调 + * 通过post方法执行方法回调 * * @param json * @param url diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java index 514f88e..d7ed3e7 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java @@ -34,7 +34,7 @@ /** - * todo: 解析数据字段 + * 解析数据字段 * * @param ruleConfig * @param byteBuf @@ -54,7 +54,7 @@ } /** - * todo：查询规则对应的组合配合 + * 查询规则对应的组合配合 * 准备，过滤字段列表，选取所需的值 * * @param ruleConfig diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java index 1c96040..97a78ad 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java @@ -41,7 +41,7 @@ } /** - * todo:解析数据字段 + * 解析数据字段 * * @param ruleConfig * @param byteBuf @@ -66,7 +66,7 @@ } /** - * todo: 根据规则查询业务字段 + * 根据规则查询业务字段 * * 得到需要处理的业务内容 * diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java index dceeb89..b2974a5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java @@ -49,7 +49,7 @@ } /** - * todo: 报文解密 + * 报文解密 * 1、否有动态bean,没有去设置的bean,有则取之 * 2、bean不为空，进行解密操作，否则返回原文 * @@ -72,7 +72,7 @@ /** - * todo: 报文加密 + * 报文加密 *

* 如果进行过解密操作，那么回复自动判定密文需要加密并按照同样的加密的方式进行回复 */ @@ -93,7 +93,7 @@ } /** - * todo:解密清零操作 + * 解密清零操作 * * @param plainBuf * @return @@ -108,7 +108,7 @@ } /** - * todo: 加密补零操作 + * 加密补零操作 */ private ByteBuf fillFrameStructZero(ByteBuf replyBytes) { while (ByteBufUtil.hexDump(replyBytes).length() % 32 == 0) { @@ -119,7 +119,7 @@ /** - * todo: 数据订阅 + * 数据订阅 */ public void storeData(List> bizDataMap) { // DataSubscribeProvider dataSubscribeProvider = SpringContextUtil.getBean(processorInstance.getSubscribeBean()); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java index 90e4b18..5ffdcaa 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java @@ -46,7 +46,7 @@ } /** - * todo:初始化获取对应协议的配置字段列表 + * 初始化获取对应协议的配置字段列表 * * @param protocolId */ @@ -69,7 +69,7 @@ } /** - * todo:通过协议字段id和协议报文获取该配置实例化内容的值 + * 通过协议字段id和协议报文获取该配置实例化内容的值 * * @param protocolFieldId * @param byteBuf @@ -114,7 +114,7 @@ } /** - * todo:获取帧固定位置字段配置信息 + * 获取帧固定位置字段配置信息 * * @param byteBuf * @param protocolConfig @@ -141,7 +141,7 @@ /** - * todo:获取帧固定位置字段配置信息 + * 获取帧固定位置字段配置信息 * * @param byteBuf * @param protocolConfig @@ -166,7 +166,7 @@ } /** - * todo:获取过滤字段的长度 + * 获取过滤字段的长度 */ public Integer getTotalFilterLength(ProtocolConfig protocolConfig) { if (showSkip()) { @@ -185,7 +185,7 @@ /** - * todo:获取帧结构应有的总长度 + * 获取帧结构应有的总长度 */ public Integer getTotalLength(ByteBuf byteBuf, ProtocolConfig protocolConfig) { if (showSkip()) { @@ -211,7 +211,7 @@ } /** - * todo:获取协议有关字段解析内容 + * 获取协议有关字段解析内容 * storeObjectMap存储代转存的数据 * * @return @@ -237,7 +237,7 @@ } /** - * todo:获取业务报文内容的content字节 + * 获取业务报文内容的content字节 * * @param wholeDatagramByte * @return @@ -261,7 +261,7 @@ } /** - * todo:对解密的内容进行尾部清零操作 + * 对解密的内容进行尾部清零操作 *

* 根据解析后的业务内容，通过存储的帧结构，创建完整完整的数据报文， * 这里对帧结构的可变报文没有处理，只是简单的组装,保证提前解密，为帧结构检验做准备 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java index 7872a3c..4981167 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java @@ -36,7 +36,7 @@ } /** - * todo: 获取规则匹配结果 + * 获取规则匹配结果 * * @param parseFixedDataMap * @param protocolFieldConfigs 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 b4a0f0a..8e6b55e 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,7 +14,7 @@ public class SensorhubReplier extends SimpleChannelInboundHandler { /** - * todo: 回复内容构建的流程入口方法 + * 回复内容构建的流程入口方法 * 1、通过有标准协议解析器传来的结果进行命令的构建 * 2、构建命令有以下的命令内容 * （1）成功返回时间，并进行下发配置操作 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 a7bb1b8..b4dd1ba 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 @@ -25,7 +25,7 @@ public class DataReplyCommand extends ReplyCommandSupport implements AbstractBuildReplyCommand { /** - * todo: 报文构建命令 + * 报文构建命令 * 成功解析帧结构内容，进行下发成功回复命令的主要流程方法 * 其构建流程逻辑如下: * 1、初始化回复报文配置 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/replier/command/ReplyCommandSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/replier/command/ReplyCommandSupport.java index 4d60246..f051dc9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/replier/command/ReplyCommandSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/replier/command/ReplyCommandSupport.java @@ -35,7 +35,7 @@ /** - * todo: 执行默认回复配置 + * 执行默认回复配置 *

* 组合字段解析，单字段解析 * 构建业务字段的byteBuf @@ -60,7 +60,7 @@ } /** - * todo: 执行下发配置 + * 执行下发配置 *

* 取redis相关配置的值，查询相关的配置进行构建返回的帧业务内容 * @@ -91,7 +91,7 @@ } /** - * todo:计算帧长度 + * 计算帧长度 * 1、获取过滤字段长度 * 2、获取字段长度配置，构建长度业务字段集合 */ @@ -107,7 +107,7 @@ /** - * todo:构建业务前固定内容 + * 构建业务前固定内容 * 1、筛选业务内容前固定配置 * 2、排序 * 3、以完整的byte为单位，构建组合集合进行回复报文的构建 @@ -188,7 +188,7 @@ } /** - * todo: 构建回复配置固定字段配置 + * 构建回复配置固定字段配置 * 1、判断配置的协议字段是否有变化， * （1）通过协议配置，没有变化则直接使用 * （2）有变化则以byte为列表执行报文的构建 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java index 27f3c77..f5e671b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java @@ -10,7 +10,7 @@ public class PretreatmentSupport { /** - * todo: 取第一个大括号，对应的右括号下标值 + * 取第一个大括号，对应的右括号下标值 * 算法流程 * 1、初始化totalRightBracket为0 * 2、获取首个“{”压栈，totalRightBracket加偏移下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java index 588d412..3e0fe74 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java @@ -35,7 +35,8 @@ } /** - * todo: 执行aep平台前的协议解析 预处理为标准的协议报文 + * 执行aep平台前的协议解析 预处理为标准的协议报文 + * ****有http的server */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java index 43ee69d..4ae0495 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java @@ -31,7 +31,7 @@ } /** - * todo: 执行np平台前的协议解析 预处理为标准的协议报文 + * 执行np平台前的协议解析 预处理为标准的协议报文 */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java index 67ce2f3..63dd7de 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java @@ -12,7 +12,7 @@ * 可任意构建自己的命令 * * @author cz - * todo: 过滤筛选器抽象类，进行特定内容的指令下发 + * 过滤筛选器抽象类，进行特定内容的指令下发 */ public interface AbstractReplyCommandPostProcessing extends ReplyCommandEnum { @@ -20,7 +20,7 @@ /** * 走一层过滤，没有走默认配置，加自己默认的过滤 *

- * todo:回复命令构建 + * 回复命令构建 * * @param bizDataMap * @param ruleConfigFactory diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java index cf0dba0..a5c51a6 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java @@ -8,7 +8,7 @@ import java.util.Map; /** - * todo:后置处理器，将散落解析的时间进行合并 + * 后置处理器，将散落解析的时间进行合并 * * @author cz */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java index 8291f68..981d235 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java @@ -10,7 +10,7 @@ public class FieldParserSupport { /** - * todo: 计算协议配置字段的总长度 + * 计算协议配置字段的总长度 * 1、分别计算bit和byte长度 * 2、合并长度 */ @@ -29,7 +29,7 @@ } /** - * todo:最大固定位置下标 + * 最大固定位置下标 * * 1、获取没有指定起始位置的业务内容后的字段配置集合 * 2、分别计算固定值最大长度和业务内容后字段配置进行相减得到计算结果即是固定位置下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java index 7901ce0..4047da9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java @@ -19,7 +19,7 @@ public class GenericFiledRuleResolver { /** - * todo: 拿到所有的值合并到一个值 + * 拿到所有的值合并到一个值 * 无论是bit位的解析，还是byte的解析，统一都转换成byte进行规则的换算解析 * 1、必须进行byte与值的类型转换 * 2、存在可能，对值进行运算 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 338be3d..a9af4e8 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 @@ -28,7 +28,7 @@ public class GenericCombinedFieldResolver { /** - * todo: 组合字段解析主要流程类 + * 组合字段解析主要流程类 * 通过查询，字段长度长度随机 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java index 8eb3362..33d83ae 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class BizFieldParseProcessor implements AbstractCombinedFieldProcessor { /** - * todo: 业务字段解析 + * 业务字段解析 * * @param combinedFieldParam * @return @@ -50,7 +50,7 @@ } /** - * todo:计算处理后的偏移位置 + * 计算处理后的偏移位置 */ private Integer calculateAfterProcessPosition(AbstractFieldConfig newProtocolFieldConfig, CombinedFieldProcessorParam combinedFieldParam) { Integer originPositionIndex = newProtocolFieldConfig.getOriginPositionByte() - combinedFieldParam.getByteBuf().readerIndex(); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java index 2f1f32a..8a28f6b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class PreBizFieldParseProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor { /** - * todo: 计算业务字段长度，同时拿到对应指定的字段解析配置 + * 计算业务字段长度，同时拿到对应指定的字段解析配置 * * @param combinedFieldParam * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java index 515d988..e64f0da 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java @@ -22,7 +22,7 @@ public class PreLeadCodeProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor, PreLeadCodeParseStatus { /** - * todo:前导码匹配 + * 前导码匹配 * 匹配获取前导码，找到对应的组合字段配置，并将报文读位置前移 * * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java index 2e374bb..0375b81 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java @@ -22,7 +22,7 @@ public class BitFieldParser extends GenericFiledRuleResolver { /** - * todo: 位字段解析 + * 位字段解析 * 1、单个字节情况表示字段 * 2、多字节情况表示字段（暂未处理） */ @@ -91,7 +91,7 @@ /** - * todo: 从二进制字符串转为byte[] + * 从二进制字符串转为byte[] * * @param binaryStr * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java index c1ca720..8999afc 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java @@ -19,7 +19,7 @@ /** - * todo: 字节字段解析核心类 + * 字节字段解析核心类 * 存在rule_json走自定义的规则设置，没有则支持默认配置的规则设置 * * @param byteBuf @@ -37,7 +37,7 @@ } /** - * todo: 默认解析方法 + * 默认解析方法 * * @param byteBuf * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java index 687e786..d6bf1c2 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java @@ -24,7 +24,7 @@ public class DefaultProtocolFieldParser extends FieldParserSupport implements FieldParser, FrameStructEnum { /** - * todo:按照配置和待解析的缓冲池解析字段 + * 按照配置和待解析的缓冲池解析字段 * * @param protocolFieldConfigs 字段配置集合 * @param storeObjectMap 待存储的字段集合 @@ -46,7 +46,7 @@ } /** - * todo: 解析和协议帧结构相关的协议字段结合（位置、长度等信息） + * 解析和协议帧结构相关的协议字段结合（位置、长度等信息） * * @param protocolFieldConfigs * @param totalLength @@ -65,7 +65,7 @@ } /** - * todo: 获取业务内容的byteBuf + * 获取业务内容的byteBuf * 主要流程如下所示 * 1、通过协议配置计算固定长度 * 2、固定字段列表=> 计算固定字段长度=> 计算业务内容起始位置=>结合总长度，计算业务内容长度=>得到业务内容 @@ -87,7 +87,7 @@ } /** - * todo:获取过滤字段的长度 + * 获取过滤字段的长度 */ @Override public Integer totalFilterLength(ProtocolConfig protocolConfig, diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java index f8a359e..7023028 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java @@ -12,7 +12,7 @@ public class GenericRuleResolver { /** - * todo: 匹配规则 + * 匹配规则 * * 1、准备前置规则字段集合 * 2、准备固定字段集合 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 04e4e36..204b4dc 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 @@ -8,7 +8,7 @@ import java.util.*; /** - * todo: 规则匹配的核心类 + * 规则匹配的核心类 * * @author cz * @date 2023-6-12 @@ -18,7 +18,7 @@ /** - * todo: 规则匹配核心方法 + * 规则匹配核心方法 * 1、通过前置字段集合匹配规则 * 2、判断规则终止标记字段是否已经完成匹配 * （1）完成匹配，返回当前的规则 @@ -58,7 +58,7 @@ /** - * todo: 获取规则字段列表 + * 获取规则字段列表 * * @param preRuleConfigList * @param fixedDataMap @@ -79,7 +79,7 @@ /** - * todo:匹配规则配置 + * 匹配规则配置 * * @param ruleMap * @param metaDataMap diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java index 8652ef0..787874a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java @@ -27,7 +27,7 @@ } /** - * todo:通过post方法执行方法回调 + * 通过post方法执行方法回调 * * @param json * @param url diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java index 514f88e..d7ed3e7 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java @@ -34,7 +34,7 @@ /** - * todo: 解析数据字段 + * 解析数据字段 * * @param ruleConfig * @param byteBuf @@ -54,7 +54,7 @@ } /** - * todo：查询规则对应的组合配合 + * 查询规则对应的组合配合 * 准备，过滤字段列表，选取所需的值 * * @param ruleConfig diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java index 1c96040..97a78ad 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java @@ -41,7 +41,7 @@ } /** - * todo:解析数据字段 + * 解析数据字段 * * @param ruleConfig * @param byteBuf @@ -66,7 +66,7 @@ } /** - * todo: 根据规则查询业务字段 + * 根据规则查询业务字段 * * 得到需要处理的业务内容 * diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java index dceeb89..b2974a5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java @@ -49,7 +49,7 @@ } /** - * todo: 报文解密 + * 报文解密 * 1、否有动态bean,没有去设置的bean,有则取之 * 2、bean不为空，进行解密操作，否则返回原文 * @@ -72,7 +72,7 @@ /** - * todo: 报文加密 + * 报文加密 *

* 如果进行过解密操作，那么回复自动判定密文需要加密并按照同样的加密的方式进行回复 */ @@ -93,7 +93,7 @@ } /** - * todo:解密清零操作 + * 解密清零操作 * * @param plainBuf * @return @@ -108,7 +108,7 @@ } /** - * todo: 加密补零操作 + * 加密补零操作 */ private ByteBuf fillFrameStructZero(ByteBuf replyBytes) { while (ByteBufUtil.hexDump(replyBytes).length() % 32 == 0) { @@ -119,7 +119,7 @@ /** - * todo: 数据订阅 + * 数据订阅 */ public void storeData(List> bizDataMap) { // DataSubscribeProvider dataSubscribeProvider = SpringContextUtil.getBean(processorInstance.getSubscribeBean()); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java index 90e4b18..5ffdcaa 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java @@ -46,7 +46,7 @@ } /** - * todo:初始化获取对应协议的配置字段列表 + * 初始化获取对应协议的配置字段列表 * * @param protocolId */ @@ -69,7 +69,7 @@ } /** - * todo:通过协议字段id和协议报文获取该配置实例化内容的值 + * 通过协议字段id和协议报文获取该配置实例化内容的值 * * @param protocolFieldId * @param byteBuf @@ -114,7 +114,7 @@ } /** - * todo:获取帧固定位置字段配置信息 + * 获取帧固定位置字段配置信息 * * @param byteBuf * @param protocolConfig @@ -141,7 +141,7 @@ /** - * todo:获取帧固定位置字段配置信息 + * 获取帧固定位置字段配置信息 * * @param byteBuf * @param protocolConfig @@ -166,7 +166,7 @@ } /** - * todo:获取过滤字段的长度 + * 获取过滤字段的长度 */ public Integer getTotalFilterLength(ProtocolConfig protocolConfig) { if (showSkip()) { @@ -185,7 +185,7 @@ /** - * todo:获取帧结构应有的总长度 + * 获取帧结构应有的总长度 */ public Integer getTotalLength(ByteBuf byteBuf, ProtocolConfig protocolConfig) { if (showSkip()) { @@ -211,7 +211,7 @@ } /** - * todo:获取协议有关字段解析内容 + * 获取协议有关字段解析内容 * storeObjectMap存储代转存的数据 * * @return @@ -237,7 +237,7 @@ } /** - * todo:获取业务报文内容的content字节 + * 获取业务报文内容的content字节 * * @param wholeDatagramByte * @return @@ -261,7 +261,7 @@ } /** - * todo:对解密的内容进行尾部清零操作 + * 对解密的内容进行尾部清零操作 *

* 根据解析后的业务内容，通过存储的帧结构，创建完整完整的数据报文， * 这里对帧结构的可变报文没有处理，只是简单的组装,保证提前解密，为帧结构检验做准备 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java index 7872a3c..4981167 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java @@ -36,7 +36,7 @@ } /** - * todo: 获取规则匹配结果 + * 获取规则匹配结果 * * @param parseFixedDataMap * @param protocolFieldConfigs 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 b4a0f0a..8e6b55e 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,7 +14,7 @@ public class SensorhubReplier extends SimpleChannelInboundHandler { /** - * todo: 回复内容构建的流程入口方法 + * 回复内容构建的流程入口方法 * 1、通过有标准协议解析器传来的结果进行命令的构建 * 2、构建命令有以下的命令内容 * （1）成功返回时间，并进行下发配置操作 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 a7bb1b8..b4dd1ba 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 @@ -25,7 +25,7 @@ public class DataReplyCommand extends ReplyCommandSupport implements AbstractBuildReplyCommand { /** - * todo: 报文构建命令 + * 报文构建命令 * 成功解析帧结构内容，进行下发成功回复命令的主要流程方法 * 其构建流程逻辑如下: * 1、初始化回复报文配置 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/replier/command/ReplyCommandSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/replier/command/ReplyCommandSupport.java index 4d60246..f051dc9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/replier/command/ReplyCommandSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/replier/command/ReplyCommandSupport.java @@ -35,7 +35,7 @@ /** - * todo: 执行默认回复配置 + * 执行默认回复配置 *

* 组合字段解析，单字段解析 * 构建业务字段的byteBuf @@ -60,7 +60,7 @@ } /** - * todo: 执行下发配置 + * 执行下发配置 *

* 取redis相关配置的值，查询相关的配置进行构建返回的帧业务内容 * @@ -91,7 +91,7 @@ } /** - * todo:计算帧长度 + * 计算帧长度 * 1、获取过滤字段长度 * 2、获取字段长度配置，构建长度业务字段集合 */ @@ -107,7 +107,7 @@ /** - * todo:构建业务前固定内容 + * 构建业务前固定内容 * 1、筛选业务内容前固定配置 * 2、排序 * 3、以完整的byte为单位，构建组合集合进行回复报文的构建 @@ -188,7 +188,7 @@ } /** - * todo: 构建回复配置固定字段配置 + * 构建回复配置固定字段配置 * 1、判断配置的协议字段是否有变化， * （1）通过协议配置，没有变化则直接使用 * （2）有变化则以byte为列表执行报文的构建 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/BitFieldDecorator.java b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/BitFieldDecorator.java index d7e178d..ff58f89 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/BitFieldDecorator.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/BitFieldDecorator.java @@ -19,7 +19,7 @@ public class BitFieldDecorator { /** - * todo: 构建bitBuf + * 构建bitBuf * * @param fieldConfig * @param currentConfigValue @@ -63,7 +63,7 @@ /** - * todo: 从二进制字符串转为byte[] + * 从二进制字符串转为byte[] * * @param binaryStr * @return @@ -78,7 +78,7 @@ } /** - * todo: 把byte转化成2进制字符串 + * 把byte转化成2进制字符串 */ private static String getBinaryStrFromByte(byte value) { String result = ""; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java index 27f3c77..f5e671b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java @@ -10,7 +10,7 @@ public class PretreatmentSupport { /** - * todo: 取第一个大括号，对应的右括号下标值 + * 取第一个大括号，对应的右括号下标值 * 算法流程 * 1、初始化totalRightBracket为0 * 2、获取首个“{”压栈，totalRightBracket加偏移下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java index 588d412..3e0fe74 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java @@ -35,7 +35,8 @@ } /** - * todo: 执行aep平台前的协议解析 预处理为标准的协议报文 + * 执行aep平台前的协议解析 预处理为标准的协议报文 + * ****有http的server */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java index 43ee69d..4ae0495 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java @@ -31,7 +31,7 @@ } /** - * todo: 执行np平台前的协议解析 预处理为标准的协议报文 + * 执行np平台前的协议解析 预处理为标准的协议报文 */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java index 67ce2f3..63dd7de 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java @@ -12,7 +12,7 @@ * 可任意构建自己的命令 * * @author cz - * todo: 过滤筛选器抽象类，进行特定内容的指令下发 + * 过滤筛选器抽象类，进行特定内容的指令下发 */ public interface AbstractReplyCommandPostProcessing extends ReplyCommandEnum { @@ -20,7 +20,7 @@ /** * 走一层过滤，没有走默认配置，加自己默认的过滤 *

- * todo:回复命令构建 + * 回复命令构建 * * @param bizDataMap * @param ruleConfigFactory diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java index cf0dba0..a5c51a6 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java @@ -8,7 +8,7 @@ import java.util.Map; /** - * todo:后置处理器，将散落解析的时间进行合并 + * 后置处理器，将散落解析的时间进行合并 * * @author cz */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java index 8291f68..981d235 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java @@ -10,7 +10,7 @@ public class FieldParserSupport { /** - * todo: 计算协议配置字段的总长度 + * 计算协议配置字段的总长度 * 1、分别计算bit和byte长度 * 2、合并长度 */ @@ -29,7 +29,7 @@ } /** - * todo:最大固定位置下标 + * 最大固定位置下标 * * 1、获取没有指定起始位置的业务内容后的字段配置集合 * 2、分别计算固定值最大长度和业务内容后字段配置进行相减得到计算结果即是固定位置下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java index 7901ce0..4047da9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java @@ -19,7 +19,7 @@ public class GenericFiledRuleResolver { /** - * todo: 拿到所有的值合并到一个值 + * 拿到所有的值合并到一个值 * 无论是bit位的解析，还是byte的解析，统一都转换成byte进行规则的换算解析 * 1、必须进行byte与值的类型转换 * 2、存在可能，对值进行运算 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 338be3d..a9af4e8 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 @@ -28,7 +28,7 @@ public class GenericCombinedFieldResolver { /** - * todo: 组合字段解析主要流程类 + * 组合字段解析主要流程类 * 通过查询，字段长度长度随机 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java index 8eb3362..33d83ae 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class BizFieldParseProcessor implements AbstractCombinedFieldProcessor { /** - * todo: 业务字段解析 + * 业务字段解析 * * @param combinedFieldParam * @return @@ -50,7 +50,7 @@ } /** - * todo:计算处理后的偏移位置 + * 计算处理后的偏移位置 */ private Integer calculateAfterProcessPosition(AbstractFieldConfig newProtocolFieldConfig, CombinedFieldProcessorParam combinedFieldParam) { Integer originPositionIndex = newProtocolFieldConfig.getOriginPositionByte() - combinedFieldParam.getByteBuf().readerIndex(); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java index 2f1f32a..8a28f6b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class PreBizFieldParseProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor { /** - * todo: 计算业务字段长度，同时拿到对应指定的字段解析配置 + * 计算业务字段长度，同时拿到对应指定的字段解析配置 * * @param combinedFieldParam * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java index 515d988..e64f0da 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java @@ -22,7 +22,7 @@ public class PreLeadCodeProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor, PreLeadCodeParseStatus { /** - * todo:前导码匹配 + * 前导码匹配 * 匹配获取前导码，找到对应的组合字段配置，并将报文读位置前移 * * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java index 2e374bb..0375b81 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java @@ -22,7 +22,7 @@ public class BitFieldParser extends GenericFiledRuleResolver { /** - * todo: 位字段解析 + * 位字段解析 * 1、单个字节情况表示字段 * 2、多字节情况表示字段（暂未处理） */ @@ -91,7 +91,7 @@ /** - * todo: 从二进制字符串转为byte[] + * 从二进制字符串转为byte[] * * @param binaryStr * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java index c1ca720..8999afc 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java @@ -19,7 +19,7 @@ /** - * todo: 字节字段解析核心类 + * 字节字段解析核心类 * 存在rule_json走自定义的规则设置，没有则支持默认配置的规则设置 * * @param byteBuf @@ -37,7 +37,7 @@ } /** - * todo: 默认解析方法 + * 默认解析方法 * * @param byteBuf * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java index 687e786..d6bf1c2 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java @@ -24,7 +24,7 @@ public class DefaultProtocolFieldParser extends FieldParserSupport implements FieldParser, FrameStructEnum { /** - * todo:按照配置和待解析的缓冲池解析字段 + * 按照配置和待解析的缓冲池解析字段 * * @param protocolFieldConfigs 字段配置集合 * @param storeObjectMap 待存储的字段集合 @@ -46,7 +46,7 @@ } /** - * todo: 解析和协议帧结构相关的协议字段结合（位置、长度等信息） + * 解析和协议帧结构相关的协议字段结合（位置、长度等信息） * * @param protocolFieldConfigs * @param totalLength @@ -65,7 +65,7 @@ } /** - * todo: 获取业务内容的byteBuf + * 获取业务内容的byteBuf * 主要流程如下所示 * 1、通过协议配置计算固定长度 * 2、固定字段列表=> 计算固定字段长度=> 计算业务内容起始位置=>结合总长度，计算业务内容长度=>得到业务内容 @@ -87,7 +87,7 @@ } /** - * todo:获取过滤字段的长度 + * 获取过滤字段的长度 */ @Override public Integer totalFilterLength(ProtocolConfig protocolConfig, diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java index f8a359e..7023028 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java @@ -12,7 +12,7 @@ public class GenericRuleResolver { /** - * todo: 匹配规则 + * 匹配规则 * * 1、准备前置规则字段集合 * 2、准备固定字段集合 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 04e4e36..204b4dc 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 @@ -8,7 +8,7 @@ import java.util.*; /** - * todo: 规则匹配的核心类 + * 规则匹配的核心类 * * @author cz * @date 2023-6-12 @@ -18,7 +18,7 @@ /** - * todo: 规则匹配核心方法 + * 规则匹配核心方法 * 1、通过前置字段集合匹配规则 * 2、判断规则终止标记字段是否已经完成匹配 * （1）完成匹配，返回当前的规则 @@ -58,7 +58,7 @@ /** - * todo: 获取规则字段列表 + * 获取规则字段列表 * * @param preRuleConfigList * @param fixedDataMap @@ -79,7 +79,7 @@ /** - * todo:匹配规则配置 + * 匹配规则配置 * * @param ruleMap * @param metaDataMap diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java index 8652ef0..787874a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java @@ -27,7 +27,7 @@ } /** - * todo:通过post方法执行方法回调 + * 通过post方法执行方法回调 * * @param json * @param url diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java index 514f88e..d7ed3e7 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java @@ -34,7 +34,7 @@ /** - * todo: 解析数据字段 + * 解析数据字段 * * @param ruleConfig * @param byteBuf @@ -54,7 +54,7 @@ } /** - * todo：查询规则对应的组合配合 + * 查询规则对应的组合配合 * 准备，过滤字段列表，选取所需的值 * * @param ruleConfig diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java index 1c96040..97a78ad 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java @@ -41,7 +41,7 @@ } /** - * todo:解析数据字段 + * 解析数据字段 * * @param ruleConfig * @param byteBuf @@ -66,7 +66,7 @@ } /** - * todo: 根据规则查询业务字段 + * 根据规则查询业务字段 * * 得到需要处理的业务内容 * diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java index dceeb89..b2974a5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java @@ -49,7 +49,7 @@ } /** - * todo: 报文解密 + * 报文解密 * 1、否有动态bean,没有去设置的bean,有则取之 * 2、bean不为空，进行解密操作，否则返回原文 * @@ -72,7 +72,7 @@ /** - * todo: 报文加密 + * 报文加密 *

* 如果进行过解密操作，那么回复自动判定密文需要加密并按照同样的加密的方式进行回复 */ @@ -93,7 +93,7 @@ } /** - * todo:解密清零操作 + * 解密清零操作 * * @param plainBuf * @return @@ -108,7 +108,7 @@ } /** - * todo: 加密补零操作 + * 加密补零操作 */ private ByteBuf fillFrameStructZero(ByteBuf replyBytes) { while (ByteBufUtil.hexDump(replyBytes).length() % 32 == 0) { @@ -119,7 +119,7 @@ /** - * todo: 数据订阅 + * 数据订阅 */ public void storeData(List> bizDataMap) { // DataSubscribeProvider dataSubscribeProvider = SpringContextUtil.getBean(processorInstance.getSubscribeBean()); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java index 90e4b18..5ffdcaa 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java @@ -46,7 +46,7 @@ } /** - * todo:初始化获取对应协议的配置字段列表 + * 初始化获取对应协议的配置字段列表 * * @param protocolId */ @@ -69,7 +69,7 @@ } /** - * todo:通过协议字段id和协议报文获取该配置实例化内容的值 + * 通过协议字段id和协议报文获取该配置实例化内容的值 * * @param protocolFieldId * @param byteBuf @@ -114,7 +114,7 @@ } /** - * todo:获取帧固定位置字段配置信息 + * 获取帧固定位置字段配置信息 * * @param byteBuf * @param protocolConfig @@ -141,7 +141,7 @@ /** - * todo:获取帧固定位置字段配置信息 + * 获取帧固定位置字段配置信息 * * @param byteBuf * @param protocolConfig @@ -166,7 +166,7 @@ } /** - * todo:获取过滤字段的长度 + * 获取过滤字段的长度 */ public Integer getTotalFilterLength(ProtocolConfig protocolConfig) { if (showSkip()) { @@ -185,7 +185,7 @@ /** - * todo:获取帧结构应有的总长度 + * 获取帧结构应有的总长度 */ public Integer getTotalLength(ByteBuf byteBuf, ProtocolConfig protocolConfig) { if (showSkip()) { @@ -211,7 +211,7 @@ } /** - * todo:获取协议有关字段解析内容 + * 获取协议有关字段解析内容 * storeObjectMap存储代转存的数据 * * @return @@ -237,7 +237,7 @@ } /** - * todo:获取业务报文内容的content字节 + * 获取业务报文内容的content字节 * * @param wholeDatagramByte * @return @@ -261,7 +261,7 @@ } /** - * todo:对解密的内容进行尾部清零操作 + * 对解密的内容进行尾部清零操作 *

* 根据解析后的业务内容，通过存储的帧结构，创建完整完整的数据报文， * 这里对帧结构的可变报文没有处理，只是简单的组装,保证提前解密，为帧结构检验做准备 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java index 7872a3c..4981167 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java @@ -36,7 +36,7 @@ } /** - * todo: 获取规则匹配结果 + * 获取规则匹配结果 * * @param parseFixedDataMap * @param protocolFieldConfigs 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 b4a0f0a..8e6b55e 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,7 +14,7 @@ public class SensorhubReplier extends SimpleChannelInboundHandler { /** - * todo: 回复内容构建的流程入口方法 + * 回复内容构建的流程入口方法 * 1、通过有标准协议解析器传来的结果进行命令的构建 * 2、构建命令有以下的命令内容 * （1）成功返回时间，并进行下发配置操作 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 a7bb1b8..b4dd1ba 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 @@ -25,7 +25,7 @@ public class DataReplyCommand extends ReplyCommandSupport implements AbstractBuildReplyCommand { /** - * todo: 报文构建命令 + * 报文构建命令 * 成功解析帧结构内容，进行下发成功回复命令的主要流程方法 * 其构建流程逻辑如下: * 1、初始化回复报文配置 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/replier/command/ReplyCommandSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/replier/command/ReplyCommandSupport.java index 4d60246..f051dc9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/replier/command/ReplyCommandSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/replier/command/ReplyCommandSupport.java @@ -35,7 +35,7 @@ /** - * todo: 执行默认回复配置 + * 执行默认回复配置 *

* 组合字段解析，单字段解析 * 构建业务字段的byteBuf @@ -60,7 +60,7 @@ } /** - * todo: 执行下发配置 + * 执行下发配置 *

* 取redis相关配置的值，查询相关的配置进行构建返回的帧业务内容 * @@ -91,7 +91,7 @@ } /** - * todo:计算帧长度 + * 计算帧长度 * 1、获取过滤字段长度 * 2、获取字段长度配置，构建长度业务字段集合 */ @@ -107,7 +107,7 @@ /** - * todo:构建业务前固定内容 + * 构建业务前固定内容 * 1、筛选业务内容前固定配置 * 2、排序 * 3、以完整的byte为单位，构建组合集合进行回复报文的构建 @@ -188,7 +188,7 @@ } /** - * todo: 构建回复配置固定字段配置 + * 构建回复配置固定字段配置 * 1、判断配置的协议字段是否有变化， * （1）通过协议配置，没有变化则直接使用 * （2）有变化则以byte为列表执行报文的构建 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/BitFieldDecorator.java b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/BitFieldDecorator.java index d7e178d..ff58f89 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/BitFieldDecorator.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/BitFieldDecorator.java @@ -19,7 +19,7 @@ public class BitFieldDecorator { /** - * todo: 构建bitBuf + * 构建bitBuf * * @param fieldConfig * @param currentConfigValue @@ -63,7 +63,7 @@ /** - * todo: 从二进制字符串转为byte[] + * 从二进制字符串转为byte[] * * @param binaryStr * @return @@ -78,7 +78,7 @@ } /** - * todo: 把byte转化成2进制字符串 + * 把byte转化成2进制字符串 */ private static String getBinaryStrFromByte(byte value) { String result = ""; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/ByteFieldDecorator.java b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/ByteFieldDecorator.java index a4d8ebc..b58e1d0 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/ByteFieldDecorator.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/ByteFieldDecorator.java @@ -19,7 +19,7 @@ public class ByteFieldDecorator { /** - * todo:定制化的和默认的byte回复报文构建 + * 定制化的和默认的byte回复报文构建 * * @param fieldConfig * @param currentConfigValue @@ -35,7 +35,7 @@ /** - * todo: 默认byte构建修饰器 + * 默认byte构建修饰器 * * @param fieldConfig * @param currentValue @@ -47,7 +47,7 @@ } /** - * todo： 定制化的byte报文构建修饰器 + * 定制化的byte报文构建修饰器 * 1、执行前置规则处理 * 2、调用默认的报文构建 * diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java index 27f3c77..f5e671b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java @@ -10,7 +10,7 @@ public class PretreatmentSupport { /** - * todo: 取第一个大括号，对应的右括号下标值 + * 取第一个大括号，对应的右括号下标值 * 算法流程 * 1、初始化totalRightBracket为0 * 2、获取首个“{”压栈，totalRightBracket加偏移下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java index 588d412..3e0fe74 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java @@ -35,7 +35,8 @@ } /** - * todo: 执行aep平台前的协议解析 预处理为标准的协议报文 + * 执行aep平台前的协议解析 预处理为标准的协议报文 + * ****有http的server */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java index 43ee69d..4ae0495 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java @@ -31,7 +31,7 @@ } /** - * todo: 执行np平台前的协议解析 预处理为标准的协议报文 + * 执行np平台前的协议解析 预处理为标准的协议报文 */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java index 67ce2f3..63dd7de 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java @@ -12,7 +12,7 @@ * 可任意构建自己的命令 * * @author cz - * todo: 过滤筛选器抽象类，进行特定内容的指令下发 + * 过滤筛选器抽象类，进行特定内容的指令下发 */ public interface AbstractReplyCommandPostProcessing extends ReplyCommandEnum { @@ -20,7 +20,7 @@ /** * 走一层过滤，没有走默认配置，加自己默认的过滤 *

- * todo:回复命令构建 + * 回复命令构建 * * @param bizDataMap * @param ruleConfigFactory diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java index cf0dba0..a5c51a6 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java @@ -8,7 +8,7 @@ import java.util.Map; /** - * todo:后置处理器，将散落解析的时间进行合并 + * 后置处理器，将散落解析的时间进行合并 * * @author cz */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java index 8291f68..981d235 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java @@ -10,7 +10,7 @@ public class FieldParserSupport { /** - * todo: 计算协议配置字段的总长度 + * 计算协议配置字段的总长度 * 1、分别计算bit和byte长度 * 2、合并长度 */ @@ -29,7 +29,7 @@ } /** - * todo:最大固定位置下标 + * 最大固定位置下标 * * 1、获取没有指定起始位置的业务内容后的字段配置集合 * 2、分别计算固定值最大长度和业务内容后字段配置进行相减得到计算结果即是固定位置下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java index 7901ce0..4047da9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java @@ -19,7 +19,7 @@ public class GenericFiledRuleResolver { /** - * todo: 拿到所有的值合并到一个值 + * 拿到所有的值合并到一个值 * 无论是bit位的解析，还是byte的解析，统一都转换成byte进行规则的换算解析 * 1、必须进行byte与值的类型转换 * 2、存在可能，对值进行运算 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 338be3d..a9af4e8 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 @@ -28,7 +28,7 @@ public class GenericCombinedFieldResolver { /** - * todo: 组合字段解析主要流程类 + * 组合字段解析主要流程类 * 通过查询，字段长度长度随机 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java index 8eb3362..33d83ae 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class BizFieldParseProcessor implements AbstractCombinedFieldProcessor { /** - * todo: 业务字段解析 + * 业务字段解析 * * @param combinedFieldParam * @return @@ -50,7 +50,7 @@ } /** - * todo:计算处理后的偏移位置 + * 计算处理后的偏移位置 */ private Integer calculateAfterProcessPosition(AbstractFieldConfig newProtocolFieldConfig, CombinedFieldProcessorParam combinedFieldParam) { Integer originPositionIndex = newProtocolFieldConfig.getOriginPositionByte() - combinedFieldParam.getByteBuf().readerIndex(); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java index 2f1f32a..8a28f6b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class PreBizFieldParseProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor { /** - * todo: 计算业务字段长度，同时拿到对应指定的字段解析配置 + * 计算业务字段长度，同时拿到对应指定的字段解析配置 * * @param combinedFieldParam * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java index 515d988..e64f0da 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java @@ -22,7 +22,7 @@ public class PreLeadCodeProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor, PreLeadCodeParseStatus { /** - * todo:前导码匹配 + * 前导码匹配 * 匹配获取前导码，找到对应的组合字段配置，并将报文读位置前移 * * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java index 2e374bb..0375b81 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java @@ -22,7 +22,7 @@ public class BitFieldParser extends GenericFiledRuleResolver { /** - * todo: 位字段解析 + * 位字段解析 * 1、单个字节情况表示字段 * 2、多字节情况表示字段（暂未处理） */ @@ -91,7 +91,7 @@ /** - * todo: 从二进制字符串转为byte[] + * 从二进制字符串转为byte[] * * @param binaryStr * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java index c1ca720..8999afc 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java @@ -19,7 +19,7 @@ /** - * todo: 字节字段解析核心类 + * 字节字段解析核心类 * 存在rule_json走自定义的规则设置，没有则支持默认配置的规则设置 * * @param byteBuf @@ -37,7 +37,7 @@ } /** - * todo: 默认解析方法 + * 默认解析方法 * * @param byteBuf * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java index 687e786..d6bf1c2 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java @@ -24,7 +24,7 @@ public class DefaultProtocolFieldParser extends FieldParserSupport implements FieldParser, FrameStructEnum { /** - * todo:按照配置和待解析的缓冲池解析字段 + * 按照配置和待解析的缓冲池解析字段 * * @param protocolFieldConfigs 字段配置集合 * @param storeObjectMap 待存储的字段集合 @@ -46,7 +46,7 @@ } /** - * todo: 解析和协议帧结构相关的协议字段结合（位置、长度等信息） + * 解析和协议帧结构相关的协议字段结合（位置、长度等信息） * * @param protocolFieldConfigs * @param totalLength @@ -65,7 +65,7 @@ } /** - * todo: 获取业务内容的byteBuf + * 获取业务内容的byteBuf * 主要流程如下所示 * 1、通过协议配置计算固定长度 * 2、固定字段列表=> 计算固定字段长度=> 计算业务内容起始位置=>结合总长度，计算业务内容长度=>得到业务内容 @@ -87,7 +87,7 @@ } /** - * todo:获取过滤字段的长度 + * 获取过滤字段的长度 */ @Override public Integer totalFilterLength(ProtocolConfig protocolConfig, diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java index f8a359e..7023028 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java @@ -12,7 +12,7 @@ public class GenericRuleResolver { /** - * todo: 匹配规则 + * 匹配规则 * * 1、准备前置规则字段集合 * 2、准备固定字段集合 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 04e4e36..204b4dc 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 @@ -8,7 +8,7 @@ import java.util.*; /** - * todo: 规则匹配的核心类 + * 规则匹配的核心类 * * @author cz * @date 2023-6-12 @@ -18,7 +18,7 @@ /** - * todo: 规则匹配核心方法 + * 规则匹配核心方法 * 1、通过前置字段集合匹配规则 * 2、判断规则终止标记字段是否已经完成匹配 * （1）完成匹配，返回当前的规则 @@ -58,7 +58,7 @@ /** - * todo: 获取规则字段列表 + * 获取规则字段列表 * * @param preRuleConfigList * @param fixedDataMap @@ -79,7 +79,7 @@ /** - * todo:匹配规则配置 + * 匹配规则配置 * * @param ruleMap * @param metaDataMap diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java index 8652ef0..787874a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java @@ -27,7 +27,7 @@ } /** - * todo:通过post方法执行方法回调 + * 通过post方法执行方法回调 * * @param json * @param url diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java index 514f88e..d7ed3e7 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java @@ -34,7 +34,7 @@ /** - * todo: 解析数据字段 + * 解析数据字段 * * @param ruleConfig * @param byteBuf @@ -54,7 +54,7 @@ } /** - * todo：查询规则对应的组合配合 + * 查询规则对应的组合配合 * 准备，过滤字段列表，选取所需的值 * * @param ruleConfig diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java index 1c96040..97a78ad 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java @@ -41,7 +41,7 @@ } /** - * todo:解析数据字段 + * 解析数据字段 * * @param ruleConfig * @param byteBuf @@ -66,7 +66,7 @@ } /** - * todo: 根据规则查询业务字段 + * 根据规则查询业务字段 * * 得到需要处理的业务内容 * diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java index dceeb89..b2974a5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java @@ -49,7 +49,7 @@ } /** - * todo: 报文解密 + * 报文解密 * 1、否有动态bean,没有去设置的bean,有则取之 * 2、bean不为空，进行解密操作，否则返回原文 * @@ -72,7 +72,7 @@ /** - * todo: 报文加密 + * 报文加密 *

* 如果进行过解密操作，那么回复自动判定密文需要加密并按照同样的加密的方式进行回复 */ @@ -93,7 +93,7 @@ } /** - * todo:解密清零操作 + * 解密清零操作 * * @param plainBuf * @return @@ -108,7 +108,7 @@ } /** - * todo: 加密补零操作 + * 加密补零操作 */ private ByteBuf fillFrameStructZero(ByteBuf replyBytes) { while (ByteBufUtil.hexDump(replyBytes).length() % 32 == 0) { @@ -119,7 +119,7 @@ /** - * todo: 数据订阅 + * 数据订阅 */ public void storeData(List> bizDataMap) { // DataSubscribeProvider dataSubscribeProvider = SpringContextUtil.getBean(processorInstance.getSubscribeBean()); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java index 90e4b18..5ffdcaa 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java @@ -46,7 +46,7 @@ } /** - * todo:初始化获取对应协议的配置字段列表 + * 初始化获取对应协议的配置字段列表 * * @param protocolId */ @@ -69,7 +69,7 @@ } /** - * todo:通过协议字段id和协议报文获取该配置实例化内容的值 + * 通过协议字段id和协议报文获取该配置实例化内容的值 * * @param protocolFieldId * @param byteBuf @@ -114,7 +114,7 @@ } /** - * todo:获取帧固定位置字段配置信息 + * 获取帧固定位置字段配置信息 * * @param byteBuf * @param protocolConfig @@ -141,7 +141,7 @@ /** - * todo:获取帧固定位置字段配置信息 + * 获取帧固定位置字段配置信息 * * @param byteBuf * @param protocolConfig @@ -166,7 +166,7 @@ } /** - * todo:获取过滤字段的长度 + * 获取过滤字段的长度 */ public Integer getTotalFilterLength(ProtocolConfig protocolConfig) { if (showSkip()) { @@ -185,7 +185,7 @@ /** - * todo:获取帧结构应有的总长度 + * 获取帧结构应有的总长度 */ public Integer getTotalLength(ByteBuf byteBuf, ProtocolConfig protocolConfig) { if (showSkip()) { @@ -211,7 +211,7 @@ } /** - * todo:获取协议有关字段解析内容 + * 获取协议有关字段解析内容 * storeObjectMap存储代转存的数据 * * @return @@ -237,7 +237,7 @@ } /** - * todo:获取业务报文内容的content字节 + * 获取业务报文内容的content字节 * * @param wholeDatagramByte * @return @@ -261,7 +261,7 @@ } /** - * todo:对解密的内容进行尾部清零操作 + * 对解密的内容进行尾部清零操作 *

* 根据解析后的业务内容，通过存储的帧结构，创建完整完整的数据报文， * 这里对帧结构的可变报文没有处理，只是简单的组装,保证提前解密，为帧结构检验做准备 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java index 7872a3c..4981167 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java @@ -36,7 +36,7 @@ } /** - * todo: 获取规则匹配结果 + * 获取规则匹配结果 * * @param parseFixedDataMap * @param protocolFieldConfigs 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 b4a0f0a..8e6b55e 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,7 +14,7 @@ public class SensorhubReplier extends SimpleChannelInboundHandler { /** - * todo: 回复内容构建的流程入口方法 + * 回复内容构建的流程入口方法 * 1、通过有标准协议解析器传来的结果进行命令的构建 * 2、构建命令有以下的命令内容 * （1）成功返回时间，并进行下发配置操作 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 a7bb1b8..b4dd1ba 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 @@ -25,7 +25,7 @@ public class DataReplyCommand extends ReplyCommandSupport implements AbstractBuildReplyCommand { /** - * todo: 报文构建命令 + * 报文构建命令 * 成功解析帧结构内容，进行下发成功回复命令的主要流程方法 * 其构建流程逻辑如下: * 1、初始化回复报文配置 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/replier/command/ReplyCommandSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/replier/command/ReplyCommandSupport.java index 4d60246..f051dc9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/replier/command/ReplyCommandSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/replier/command/ReplyCommandSupport.java @@ -35,7 +35,7 @@ /** - * todo: 执行默认回复配置 + * 执行默认回复配置 *

* 组合字段解析，单字段解析 * 构建业务字段的byteBuf @@ -60,7 +60,7 @@ } /** - * todo: 执行下发配置 + * 执行下发配置 *

* 取redis相关配置的值，查询相关的配置进行构建返回的帧业务内容 * @@ -91,7 +91,7 @@ } /** - * todo:计算帧长度 + * 计算帧长度 * 1、获取过滤字段长度 * 2、获取字段长度配置，构建长度业务字段集合 */ @@ -107,7 +107,7 @@ /** - * todo:构建业务前固定内容 + * 构建业务前固定内容 * 1、筛选业务内容前固定配置 * 2、排序 * 3、以完整的byte为单位，构建组合集合进行回复报文的构建 @@ -188,7 +188,7 @@ } /** - * todo: 构建回复配置固定字段配置 + * 构建回复配置固定字段配置 * 1、判断配置的协议字段是否有变化， * （1）通过协议配置，没有变化则直接使用 * （2）有变化则以byte为列表执行报文的构建 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/BitFieldDecorator.java b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/BitFieldDecorator.java index d7e178d..ff58f89 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/BitFieldDecorator.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/BitFieldDecorator.java @@ -19,7 +19,7 @@ public class BitFieldDecorator { /** - * todo: 构建bitBuf + * 构建bitBuf * * @param fieldConfig * @param currentConfigValue @@ -63,7 +63,7 @@ /** - * todo: 从二进制字符串转为byte[] + * 从二进制字符串转为byte[] * * @param binaryStr * @return @@ -78,7 +78,7 @@ } /** - * todo: 把byte转化成2进制字符串 + * 把byte转化成2进制字符串 */ private static String getBinaryStrFromByte(byte value) { String result = ""; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/ByteFieldDecorator.java b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/ByteFieldDecorator.java index a4d8ebc..b58e1d0 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/ByteFieldDecorator.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/ByteFieldDecorator.java @@ -19,7 +19,7 @@ public class ByteFieldDecorator { /** - * todo:定制化的和默认的byte回复报文构建 + * 定制化的和默认的byte回复报文构建 * * @param fieldConfig * @param currentConfigValue @@ -35,7 +35,7 @@ /** - * todo: 默认byte构建修饰器 + * 默认byte构建修饰器 * * @param fieldConfig * @param currentValue @@ -47,7 +47,7 @@ } /** - * todo： 定制化的byte报文构建修饰器 + * 定制化的byte报文构建修饰器 * 1、执行前置规则处理 * 2、调用默认的报文构建 * diff --git a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/DefaultValueTypeResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/DefaultValueTypeResolver.java index 5f94b81..c6a93a6 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/DefaultValueTypeResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/DefaultValueTypeResolver.java @@ -12,7 +12,7 @@ public class DefaultValueTypeResolver implements AbstractValueTypeResolver { /** - * todo: 执行业务值得构建 + * 执行业务值得构建 * 1、判断业务类型内容，执行类型转化为16进制的报文 * 2、执行回复报文的构建 * @@ -27,7 +27,7 @@ } /** - * todo: 将str转化bytebuf + * 将str转化bytebuf * * @param totalLength 应填充的总长度 * @param currentStrValue 待填充的字符串 @@ -53,7 +53,7 @@ } /** - * todo：将对象转化16进制的字符串 + * 将对象转化16进制的字符串 * * @param currentObjectValue * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java index 27f3c77..f5e671b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java @@ -10,7 +10,7 @@ public class PretreatmentSupport { /** - * todo: 取第一个大括号，对应的右括号下标值 + * 取第一个大括号，对应的右括号下标值 * 算法流程 * 1、初始化totalRightBracket为0 * 2、获取首个“{”压栈，totalRightBracket加偏移下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java index 588d412..3e0fe74 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java @@ -35,7 +35,8 @@ } /** - * todo: 执行aep平台前的协议解析 预处理为标准的协议报文 + * 执行aep平台前的协议解析 预处理为标准的协议报文 + * ****有http的server */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java index 43ee69d..4ae0495 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java @@ -31,7 +31,7 @@ } /** - * todo: 执行np平台前的协议解析 预处理为标准的协议报文 + * 执行np平台前的协议解析 预处理为标准的协议报文 */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java index 67ce2f3..63dd7de 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java @@ -12,7 +12,7 @@ * 可任意构建自己的命令 * * @author cz - * todo: 过滤筛选器抽象类，进行特定内容的指令下发 + * 过滤筛选器抽象类，进行特定内容的指令下发 */ public interface AbstractReplyCommandPostProcessing extends ReplyCommandEnum { @@ -20,7 +20,7 @@ /** * 走一层过滤，没有走默认配置，加自己默认的过滤 *

- * todo:回复命令构建 + * 回复命令构建 * * @param bizDataMap * @param ruleConfigFactory diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java index cf0dba0..a5c51a6 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java @@ -8,7 +8,7 @@ import java.util.Map; /** - * todo:后置处理器，将散落解析的时间进行合并 + * 后置处理器，将散落解析的时间进行合并 * * @author cz */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java index 8291f68..981d235 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java @@ -10,7 +10,7 @@ public class FieldParserSupport { /** - * todo: 计算协议配置字段的总长度 + * 计算协议配置字段的总长度 * 1、分别计算bit和byte长度 * 2、合并长度 */ @@ -29,7 +29,7 @@ } /** - * todo:最大固定位置下标 + * 最大固定位置下标 * * 1、获取没有指定起始位置的业务内容后的字段配置集合 * 2、分别计算固定值最大长度和业务内容后字段配置进行相减得到计算结果即是固定位置下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java index 7901ce0..4047da9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java @@ -19,7 +19,7 @@ public class GenericFiledRuleResolver { /** - * todo: 拿到所有的值合并到一个值 + * 拿到所有的值合并到一个值 * 无论是bit位的解析，还是byte的解析，统一都转换成byte进行规则的换算解析 * 1、必须进行byte与值的类型转换 * 2、存在可能，对值进行运算 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 338be3d..a9af4e8 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 @@ -28,7 +28,7 @@ public class GenericCombinedFieldResolver { /** - * todo: 组合字段解析主要流程类 + * 组合字段解析主要流程类 * 通过查询，字段长度长度随机 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java index 8eb3362..33d83ae 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class BizFieldParseProcessor implements AbstractCombinedFieldProcessor { /** - * todo: 业务字段解析 + * 业务字段解析 * * @param combinedFieldParam * @return @@ -50,7 +50,7 @@ } /** - * todo:计算处理后的偏移位置 + * 计算处理后的偏移位置 */ private Integer calculateAfterProcessPosition(AbstractFieldConfig newProtocolFieldConfig, CombinedFieldProcessorParam combinedFieldParam) { Integer originPositionIndex = newProtocolFieldConfig.getOriginPositionByte() - combinedFieldParam.getByteBuf().readerIndex(); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java index 2f1f32a..8a28f6b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class PreBizFieldParseProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor { /** - * todo: 计算业务字段长度，同时拿到对应指定的字段解析配置 + * 计算业务字段长度，同时拿到对应指定的字段解析配置 * * @param combinedFieldParam * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java index 515d988..e64f0da 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java @@ -22,7 +22,7 @@ public class PreLeadCodeProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor, PreLeadCodeParseStatus { /** - * todo:前导码匹配 + * 前导码匹配 * 匹配获取前导码，找到对应的组合字段配置，并将报文读位置前移 * * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java index 2e374bb..0375b81 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java @@ -22,7 +22,7 @@ public class BitFieldParser extends GenericFiledRuleResolver { /** - * todo: 位字段解析 + * 位字段解析 * 1、单个字节情况表示字段 * 2、多字节情况表示字段（暂未处理） */ @@ -91,7 +91,7 @@ /** - * todo: 从二进制字符串转为byte[] + * 从二进制字符串转为byte[] * * @param binaryStr * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java index c1ca720..8999afc 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java @@ -19,7 +19,7 @@ /** - * todo: 字节字段解析核心类 + * 字节字段解析核心类 * 存在rule_json走自定义的规则设置，没有则支持默认配置的规则设置 * * @param byteBuf @@ -37,7 +37,7 @@ } /** - * todo: 默认解析方法 + * 默认解析方法 * * @param byteBuf * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java index 687e786..d6bf1c2 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java @@ -24,7 +24,7 @@ public class DefaultProtocolFieldParser extends FieldParserSupport implements FieldParser, FrameStructEnum { /** - * todo:按照配置和待解析的缓冲池解析字段 + * 按照配置和待解析的缓冲池解析字段 * * @param protocolFieldConfigs 字段配置集合 * @param storeObjectMap 待存储的字段集合 @@ -46,7 +46,7 @@ } /** - * todo: 解析和协议帧结构相关的协议字段结合（位置、长度等信息） + * 解析和协议帧结构相关的协议字段结合（位置、长度等信息） * * @param protocolFieldConfigs * @param totalLength @@ -65,7 +65,7 @@ } /** - * todo: 获取业务内容的byteBuf + * 获取业务内容的byteBuf * 主要流程如下所示 * 1、通过协议配置计算固定长度 * 2、固定字段列表=> 计算固定字段长度=> 计算业务内容起始位置=>结合总长度，计算业务内容长度=>得到业务内容 @@ -87,7 +87,7 @@ } /** - * todo:获取过滤字段的长度 + * 获取过滤字段的长度 */ @Override public Integer totalFilterLength(ProtocolConfig protocolConfig, diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java index f8a359e..7023028 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java @@ -12,7 +12,7 @@ public class GenericRuleResolver { /** - * todo: 匹配规则 + * 匹配规则 * * 1、准备前置规则字段集合 * 2、准备固定字段集合 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 04e4e36..204b4dc 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 @@ -8,7 +8,7 @@ import java.util.*; /** - * todo: 规则匹配的核心类 + * 规则匹配的核心类 * * @author cz * @date 2023-6-12 @@ -18,7 +18,7 @@ /** - * todo: 规则匹配核心方法 + * 规则匹配核心方法 * 1、通过前置字段集合匹配规则 * 2、判断规则终止标记字段是否已经完成匹配 * （1）完成匹配，返回当前的规则 @@ -58,7 +58,7 @@ /** - * todo: 获取规则字段列表 + * 获取规则字段列表 * * @param preRuleConfigList * @param fixedDataMap @@ -79,7 +79,7 @@ /** - * todo:匹配规则配置 + * 匹配规则配置 * * @param ruleMap * @param metaDataMap diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java index 8652ef0..787874a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java @@ -27,7 +27,7 @@ } /** - * todo:通过post方法执行方法回调 + * 通过post方法执行方法回调 * * @param json * @param url diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java index 514f88e..d7ed3e7 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java @@ -34,7 +34,7 @@ /** - * todo: 解析数据字段 + * 解析数据字段 * * @param ruleConfig * @param byteBuf @@ -54,7 +54,7 @@ } /** - * todo：查询规则对应的组合配合 + * 查询规则对应的组合配合 * 准备，过滤字段列表，选取所需的值 * * @param ruleConfig diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java index 1c96040..97a78ad 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java @@ -41,7 +41,7 @@ } /** - * todo:解析数据字段 + * 解析数据字段 * * @param ruleConfig * @param byteBuf @@ -66,7 +66,7 @@ } /** - * todo: 根据规则查询业务字段 + * 根据规则查询业务字段 * * 得到需要处理的业务内容 * diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java index dceeb89..b2974a5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java @@ -49,7 +49,7 @@ } /** - * todo: 报文解密 + * 报文解密 * 1、否有动态bean,没有去设置的bean,有则取之 * 2、bean不为空，进行解密操作，否则返回原文 * @@ -72,7 +72,7 @@ /** - * todo: 报文加密 + * 报文加密 *

* 如果进行过解密操作，那么回复自动判定密文需要加密并按照同样的加密的方式进行回复 */ @@ -93,7 +93,7 @@ } /** - * todo:解密清零操作 + * 解密清零操作 * * @param plainBuf * @return @@ -108,7 +108,7 @@ } /** - * todo: 加密补零操作 + * 加密补零操作 */ private ByteBuf fillFrameStructZero(ByteBuf replyBytes) { while (ByteBufUtil.hexDump(replyBytes).length() % 32 == 0) { @@ -119,7 +119,7 @@ /** - * todo: 数据订阅 + * 数据订阅 */ public void storeData(List> bizDataMap) { // DataSubscribeProvider dataSubscribeProvider = SpringContextUtil.getBean(processorInstance.getSubscribeBean()); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java index 90e4b18..5ffdcaa 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java @@ -46,7 +46,7 @@ } /** - * todo:初始化获取对应协议的配置字段列表 + * 初始化获取对应协议的配置字段列表 * * @param protocolId */ @@ -69,7 +69,7 @@ } /** - * todo:通过协议字段id和协议报文获取该配置实例化内容的值 + * 通过协议字段id和协议报文获取该配置实例化内容的值 * * @param protocolFieldId * @param byteBuf @@ -114,7 +114,7 @@ } /** - * todo:获取帧固定位置字段配置信息 + * 获取帧固定位置字段配置信息 * * @param byteBuf * @param protocolConfig @@ -141,7 +141,7 @@ /** - * todo:获取帧固定位置字段配置信息 + * 获取帧固定位置字段配置信息 * * @param byteBuf * @param protocolConfig @@ -166,7 +166,7 @@ } /** - * todo:获取过滤字段的长度 + * 获取过滤字段的长度 */ public Integer getTotalFilterLength(ProtocolConfig protocolConfig) { if (showSkip()) { @@ -185,7 +185,7 @@ /** - * todo:获取帧结构应有的总长度 + * 获取帧结构应有的总长度 */ public Integer getTotalLength(ByteBuf byteBuf, ProtocolConfig protocolConfig) { if (showSkip()) { @@ -211,7 +211,7 @@ } /** - * todo:获取协议有关字段解析内容 + * 获取协议有关字段解析内容 * storeObjectMap存储代转存的数据 * * @return @@ -237,7 +237,7 @@ } /** - * todo:获取业务报文内容的content字节 + * 获取业务报文内容的content字节 * * @param wholeDatagramByte * @return @@ -261,7 +261,7 @@ } /** - * todo:对解密的内容进行尾部清零操作 + * 对解密的内容进行尾部清零操作 *

* 根据解析后的业务内容，通过存储的帧结构，创建完整完整的数据报文， * 这里对帧结构的可变报文没有处理，只是简单的组装,保证提前解密，为帧结构检验做准备 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java index 7872a3c..4981167 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java @@ -36,7 +36,7 @@ } /** - * todo: 获取规则匹配结果 + * 获取规则匹配结果 * * @param parseFixedDataMap * @param protocolFieldConfigs 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 b4a0f0a..8e6b55e 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,7 +14,7 @@ public class SensorhubReplier extends SimpleChannelInboundHandler { /** - * todo: 回复内容构建的流程入口方法 + * 回复内容构建的流程入口方法 * 1、通过有标准协议解析器传来的结果进行命令的构建 * 2、构建命令有以下的命令内容 * （1）成功返回时间，并进行下发配置操作 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 a7bb1b8..b4dd1ba 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 @@ -25,7 +25,7 @@ public class DataReplyCommand extends ReplyCommandSupport implements AbstractBuildReplyCommand { /** - * todo: 报文构建命令 + * 报文构建命令 * 成功解析帧结构内容，进行下发成功回复命令的主要流程方法 * 其构建流程逻辑如下: * 1、初始化回复报文配置 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/replier/command/ReplyCommandSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/replier/command/ReplyCommandSupport.java index 4d60246..f051dc9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/replier/command/ReplyCommandSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/replier/command/ReplyCommandSupport.java @@ -35,7 +35,7 @@ /** - * todo: 执行默认回复配置 + * 执行默认回复配置 *

* 组合字段解析，单字段解析 * 构建业务字段的byteBuf @@ -60,7 +60,7 @@ } /** - * todo: 执行下发配置 + * 执行下发配置 *

* 取redis相关配置的值，查询相关的配置进行构建返回的帧业务内容 * @@ -91,7 +91,7 @@ } /** - * todo:计算帧长度 + * 计算帧长度 * 1、获取过滤字段长度 * 2、获取字段长度配置，构建长度业务字段集合 */ @@ -107,7 +107,7 @@ /** - * todo:构建业务前固定内容 + * 构建业务前固定内容 * 1、筛选业务内容前固定配置 * 2、排序 * 3、以完整的byte为单位，构建组合集合进行回复报文的构建 @@ -188,7 +188,7 @@ } /** - * todo: 构建回复配置固定字段配置 + * 构建回复配置固定字段配置 * 1、判断配置的协议字段是否有变化， * （1）通过协议配置，没有变化则直接使用 * （2）有变化则以byte为列表执行报文的构建 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/BitFieldDecorator.java b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/BitFieldDecorator.java index d7e178d..ff58f89 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/BitFieldDecorator.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/BitFieldDecorator.java @@ -19,7 +19,7 @@ public class BitFieldDecorator { /** - * todo: 构建bitBuf + * 构建bitBuf * * @param fieldConfig * @param currentConfigValue @@ -63,7 +63,7 @@ /** - * todo: 从二进制字符串转为byte[] + * 从二进制字符串转为byte[] * * @param binaryStr * @return @@ -78,7 +78,7 @@ } /** - * todo: 把byte转化成2进制字符串 + * 把byte转化成2进制字符串 */ private static String getBinaryStrFromByte(byte value) { String result = ""; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/ByteFieldDecorator.java b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/ByteFieldDecorator.java index a4d8ebc..b58e1d0 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/ByteFieldDecorator.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/ByteFieldDecorator.java @@ -19,7 +19,7 @@ public class ByteFieldDecorator { /** - * todo:定制化的和默认的byte回复报文构建 + * 定制化的和默认的byte回复报文构建 * * @param fieldConfig * @param currentConfigValue @@ -35,7 +35,7 @@ /** - * todo: 默认byte构建修饰器 + * 默认byte构建修饰器 * * @param fieldConfig * @param currentValue @@ -47,7 +47,7 @@ } /** - * todo： 定制化的byte报文构建修饰器 + * 定制化的byte报文构建修饰器 * 1、执行前置规则处理 * 2、调用默认的报文构建 * diff --git a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/DefaultValueTypeResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/DefaultValueTypeResolver.java index 5f94b81..c6a93a6 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/DefaultValueTypeResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/DefaultValueTypeResolver.java @@ -12,7 +12,7 @@ public class DefaultValueTypeResolver implements AbstractValueTypeResolver { /** - * todo: 执行业务值得构建 + * 执行业务值得构建 * 1、判断业务类型内容，执行类型转化为16进制的报文 * 2、执行回复报文的构建 * @@ -27,7 +27,7 @@ } /** - * todo: 将str转化bytebuf + * 将str转化bytebuf * * @param totalLength 应填充的总长度 * @param currentStrValue 待填充的字符串 @@ -53,7 +53,7 @@ } /** - * todo：将对象转化16进制的字符串 + * 将对象转化16进制的字符串 * * @param currentObjectValue * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/FieldReverseDecorator.java b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/FieldReverseDecorator.java index 9d8ae1e..31ebf8f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/FieldReverseDecorator.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/FieldReverseDecorator.java @@ -29,7 +29,7 @@ /** - * todo: 组合字段的报文构建 + * 组合字段的报文构建 * (1) 处理前导字段的反构 * (2)处理长度字段的反构 * (3)将核心字段的反构，交给解析器进行反构 @@ -64,7 +64,7 @@ /** - * todo: 字段解析反构 + * 字段解析反构 * 1、字段配置排序 * 2、检查配置是否是完整的byte组合解析 * 3、遍历待解析的配置集合，执行协议报告构建 @@ -99,7 +99,7 @@ } /** - * todo:处理非完整的字节字段处理方式,动态的业务字段和静态的业务字段 + * 处理非完整的字节字段处理方式,动态的业务字段和静态的业务字段 * （1）bit单位构建报文 * (2)byte单位构建报文 * diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java index 27f3c77..f5e671b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java @@ -10,7 +10,7 @@ public class PretreatmentSupport { /** - * todo: 取第一个大括号，对应的右括号下标值 + * 取第一个大括号，对应的右括号下标值 * 算法流程 * 1、初始化totalRightBracket为0 * 2、获取首个“{”压栈，totalRightBracket加偏移下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java index 588d412..3e0fe74 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java @@ -35,7 +35,8 @@ } /** - * todo: 执行aep平台前的协议解析 预处理为标准的协议报文 + * 执行aep平台前的协议解析 预处理为标准的协议报文 + * ****有http的server */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java index 43ee69d..4ae0495 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java @@ -31,7 +31,7 @@ } /** - * todo: 执行np平台前的协议解析 预处理为标准的协议报文 + * 执行np平台前的协议解析 预处理为标准的协议报文 */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java index 67ce2f3..63dd7de 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java @@ -12,7 +12,7 @@ * 可任意构建自己的命令 * * @author cz - * todo: 过滤筛选器抽象类，进行特定内容的指令下发 + * 过滤筛选器抽象类，进行特定内容的指令下发 */ public interface AbstractReplyCommandPostProcessing extends ReplyCommandEnum { @@ -20,7 +20,7 @@ /** * 走一层过滤，没有走默认配置，加自己默认的过滤 *

- * todo:回复命令构建 + * 回复命令构建 * * @param bizDataMap * @param ruleConfigFactory diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java index cf0dba0..a5c51a6 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java @@ -8,7 +8,7 @@ import java.util.Map; /** - * todo:后置处理器，将散落解析的时间进行合并 + * 后置处理器，将散落解析的时间进行合并 * * @author cz */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java index 8291f68..981d235 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java @@ -10,7 +10,7 @@ public class FieldParserSupport { /** - * todo: 计算协议配置字段的总长度 + * 计算协议配置字段的总长度 * 1、分别计算bit和byte长度 * 2、合并长度 */ @@ -29,7 +29,7 @@ } /** - * todo:最大固定位置下标 + * 最大固定位置下标 * * 1、获取没有指定起始位置的业务内容后的字段配置集合 * 2、分别计算固定值最大长度和业务内容后字段配置进行相减得到计算结果即是固定位置下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java index 7901ce0..4047da9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java @@ -19,7 +19,7 @@ public class GenericFiledRuleResolver { /** - * todo: 拿到所有的值合并到一个值 + * 拿到所有的值合并到一个值 * 无论是bit位的解析，还是byte的解析，统一都转换成byte进行规则的换算解析 * 1、必须进行byte与值的类型转换 * 2、存在可能，对值进行运算 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 338be3d..a9af4e8 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 @@ -28,7 +28,7 @@ public class GenericCombinedFieldResolver { /** - * todo: 组合字段解析主要流程类 + * 组合字段解析主要流程类 * 通过查询，字段长度长度随机 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java index 8eb3362..33d83ae 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class BizFieldParseProcessor implements AbstractCombinedFieldProcessor { /** - * todo: 业务字段解析 + * 业务字段解析 * * @param combinedFieldParam * @return @@ -50,7 +50,7 @@ } /** - * todo:计算处理后的偏移位置 + * 计算处理后的偏移位置 */ private Integer calculateAfterProcessPosition(AbstractFieldConfig newProtocolFieldConfig, CombinedFieldProcessorParam combinedFieldParam) { Integer originPositionIndex = newProtocolFieldConfig.getOriginPositionByte() - combinedFieldParam.getByteBuf().readerIndex(); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java index 2f1f32a..8a28f6b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class PreBizFieldParseProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor { /** - * todo: 计算业务字段长度，同时拿到对应指定的字段解析配置 + * 计算业务字段长度，同时拿到对应指定的字段解析配置 * * @param combinedFieldParam * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java index 515d988..e64f0da 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java @@ -22,7 +22,7 @@ public class PreLeadCodeProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor, PreLeadCodeParseStatus { /** - * todo:前导码匹配 + * 前导码匹配 * 匹配获取前导码，找到对应的组合字段配置，并将报文读位置前移 * * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java index 2e374bb..0375b81 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java @@ -22,7 +22,7 @@ public class BitFieldParser extends GenericFiledRuleResolver { /** - * todo: 位字段解析 + * 位字段解析 * 1、单个字节情况表示字段 * 2、多字节情况表示字段（暂未处理） */ @@ -91,7 +91,7 @@ /** - * todo: 从二进制字符串转为byte[] + * 从二进制字符串转为byte[] * * @param binaryStr * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java index c1ca720..8999afc 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java @@ -19,7 +19,7 @@ /** - * todo: 字节字段解析核心类 + * 字节字段解析核心类 * 存在rule_json走自定义的规则设置，没有则支持默认配置的规则设置 * * @param byteBuf @@ -37,7 +37,7 @@ } /** - * todo: 默认解析方法 + * 默认解析方法 * * @param byteBuf * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java index 687e786..d6bf1c2 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java @@ -24,7 +24,7 @@ public class DefaultProtocolFieldParser extends FieldParserSupport implements FieldParser, FrameStructEnum { /** - * todo:按照配置和待解析的缓冲池解析字段 + * 按照配置和待解析的缓冲池解析字段 * * @param protocolFieldConfigs 字段配置集合 * @param storeObjectMap 待存储的字段集合 @@ -46,7 +46,7 @@ } /** - * todo: 解析和协议帧结构相关的协议字段结合（位置、长度等信息） + * 解析和协议帧结构相关的协议字段结合（位置、长度等信息） * * @param protocolFieldConfigs * @param totalLength @@ -65,7 +65,7 @@ } /** - * todo: 获取业务内容的byteBuf + * 获取业务内容的byteBuf * 主要流程如下所示 * 1、通过协议配置计算固定长度 * 2、固定字段列表=> 计算固定字段长度=> 计算业务内容起始位置=>结合总长度，计算业务内容长度=>得到业务内容 @@ -87,7 +87,7 @@ } /** - * todo:获取过滤字段的长度 + * 获取过滤字段的长度 */ @Override public Integer totalFilterLength(ProtocolConfig protocolConfig, diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java index f8a359e..7023028 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java @@ -12,7 +12,7 @@ public class GenericRuleResolver { /** - * todo: 匹配规则 + * 匹配规则 * * 1、准备前置规则字段集合 * 2、准备固定字段集合 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 04e4e36..204b4dc 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 @@ -8,7 +8,7 @@ import java.util.*; /** - * todo: 规则匹配的核心类 + * 规则匹配的核心类 * * @author cz * @date 2023-6-12 @@ -18,7 +18,7 @@ /** - * todo: 规则匹配核心方法 + * 规则匹配核心方法 * 1、通过前置字段集合匹配规则 * 2、判断规则终止标记字段是否已经完成匹配 * （1）完成匹配，返回当前的规则 @@ -58,7 +58,7 @@ /** - * todo: 获取规则字段列表 + * 获取规则字段列表 * * @param preRuleConfigList * @param fixedDataMap @@ -79,7 +79,7 @@ /** - * todo:匹配规则配置 + * 匹配规则配置 * * @param ruleMap * @param metaDataMap diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java index 8652ef0..787874a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java @@ -27,7 +27,7 @@ } /** - * todo:通过post方法执行方法回调 + * 通过post方法执行方法回调 * * @param json * @param url diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java index 514f88e..d7ed3e7 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java @@ -34,7 +34,7 @@ /** - * todo: 解析数据字段 + * 解析数据字段 * * @param ruleConfig * @param byteBuf @@ -54,7 +54,7 @@ } /** - * todo：查询规则对应的组合配合 + * 查询规则对应的组合配合 * 准备，过滤字段列表，选取所需的值 * * @param ruleConfig diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java index 1c96040..97a78ad 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java @@ -41,7 +41,7 @@ } /** - * todo:解析数据字段 + * 解析数据字段 * * @param ruleConfig * @param byteBuf @@ -66,7 +66,7 @@ } /** - * todo: 根据规则查询业务字段 + * 根据规则查询业务字段 * * 得到需要处理的业务内容 * diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java index dceeb89..b2974a5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java @@ -49,7 +49,7 @@ } /** - * todo: 报文解密 + * 报文解密 * 1、否有动态bean,没有去设置的bean,有则取之 * 2、bean不为空，进行解密操作，否则返回原文 * @@ -72,7 +72,7 @@ /** - * todo: 报文加密 + * 报文加密 *

* 如果进行过解密操作，那么回复自动判定密文需要加密并按照同样的加密的方式进行回复 */ @@ -93,7 +93,7 @@ } /** - * todo:解密清零操作 + * 解密清零操作 * * @param plainBuf * @return @@ -108,7 +108,7 @@ } /** - * todo: 加密补零操作 + * 加密补零操作 */ private ByteBuf fillFrameStructZero(ByteBuf replyBytes) { while (ByteBufUtil.hexDump(replyBytes).length() % 32 == 0) { @@ -119,7 +119,7 @@ /** - * todo: 数据订阅 + * 数据订阅 */ public void storeData(List> bizDataMap) { // DataSubscribeProvider dataSubscribeProvider = SpringContextUtil.getBean(processorInstance.getSubscribeBean()); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java index 90e4b18..5ffdcaa 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java @@ -46,7 +46,7 @@ } /** - * todo:初始化获取对应协议的配置字段列表 + * 初始化获取对应协议的配置字段列表 * * @param protocolId */ @@ -69,7 +69,7 @@ } /** - * todo:通过协议字段id和协议报文获取该配置实例化内容的值 + * 通过协议字段id和协议报文获取该配置实例化内容的值 * * @param protocolFieldId * @param byteBuf @@ -114,7 +114,7 @@ } /** - * todo:获取帧固定位置字段配置信息 + * 获取帧固定位置字段配置信息 * * @param byteBuf * @param protocolConfig @@ -141,7 +141,7 @@ /** - * todo:获取帧固定位置字段配置信息 + * 获取帧固定位置字段配置信息 * * @param byteBuf * @param protocolConfig @@ -166,7 +166,7 @@ } /** - * todo:获取过滤字段的长度 + * 获取过滤字段的长度 */ public Integer getTotalFilterLength(ProtocolConfig protocolConfig) { if (showSkip()) { @@ -185,7 +185,7 @@ /** - * todo:获取帧结构应有的总长度 + * 获取帧结构应有的总长度 */ public Integer getTotalLength(ByteBuf byteBuf, ProtocolConfig protocolConfig) { if (showSkip()) { @@ -211,7 +211,7 @@ } /** - * todo:获取协议有关字段解析内容 + * 获取协议有关字段解析内容 * storeObjectMap存储代转存的数据 * * @return @@ -237,7 +237,7 @@ } /** - * todo:获取业务报文内容的content字节 + * 获取业务报文内容的content字节 * * @param wholeDatagramByte * @return @@ -261,7 +261,7 @@ } /** - * todo:对解密的内容进行尾部清零操作 + * 对解密的内容进行尾部清零操作 *

* 根据解析后的业务内容，通过存储的帧结构，创建完整完整的数据报文， * 这里对帧结构的可变报文没有处理，只是简单的组装,保证提前解密，为帧结构检验做准备 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java index 7872a3c..4981167 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java @@ -36,7 +36,7 @@ } /** - * todo: 获取规则匹配结果 + * 获取规则匹配结果 * * @param parseFixedDataMap * @param protocolFieldConfigs 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 b4a0f0a..8e6b55e 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,7 +14,7 @@ public class SensorhubReplier extends SimpleChannelInboundHandler { /** - * todo: 回复内容构建的流程入口方法 + * 回复内容构建的流程入口方法 * 1、通过有标准协议解析器传来的结果进行命令的构建 * 2、构建命令有以下的命令内容 * （1）成功返回时间，并进行下发配置操作 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 a7bb1b8..b4dd1ba 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 @@ -25,7 +25,7 @@ public class DataReplyCommand extends ReplyCommandSupport implements AbstractBuildReplyCommand { /** - * todo: 报文构建命令 + * 报文构建命令 * 成功解析帧结构内容，进行下发成功回复命令的主要流程方法 * 其构建流程逻辑如下: * 1、初始化回复报文配置 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/replier/command/ReplyCommandSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/replier/command/ReplyCommandSupport.java index 4d60246..f051dc9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/replier/command/ReplyCommandSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/replier/command/ReplyCommandSupport.java @@ -35,7 +35,7 @@ /** - * todo: 执行默认回复配置 + * 执行默认回复配置 *

* 组合字段解析，单字段解析 * 构建业务字段的byteBuf @@ -60,7 +60,7 @@ } /** - * todo: 执行下发配置 + * 执行下发配置 *

* 取redis相关配置的值，查询相关的配置进行构建返回的帧业务内容 * @@ -91,7 +91,7 @@ } /** - * todo:计算帧长度 + * 计算帧长度 * 1、获取过滤字段长度 * 2、获取字段长度配置，构建长度业务字段集合 */ @@ -107,7 +107,7 @@ /** - * todo:构建业务前固定内容 + * 构建业务前固定内容 * 1、筛选业务内容前固定配置 * 2、排序 * 3、以完整的byte为单位，构建组合集合进行回复报文的构建 @@ -188,7 +188,7 @@ } /** - * todo: 构建回复配置固定字段配置 + * 构建回复配置固定字段配置 * 1、判断配置的协议字段是否有变化， * （1）通过协议配置，没有变化则直接使用 * （2）有变化则以byte为列表执行报文的构建 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/BitFieldDecorator.java b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/BitFieldDecorator.java index d7e178d..ff58f89 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/BitFieldDecorator.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/BitFieldDecorator.java @@ -19,7 +19,7 @@ public class BitFieldDecorator { /** - * todo: 构建bitBuf + * 构建bitBuf * * @param fieldConfig * @param currentConfigValue @@ -63,7 +63,7 @@ /** - * todo: 从二进制字符串转为byte[] + * 从二进制字符串转为byte[] * * @param binaryStr * @return @@ -78,7 +78,7 @@ } /** - * todo: 把byte转化成2进制字符串 + * 把byte转化成2进制字符串 */ private static String getBinaryStrFromByte(byte value) { String result = ""; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/ByteFieldDecorator.java b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/ByteFieldDecorator.java index a4d8ebc..b58e1d0 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/ByteFieldDecorator.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/ByteFieldDecorator.java @@ -19,7 +19,7 @@ public class ByteFieldDecorator { /** - * todo:定制化的和默认的byte回复报文构建 + * 定制化的和默认的byte回复报文构建 * * @param fieldConfig * @param currentConfigValue @@ -35,7 +35,7 @@ /** - * todo: 默认byte构建修饰器 + * 默认byte构建修饰器 * * @param fieldConfig * @param currentValue @@ -47,7 +47,7 @@ } /** - * todo： 定制化的byte报文构建修饰器 + * 定制化的byte报文构建修饰器 * 1、执行前置规则处理 * 2、调用默认的报文构建 * diff --git a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/DefaultValueTypeResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/DefaultValueTypeResolver.java index 5f94b81..c6a93a6 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/DefaultValueTypeResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/DefaultValueTypeResolver.java @@ -12,7 +12,7 @@ public class DefaultValueTypeResolver implements AbstractValueTypeResolver { /** - * todo: 执行业务值得构建 + * 执行业务值得构建 * 1、判断业务类型内容，执行类型转化为16进制的报文 * 2、执行回复报文的构建 * @@ -27,7 +27,7 @@ } /** - * todo: 将str转化bytebuf + * 将str转化bytebuf * * @param totalLength 应填充的总长度 * @param currentStrValue 待填充的字符串 @@ -53,7 +53,7 @@ } /** - * todo：将对象转化16进制的字符串 + * 将对象转化16进制的字符串 * * @param currentObjectValue * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/FieldReverseDecorator.java b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/FieldReverseDecorator.java index 9d8ae1e..31ebf8f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/FieldReverseDecorator.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/FieldReverseDecorator.java @@ -29,7 +29,7 @@ /** - * todo: 组合字段的报文构建 + * 组合字段的报文构建 * (1) 处理前导字段的反构 * (2)处理长度字段的反构 * (3)将核心字段的反构，交给解析器进行反构 @@ -64,7 +64,7 @@ /** - * todo: 字段解析反构 + * 字段解析反构 * 1、字段配置排序 * 2、检查配置是否是完整的byte组合解析 * 3、遍历待解析的配置集合，执行协议报告构建 @@ -99,7 +99,7 @@ } /** - * todo:处理非完整的字节字段处理方式,动态的业务字段和静态的业务字段 + * 处理非完整的字节字段处理方式,动态的业务字段和静态的业务字段 * （1）bit单位构建报文 * (2)byte单位构建报文 * diff --git a/sensorhub-support/src/main/java/com/casic/missiles/pojo/RuleConfig.java b/sensorhub-support/src/main/java/com/casic/missiles/pojo/RuleConfig.java index a318b2f..63d5758 100644 --- a/sensorhub-support/src/main/java/com/casic/missiles/pojo/RuleConfig.java +++ b/sensorhub-support/src/main/java/com/casic/missiles/pojo/RuleConfig.java @@ -7,7 +7,7 @@ /** * @author cz - * todo： 匹配协议对应业务实例 + * 匹配协议对应业务实例 * 1、一个协议可以多种的流程规则 * 2、规则可以支持递归规则流程 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java index 32b668c..3f40fb9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractProtocolConfigFactory.java @@ -10,7 +10,7 @@ import java.util.Map; /** - * todo:存放基本协议的的加载信息 + * 存放基本协议的的加载信息 */ public class AbstractProtocolConfigFactory { private final ProtocolConfigProvider protocolConfigProvider; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java index b5f96df..f7b0f43 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/factory/AbstractRuleConfigFactory.java @@ -5,7 +5,7 @@ import com.casic.missiles.provider.ProcessorInstanceProvider; import com.casic.missiles.provider.FieldConfigProvider; /** - * todo: 存放规则相关的的的加载信息 + * 存放规则相关的的的加载信息 */ public class AbstractRuleConfigFactory { 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 fd17e68..0abc0f8 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 @@ -32,7 +32,7 @@ public class GenericProtocolParser extends ProtocolParserSupport implements ProtocolParser, ReplyCommandEnum { /** - * todo: 标准数据报文的核心解析流程方法 + * 标准数据报文的核心解析流程方法 * 1、前导码匹配报文协议 * 2、构建协议工厂（初始化获取与协议有关的数据库配置） * 3、检测帧结构是否完整 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 3126501..7ee71af 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 @@ -23,7 +23,7 @@ /** - * todo: 获取规则配置,执行规则匹配 + * 获取规则配置,执行规则匹配 * */ protected RuleConfig getRuleConfig(AbstractProtocolConfigFactory protocolFactory, ByteBuf wholeDatagramByte) { @@ -49,7 +49,7 @@ return null; } /** - * todo:通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 + * 通过协议字段解析，组合字段解析，字段解析的store，组合返回构建的数据 */ protected List> buildStoreData(AbstractRuleConfigFactory ruleConfigFactory, AbstractProtocolConfigFactory protocolFactory) { List> bizDataMapList = new ArrayList<>(); @@ -76,7 +76,7 @@ } /** - * todo:添加 组合字段的后置处理器 + * 添加 组合字段的后置处理器 * * @param bizDataMap */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java index 11e2156..5c70209 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/SensorhubDecoder.java @@ -19,7 +19,7 @@ public class SensorhubDecoder extends ByteToMessageDecoder { /** - * todo: 自定义协议解析 + * 自定义协议解析 * 帧解码分为以下阶段 * 1、帧预处理，判断是否是标准的报文结构，可以通过各个平台的特点，进行拦截预处理，同时根据特点进行处理粘包问题，获取标准的报文 * 2、将标准的报文，调用通用协议处理解析器，进行协议解析处理 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java index c1eccfe..2204b1f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/crc/CRCUtil.java @@ -1,7 +1,7 @@ package com.casic.missiles.parser.crc; /** - * todo:CRC校验类 + * CRC校验类 * * @author cz * @date diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java index ca8beb3..0ceac12 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatchSupport.java @@ -13,7 +13,7 @@ import java.util.Map; /** - * todo: 帧结构匹配支持类 + * 帧结构匹配支持类 * * @author cz * @date 2023-7-7 @@ -21,7 +21,7 @@ public class FrameStructMatchSupport implements ReplyCommandEnum, FrameStructEnum { /** - * todo:长度处理核心流程类 + * 长度处理核心流程类 *

* 匹配长度分为以下情况，进行以下情况进行匹配 * 分为加密大于等于，不加密大于等于的情况 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java index 17dde4f..f8a51fb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/FrameStructMatcher.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; /** - * todo: 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 + * 通过帧结构，进行帧粘包，截取包、数据完整性等问题的处理 * 分析匹配情况 * 1、匹配成功，直接返回帧结构，截取完整的数据，可以进行下次匹配。 * 2、匹配不成功，有后续帧，可以进行下次匹配。 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java index 5a0bdd5..9cc42f5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/LeadingCodeMatcher.java @@ -17,7 +17,7 @@ public class LeadingCodeMatcher implements FrameStructEnum { /** - * todo:帧结构前导码匹配 + * 帧结构前导码匹配 * 1、首字母匹配前导码， * 2、以匹配出的前导码是否在报文中条件进行前导码的匹配二次筛选 * @@ -31,7 +31,7 @@ List firstMatchConfigs = protocolConfigProvider.getMatchList(); //执行最左字符匹配，匹配成功返回当前配置 for (ProtocolConfig firstMatchConfig : firstMatchConfigs) { - if (doMatchRightLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { + if (doMatchLeftLeadCode(firstMatchConfig.getPreFix().toLowerCase(), protocolContent)) { return firstMatchConfig; } } @@ -41,7 +41,7 @@ /** * 查询匹配位置，进行再次匹配 - * todo： 再次匹配 如何丢弃无法识别的帧， + * 再次匹配 如何丢弃无法识别的帧， *

* 如果是拆包序列2进入，需要重置byteBuf的读位置，进行重新匹配 * 匹配布上的数据 @@ -75,7 +75,7 @@ } /** - * todo: 解析字组合前导码匹配 scene: 组合字段匹配组合配置 + * 解析字组合前导码匹配 scene: 组合字段匹配组合配置 * 1、解析字前导码长度，根据长度进行匹配 * 2、采用有限匹配原则，不允许匹配字符包含 * @@ -88,7 +88,7 @@ Set> en = fieldFixedMap.entrySet(); for (Map.Entry entry : en) { String key = entry.getKey(); - if (doMatchRightLeadCode(key, protocolContent)) { + if (doMatchLeftLeadCode(key, protocolContent)) { return entry.getValue(); } } @@ -97,7 +97,7 @@ } /** - * todo:默认获取其中使用最多的长度Id + * 默认获取其中使用最多的长度Id * 1、统计最多长度配置 * 2、随机选取配置最多的配置 */ @@ -111,10 +111,10 @@ } /** - * todo: 右前导码匹配 + * 右前导码匹配 * 以前导码长度执行字符串的截取，是否相等，保证匹配的前导准确性 */ - private static Boolean doMatchRightLeadCode(String preFix, String matchContent) { + private static Boolean doMatchLeftLeadCode(String preFix, String matchContent) { if (preFix.endsWith("x")) { while (preFix.endsWith("x")) { preFix = preFix.substring(0, preFix.length() - 1); @@ -126,7 +126,7 @@ } /** - * todo: 对帧进行配置协议的识别 + * 对帧进行配置协议的识别 * 以前导码长度进行截取字符串长度，是否相等，获取帧内是否有存在的识别协议 */ private static Map doMatchMiddleLeadCode(ProtocolConfig protocolConfig, String matchContent) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java index 980d22d..2e0d6cb 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameLengthMatcher.java @@ -20,7 +20,7 @@ public class FrameLengthMatcher extends FrameStructMatchSupport implements FrameStructMatcher { /** - * todo:通过长度获取完整的协议数据报文 + * 通过长度获取完整的协议数据报文 * 1、如果没有配置结尾标志和拆包长度，可以直接使用长度进行匹配 * 2、长度相等的16进制串，执行CRC校验成功，获取完整的协议数据报文 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java index 1f4eee9..15ea56f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameMarkMatcher.java @@ -24,7 +24,7 @@ /** * @author cz - * todo:后续标志获取完整实例数据报文 + * 后续标志获取完整实例数据报文 *

* 处理粘包分为以下情况 * 1、通过后续标志位没有结束，并且继续查询临近帧的时候，没有该数据帧的结束，则进行临时存储，存储时长为当前通道所对应的半小时时长 @@ -69,7 +69,7 @@ } /** - * todo: 获取完整的报文，有历史包进行帧结构合并 + * 获取完整的报文，有历史包进行帧结构合并 *

* 查询是否有历史半包帧，获取历史帧尾部列表 * 1、当前帧为结尾标志帧，进行尾结点添加 @@ -115,7 +115,7 @@ /** - * todo: 存储当前不需要直接进行的帧结构及相应的帧结构信息 + * 存储当前不需要直接进行的帧结构及相应的帧结构信息 * * @param protocolFactory * @param byteBuf @@ -144,7 +144,7 @@ } /** - * todo: 获取历史存在的缓存列表，同时按照指定的序列号进行排序 + * 获取历史存在的缓存列表，同时按照指定的序列号进行排序 * * @param key * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java index fd18bf4..626fed3 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/impl/FrameTailMatcher.java @@ -15,7 +15,7 @@ import org.springframework.util.ObjectUtils; /** - * todo: 结尾标志获取完整的数据报文 + * 结尾标志获取完整的数据报文 * 这里对尾部标志位经验较少，可以进行后续扩展增加 */ @Order(2) diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java index 4c612f4..289338a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/matcher/store/MatchDataStore.java @@ -11,7 +11,7 @@ import java.util.concurrent.TimeUnit; /** - * todo：匹配数据store + * 匹配数据store */ public class MatchDataStore { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java index 27f3c77..f5e671b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/PretreatmentSupport.java @@ -10,7 +10,7 @@ public class PretreatmentSupport { /** - * todo: 取第一个大括号，对应的右括号下标值 + * 取第一个大括号，对应的右括号下标值 * 算法流程 * 1、初始化totalRightBracket为0 * 2、获取首个“{”压栈，totalRightBracket加偏移下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java index 588d412..3e0fe74 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/AepPretreatment.java @@ -35,7 +35,8 @@ } /** - * todo: 执行aep平台前的协议解析 预处理为标准的协议报文 + * 执行aep平台前的协议解析 预处理为标准的协议报文 + * ****有http的server */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java index 43ee69d..4ae0495 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/predecodec/impl/NbPretreatment.java @@ -31,7 +31,7 @@ } /** - * todo: 执行np平台前的协议解析 预处理为标准的协议报文 + * 执行np平台前的协议解析 预处理为标准的协议报文 */ @Override public ByteBuf decode(ByteBuf msg) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java index 67ce2f3..63dd7de 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/AbstractReplyCommandPostProcessing.java @@ -12,7 +12,7 @@ * 可任意构建自己的命令 * * @author cz - * todo: 过滤筛选器抽象类，进行特定内容的指令下发 + * 过滤筛选器抽象类，进行特定内容的指令下发 */ public interface AbstractReplyCommandPostProcessing extends ReplyCommandEnum { @@ -20,7 +20,7 @@ /** * 走一层过滤，没有走默认配置，加自己默认的过滤 *

- * todo:回复命令构建 + * 回复命令构建 * * @param bizDataMap * @param ruleConfigFactory diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java index cf0dba0..a5c51a6 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/processor/field/TimeFormatFieldProcessor.java @@ -8,7 +8,7 @@ import java.util.Map; /** - * todo:后置处理器，将散落解析的时间进行合并 + * 后置处理器，将散落解析的时间进行合并 * * @author cz */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java index 8291f68..981d235 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/FieldParserSupport.java @@ -10,7 +10,7 @@ public class FieldParserSupport { /** - * todo: 计算协议配置字段的总长度 + * 计算协议配置字段的总长度 * 1、分别计算bit和byte长度 * 2、合并长度 */ @@ -29,7 +29,7 @@ } /** - * todo:最大固定位置下标 + * 最大固定位置下标 * * 1、获取没有指定起始位置的业务内容后的字段配置集合 * 2、分别计算固定值最大长度和业务内容后字段配置进行相减得到计算结果即是固定位置下标 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java index 7901ce0..4047da9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/GenericFiledRuleResolver.java @@ -19,7 +19,7 @@ public class GenericFiledRuleResolver { /** - * todo: 拿到所有的值合并到一个值 + * 拿到所有的值合并到一个值 * 无论是bit位的解析，还是byte的解析，统一都转换成byte进行规则的换算解析 * 1、必须进行byte与值的类型转换 * 2、存在可能，对值进行运算 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 338be3d..a9af4e8 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 @@ -28,7 +28,7 @@ public class GenericCombinedFieldResolver { /** - * todo: 组合字段解析主要流程类 + * 组合字段解析主要流程类 * 通过查询，字段长度长度随机 */ diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java index 8eb3362..33d83ae 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/BizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class BizFieldParseProcessor implements AbstractCombinedFieldProcessor { /** - * todo: 业务字段解析 + * 业务字段解析 * * @param combinedFieldParam * @return @@ -50,7 +50,7 @@ } /** - * todo:计算处理后的偏移位置 + * 计算处理后的偏移位置 */ private Integer calculateAfterProcessPosition(AbstractFieldConfig newProtocolFieldConfig, CombinedFieldProcessorParam combinedFieldParam) { Integer originPositionIndex = newProtocolFieldConfig.getOriginPositionByte() - combinedFieldParam.getByteBuf().readerIndex(); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java index 2f1f32a..8a28f6b 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreBizFieldParseProcessor.java @@ -22,7 +22,7 @@ public class PreBizFieldParseProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor { /** - * todo: 计算业务字段长度，同时拿到对应指定的字段解析配置 + * 计算业务字段长度，同时拿到对应指定的字段解析配置 * * @param combinedFieldParam * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java index 515d988..e64f0da 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/combined/impl/PreLeadCodeProcessor.java @@ -22,7 +22,7 @@ public class PreLeadCodeProcessor extends CombinedFieldSupport implements AbstractCombinedFieldProcessor, PreLeadCodeParseStatus { /** - * todo:前导码匹配 + * 前导码匹配 * 匹配获取前导码，找到对应的组合字段配置，并将报文读位置前移 * * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java index 2e374bb..0375b81 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/BitFieldParser.java @@ -22,7 +22,7 @@ public class BitFieldParser extends GenericFiledRuleResolver { /** - * todo: 位字段解析 + * 位字段解析 * 1、单个字节情况表示字段 * 2、多字节情况表示字段（暂未处理） */ @@ -91,7 +91,7 @@ /** - * todo: 从二进制字符串转为byte[] + * 从二进制字符串转为byte[] * * @param binaryStr * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java index c1ca720..8999afc 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/ByteFieldParser.java @@ -19,7 +19,7 @@ /** - * todo: 字节字段解析核心类 + * 字节字段解析核心类 * 存在rule_json走自定义的规则设置，没有则支持默认配置的规则设置 * * @param byteBuf @@ -37,7 +37,7 @@ } /** - * todo: 默认解析方法 + * 默认解析方法 * * @param byteBuf * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java index 687e786..d6bf1c2 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/resolver/fields/DefaultProtocolFieldParser.java @@ -24,7 +24,7 @@ public class DefaultProtocolFieldParser extends FieldParserSupport implements FieldParser, FrameStructEnum { /** - * todo:按照配置和待解析的缓冲池解析字段 + * 按照配置和待解析的缓冲池解析字段 * * @param protocolFieldConfigs 字段配置集合 * @param storeObjectMap 待存储的字段集合 @@ -46,7 +46,7 @@ } /** - * todo: 解析和协议帧结构相关的协议字段结合（位置、长度等信息） + * 解析和协议帧结构相关的协议字段结合（位置、长度等信息） * * @param protocolFieldConfigs * @param totalLength @@ -65,7 +65,7 @@ } /** - * todo: 获取业务内容的byteBuf + * 获取业务内容的byteBuf * 主要流程如下所示 * 1、通过协议配置计算固定长度 * 2、固定字段列表=> 计算固定字段长度=> 计算业务内容起始位置=>结合总长度，计算业务内容长度=>得到业务内容 @@ -87,7 +87,7 @@ } /** - * todo:获取过滤字段的长度 + * 获取过滤字段的长度 */ @Override public Integer totalFilterLength(ProtocolConfig protocolConfig, diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java index f8a359e..7023028 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/rule/GenericRuleResolver.java @@ -12,7 +12,7 @@ public class GenericRuleResolver { /** - * todo: 匹配规则 + * 匹配规则 * * 1、准备前置规则字段集合 * 2、准备固定字段集合 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 04e4e36..204b4dc 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 @@ -8,7 +8,7 @@ import java.util.*; /** - * todo: 规则匹配的核心类 + * 规则匹配的核心类 * * @author cz * @date 2023-6-12 @@ -18,7 +18,7 @@ /** - * todo: 规则匹配核心方法 + * 规则匹配核心方法 * 1、通过前置字段集合匹配规则 * 2、判断规则终止标记字段是否已经完成匹配 * （1）完成匹配，返回当前的规则 @@ -58,7 +58,7 @@ /** - * todo: 获取规则字段列表 + * 获取规则字段列表 * * @param preRuleConfigList * @param fixedDataMap @@ -79,7 +79,7 @@ /** - * todo:匹配规则配置 + * 匹配规则配置 * * @param ruleMap * @param metaDataMap diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java index 8652ef0..787874a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/sender/impl/FunctionCallback.java @@ -27,7 +27,7 @@ } /** - * todo:通过post方法执行方法回调 + * 通过post方法执行方法回调 * * @param json * @param url diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java index 514f88e..d7ed3e7 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/CombinedFieldConfigProvider.java @@ -34,7 +34,7 @@ /** - * todo: 解析数据字段 + * 解析数据字段 * * @param ruleConfig * @param byteBuf @@ -54,7 +54,7 @@ } /** - * todo：查询规则对应的组合配合 + * 查询规则对应的组合配合 * 准备，过滤字段列表，选取所需的值 * * @param ruleConfig diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java index 1c96040..97a78ad 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/FieldConfigProvider.java @@ -41,7 +41,7 @@ } /** - * todo:解析数据字段 + * 解析数据字段 * * @param ruleConfig * @param byteBuf @@ -66,7 +66,7 @@ } /** - * todo: 根据规则查询业务字段 + * 根据规则查询业务字段 * * 得到需要处理的业务内容 * diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java index dceeb89..b2974a5 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProcessorInstanceProvider.java @@ -49,7 +49,7 @@ } /** - * todo: 报文解密 + * 报文解密 * 1、否有动态bean,没有去设置的bean,有则取之 * 2、bean不为空，进行解密操作，否则返回原文 * @@ -72,7 +72,7 @@ /** - * todo: 报文加密 + * 报文加密 *

* 如果进行过解密操作，那么回复自动判定密文需要加密并按照同样的加密的方式进行回复 */ @@ -93,7 +93,7 @@ } /** - * todo:解密清零操作 + * 解密清零操作 * * @param plainBuf * @return @@ -108,7 +108,7 @@ } /** - * todo: 加密补零操作 + * 加密补零操作 */ private ByteBuf fillFrameStructZero(ByteBuf replyBytes) { while (ByteBufUtil.hexDump(replyBytes).length() % 32 == 0) { @@ -119,7 +119,7 @@ /** - * todo: 数据订阅 + * 数据订阅 */ public void storeData(List> bizDataMap) { // DataSubscribeProvider dataSubscribeProvider = SpringContextUtil.getBean(processorInstance.getSubscribeBean()); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java index 90e4b18..5ffdcaa 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/ProtocolFieldConfigProvider.java @@ -46,7 +46,7 @@ } /** - * todo:初始化获取对应协议的配置字段列表 + * 初始化获取对应协议的配置字段列表 * * @param protocolId */ @@ -69,7 +69,7 @@ } /** - * todo:通过协议字段id和协议报文获取该配置实例化内容的值 + * 通过协议字段id和协议报文获取该配置实例化内容的值 * * @param protocolFieldId * @param byteBuf @@ -114,7 +114,7 @@ } /** - * todo:获取帧固定位置字段配置信息 + * 获取帧固定位置字段配置信息 * * @param byteBuf * @param protocolConfig @@ -141,7 +141,7 @@ /** - * todo:获取帧固定位置字段配置信息 + * 获取帧固定位置字段配置信息 * * @param byteBuf * @param protocolConfig @@ -166,7 +166,7 @@ } /** - * todo:获取过滤字段的长度 + * 获取过滤字段的长度 */ public Integer getTotalFilterLength(ProtocolConfig protocolConfig) { if (showSkip()) { @@ -185,7 +185,7 @@ /** - * todo:获取帧结构应有的总长度 + * 获取帧结构应有的总长度 */ public Integer getTotalLength(ByteBuf byteBuf, ProtocolConfig protocolConfig) { if (showSkip()) { @@ -211,7 +211,7 @@ } /** - * todo:获取协议有关字段解析内容 + * 获取协议有关字段解析内容 * storeObjectMap存储代转存的数据 * * @return @@ -237,7 +237,7 @@ } /** - * todo:获取业务报文内容的content字节 + * 获取业务报文内容的content字节 * * @param wholeDatagramByte * @return @@ -261,7 +261,7 @@ } /** - * todo:对解密的内容进行尾部清零操作 + * 对解密的内容进行尾部清零操作 *

* 根据解析后的业务内容，通过存储的帧结构，创建完整完整的数据报文， * 这里对帧结构的可变报文没有处理，只是简单的组装,保证提前解密，为帧结构检验做准备 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java b/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java index 7872a3c..4981167 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/provider/RuleConfigProvider.java @@ -36,7 +36,7 @@ } /** - * todo: 获取规则匹配结果 + * 获取规则匹配结果 * * @param parseFixedDataMap * @param protocolFieldConfigs 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 b4a0f0a..8e6b55e 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,7 +14,7 @@ public class SensorhubReplier extends SimpleChannelInboundHandler { /** - * todo: 回复内容构建的流程入口方法 + * 回复内容构建的流程入口方法 * 1、通过有标准协议解析器传来的结果进行命令的构建 * 2、构建命令有以下的命令内容 * （1）成功返回时间，并进行下发配置操作 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 a7bb1b8..b4dd1ba 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 @@ -25,7 +25,7 @@ public class DataReplyCommand extends ReplyCommandSupport implements AbstractBuildReplyCommand { /** - * todo: 报文构建命令 + * 报文构建命令 * 成功解析帧结构内容，进行下发成功回复命令的主要流程方法 * 其构建流程逻辑如下: * 1、初始化回复报文配置 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/replier/command/ReplyCommandSupport.java b/sensorhub-core/src/main/java/com/casic/missiles/replier/command/ReplyCommandSupport.java index 4d60246..f051dc9 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/replier/command/ReplyCommandSupport.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/replier/command/ReplyCommandSupport.java @@ -35,7 +35,7 @@ /** - * todo: 执行默认回复配置 + * 执行默认回复配置 *

* 组合字段解析，单字段解析 * 构建业务字段的byteBuf @@ -60,7 +60,7 @@ } /** - * todo: 执行下发配置 + * 执行下发配置 *

* 取redis相关配置的值，查询相关的配置进行构建返回的帧业务内容 * @@ -91,7 +91,7 @@ } /** - * todo:计算帧长度 + * 计算帧长度 * 1、获取过滤字段长度 * 2、获取字段长度配置，构建长度业务字段集合 */ @@ -107,7 +107,7 @@ /** - * todo:构建业务前固定内容 + * 构建业务前固定内容 * 1、筛选业务内容前固定配置 * 2、排序 * 3、以完整的byte为单位，构建组合集合进行回复报文的构建 @@ -188,7 +188,7 @@ } /** - * todo: 构建回复配置固定字段配置 + * 构建回复配置固定字段配置 * 1、判断配置的协议字段是否有变化， * （1）通过协议配置，没有变化则直接使用 * （2）有变化则以byte为列表执行报文的构建 diff --git a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/BitFieldDecorator.java b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/BitFieldDecorator.java index d7e178d..ff58f89 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/BitFieldDecorator.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/BitFieldDecorator.java @@ -19,7 +19,7 @@ public class BitFieldDecorator { /** - * todo: 构建bitBuf + * 构建bitBuf * * @param fieldConfig * @param currentConfigValue @@ -63,7 +63,7 @@ /** - * todo: 从二进制字符串转为byte[] + * 从二进制字符串转为byte[] * * @param binaryStr * @return @@ -78,7 +78,7 @@ } /** - * todo: 把byte转化成2进制字符串 + * 把byte转化成2进制字符串 */ private static String getBinaryStrFromByte(byte value) { String result = ""; diff --git a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/ByteFieldDecorator.java b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/ByteFieldDecorator.java index a4d8ebc..b58e1d0 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/ByteFieldDecorator.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/ByteFieldDecorator.java @@ -19,7 +19,7 @@ public class ByteFieldDecorator { /** - * todo:定制化的和默认的byte回复报文构建 + * 定制化的和默认的byte回复报文构建 * * @param fieldConfig * @param currentConfigValue @@ -35,7 +35,7 @@ /** - * todo: 默认byte构建修饰器 + * 默认byte构建修饰器 * * @param fieldConfig * @param currentValue @@ -47,7 +47,7 @@ } /** - * todo： 定制化的byte报文构建修饰器 + * 定制化的byte报文构建修饰器 * 1、执行前置规则处理 * 2、调用默认的报文构建 * diff --git a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/DefaultValueTypeResolver.java b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/DefaultValueTypeResolver.java index 5f94b81..c6a93a6 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/DefaultValueTypeResolver.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/DefaultValueTypeResolver.java @@ -12,7 +12,7 @@ public class DefaultValueTypeResolver implements AbstractValueTypeResolver { /** - * todo: 执行业务值得构建 + * 执行业务值得构建 * 1、判断业务类型内容，执行类型转化为16进制的报文 * 2、执行回复报文的构建 * @@ -27,7 +27,7 @@ } /** - * todo: 将str转化bytebuf + * 将str转化bytebuf * * @param totalLength 应填充的总长度 * @param currentStrValue 待填充的字符串 @@ -53,7 +53,7 @@ } /** - * todo：将对象转化16进制的字符串 + * 将对象转化16进制的字符串 * * @param currentObjectValue * @return diff --git a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/FieldReverseDecorator.java b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/FieldReverseDecorator.java index 9d8ae1e..31ebf8f 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/FieldReverseDecorator.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/replier/decorator/FieldReverseDecorator.java @@ -29,7 +29,7 @@ /** - * todo: 组合字段的报文构建 + * 组合字段的报文构建 * (1) 处理前导字段的反构 * (2)处理长度字段的反构 * (3)将核心字段的反构，交给解析器进行反构 @@ -64,7 +64,7 @@ /** - * todo: 字段解析反构 + * 字段解析反构 * 1、字段配置排序 * 2、检查配置是否是完整的byte组合解析 * 3、遍历待解析的配置集合，执行协议报告构建 @@ -99,7 +99,7 @@ } /** - * todo:处理非完整的字节字段处理方式,动态的业务字段和静态的业务字段 + * 处理非完整的字节字段处理方式,动态的业务字段和静态的业务字段 * （1）bit单位构建报文 * (2)byte单位构建报文 * diff --git a/sensorhub-support/src/main/java/com/casic/missiles/pojo/RuleConfig.java b/sensorhub-support/src/main/java/com/casic/missiles/pojo/RuleConfig.java index a318b2f..63d5758 100644 --- a/sensorhub-support/src/main/java/com/casic/missiles/pojo/RuleConfig.java +++ b/sensorhub-support/src/main/java/com/casic/missiles/pojo/RuleConfig.java @@ -7,7 +7,7 @@ /** * @author cz - * todo： 匹配协议对应业务实例 + * 匹配协议对应业务实例 * 1、一个协议可以多种的流程规则 * 2、规则可以支持递归规则流程 */ diff --git a/sensorhub-support/src/main/java/com/casic/missiles/registry/impl/SubscribeRegistryImpl.java b/sensorhub-support/src/main/java/com/casic/missiles/registry/impl/SubscribeRegistryImpl.java index 8fa1999..dcdb909 100644 --- a/sensorhub-support/src/main/java/com/casic/missiles/registry/impl/SubscribeRegistryImpl.java +++ b/sensorhub-support/src/main/java/com/casic/missiles/registry/impl/SubscribeRegistryImpl.java @@ -37,7 +37,7 @@ } /** - * todo: 设置订阅配置明细信息 + * 设置订阅配置明细信息 * * @param subscribeDetailConfigs */