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 142e1f2..3446e7b 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 @@ -32,7 +32,7 @@ */ @Override public Object invoke(CombinedFieldProcessorParam combinedFieldParam) throws RuntimeException { - log.debug(combinedFieldParam.getPlainPackMsg()); + log.debug(combinedFieldParam.getPlainPackMsg().substring(combinedFieldParam.getCurrentParsePosition()*2 )); List protocolFieldConfigs = (List) combinedFieldParam.getPreProcessorResult(); Assert.isFalse(CollectionUtils.isEmpty(protocolFieldConfigs), () -> { throw new EngineException(EngineExceptionEnum.COMBINED_FIELD_NULL); 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 142e1f2..3446e7b 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 @@ -32,7 +32,7 @@ */ @Override public Object invoke(CombinedFieldProcessorParam combinedFieldParam) throws RuntimeException { - log.debug(combinedFieldParam.getPlainPackMsg()); + log.debug(combinedFieldParam.getPlainPackMsg().substring(combinedFieldParam.getCurrentParsePosition()*2 )); List protocolFieldConfigs = (List) combinedFieldParam.getPreProcessorResult(); Assert.isFalse(CollectionUtils.isEmpty(protocolFieldConfigs), () -> { throw new EngineException(EngineExceptionEnum.COMBINED_FIELD_NULL); 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 262c8b8..f5ca2e2 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 @@ -32,7 +32,7 @@ */ @Override public Object invoke(CombinedFieldProcessorParam combinedFieldParam) throws RuntimeException { - log.debug(combinedFieldParam.getPlainPackMsg()); + log.debug(combinedFieldParam.getPlainPackMsg().substring(combinedFieldParam.getCurrentParsePosition()*2 )); CombinedFieldConfig combinedFieldConfig = (CombinedFieldConfig) combinedFieldParam.getPreProcessorResult(); String[] dataFieldIds = combinedFieldConfig.getDataFieldIds().split(","); Integer fieldValue = getLengthFieldValue(combinedFieldConfig.getDynamicLengthId(), combinedFieldParam); 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 142e1f2..3446e7b 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 @@ -32,7 +32,7 @@ */ @Override public Object invoke(CombinedFieldProcessorParam combinedFieldParam) throws RuntimeException { - log.debug(combinedFieldParam.getPlainPackMsg()); + log.debug(combinedFieldParam.getPlainPackMsg().substring(combinedFieldParam.getCurrentParsePosition()*2 )); List protocolFieldConfigs = (List) combinedFieldParam.getPreProcessorResult(); Assert.isFalse(CollectionUtils.isEmpty(protocolFieldConfigs), () -> { throw new EngineException(EngineExceptionEnum.COMBINED_FIELD_NULL); 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 262c8b8..f5ca2e2 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 @@ -32,7 +32,7 @@ */ @Override public Object invoke(CombinedFieldProcessorParam combinedFieldParam) throws RuntimeException { - log.debug(combinedFieldParam.getPlainPackMsg()); + log.debug(combinedFieldParam.getPlainPackMsg().substring(combinedFieldParam.getCurrentParsePosition()*2 )); CombinedFieldConfig combinedFieldConfig = (CombinedFieldConfig) combinedFieldParam.getPreProcessorResult(); String[] dataFieldIds = combinedFieldConfig.getDataFieldIds().split(","); Integer fieldValue = getLengthFieldValue(combinedFieldConfig.getDynamicLengthId(), combinedFieldParam); 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 5d85656..4a02ef8 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 @@ -35,9 +35,9 @@ @Override public Object invoke(CombinedFieldProcessorParam combinedFieldParam) throws RuntimeException { //前导码匹配 - log.debug(combinedFieldParam.getPlainPackMsg()); + log.debug(combinedFieldParam.getPlainPackMsg().substring(combinedFieldParam.getCurrentParsePosition()*2 )); CombinedFieldConfig combinedFieldConfig = LeadingCodeMatcher.matchFieldLeadingCode(combinedFieldParam.getFieldFixedMap(), - combinedFieldParam.getPlainPackMsg()); + combinedFieldParam.getPlainPackMsg().substring(combinedFieldParam.getCurrentParsePosition()*2)); Assert.isFalse(Objects.isNull(combinedFieldConfig), () -> { throw new EngineException(EngineExceptionEnum.COMBINED_FIELD_NULL.getCode(), "匹配失败,报文信息是" + combinedFieldParam.getPlainPackMsg() + ",配置信息是" 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 142e1f2..3446e7b 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 @@ -32,7 +32,7 @@ */ @Override public Object invoke(CombinedFieldProcessorParam combinedFieldParam) throws RuntimeException { - log.debug(combinedFieldParam.getPlainPackMsg()); + log.debug(combinedFieldParam.getPlainPackMsg().substring(combinedFieldParam.getCurrentParsePosition()*2 )); List protocolFieldConfigs = (List) combinedFieldParam.getPreProcessorResult(); Assert.isFalse(CollectionUtils.isEmpty(protocolFieldConfigs), () -> { throw new EngineException(EngineExceptionEnum.COMBINED_FIELD_NULL); 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 262c8b8..f5ca2e2 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 @@ -32,7 +32,7 @@ */ @Override public Object invoke(CombinedFieldProcessorParam combinedFieldParam) throws RuntimeException { - log.debug(combinedFieldParam.getPlainPackMsg()); + log.debug(combinedFieldParam.getPlainPackMsg().substring(combinedFieldParam.getCurrentParsePosition()*2 )); CombinedFieldConfig combinedFieldConfig = (CombinedFieldConfig) combinedFieldParam.getPreProcessorResult(); String[] dataFieldIds = combinedFieldConfig.getDataFieldIds().split(","); Integer fieldValue = getLengthFieldValue(combinedFieldConfig.getDynamicLengthId(), combinedFieldParam); 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 5d85656..4a02ef8 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 @@ -35,9 +35,9 @@ @Override public Object invoke(CombinedFieldProcessorParam combinedFieldParam) throws RuntimeException { //前导码匹配 - log.debug(combinedFieldParam.getPlainPackMsg()); + log.debug(combinedFieldParam.getPlainPackMsg().substring(combinedFieldParam.getCurrentParsePosition()*2 )); CombinedFieldConfig combinedFieldConfig = LeadingCodeMatcher.matchFieldLeadingCode(combinedFieldParam.getFieldFixedMap(), - combinedFieldParam.getPlainPackMsg()); + combinedFieldParam.getPlainPackMsg().substring(combinedFieldParam.getCurrentParsePosition()*2)); Assert.isFalse(Objects.isNull(combinedFieldConfig), () -> { throw new EngineException(EngineExceptionEnum.COMBINED_FIELD_NULL.getCode(), "匹配失败,报文信息是" + combinedFieldParam.getPlainPackMsg() + ",配置信息是" 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 d5ae880..bc83c09 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 @@ -113,7 +113,7 @@ return packBodyMsg; } - public String getPlainTextDatagram(String replyBodyMsg,Supplier fieldLengthSupplier) { + public String getPlainTextDatagram(String replyBodyMsg, Supplier fieldLengthSupplier) { textPlain = true; String safeName = matchingRuleConfig.getSafeBean(); if (!StringUtils.isEmpty(safeName)) { @@ -167,7 +167,7 @@ */ private String clearComplementZero(String plainMsg, int bizFieldLength) { Integer plainLength = plainMsg.length() / 2; - while ("00".equals(plainMsg.substring((plainLength - 1)*2, plainLength*2)) + while ("00".equals(plainMsg.substring((plainLength - 1) * 2, plainLength * 2)) && plainLength >= bizFieldLength) { plainLength--; } @@ -179,7 +179,7 @@ * 加密补零操作 */ private String fillFrameStructZero(String replyMsgStr, Integer safeLength) { - while (replyMsgStr.length() % (safeLength*2) != 0) { + while (replyMsgStr.length() % (safeLength * 2) != 0) { replyMsgStr += "00"; } return replyMsgStr; @@ -193,5 +193,4 @@ private Boolean showSkip() { return CollectionUtils.isNotEmpty(ruleConfigs) ? false : true; } - }