From d0eabfd08f981dd0c9209b706bbcb2def19e8fc8 Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Thu, 9 Feb 2023 19:46:46 +0800
Subject: [PATCH] =?UTF-8?q?fix=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logging/service/impl/EsLogServiceImpl.java       | 12 +++++-------
 .../src/main/resources/logback-spring.xml            |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

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
 
     <!--开发环境:打印控制台-->
     <springProfile name="dev">
-        <root level="info">
+        <root level="debug">
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="asyncFileAppender"/>
             <appender-ref ref="esLogAppender" />