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 ab6e354..33a2d82 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 @@ -1,7 +1,6 @@ package com.casic.missiles.replier.command; import cn.hutool.core.util.ObjectUtil; -import com.casic.missiles.enums.ReplyCommandEnum; import com.casic.missiles.parser.crc.CRC16; import com.casic.missiles.pojo.FieldConfig; import com.casic.missiles.pojo.ParseResult; 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 ab6e354..33a2d82 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 @@ -1,7 +1,6 @@ package com.casic.missiles.replier.command; import cn.hutool.core.util.ObjectUtil; -import com.casic.missiles.enums.ReplyCommandEnum; import com.casic.missiles.parser.crc.CRC16; import com.casic.missiles.pojo.FieldConfig; import com.casic.missiles.pojo.ParseResult; 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 21c017a..15f113b 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 @@ -49,6 +49,9 @@ * @return */ protected Map beforeRuleReply(ParseResult parseResult) { + if (ReplyCommandEnum.SUCCESS_DATA.equals(parseResult.getReplyCommand())) { + return null; + } String deviceType = String.valueOf(parseResult.getBizDataMap().get(DEVICE_TYPE)); Map bizDataMap = new HashMap<>(); //2状态拿到的时候,执行的升级文件的缓存,同时更新最新文件,不用进去文件的 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 ab6e354..33a2d82 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 @@ -1,7 +1,6 @@ package com.casic.missiles.replier.command; import cn.hutool.core.util.ObjectUtil; -import com.casic.missiles.enums.ReplyCommandEnum; import com.casic.missiles.parser.crc.CRC16; import com.casic.missiles.pojo.FieldConfig; import com.casic.missiles.pojo.ParseResult; 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 21c017a..15f113b 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 @@ -49,6 +49,9 @@ * @return */ protected Map beforeRuleReply(ParseResult parseResult) { + if (ReplyCommandEnum.SUCCESS_DATA.equals(parseResult.getReplyCommand())) { + return null; + } String deviceType = String.valueOf(parseResult.getBizDataMap().get(DEVICE_TYPE)); Map bizDataMap = new HashMap<>(); //2状态拿到的时候,执行的升级文件的缓存,同时更新最新文件,不用进去文件的 diff --git a/sensorhub-support/src/main/java/com/casic/missiles/util/AviatorUtil.java b/sensorhub-support/src/main/java/com/casic/missiles/util/AviatorUtil.java index 45c50eb..fc13be9 100644 --- a/sensorhub-support/src/main/java/com/casic/missiles/util/AviatorUtil.java +++ b/sensorhub-support/src/main/java/com/casic/missiles/util/AviatorUtil.java @@ -33,7 +33,7 @@ // } // env2.put("list", list); - Object values = String.valueOf(AviatorEvaluator.execute("dateTime=date_to_string(sysdate(),'yyyyMMdd');string.replace_first(dateTime,\"2\",\"0\")")); + Object values = String.valueOf(AviatorEvaluator.execute("dateTime=date_to_string(sysdate(),'yyyyMMddHHmmss');string.replace_first(dateTime,\"20\",\"\")")); System.out.println(values); // int i = 0; }