From 2a9531d5b618e511a4d56e152c4cf17c54f6a0ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=91=A8=E4=BF=8A=E6=9D=B0?=
 <9463626+zhou-junjiezjj@user.noreply.gitee.com>
Date: Thu, 7 Mar 2024 10:25:43 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E7=AE=A1=E7=90=86=E5=91=98=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E4=B8=8E=E6=8C=87=E4=BB=A4=E5=88=9B=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java | 2 +-
 .../main/java/org/nl/modules/lucene/common/LuceneAppender.java  | 2 +-
 .../src/main/java/org/nl/modules/quartz/utils/ExecutionJob.java | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
index 5cc3cd3..24cfd74 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
@@ -158,7 +158,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
 
     @Override
     public Map<String, Object> queryAllByCache(Map whereJson, Pageable page) {
-//        this.reload();
+        this.reload();
         String task_code = (String) whereJson.get("task_code");
         String vehicle_code = (String) whereJson.get("vehicle_code");
         String material_type = (String) whereJson.get("material_type");
diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/lucene/common/LuceneAppender.java b/acs/nladmin-system/src/main/java/org/nl/modules/lucene/common/LuceneAppender.java
index c3cb0d3..2972a2f 100644
--- a/acs/nladmin-system/src/main/java/org/nl/modules/lucene/common/LuceneAppender.java
+++ b/acs/nladmin-system/src/main/java/org/nl/modules/lucene/common/LuceneAppender.java
@@ -60,7 +60,7 @@ public class LuceneAppender extends AppenderBase<ILoggingEvent> {
         String message = event.getFormattedMessage();
         try {
             String[] split = message.split("@");
-            LuceneLogDto luceneLogDto = JSONObject.parseObject(split[1], LuceneLogDto.class);
+            LuceneLogDto luceneLogDto = JSONObject.parseObject(message, LuceneLogDto.class);
             Document document = new Document();
             try {
                 //向document对象中添加域。
diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/quartz/utils/ExecutionJob.java b/acs/nladmin-system/src/main/java/org/nl/modules/quartz/utils/ExecutionJob.java
index ee4f685..2843083 100644
--- a/acs/nladmin-system/src/main/java/org/nl/modules/quartz/utils/ExecutionJob.java
+++ b/acs/nladmin-system/src/main/java/org/nl/modules/quartz/utils/ExecutionJob.java
@@ -25,6 +25,7 @@ import org.nl.modules.quartz.domain.QuartzLog;
 import org.nl.modules.quartz.repository.QuartzLogRepository;
 import org.nl.modules.quartz.service.QuartzJobService;
 import org.nl.modules.wql.util.SpringContextHolder;
+import org.quartz.DisallowConcurrentExecution;
 import org.quartz.JobExecutionContext;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.quartz.QuartzJobBean;
@@ -41,6 +42,7 @@ import java.util.concurrent.ThreadPoolExecutor;
 @Async
 @SuppressWarnings({"unchecked", "all"})
 @Slf4j
+@DisallowConcurrentExecution
 public class ExecutionJob extends QuartzJobBean {
 
     /**