From 09cbc1889830cdfc2d02b560c78362cd30100bb3 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Fri, 2 Jun 2023 15:05:22 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/modules/system/service/impl/EsLogServiceImpl.java | 4 ++-- .../nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java | 2 +- .../main/java/org/nl/wms/st/core/manage/AbstractInManage.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/EsLogServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/EsLogServiceImpl.java index 23873072..14c4fd2c 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/EsLogServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/modules/system/service/impl/EsLogServiceImpl.java @@ -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())){ diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java index 777a300d..8c92c84d 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java @@ -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(); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/AbstractInManage.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/AbstractInManage.java index a86e46f4..a8507f76 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/AbstractInManage.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/core/manage/AbstractInManage.java @@ -758,7 +758,7 @@ public abstract class AbstractInManage { } } catch (Exception e) { e.printStackTrace(); - throw new BadRequestException("分配货位并发锁获取失败，请稍后再试！"); + throw new PdaRequestException("逻辑分配错误:"+e.getMessage()); } finally { lock.unlock(); }