From 13d9551bc55e09a2619986799afb0dd23a403292 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?=
 <wang.haotian@hzleaper.com>
Date: Mon, 20 May 2024 15:46:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E7=A8=8B=E6=9D=A5=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zhehekeji/web/service/InitService.java    | 29 ++++++++++++-------
 .../com/zhehekeji/web/service/PlcService.java |  5 ++--
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/web/src/main/java/com/zhehekeji/web/service/InitService.java b/web/src/main/java/com/zhehekeji/web/service/InitService.java
index ccc1177..b02816b 100644
--- a/web/src/main/java/com/zhehekeji/web/service/InitService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/InitService.java
@@ -25,6 +25,8 @@ import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * 服务初始化
@@ -52,6 +54,9 @@ public class InitService implements ApplicationRunner {
     @Resource
     private CameraService cameraService;
 
+    private static ExecutorService exec = Executors.newFixedThreadPool(5);
+
+
     @Bean
     public CameraControlLoginModule cameraControlLoginModule(){
         CameraControlLoginModule cameraControlLoginModule = null;
@@ -101,21 +106,23 @@ public class InitService implements ApplicationRunner {
                 }
             });
         }else if(configProperties.getServerMode() == 1){
+
             log.info("KESC JSON MODE");
             // 昆船协议
             for(ConfigProperties.KSEC ksec : configProperties.getKsec()) {
-
-                if (ksec != null) {
-                    StreetConn.init(ksec.getId(), "ksec");
-                    try {
-                        ksecNettyClient.createClient(ksec);
-                    } catch (Exception e) {
-                        log.error("kesc connect error,url:{},port:{}", ksec.getIp(), ksec.getPort());
-                        ksecNettyClient.reconnect(ksec);
+                exec.submit(()-> {
+                    if (ksec != null) {
+                        StreetConn.init(ksec.getId(), "ksec");
+                        try {
+                            ksecNettyClient.createClient(ksec);
+                        } catch (Exception e) {
+                            log.error("kesc connect error,url:{},port:{}", ksec.getIp(), ksec.getPort());
+                            ksecNettyClient.reconnect(ksec);
+                        }
+                    } else {
+                        log.error("ksec no config");
                     }
-                } else {
-                    log.error("ksec no config");
-                }
+                });
             }
         }
         TaskDelayExecutor.runMp4DownloadExecutor();
diff --git a/web/src/main/java/com/zhehekeji/web/service/PlcService.java b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
index fd7e4a6..20e95c7 100644
--- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
@@ -693,7 +693,7 @@ public class PlcService {
             log.error("相机{}未连接无法拍照", cameraId);
         }
         //托盘码
-        String trayCode = null;
+        String trayCode = "";
         Boolean trayCheck = Boolean.TRUE;
         //扫托盘码
         if(configProperties.getScanCodeMode().getTray() == 2) {
@@ -729,7 +729,8 @@ public class PlcService {
                     }
                 }
             }
-        }else if(configProperties.getScanCodeMode().getTray() == 3){
+        }else
+            if(configProperties.getScanCodeMode().getTray() == 3){
             //扫到的码
             Set<String> tags = new HashSet<>();
             try {