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 278e77d..d177fc3 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 @@ -42,6 +42,7 @@ if (StringUtils.isNotEmpty(rulePrepareFields)) { //获取统一固定字段解析 Map parseFixedDataMap = protocolFieldConfigProvider.getProtocolDataMap(wholeDatagramByte, protocolConfig.getFieldRuleConfigMap()); + log.info("协议字段内容为" + JSON.toJSONString(parseFixedDataMap) ); //获取该协议的字段配置,用于协议规则匹配 List protocolFieldConfigs = protocolFieldConfigProvider.getProtocolFieldConfigs(); //获取规则 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 278e77d..d177fc3 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 @@ -42,6 +42,7 @@ if (StringUtils.isNotEmpty(rulePrepareFields)) { //获取统一固定字段解析 Map parseFixedDataMap = protocolFieldConfigProvider.getProtocolDataMap(wholeDatagramByte, protocolConfig.getFieldRuleConfigMap()); + log.info("协议字段内容为" + JSON.toJSONString(parseFixedDataMap) ); //获取该协议的字段配置,用于协议规则匹配 List protocolFieldConfigs = protocolFieldConfigProvider.getProtocolFieldConfigs(); //获取规则 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 a5c51a6..f9894b6 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; /** - * 后置处理器,将散落解析的时间进行合并 + * 后置处理器,将散落解析的时间进行合并 * * @author cz */ @@ -32,16 +32,17 @@ Calendar mergeTime = Calendar.getInstance(); int hourOfDay = (Integer) storeObjectMap.get("采集时间") / 60; int minute = (Integer) storeObjectMap.get("采集时间") % 60; - mergeTime.set((Integer) storeObjectMap.get("年") + 2018, (Integer) storeObjectMap.get("月"), + mergeTime.set((Integer) storeObjectMap.get("年") + 2000, (Integer) storeObjectMap.get("月") - 1, (Integer) storeObjectMap.get("日"), hourOfDay, minute); return mergeTime; } private void mergeAllTimeFormat(List> storeFieldList, Calendar tailMergeTime, Integer interval) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + Calendar tempTailTime = tailMergeTime; for (int i = storeFieldList.size() - 1; i >= 0; i--) { Map storeObjectMap = storeFieldList.get(i); - tailMergeTime.add(Calendar.MINUTE, -interval); + tempTailTime.add(Calendar.MINUTE, -(i * interval)); storeObjectMap.put("采集时间", sdf.format(tailMergeTime.getTime())); storeObjectMap.remove("月"); storeObjectMap.remove("年");