diff --git a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/EsLogServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/EsLogServiceImpl.java index 1ec150cfa..9d6ccdd38 100644 --- a/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/EsLogServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/EsLogServiceImpl.java @@ -73,15 +73,13 @@ public class EsLogServiceImpl implements EsLogService { if (StringUtils.isNotEmpty(logQuery.getMessage())){ query.must().add(QueryBuilders.matchQuery("message", logQuery.getMessage()).minimumShouldMatch("80%")); } - if (logQuery.getEndTime()!=null){ - long end = logQuery.getEndTime().getTime(); - query.must().add(QueryBuilders.rangeQuery("@timestamp").gte(logQuery.getEndTime())); + if (logQuery.getEndTime()!=null ){ + String script = "doc['@timestamp'].value.millis < " + logQuery.getEndTime().getTime() + "L"; + query.must().add(QueryBuilders.scriptQuery(new Script(script))); } if (logQuery.getStartTime()!=null){ - long start = logQuery.getStartTime().getTime(); - String script = "doc['@timestamp'].value.millis > "+start+"L"; - Script Script = new Script(script); - query.must().add(QueryBuilders.scriptQuery(Script)); + String script = "doc['@timestamp'].value.millis > " + logQuery.getStartTime().getTime() + "L"; + query.must().add(QueryBuilders.scriptQuery(new Script(script))); } } diff --git a/lms/nladmin-system/src/main/resources/logback-spring.xml b/lms/nladmin-system/src/main/resources/logback-spring.xml index e86c14ebe..66b819723 100644 --- a/lms/nladmin-system/src/main/resources/logback-spring.xml +++ b/lms/nladmin-system/src/main/resources/logback-spring.xml @@ -137,7 +137,7 @@ https://juejin.cn/post/6844903775631572999 - +