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 6e6b507..390848c 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 @@ -88,7 +88,6 @@ String key = (String) protocolFactory.getProtocolFieldConfigProvider().getStoreObjectMap().get("devcode"); List sortList = getStoreHalfPackBuf(key); //添加当前的帧信息 -// Map parseFixedDataMap = protocolFactory.getProtocolFieldConfigProvider().getProtocolDataMap(null, protocolConfig.getFieldRuleConfigMap()); sortList.add(MatchDataStore.ExpiringByteBuf.builder() .byteBuf(byteBufContent) .tailPosition(currentFrameFixedProperty.get(TAIL_POSITION)) @@ -96,6 +95,7 @@ .fixedStoreMap(parseFixedDataMap) .build()); //TODO sortList 需要进行seq排序, + //会存在多个帧拼接在一起的的情况,进行合并处理 for (MatchDataStore.ExpiringByteBuf expiringByteBuf : sortList) { ByteBuf currentByteBuf = expiringByteBuf.getByteBuf(); 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 6e6b507..390848c 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 @@ -88,7 +88,6 @@ String key = (String) protocolFactory.getProtocolFieldConfigProvider().getStoreObjectMap().get("devcode"); List sortList = getStoreHalfPackBuf(key); //添加当前的帧信息 -// Map parseFixedDataMap = protocolFactory.getProtocolFieldConfigProvider().getProtocolDataMap(null, protocolConfig.getFieldRuleConfigMap()); sortList.add(MatchDataStore.ExpiringByteBuf.builder() .byteBuf(byteBufContent) .tailPosition(currentFrameFixedProperty.get(TAIL_POSITION)) @@ -96,6 +95,7 @@ .fixedStoreMap(parseFixedDataMap) .build()); //TODO sortList 需要进行seq排序, + //会存在多个帧拼接在一起的的情况,进行合并处理 for (MatchDataStore.ExpiringByteBuf expiringByteBuf : sortList) { ByteBuf currentByteBuf = expiringByteBuf.getByteBuf(); diff --git a/sensorhub-core/src/main/java/com/casic/missiles/parser/safe/impl/Teas.java b/sensorhub-core/src/main/java/com/casic/missiles/parser/safe/impl/Teas.java index 384cd9a..143f899 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/parser/safe/impl/Teas.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/parser/safe/impl/Teas.java @@ -14,7 +14,6 @@ * @author hyl * @version v1.0: Tea.java, v 0.1 2021/3/12 13:48 $ */ -@Component("tea") public class Teas { public static byte[] MyTea_Encrypt(byte[] MyTeaContent, int ByteLen, byte[] MyTeakey) {