From 4f4ae801fbd52546ee65353b43af7b41f37d9a44 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期三, 20 十一月 2024 16:27:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskwcs_3' into tzskwcs_3

---
 src/main/java/com/zy/core/MainProcess.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 33ac14b..13537db 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -22,6 +22,8 @@
     private MainServiceImpl mainService;
     // 鎵�灞炵嚎绋�
     private Thread thread;
+    // 鎵�灞炵嚎绋�
+    private Thread agvThread;
     // 棰戠巼
     private int i = 0;
 
@@ -108,7 +110,7 @@
     }
 
     public void agvStart(){
-        thread = new Thread(() -> {
+        agvThread = new Thread(() -> {
             while (!Thread.currentThread().isInterrupted()) {
                 try {
 
@@ -134,12 +136,13 @@
                 }
             }
         });
-        thread.start();
+        agvThread.start();
     }
 
     @PreDestroy
     public void shutDown(){
         if (thread != null) thread.interrupt();
+        if (agvThread != null) agvThread.interrupt();
     }
 
 }

--
Gitblit v1.9.1