From 0da95c97fe87a359eefceeaeb25f9d62bc908e2e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 08 九月 2022 14:24:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/BarcodeThread.java | 2 +-
src/main/java/com/zy/core/enums/SteLocaType.java | 1 +
src/main/webapp/views/ste.html | 20 ++++++++++----------
src/main/java/com/zy/core/thread/ScaleThread.java | 2 +-
4 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/core/enums/SteLocaType.java b/src/main/java/com/zy/core/enums/SteLocaType.java
index 570b759..bf72a9c 100644
--- a/src/main/java/com/zy/core/enums/SteLocaType.java
+++ b/src/main/java/com/zy/core/enums/SteLocaType.java
@@ -2,6 +2,7 @@
public enum SteLocaType {
+ NONE(0, "鏈煡"),
A(1, "A鐐�"),
B(2, "B鐐�"),
A_WAITING(3, "A寰呮満鐐�"),
diff --git a/src/main/java/com/zy/core/thread/BarcodeThread.java b/src/main/java/com/zy/core/thread/BarcodeThread.java
index ca2783d..571c438 100644
--- a/src/main/java/com/zy/core/thread/BarcodeThread.java
+++ b/src/main/java/com/zy/core/thread/BarcodeThread.java
@@ -75,7 +75,7 @@
// log.info("鏉＄爜鎵弿浠繛鎺ユ垚鍔� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
} catch (Exception e) {
socket = null;
- log.error("鏉＄爜鎵弿浠繛鎺ュけ璐ワ紒锛侊紒 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+// log.error("鏉＄爜鎵弿浠繛鎺ュけ璐ワ紒锛侊紒 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
return false;
}
return true;
diff --git a/src/main/java/com/zy/core/thread/ScaleThread.java b/src/main/java/com/zy/core/thread/ScaleThread.java
index c5a2d4b..94e42f0 100644
--- a/src/main/java/com/zy/core/thread/ScaleThread.java
+++ b/src/main/java/com/zy/core/thread/ScaleThread.java
@@ -66,7 +66,7 @@
// log.info("鏉＄爜鎵弿浠繛鎺ユ垚鍔� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
} catch (Exception e) {
socket = null;
- log.error("鏉＄爜鎵弿浠繛鎺ュけ璐ワ紒锛侊紒 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ log.error("纾呯Г鎵弿浠繛鎺ュけ璐ワ紒锛侊紒 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
return false;
}
return true;
diff --git a/src/main/webapp/views/ste.html b/src/main/webapp/views/ste.html
index 8628a2f..642f918 100644
--- a/src/main/webapp/views/ste.html
+++ b/src/main/webapp/views/ste.html
@@ -109,17 +109,17 @@
<button class="item" onclick="steOperator(2)">鍙冲嚭搴�</button>
<button class="item" onclick="steOperator(3)">宸﹀叆搴�</button>
<button class="item" onclick="steOperator(4)">鍙冲叆搴�</button>
- <button class="item" onclick="steOperator(5)">宸︾Щ搴�</button>
- <button class="item" onclick="steOperator(6)">鍙崇Щ搴�</button>
- <button class="item" onclick="steOperator(7)">鍘熺偣</button>
- <button class="item" onclick="steOperator(8)">杩滅偣</button>
- <button class="item" onclick="steOperator(9)">A 鐐�</button>
- <button class="item" onclick="steOperator(10)">B 鐐�</button>
- <button class="item" onclick="steOperator(11)">宸︽惉绉�</button>
- <button class="item" onclick="steOperator(12)">鍙虫惉绉�</button>
+<!-- <button class="item" onclick="steOperator(5)">宸︾Щ搴�</button>-->
+<!-- <button class="item" onclick="steOperator(6)">鍙崇Щ搴�</button>-->
+ <button class="item" onclick="steOperator(7)">鍘诲彸绔�</button>
+ <button class="item" onclick="steOperator(8)">鍘诲乏绔�</button>
+<!-- <button class="item" onclick="steOperator(9)">A 鐐�</button>-->
+<!-- <button class="item" onclick="steOperator(10)">B 鐐�</button>-->
+<!-- <button class="item" onclick="steOperator(11)">宸︽惉绉�</button>-->
+<!-- <button class="item" onclick="steOperator(12)">鍙虫惉绉�</button>-->
<button class="item" onclick="steOperator(13)">鍏呯數</button>
- <button class="item" onclick="steOperator(14)">宸︾洏鐐�</button>
- <button class="item" onclick="steOperator(15)">鍙崇洏鐐�</button>
+<!-- <button class="item" onclick="steOperator(14)">宸︾洏鐐�</button>-->
+<!-- <button class="item" onclick="steOperator(15)">鍙崇洏鐐�</button>-->
<button class="item" onclick="steOperator(16)">浠诲姟瀹屾垚</button>
</div>
</fieldset>
--
Gitblit v1.9.1