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

rev：修改日志

Browse Source
This commit is contained in:
zhangzhiqiang
2023-06-02 15:05:22 +08:00
parent e75fb3216c
commit 09cbc18898
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -107,10 +107,10 @@ public class EsLogServiceImpl implements EsLogService {
private void extractedParam(LogQuery logQuery, BoolQueryBuilder query) {
if (StringUtils.isNotEmpty(logQuery.getLogLevel())){
query.must().add(QueryBuilders.matchQuery("logLevel", LevelEnum.checkLevel(logQuery.getLogLevel())));
query.must().add(QueryBuilders.matchQuery("logLevel.keyword", LevelEnum.checkLevel(logQuery.getLogLevel())));
}
if (StringUtils.isNotEmpty(logQuery.getSystem())){
query.must().add(QueryBuilders.matchQuery("system", logQuery.getSystem()));
query.must().add(QueryBuilders.matchQuery("system.keyword", logQuery.getSystem()));
}
query.mustNot().add(QueryBuilders.matchPhraseQuery("logger","org.elasticsearch.client.RestClient"));
if (StringUtils.isNotEmpty(logQuery.getTraceId())){

2
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java
View File

@@ -883,7 +883,7 @@ public class HandPFOutIvtServiceImpl implements HandPFOutIvtService {
}
} catch (Exception e) {
e.printStackTrace();
throw new PdaRequestException("分配货位并发锁获取失败，请稍后再试！");
throw new PdaRequestException("逻辑分配错误:"+e.getMessage());
} finally {
lock.unlock();
}

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/AbstractInManage.java
View File

@@ -758,7 +758,7 @@ public abstract class AbstractInManage {
}
} catch (Exception e) {
e.printStackTrace();
throw new BadRequestException("分配货位并发锁获取失败，请稍后再试！");
throw new PdaRequestException("逻辑分配错误:"+e.getMessage());
} finally {
lock.unlock();
}