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 ec98333..b8e4838 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 @@ -125,13 +125,13 @@ frameHeader = hexDump.substring(0, expiringByteBuf.getFixPosition() * 2); //首次获取业务数据报文,明文合并,密文合并还存在问题 String encipherHex = hexDump.substring(expiringByteBuf.getFixPosition() * 2, (expiringByteBuf.getTailPosition()) * 2); - String plainText = ruleConfigProvide.getPlainTextDatagram(encipherHex, protocolFactory.getProtocolFieldConfigProvider().getFixFieldConfigMap(), fieldLengthSupplier); + String plainText = ruleConfigProvide.getPlainTextDatagram(encipherHex, fieldLengthSupplier); frameBody = plainText; frameTail = hexDump.substring(expiringByteBuf.getTailPosition() * 2); } else { //是否需要解密 String encipherHex = hexDump.substring(expiringByteBuf.getFixPosition() * 2, (expiringByteBuf.getTailPosition()) * 2); - String plainText = ruleConfigProvide.getPlainTextDatagram(encipherHex, protocolFactory.getProtocolFieldConfigProvider().getFixFieldConfigMap(), fieldLengthSupplier); + String plainText = ruleConfigProvide.getPlainTextDatagram(encipherHex, fieldLengthSupplier); frameBody += plainText; } } 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 ec98333..b8e4838 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 @@ -125,13 +125,13 @@ frameHeader = hexDump.substring(0, expiringByteBuf.getFixPosition() * 2); //首次获取业务数据报文,明文合并,密文合并还存在问题 String encipherHex = hexDump.substring(expiringByteBuf.getFixPosition() * 2, (expiringByteBuf.getTailPosition()) * 2); - String plainText = ruleConfigProvide.getPlainTextDatagram(encipherHex, protocolFactory.getProtocolFieldConfigProvider().getFixFieldConfigMap(), fieldLengthSupplier); + String plainText = ruleConfigProvide.getPlainTextDatagram(encipherHex, fieldLengthSupplier); frameBody = plainText; frameTail = hexDump.substring(expiringByteBuf.getTailPosition() * 2); } else { //是否需要解密 String encipherHex = hexDump.substring(expiringByteBuf.getFixPosition() * 2, (expiringByteBuf.getTailPosition()) * 2); - String plainText = ruleConfigProvide.getPlainTextDatagram(encipherHex, protocolFactory.getProtocolFieldConfigProvider().getFixFieldConfigMap(), fieldLengthSupplier); + String plainText = ruleConfigProvide.getPlainTextDatagram(encipherHex, fieldLengthSupplier); frameBody += plainText; } } 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 f619a27..d5ae880 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, Map fieldConfigMap, Supplier fieldLengthSupplier) { + public String getPlainTextDatagram(String replyBodyMsg,Supplier fieldLengthSupplier) { textPlain = true; String safeName = matchingRuleConfig.getSafeBean(); if (!StringUtils.isEmpty(safeName)) { @@ -134,7 +134,7 @@ *

* 如果进行过解密操作,那么回复自动判定密文需要加密并按照同样的加密的方式进行回复 */ - public String buildSafeDatagram(String replyMsgStr, Map fieldConfigMap) { + public String buildSafeDatagram(String replyMsgStr) { String safeName = matchingRuleConfig.getSafeBean(); String cipherMsg = ""; if (!StringUtils.isEmpty(safeName)) { 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 ec98333..b8e4838 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 @@ -125,13 +125,13 @@ frameHeader = hexDump.substring(0, expiringByteBuf.getFixPosition() * 2); //首次获取业务数据报文,明文合并,密文合并还存在问题 String encipherHex = hexDump.substring(expiringByteBuf.getFixPosition() * 2, (expiringByteBuf.getTailPosition()) * 2); - String plainText = ruleConfigProvide.getPlainTextDatagram(encipherHex, protocolFactory.getProtocolFieldConfigProvider().getFixFieldConfigMap(), fieldLengthSupplier); + String plainText = ruleConfigProvide.getPlainTextDatagram(encipherHex, fieldLengthSupplier); frameBody = plainText; frameTail = hexDump.substring(expiringByteBuf.getTailPosition() * 2); } else { //是否需要解密 String encipherHex = hexDump.substring(expiringByteBuf.getFixPosition() * 2, (expiringByteBuf.getTailPosition()) * 2); - String plainText = ruleConfigProvide.getPlainTextDatagram(encipherHex, protocolFactory.getProtocolFieldConfigProvider().getFixFieldConfigMap(), fieldLengthSupplier); + String plainText = ruleConfigProvide.getPlainTextDatagram(encipherHex, fieldLengthSupplier); frameBody += plainText; } } 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 f619a27..d5ae880 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, Map fieldConfigMap, Supplier fieldLengthSupplier) { + public String getPlainTextDatagram(String replyBodyMsg,Supplier fieldLengthSupplier) { textPlain = true; String safeName = matchingRuleConfig.getSafeBean(); if (!StringUtils.isEmpty(safeName)) { @@ -134,7 +134,7 @@ *

* 如果进行过解密操作,那么回复自动判定密文需要加密并按照同样的加密的方式进行回复 */ - public String buildSafeDatagram(String replyMsgStr, Map fieldConfigMap) { + public String buildSafeDatagram(String replyMsgStr) { String safeName = matchingRuleConfig.getSafeBean(); String cipherMsg = ""; if (!StringUtils.isEmpty(safeName)) { diff --git a/sensorhub-core/src/main/java/com/casic/missiles/replier/command/DefaultReplyCommand.java b/sensorhub-core/src/main/java/com/casic/missiles/replier/command/DefaultReplyCommand.java index a5b1793..1a4c13a 100644 --- a/sensorhub-core/src/main/java/com/casic/missiles/replier/command/DefaultReplyCommand.java +++ b/sensorhub-core/src/main/java/com/casic/missiles/replier/command/DefaultReplyCommand.java @@ -59,7 +59,7 @@ //判断是否有下发配置,获取内容,组建配置,通过设备编号去拿数据 CallTagMsg callTagMsg = buildBizConfigFieldFrame(replyPackMsg, fieldConfigsMap, parseResult, fieldRuleConfigMap); //加密分为,补零 加密报文 - String replyBodyMsg = parseResult.getProtocolFactory().getRuleConfigProvider().buildSafeDatagram(callTagMsg.getPackMsg(), fieldConfigsMap); + String replyBodyMsg = parseResult.getProtocolFactory().getRuleConfigProvider().buildSafeDatagram(callTagMsg.getPackMsg()); //pareFrameBuild Map fixMap = calculatedFrameLength(callTagMsg.getLength(), parseResult.getProtocolFactory()); //参数准备