From e76507fb9e48647382ad167b3712b4a0cdbc3f9f Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Thu, 16 Jul 2026 16:43:37 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E8=87=AA=E5=8A=A8=E7=BA=BF?=
 =?UTF-8?q?=E7=A8=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../autoRun/impl/deviceAuto/DeviceExecuteAutoRunable.java    | 5 +++--
 .../org/nl/acs/autoThread/controller/AutoRunController.java  | 1 +
 .../nl/acs/autoThread/service/impl/AutoRunServiceImpl.java   | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/autoRun/impl/deviceAuto/DeviceExecuteAutoRunable.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/autoRun/impl/deviceAuto/DeviceExecuteAutoRunable.java
index 23ea381..6f6125c 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/autoRun/impl/deviceAuto/DeviceExecuteAutoRunable.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/autoRun/impl/deviceAuto/DeviceExecuteAutoRunable.java
@@ -53,7 +53,8 @@ public class DeviceExecuteAutoRunable extends AbstractAutoRunnable {
 
     @Override
     public void autoRun() throws Exception {
-        for (int i = 0; !OpcConfig.OPC_START_TAG; ++i) {
+        // TODO本项目没有OPC
+        /*for (int i = 0; !OpcConfig.OPC_START_TAG; ++i) {
             log.info("设备执行线程等待opc同步线程...");
             Thread.sleep(1000L);
             if (i > 60) {
@@ -87,6 +88,6 @@ public class DeviceExecuteAutoRunable extends AbstractAutoRunnable {
                     executorService.submit(runnable);
                 }
             }
-        }
+        }*/
     }
 }
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/controller/AutoRunController.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/controller/AutoRunController.java
index f4ee572..e05104b 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/controller/AutoRunController.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/controller/AutoRunController.java
@@ -21,6 +21,7 @@ public class AutoRunController {
 
 
     @Log("查询自动线程")
+    @GetMapping
     public ResponseEntity<Object> query(Map map) throws Exception {
         List<AutoRunDto> ThreadDtos = autoRunService.findAll();
         return new ResponseEntity<>(PageUtil.toPage(ThreadDtos, ThreadDtos.size()), HttpStatus.OK);
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/service/impl/AutoRunServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/service/impl/AutoRunServiceImpl.java
index 11d4afd..33a6459 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/service/impl/AutoRunServiceImpl.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/autoThread/service/impl/AutoRunServiceImpl.java
@@ -2,6 +2,7 @@ package org.nl.acs.autoThread.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 
+import cn.hutool.core.util.ObjectUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.nl.ApplicationAutoInitial;
@@ -79,6 +80,9 @@ public class AutoRunServiceImpl implements AutoRunService, ApplicationAutoInitia
             AutoRunDto autoRunDto = new AutoRunDto();
             BeanUtil.copyProperties(autoRunnable, autoRunDto, true);
             Thread thread = code_Thread_Map.get(autoRunnable.getCode());
+            if (ObjectUtil.isEmpty(thread)) {
+                continue;
+            }
             autoRunDto.setCode(autoRunnable.getCode());
             autoRunDto.setName(autoRunnable.getName());
             autoRunDto.setThread_alive(thread.isAlive());