From 5bb21f6acf38e234b765a76561c588d808a44c93 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期五, 28 八月 2020 13:51:00 +0800
Subject: [PATCH] #v2.1

---
 src/main/java/com/zy/asrs/controller/ConsoleController.java |    3 +++
 src/main/webapp/views/console.html                          |   17 +++++++++--------
 src/main/java/com/zy/core/ServerBootstrap.java              |   12 ++++++------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 0cd69e5..80dcce2 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -152,6 +152,9 @@
         List<BarcodeDataVo> list = new ArrayList<>();
         for (Slave barcode : slaveProperties.getBarcode()) {
             BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcode.getId());
+            if (null == barcodeThread) {
+                continue;
+            }
             BarcodeDataVo vo = new BarcodeDataVo();
             vo.setBarcodeId(barcode.getId());
             vo.setCodeValue(barcodeThread.getBarcode());
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index dd1f8dd..2ef85a0 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -76,12 +76,12 @@
             SlaveConnection.put(SlaveType.Devp, devp.getId(), devpThread);
         }
 
-        // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
-        for (Slave barcode : slaveProperties.getBarcode()) {
-            BarcodeThread barcodeThread = new BarcodeThread(barcode);
-            new Thread(barcodeThread).start();
-            SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
-        }
+//        // 鍒濆鍖栨潯鐮佹壂鎻忎华绾跨▼
+//        for (Slave barcode : slaveProperties.getBarcode()) {
+//            BarcodeThread barcodeThread = new BarcodeThread(barcode);
+//            new Thread(barcodeThread).start();
+//            SlaveConnection.put(SlaveType.Barcode, barcode.getId(), barcodeThread);
+//        }
     }
 
 
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index bf637e3..5dd65cd 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -79,15 +79,16 @@
     <!----------- 宸ュ叿鏍� ---------->
     <!-- 鍏ュ簱鍙� -->
     <div class="cargo-put"></div>
-    <!-- 鎵爜鍣� -->
-    <div id="code-decoder-1" class="code-decoder">
-        <span id="code-decoder-data-1" class="code-decoder-data">0</span>
-    </div>
 
-    <!-- 鎵爜鍣� -->
-    <div id="code-decoder-2" class="code-decoder">
-        <span id="code-decoder-data-2" class="code-decoder-data">0</span>
-    </div>
+<!--    &lt;!&ndash; 鎵爜鍣� 1&ndash;&gt;-->
+<!--    <div id="code-decoder-1" class="code-decoder">-->
+<!--        <span id="code-decoder-data-1" class="code-decoder-data">0</span>-->
+<!--    </div>-->
+
+<!--    &lt;!&ndash; 鎵爜鍣� 2&ndash;&gt;-->
+<!--    <div id="code-decoder-2" class="code-decoder">-->
+<!--        <span id="code-decoder-data-2" class="code-decoder-data">0</span>-->
+<!--    </div>-->
 
 
     <!----------- 宸﹁緭閫佺嚎 ---------->

--
Gitblit v1.9.1