root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix时间查询

Browse Source
This commit is contained in:
zhangzhiqiang
2023-02-09 19:46:46 +08:00
parent 4960fd73b5
commit d0eabfd08f
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lms/nladmin-system/src/main/java/org/nl/modules/logging/service/impl/EsLogServiceImpl.java
View File

@@ -73,15 +73,13 @@ public class EsLogServiceImpl implements EsLogService {
if (StringUtils.isNotEmpty(logQuery.getMessage())){ if (StringUtils.isNotEmpty(logQuery.getMessage())){
query.must().add(QueryBuilders.matchQuery("message", logQuery.getMessage()).minimumShouldMatch("80%")); query.must().add(QueryBuilders.matchQuery("message", logQuery.getMessage()).minimumShouldMatch("80%"));
} }
if (logQuery.getEndTime()!=null){ if (logQuery.getEndTime()!=null ){
long end = logQuery.getEndTime().getTime(); String script = "doc['@timestamp'].value.millis < " + logQuery.getEndTime().getTime() + "L";
query.must().add(QueryBuilders.rangeQuery("@timestamp").gte(logQuery.getEndTime())); query.must().add(QueryBuilders.scriptQuery(new Script(script)));
} }
if (logQuery.getStartTime()!=null){ if (logQuery.getStartTime()!=null){
long start = logQuery.getStartTime().getTime(); String script = "doc['@timestamp'].value.millis > " + logQuery.getStartTime().getTime() + "L";
String script = "doc['@timestamp'].value.millis > "+start+"L"; query.must().add(QueryBuilders.scriptQuery(new Script(script)));
Script Script = new Script(script);
query.must().add(QueryBuilders.scriptQuery(Script));
} }
} }

2
lms/nladmin-system/src/main/resources/logback-spring.xml
View File

@@ -137,7 +137,7 @@ https://juejin.cn/post/6844903775631572999
<!--开发环境:打印控制台--> <!--开发环境:打印控制台-->
<springProfile name="dev"> <springProfile name="dev">
<root level="info"> <root level="debug">
<appender-ref ref="CONSOLE"/> <appender-ref ref="CONSOLE"/>
<appender-ref ref="asyncFileAppender"/> <appender-ref ref="asyncFileAppender"/>
<appender-ref ref="esLogAppender" /> <appender-ref ref="esLogAppender" />