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

fix:日志查询

Browse Source
This commit is contained in:
zhangzhiqiang
2023-03-01 10:14:06 +08:00
parent 1fdb9d4911
commit d56efb2621
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/EsLogServiceImpl.java
View File

@@ -47,7 +47,7 @@ public class EsLogServiceImpl implements EsLogService {
PageResult page = new PageResult(); PageResult page = new PageResult();
if (logQuery != null){ if (logQuery != null){
BoolQueryBuilder query = QueryBuilders.boolQuery(); //requestMethod BoolQueryBuilder query = QueryBuilders.boolQuery(); //requestMethod
extractedQueryParam(logQuery, query); extractedParam(logQuery, query);
Iterable<LogRepositoryDTO> all = esLogRepository.search(query, PageRequest.of(logQuery.getPage()-1,logQuery.getSize(), Sort.by("@timestamp").descending())); Iterable<LogRepositoryDTO> all = esLogRepository.search(query, PageRequest.of(logQuery.getPage()-1,logQuery.getSize(), Sort.by("@timestamp").descending()));
page.addAll(((AggregatedPageImpl) all).getContent()); page.addAll(((AggregatedPageImpl) all).getContent());
page.setTotal((int) ((AggregatedPageImpl) all).getTotalElements()); page.setTotal((int) ((AggregatedPageImpl) all).getTotalElements());
@@ -61,8 +61,12 @@ public class EsLogServiceImpl implements EsLogService {
@Override @Override
public void clearLogs(LogQuery logQuery) { public void clearLogs(LogQuery logQuery) {
String system = logQuery.getSystem();
if (StringUtils.isEmpty(system)){
return;
}
BoolQueryBuilder query = QueryBuilders.boolQuery(); BoolQueryBuilder query = QueryBuilders.boolQuery();
extractedParam(logQuery, query); query.must().add(QueryBuilders.matchQuery("system", system));
DeleteQuery deleteQuery = new DeleteQuery(); DeleteQuery deleteQuery = new DeleteQuery();
deleteQuery.setQuery(query); deleteQuery.setQuery(query);
elasticsearchRestTemplate.delete(deleteQuery,new LogRepositoryDTO().getClass()); elasticsearchRestTemplate.delete(deleteQuery,new LogRepositoryDTO().getClass());

2
mes/hd/nladmin-system/src/main/resources/config/application-dev.yml
View File

@@ -38,7 +38,7 @@ spring:
# url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:whxr_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true # url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:whxr_test}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:whxr}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:whxr}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
username: ${DB_USER:root} username: ${DB_USER:root}
password: ${DB_PWD:password} password: ${DB_PWD:942464Yy}
# username: ${DB_USER:root} # username: ${DB_USER:root}
# password: ${DB_PWD:root} # password: ${DB_PWD:root}
# 初始连接数 # 初始连接数

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

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