fix 管理员登录与指令创建

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");

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对象中添加域。

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 {
 
     /**