From 7464f849cd06d4fe18d76163dc6be294777e0e27 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Tue, 5 Dec 2023 20:16:00 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E4=BF=AE=E5=A4=8D=E9=A9=AC?=
=?UTF-8?q?=E9=92=A2lucene=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/org/nl/config/lucene/Searcher.java | 2 +-
.../org/nl/config/lucene/StaticConfig.java | 4 ++-
.../nlsso-server/src/main/resources/ext.dic | 26 +++++++++++++++++++
.../src/main/resources/logback-spring.xml | 14 ++++++----
.../src/main/resources/stopword.dic | 19 +-------------
5 files changed, 40 insertions(+), 25 deletions(-)
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Searcher.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Searcher.java
index e89cbe1..0a8e307 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Searcher.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Searcher.java
@@ -76,7 +76,7 @@ public class Searcher {
if (ObjectUtil.isNotEmpty(whereJson.get(LogMessageConstant.FIELD_MESSAGE))){
//查询解析器
QueryParser queryParser = new QueryParser("message", analyzer);
- Query query = queryParser.parse(whereJson.getString("message"));
+ Query query = queryParser.parse("message:" + whereJson.getString("message") + "~");
booleanQueryBuilder.add(query, BooleanClause.Occur.MUST);
}
if (ObjectUtil.isNotEmpty(whereJson.get(LogMessageConstant.FIELD_TRACEID))){
diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/StaticConfig.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/StaticConfig.java
index c7958bb..a118b49 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/StaticConfig.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/StaticConfig.java
@@ -9,7 +9,9 @@ import org.springframework.context.annotation.Configuration;
*/
@Configuration
public class StaticConfig {
- //日志索引目录
+ /**
+ * 日志索引目录
+ */
@Value("${lucene.index.path}")
private String luceneDir;
diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/ext.dic b/lms/nladmin-system/nlsso-server/src/main/resources/ext.dic
index e69de29..41a152a 100644
--- a/lms/nladmin-system/nlsso-server/src/main/resources/ext.dic
+++ b/lms/nladmin-system/nlsso-server/src/main/resources/ext.dic
@@ -0,0 +1,26 @@
+定时插入半成品实时库存失败的数据
+插入窑内失败的数据
+插入窑内失败的信息
+定时插入半成品实时库存失败的信息
+插入货架数据失败的数据
+插入货架数据失败的信息
+插入窑前失败的数据
+插入窑前失败的信息
+获取MES给的工单数据
+上报mes消耗泥料记录的数据
+上报mes消耗泥料记录失败
+压机产出-获取MES给的工单数据
+压机产出返给MES的数据
+反馈压机产出插入mes数据库失败
+半成品入库-获取MES给的工单数据
+半成品入库返给MES的数据
+半成品入库插入mes数据库失败
+半成品出库-获取MES给的工单数据
+半成品出库返给MES的数据
+半成品出库插入mes数据库失败
+压机产出-获取MES给的工单数据
+压机产出返给MES的数据
+反馈压机产出插入mes数据库失败
+插入压机检测失败
+包装数据
+更新成功：更新数据
diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
index 7024878..d5e85cf 100644
--- a/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
+++ b/lms/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
@@ -47,7 +47,13 @@ https://juejin.cn/post/6844903775631572999
</encoder>
</appender>
- <appender name="luceneAppender" class="org.nl.config.lucene.LuceneAppender" />
+ <appender name="luceneAppender" class="org.nl.config.lucene.LuceneAppender" >
+ <filter class="ch.qos.logback.classic.filter.LevelFilter">
+ <level>INFO</level>
+ <onMatch>ACCEPT</onMatch>
+ <onMismatch>DENY</onMismatch>
+ </filter>
+ </appender>
<appender name="asyncLuceneAppender" class="ch.qos.logback.classic.AsyncAppender">
<appender-ref ref="luceneAppender" />
<!-- 设置队列大小 -->
@@ -64,6 +70,7 @@ https://juejin.cn/post/6844903775631572999
<springProfile name="dev">
<root level="DEBUG">
<appender-ref ref="CONSOLE"/>
+ <appender-ref ref="asyncFileAppender"/>
<appender-ref ref="asyncLuceneAppender"/>
</root>
<logger name="org.springframework" level="ERROR" additivity="false">
@@ -107,12 +114,9 @@ https://juejin.cn/post/6844903775631572999
<!--生产环境:打印控制台和输出到文件-->
<springProfile name="prod">
- <root level="INFO">
-<!-- <appender-ref ref="asyncFileAppender"/>-->
- <appender-ref ref="asyncLuceneAppender"/>
- </root>
<root level="DEBUG">
<appender-ref ref="asyncFileAppender"/>
+ <appender-ref ref="asyncLuceneAppender"/>
</root>
<logger name="org.springframework" level="ERROR" additivity="false">
<appender-ref ref="asyncFileAppender"/>
diff --git a/lms/nladmin-system/nlsso-server/src/main/resources/stopword.dic b/lms/nladmin-system/nlsso-server/src/main/resources/stopword.dic
index 3a56472..beec81a 100644
--- a/lms/nladmin-system/nlsso-server/src/main/resources/stopword.dic
+++ b/lms/nladmin-system/nlsso-server/src/main/resources/stopword.dic
@@ -1239,21 +1239,4 @@ $
上
上来
上去
-获取MES给的工单数据
-上报mes消耗泥料记录的数据
-上报mes消耗泥料记录失败
-压机产出-获取MES给的工单数据
-压机产出返给MES的数据
-反馈压机产出插入mes数据库失败
-半成品入库-获取MES给的工单数据
-半成品入库返给MES的数据
-半成品入库插入mes数据库失败
-半成品出库-获取MES给的工单数据
-半成品出库返给MES的数据
-半成品出库插入mes数据库失败
-压机产出-获取MES给的工单数据
-压机产出返给MES的数据
-反馈压机产出插入mes数据库失败
-插入压机检测失败
-包装数据
-更新成功：更新数据
+