From ef78717c5b956a26b360de44f774fc2b804296c2 Mon Sep 17 00:00:00 2001
From: 张世豪 <979909237@qq.com>
Date: 星期四, 20 十一月 2025 20:56:36 +0800
Subject: [PATCH] 修改20251120
---
bin/xitongshezhi/ConfigSet.class | 0
bin/home/CardMachineUI.class | 0
bin/chuankou/SerialPortConnectionDialog.class | 0
bin/publicway/SerialProtocolParser.class | 0
bin/chushihua/SlotManager.class | 0
src/chushihua/lunxunzaixian.java | 36 +++---
src/xitongshezhi/kuaisuquka.java | 18 +-
bin/chushihua/Chushihua.class | 0
bin/chuankou/SerialDataReceiver.class | 0
lib/slf4j-simple-1.7.30.jar | 0
bin/xitongshezhi/kuaisuquka.class | 0
bin/.gitignore | 6 +
src/home/Homein.java | 48 ++++----
src/chushihua/SlotManager.java | 39 +++++-
src/chuankou/SerialPortService.java | 2
src/xitongshezhi/SystemDebugDialog.java | 2
log.properties | 6
src/xitongshezhi/ConfigSet.java | 6
src/xitongshezhi/banbenguanli.java | 6
src/publicway/ProtocolParser01.java | 8
bin/chuankou/SerialPortConnectionDialog$1.class | 0
src/xitongshezhi/Charulog.java | 6
src/chuankou/SerialDataReceiver.java | 8
bin/home/Homein.class | 0
src/publicway/ProtocolParser51.java | 4
src/chushihua/Chushihua.java | 18 +-
bin/publicway/ProtocolParser01.class | 0
src/chushihua/lunxun.java | 56 ++++----
src/publicway/SerialProtocolParser.java | 30 ++--
bin/chushihua/lunxun.class | 0
bin/chushihua/lunxun$PollingTask.class | 0
lib/slf4j-api-1.7.30.jar | 0
src/chuankou/SerialPortConnectionDialog.java | 6
bin/chuankou/SerialPortService.class | 0
src/home/CardMachineUI.java | 21 +-
35 files changed, 180 insertions(+), 146 deletions(-)
diff --git a/bin/.gitignore b/bin/.gitignore
new file mode 100644
index 0000000..419602a
--- /dev/null
+++ b/bin/.gitignore
@@ -0,0 +1,6 @@
+/jiekou/
+/home/
+/chushihua/
+/xitongshezhi/
+/chuankou/
+/publicway/
diff --git a/bin/chuankou/SerialDataReceiver.class b/bin/chuankou/SerialDataReceiver.class
index 599f7b8..20dad43 100644
--- a/bin/chuankou/SerialDataReceiver.class
+++ b/bin/chuankou/SerialDataReceiver.class
Binary files differ
diff --git a/bin/chuankou/SerialPortConnectionDialog$1.class b/bin/chuankou/SerialPortConnectionDialog$1.class
index f3bc901..96451c2 100644
--- a/bin/chuankou/SerialPortConnectionDialog$1.class
+++ b/bin/chuankou/SerialPortConnectionDialog$1.class
Binary files differ
diff --git a/bin/chuankou/SerialPortConnectionDialog.class b/bin/chuankou/SerialPortConnectionDialog.class
index ce51954..9dfdc84 100644
--- a/bin/chuankou/SerialPortConnectionDialog.class
+++ b/bin/chuankou/SerialPortConnectionDialog.class
Binary files differ
diff --git a/bin/chuankou/SerialPortService.class b/bin/chuankou/SerialPortService.class
index 4efcaef..0929610 100644
--- a/bin/chuankou/SerialPortService.class
+++ b/bin/chuankou/SerialPortService.class
Binary files differ
diff --git a/bin/chushihua/Chushihua.class b/bin/chushihua/Chushihua.class
index afc3321..7d327f2 100644
--- a/bin/chushihua/Chushihua.class
+++ b/bin/chushihua/Chushihua.class
Binary files differ
diff --git a/bin/chushihua/SlotManager.class b/bin/chushihua/SlotManager.class
index 875045b..c660f1b 100644
--- a/bin/chushihua/SlotManager.class
+++ b/bin/chushihua/SlotManager.class
Binary files differ
diff --git a/bin/chushihua/lunxun$PollingTask.class b/bin/chushihua/lunxun$PollingTask.class
index 06d7b40..2aa1f2e 100644
--- a/bin/chushihua/lunxun$PollingTask.class
+++ b/bin/chushihua/lunxun$PollingTask.class
Binary files differ
diff --git a/bin/chushihua/lunxun.class b/bin/chushihua/lunxun.class
index c3b8532..1f744aa 100644
--- a/bin/chushihua/lunxun.class
+++ b/bin/chushihua/lunxun.class
Binary files differ
diff --git a/bin/home/CardMachineUI.class b/bin/home/CardMachineUI.class
index 88cfd63..a818ec0 100644
--- a/bin/home/CardMachineUI.class
+++ b/bin/home/CardMachineUI.class
Binary files differ
diff --git a/bin/home/Homein.class b/bin/home/Homein.class
index bc75bf9..c6935c0 100644
--- a/bin/home/Homein.class
+++ b/bin/home/Homein.class
Binary files differ
diff --git a/bin/publicway/ProtocolParser01.class b/bin/publicway/ProtocolParser01.class
index 453e7e0..ce3015e 100644
--- a/bin/publicway/ProtocolParser01.class
+++ b/bin/publicway/ProtocolParser01.class
Binary files differ
diff --git a/bin/publicway/SerialProtocolParser.class b/bin/publicway/SerialProtocolParser.class
index c781bd5..1992833 100644
--- a/bin/publicway/SerialProtocolParser.class
+++ b/bin/publicway/SerialProtocolParser.class
Binary files differ
diff --git a/bin/xitongshezhi/ConfigSet.class b/bin/xitongshezhi/ConfigSet.class
index 429eba8..70b313f 100644
--- a/bin/xitongshezhi/ConfigSet.class
+++ b/bin/xitongshezhi/ConfigSet.class
Binary files differ
diff --git a/bin/xitongshezhi/kuaisuquka.class b/bin/xitongshezhi/kuaisuquka.class
index ae9be9a..4de679f 100644
--- a/bin/xitongshezhi/kuaisuquka.class
+++ b/bin/xitongshezhi/kuaisuquka.class
Binary files differ
diff --git a/lib/slf4j-api-1.7.30.jar b/lib/slf4j-api-1.7.30.jar
new file mode 100644
index 0000000..29ac26f
--- /dev/null
+++ b/lib/slf4j-api-1.7.30.jar
Binary files differ
diff --git a/lib/slf4j-simple-1.7.30.jar b/lib/slf4j-simple-1.7.30.jar
new file mode 100644
index 0000000..6debaa9
--- /dev/null
+++ b/lib/slf4j-simple-1.7.30.jar
Binary files differ
diff --git a/log.properties b/log.properties
index 0a5ac47..14d68b6 100644
--- a/log.properties
+++ b/log.properties
@@ -1 +1,5 @@
-测试
\ No newline at end of file
+#\u64CD\u4F5C\u65E5\u5FD7\u8BB0\u5F55 - \u6700\u540E\u66F4\u65B0: Thu Nov 20 20:49:18 CST 2025
+#Thu Nov 20 20:49:18 CST 2025
+log_1763642944396_d82061c8=[2025-11-20 20\:49\:04] \u53D6\u5361\u64CD\u4F5C\uFF1A\u5361\u69FD14\u88AB\u7BA1\u7406\u5458\u53D6\u5361
+log_1763642958908_d200dc13=[2025-11-20 20\:49\:18] \u53D6\u5361\u64CD\u4F5C\uFF1A\u5361\u69FD25\u88AB\u7BA1\u7406\u5458\u53D6\u5361
+\u00B2\u00E2\u00CA\u00D4=
diff --git a/src/chuankou/SerialDataReceiver.java b/src/chuankou/SerialDataReceiver.java
index 6383425..6c5c56c 100644
--- a/src/chuankou/SerialDataReceiver.java
+++ b/src/chuankou/SerialDataReceiver.java
@@ -58,7 +58,7 @@
if (startIndex == -1) {
// 娌℃湁鎵惧埌璧峰鏍囪锛屾竻绌烘棤鏁堟暟鎹�
if (debugEnabled) {
- System.out.println("鏈壘鍒拌捣濮嬫爣璁帮紝娓呯┖缂撳啿鍖�");
+ //System.out.println("鏈壘鍒拌捣濮嬫爣璁帮紝娓呯┖缂撳啿鍖�");
}
staticBufferPosition = 0;
return;
@@ -88,7 +88,7 @@
System.arraycopy(staticDataBuffer, startIndex, packet, 0, totalPacketLength);
if (debugEnabled) {
- System.out.println("瑙ｆ瀽鍒板畬鏁存暟鎹寘: " + bytesToHex(packet));
+ //System.out.println("瑙ｆ瀽鍒板畬鏁存暟鎹寘: " + bytesToHex(packet));
}
// 娣诲姞鍒拌繑鍥炲垪琛�
@@ -132,7 +132,7 @@
*/
private static void printRawData(String prefix, byte[] data, int maxPrintLength) {
if (data == null || data.length == 0) {
- System.out.println(prefix + ": 绌烘暟鎹�");
+ //System.out.println(prefix + ": 绌烘暟鎹�");
return;
}
@@ -148,7 +148,7 @@
sb.append("... [鎴柇锛屾�婚暱搴�: ").append(data.length).append("]");
}
- System.out.println(sb.toString());
+ //System.out.println(sb.toString());
}
/**
diff --git a/src/chuankou/SerialPortConnectionDialog.java b/src/chuankou/SerialPortConnectionDialog.java
index d84ef12..1f8d200 100644
--- a/src/chuankou/SerialPortConnectionDialog.java
+++ b/src/chuankou/SerialPortConnectionDialog.java
@@ -279,13 +279,13 @@
// 鍚姩鍗忚瑙ｆ瀽鍣�
if (serialService.getProtocolParser() != null) {
serialService.getProtocolParser().start();
- System.out.println("涓插彛鍗忚瑙ｆ瀽鍣ㄥ凡鍚姩");
+ //System.out.println("涓插彛鍗忚瑙ｆ瀽鍣ㄥ凡鍚姩");
}
// 鍚姩鏁版嵁鎹曡幏骞跺惎鐢ㄨ皟璇曡緭鍑�
serialService.enableDebugOutput();
serialService.startCapture(data -> {
- // 杩欓噷浼氳Е鍙慡erialPortService涓殑System.out.println鎵撳嵃
+ // 杩欓噷浼氳Е鍙慡erialPortService涓殑//System.out.println鎵撳嵃
});
// 閲嶈淇敼锛氱Щ闄よ嚜鍔ㄥ垱寤轰富鐣岄潰鐨勪唬鐮�
@@ -380,7 +380,7 @@
// 閲嶈淇敼锛氱Щ闄よ嚜鍔ㄦ墦寮�涓荤晫闈㈢殑浠ｇ爜
// 鐢盚omein缁熶竴绠＄悊涓荤晫闈㈢殑鍒涘缓鍜屾樉绀�
- System.out.println("涓插彛杩炴帴鎴愬姛锛屽噯澶囪繑鍥炴帶鍒舵潈缁欎富绋嬪簭");
+ //System.out.println("涓插彛杩炴帴鎴愬姛锛屽噯澶囪繑鍥炴帶鍒舵潈缁欎富绋嬪簭");
// 鍙渶瑕佸叧闂璇濇锛屼笉鍒涘缓涓荤晫闈�
// 涓荤晫闈㈠皢鍦℉omein.showMainInterface()涓垱寤�
diff --git a/src/chuankou/SerialPortService.java b/src/chuankou/SerialPortService.java
index 5fe532c..8ec5663 100644
--- a/src/chuankou/SerialPortService.java
+++ b/src/chuankou/SerialPortService.java
@@ -92,7 +92,7 @@
* 鍚敤璋冭瘯杈撳嚭锛屽皢鎺ユ敹鍒扮殑鏁版嵁鎵撳嵃鍒版帶鍒跺彴
*/
public void enableDebugOutput() {
- System.out.println("涓插彛璋冭瘯杈撳嚭宸插惎鐢� - 寮�濮嬬洃鍚覆鍙ｆ暟鎹�...");
+ //System.out.println("涓插彛璋冭瘯杈撳嚭宸插惎鐢� - 寮�濮嬬洃鍚覆鍙ｆ暟鎹�...");
}
/**
diff --git a/src/chushihua/Chushihua.java b/src/chushihua/Chushihua.java
index 648c9e8..561c68f 100644
--- a/src/chushihua/Chushihua.java
+++ b/src/chushihua/Chushihua.java
@@ -62,7 +62,7 @@
initialize(DEFAULT_CONFIG_PATH);
// 绉婚櫎鑷姩鍚姩杞鐨勯�昏緫锛岀敱Homein缁熶竴绠＄悊
- System.out.println("绯荤粺閰嶇疆鍒濆鍖栧畬鎴愶紝杞灏嗙敱涓诲惎鍔ㄧ被缁熶竴绠＄悊");
+ ////System.out.println("绯荤粺閰嶇疆鍒濆鍖栧畬鎴愶紝杞灏嗙敱涓诲惎鍔ㄧ被缁熶竴绠＄悊");
return true;
} catch (Exception e) {
@@ -80,7 +80,7 @@
// 鍋滄杞鏌ヨ
if (lunxun.isPolling()) {
lunxun.stopPolling();
- System.out.println("绯荤粺鍏抽棴锛氳疆璇㈡煡璇㈠凡鍋滄");
+ ////System.out.println("绯荤粺鍏抽棴锛氳疆璇㈡煡璇㈠凡鍋滄");
}
} catch (Exception e) {
System.err.println("绯荤粺鍏抽棴寮傚父: " + e.getMessage());
@@ -109,12 +109,12 @@
// 鏍囪鍒濆鍖栧畬鎴�
initialized = true;
- System.out.println("绯荤粺鍒濆鍖栧畬鎴愶紝閰嶇疆宸插姞杞�");
- System.out.println("璁惧缂栧彿: " + machineConfig.getMachineId());
- System.out.println("鏈嶅姟鍣ㄥ湴鍧�: " + machineConfig.getServerAddress() + ":" + machineConfig.getServerPort());
- System.out.println("鍗℃Ы鎬绘暟: " + machineConfig.getTotalSlots());
- System.out.println("杞闂撮殧: " + machineConfig.getPollingInterval() + "ms");
- System.out.println("娉㈢壒鐜�: " + machineConfig.getBaudrate());
+ ////System.out.println("绯荤粺鍒濆鍖栧畬鎴愶紝閰嶇疆宸插姞杞�");
+ ////System.out.println("璁惧缂栧彿: " + machineConfig.getMachineId());
+ ////System.out.println("鏈嶅姟鍣ㄥ湴鍧�: " + machineConfig.getServerAddress() + ":" + machineConfig.getServerPort());
+ ////System.out.println("鍗℃Ы鎬绘暟: " + machineConfig.getTotalSlots());
+ ////System.out.println("杞闂撮殧: " + machineConfig.getPollingInterval() + "ms");
+ ////System.out.println("娉㈢壒鐜�: " + machineConfig.getBaudrate());
return true;
@@ -182,7 +182,7 @@
try {
machineConfig.saveToFile(configFilePath);
- System.out.println("閰嶇疆宸蹭繚瀛樺埌: " + configFilePath);
+ ////System.out.println("閰嶇疆宸蹭繚瀛樺埌: " + configFilePath);
return true;
} catch (Exception e) {
System.err.println("淇濆瓨閰嶇疆澶辫触: " + e.getMessage());
diff --git a/src/chushihua/SlotManager.java b/src/chushihua/SlotManager.java
index 19ce442..2ff8c95 100644
--- a/src/chushihua/SlotManager.java
+++ b/src/chushihua/SlotManager.java
@@ -204,8 +204,8 @@
* 鎵撳嵃鎵�鏈夊崱妲界殑姒傝淇℃伅 - 浼樺寲鐗堟湰
*/
public void printAllSlotsSummary() {
- System.out.println("=== 鍗℃Ы姒傝淇℃伅 ===");
- System.out.println("鎬诲崱妲芥暟: " + TOTAL_SLOTS);
+ //System.out.println("=== 鍗℃Ы姒傝淇℃伅 ===");
+ //System.out.println("鎬诲崱妲芥暟: " + TOTAL_SLOTS);
for (Fkj slot : slotArray) {
System.out.printf("鍗℃Ы %s: 鍗＄紪鍙�=%s, 鏈夊崱=%s, 鐘舵��=%s, 鏁呴殰=%s%n",
@@ -223,8 +223,8 @@
public void printSlotDetail(int slotNumber) {
Fkj slot = getSlotInfo(slotNumber);
if (slot != null) {
- System.out.println("=== 鍗℃Ы " + slotNumber + " 璇︾粏淇℃伅 ===");
- System.out.println(slot.toString());
+ //System.out.println("=== 鍗℃Ы " + slotNumber + " 璇︾粏淇℃伅 ===");
+ //System.out.println(slot.toString());
}
}
@@ -415,7 +415,7 @@
slot.setFault(UNKNOWN_VALUE);
slot.setUpdateTime(UNKNOWN_VALUE);
}
- System.out.println("鎵�鏈夊崱妲界姸鎬佸凡閲嶇疆涓烘湭鐭�");
+ //System.out.println("鎵�鏈夊崱妲界姸鎬佸凡閲嶇疆涓烘湭鐭�");
}
@@ -453,8 +453,8 @@
* 鑾峰彇缂撳瓨缁熻淇℃伅锛堢敤浜庣洃鎺э級
*/
public static void printCacheStats() {
- System.out.println("鐘舵�佺紦瀛樺ぇ灏�: " + statusTextCache.size());
- System.out.println("鏁呴殰缂撳瓨澶у皬: " + faultTextCache.size());
+ //System.out.println("鐘舵�佺紦瀛樺ぇ灏�: " + statusTextCache.size());
+ //System.out.println("鏁呴殰缂撳瓨澶у皬: " + faultTextCache.size());
}
/**
@@ -528,7 +528,30 @@
"" // 闊抽鏂囦欢锛屽彲浠ヤ负绌�
);
});
- System.out.println("鍗℃Ы " + slotNumber + " 杩樺崱鎴愬姛锛屽崱鍙蜂粠 " + oldCardNumber + " 鍙樹负 " + newCardNumber);
+ //System.out.println("鍗℃Ы " + slotNumber + " 杩樺崱鎴愬姛锛屽崱鍙蜂粠 " + oldCardNumber + " 鍙樹负 " + newCardNumber);
}
}
+
+ /**
+ * 闈欐�佹柟娉曪細鏍规嵁鍗℃Ы缂栧彿鏀瑰彉鏄惁鏈夊崱鐨勫睘鎬у�间负0锛堟棤鍗★級
+ * @param slotNumber 鍗℃Ы缂栧彿锛堜粠1寮�濮嬶級
+ * @param caozuo 鎿嶄綔绫诲瀷锛�1琛ㄧず绠＄悊鍛橈紝0琛ㄧず绯荤粺
+ * @return 淇敼鎴愬姛杩斿洖true锛屽惁鍒欒繑鍥瀎alse
+ */
+ public static boolean changgehaska(int slotNumber, String caozuo) {
+ if (!isValidSlotNumber(slotNumber)) {
+ return false;
+ }
+ Fkj slot = slotArray[slotNumber - 1];
+ slot.setHasCard("0");
+ slot.setCardNumber("0000");
+ slot.setUpdateTime(getCurrentTime());
+
+ // 璁板綍鍙栧崱鏃ュ織
+ String operator = "1".equals(caozuo) ? "绠＄悊鍛�" : "绯荤粺";
+ String logMessage = String.format("鍙栧崱鎿嶄綔锛氬崱妲�%d琚�%s鍙栧崱", slotNumber, operator);
+ xitongshezhi.Charulog.logOperation(logMessage);
+
+ return true;
+ }
}
\ No newline at end of file
diff --git a/src/chushihua/lunxun.java b/src/chushihua/lunxun.java
index 6ed53dd..f7a66ee 100644
--- a/src/chushihua/lunxun.java
+++ b/src/chushihua/lunxun.java
@@ -56,7 +56,7 @@
if (result) {
if (DEBUG_ENABLED) {
- System.out.println("涓插彛杩炴帴姝ｅ父");
+ //System.out.println("涓插彛杩炴帴姝ｅ父");
}
serialConnected = true;
} else {
@@ -95,7 +95,7 @@
*/
public static boolean startPolling() {
if (isRunning) {
- System.out.println("杞鏌ヨ宸茬粡鍦ㄨ繍琛屼腑");
+ //System.out.println("杞鏌ヨ宸茬粡鍦ㄨ繍琛屼腑");
return true;
}
@@ -117,7 +117,7 @@
pollingThread.setDaemon(true);
pollingThread.start();
if (DEBUG_ENABLED) {
- System.out.println("杞鏌ヨ宸插惎鍔紝闂撮殧: " + pollingInterval + "ms");
+ //System.out.println("杞鏌ヨ宸插惎鍔紝闂撮殧: " + pollingInterval + "ms");
}
return true;
} catch (Exception e) {
@@ -134,7 +134,7 @@
*/
public static boolean stopPolling() {
if (!isRunning) {
- System.out.println("杞鏌ヨ鏈湪杩愯");
+ //System.out.println("杞鏌ヨ鏈湪杩愯");
return false;
}
@@ -163,7 +163,7 @@
}
shouldStop.set(false);
- System.out.println("杞鏌ヨ宸插仠姝�");
+ //System.out.println("杞鏌ヨ宸插仠姝�");
return true;
}
@@ -174,20 +174,20 @@
public static boolean pausePolling() {
if (!isRunning) {
if (DEBUG_ENABLED) {
- System.out.println("杞鏌ヨ鏈湪杩愯锛屾棤娉曟殏鍋�");
+ //System.out.println("杞鏌ヨ鏈湪杩愯锛屾棤娉曟殏鍋�");
}
return false;
}
if (isPaused) {
if (DEBUG_ENABLED) {
- System.out.println("杞鏌ヨ宸茬粡澶勪簬鏆傚仠鐘舵��");
+ //System.out.println("杞鏌ヨ宸茬粡澶勪簬鏆傚仠鐘舵��");
}
return false;
}
isPaused = true;
- System.out.println("杞鏌ヨ宸叉殏鍋�");
+ //System.out.println("杞鏌ヨ宸叉殏鍋�");
return true;
}
@@ -197,12 +197,12 @@
*/
public static boolean resumePolling() {
if (!isRunning) {
- System.out.println("杞鏌ヨ鏈湪杩愯锛屾棤娉曟仮澶�");
+ //System.out.println("杞鏌ヨ鏈湪杩愯锛屾棤娉曟仮澶�");
return false;
}
if (!isPaused) {
- System.out.println("杞鏌ヨ鏈浜庢殏鍋滅姸鎬�");
+ //System.out.println("杞鏌ヨ鏈浜庢殏鍋滅姸鎬�");
return false;
}
@@ -216,7 +216,7 @@
synchronized (lunxun.class) {
lunxun.class.notifyAll(); // 鍞ら啋绛夊緟鐨勭嚎绋�
}
- System.out.println("杞鏌ヨ宸叉仮澶�");
+ //System.out.println("杞鏌ヨ宸叉仮澶�");
return true;
}
@@ -255,7 +255,7 @@
}
pollingInterval = interval;
- System.out.println("杞闂撮殧宸茶缃负: " + interval + "ms");
+ //System.out.println("杞闂撮殧宸茶缃负: " + interval + "ms");
// 濡傛灉姝ｅ湪杩愯锛岄噸鏂板惎鍔ㄤ互搴旂敤鏂扮殑闂撮殧
if (isRunning) {
@@ -297,13 +297,13 @@
if (configSystem.isInitialized()) {
MachineConfig machineConfig = configSystem.getMachineConfig();
pollingInterval = machineConfig.getPollingInterval();
- System.out.println("浠庨厤缃姞杞借疆璇㈤棿闅�: " + pollingInterval + "ms");
+ //System.out.println("浠庨厤缃姞杞借疆璇㈤棿闅�: " + pollingInterval + "ms");
} else {
- System.out.println("閰嶇疆绯荤粺鏈垵濮嬪寲锛屼娇鐢ㄩ粯璁よ疆璇㈤棿闅�: " + pollingInterval + "ms");
+ //System.out.println("閰嶇疆绯荤粺鏈垵濮嬪寲锛屼娇鐢ㄩ粯璁よ疆璇㈤棿闅�: " + pollingInterval + "ms");
}
} catch (Exception e) {
System.err.println("鍔犺浇杞闂撮殧閰嶇疆澶辫触: " + e.getMessage());
- System.out.println("浣跨敤榛樿杞闂撮殧: " + pollingInterval + "ms");
+ //System.out.println("浣跨敤榛樿杞闂撮殧: " + pollingInterval + "ms");
}
}
@@ -319,7 +319,7 @@
*/
public static void clearQueryCache() {
queryCommandCache.clear();
- System.out.println("鏌ヨ鎸囦护缂撳瓨宸叉竻绌�");
+ //System.out.println("鏌ヨ鎸囦护缂撳瓨宸叉竻绌�");
}
/**
@@ -334,7 +334,7 @@
@Override
public void run() {
- System.out.println("杞鏌ヨ绾跨▼寮�濮嬭繍琛�");
+ //System.out.println("杞鏌ヨ绾跨▼寮�濮嬭繍琛�");
while (isRunning && !Thread.currentThread().isInterrupted() && !shouldStop.get()) {
try {
@@ -406,7 +406,7 @@
}
} catch (InterruptedException e) {
- System.out.println("杞鏌ヨ绾跨▼琚腑鏂�");
+ //System.out.println("杞鏌ヨ绾跨▼琚腑鏂�");
Thread.currentThread().interrupt();
break;
} catch (Exception e) {
@@ -423,7 +423,7 @@
}
}
- System.out.println("杞鏌ヨ绾跨▼缁撴潫杩愯");
+ //System.out.println("杞鏌ヨ绾跨▼缁撴潫杩愯");
}
/**
@@ -494,7 +494,7 @@
if (sendResult) {
if (DEBUG_ENABLED) {
- System.out.println("绔嬪嵆鏌ヨ鎴愬姛 - 鍗℃Ы " + slotNumber);
+ //System.out.println("绔嬪嵆鏌ヨ鎴愬姛 - 鍗℃Ы " + slotNumber);
}
return true;
} else {
@@ -527,7 +527,7 @@
int batchSize = 5; // 姣忔壒娆″彂閫�5涓煡璇�
int totalSlots = MAX_SLOT - MIN_SLOT + 1;
- System.out.println("寮�濮嬫壒閲忔煡璇㈡墍鏈夊崱妲�...");
+ //System.out.println("寮�濮嬫壒閲忔煡璇㈡墍鏈夊崱妲�...");
for (int batchStart = MIN_SLOT; batchStart <= MAX_SLOT; batchStart += batchSize) {
if (shouldStop.get()) {
@@ -554,7 +554,7 @@
}
}
- System.out.println("鎵归噺鏌ヨ瀹屾垚锛屾垚鍔熷彂閫�: " + successCount + "/" + totalSlots);
+ //System.out.println("鎵归噺鏌ヨ瀹屾垚锛屾垚鍔熷彂閫�: " + successCount + "/" + totalSlots);
return successCount;
}
@@ -567,7 +567,7 @@
lastSerialCheckTime = System.currentTimeMillis();
if (connected) {
- System.out.println("涓插彛杩炴帴鐘舵�佸凡璁剧疆涓�: 宸茶繛鎺�");
+// //System.out.println("涓插彛杩炴帴鐘舵�佸凡璁剧疆涓�: 宸茶繛鎺�");
} else {
System.err.println("涓插彛杩炴帴鐘舵�佸凡璁剧疆涓�: 鏈繛鎺�");
// 濡傛灉涓插彛鏂紑涓旇疆璇㈡鍦ㄨ繍琛岋紝鑷姩鏆傚仠杞
@@ -605,7 +605,7 @@
*/
public static boolean setPollingPaused(boolean paused) {
if (!isRunning) {
- System.out.println("杞鏌ヨ鏈湪杩愯锛屾棤娉曡缃殏鍋滅姸鎬�");
+ //System.out.println("杞鏌ヨ鏈湪杩愯锛屾棤娉曡缃殏鍋滅姸鎬�");
return false;
}
@@ -613,10 +613,10 @@
// 璇锋眰鏆傚仠
if (!isPaused) {
isPaused = true;
- System.out.println("杞鏌ヨ宸查�氳繃澶栭儴璋冪敤鏆傚仠");
+ //System.out.println("杞鏌ヨ宸查�氳繃澶栭儴璋冪敤鏆傚仠");
return true;
} else {
- System.out.println("杞鏌ヨ宸茬粡澶勪簬鏆傚仠鐘舵��");
+ //System.out.println("杞鏌ヨ宸茬粡澶勪簬鏆傚仠鐘舵��");
return false;
}
} else {
@@ -632,10 +632,10 @@
synchronized (lunxun.class) {
lunxun.class.notifyAll(); // 鍞ら啋绛夊緟鐨勭嚎绋�
}
- System.out.println("杞鏌ヨ宸查�氳繃澶栭儴璋冪敤鎭㈠");
+ //System.out.println("杞鏌ヨ宸查�氳繃澶栭儴璋冪敤鎭㈠");
return true;
} else {
- System.out.println("杞鏌ヨ鏈浜庢殏鍋滅姸鎬�");
+ //System.out.println("杞鏌ヨ鏈浜庢殏鍋滅姸鎬�");
return false;
}
}
diff --git a/src/chushihua/lunxunzaixian.java b/src/chushihua/lunxunzaixian.java
index f4eeffa..29bc8d6 100644
--- a/src/chushihua/lunxunzaixian.java
+++ b/src/chushihua/lunxunzaixian.java
@@ -56,7 +56,7 @@
onlinePollingThread = new Thread(new OnlinePollingTask(), "Online-Polling-Thread");
onlinePollingThread.setDaemon(true);
onlinePollingThread.start();
- System.out.println("鍦ㄧ嚎杞宸插惎鍔紝鍛ㄦ湡闂撮殧: " + cycleInterval + "ms, 鍗℃Ы闂撮殧: " + slotInterval + "ms");
+ //System.out.println("鍦ㄧ嚎杞宸插惎鍔紝鍛ㄦ湡闂撮殧: " + cycleInterval + "ms, 鍗℃Ы闂撮殧: " + slotInterval + "ms");
return true;
} catch (Exception e) {
System.err.println("鍚姩鍦ㄧ嚎杞绾跨▼鏃跺彂鐢熷紓甯�: " + e.getMessage());
@@ -72,7 +72,7 @@
*/
public static boolean stopOnlinePolling() {
if (!isRunning.get()) {
- System.out.println("鍦ㄧ嚎杞鏈湪杩愯");
+ //System.out.println("鍦ㄧ嚎杞鏈湪杩愯");
return false;
}
@@ -101,7 +101,7 @@
}
shouldStop.set(false);
- System.out.println("鍦ㄧ嚎杞宸插仠姝�");
+ //System.out.println("鍦ㄧ嚎杞宸插仠姝�");
return true;
}
@@ -111,17 +111,17 @@
*/
public static boolean pauseOnlinePolling() {
if (!isRunning.get()) {
- System.out.println("鍦ㄧ嚎杞鏈湪杩愯锛屾棤娉曟殏鍋�");
+ //System.out.println("鍦ㄧ嚎杞鏈湪杩愯锛屾棤娉曟殏鍋�");
return false;
}
if (isPaused.get()) {
- System.out.println("鍦ㄧ嚎杞宸茬粡澶勪簬鏆傚仠鐘舵��");
+ //System.out.println("鍦ㄧ嚎杞宸茬粡澶勪簬鏆傚仠鐘舵��");
return false;
}
isPaused.set(true);
- System.out.println("鍦ㄧ嚎杞宸叉殏鍋�");
+ //System.out.println("鍦ㄧ嚎杞宸叉殏鍋�");
return true;
}
@@ -131,12 +131,12 @@
*/
public static boolean resumeOnlinePolling() {
if (!isRunning.get()) {
- System.out.println("鍦ㄧ嚎杞鏈湪杩愯锛屾棤娉曟仮澶�");
+ //System.out.println("鍦ㄧ嚎杞鏈湪杩愯锛屾棤娉曟仮澶�");
return false;
}
if (!isPaused.get()) {
- System.out.println("鍦ㄧ嚎杞鏈浜庢殏鍋滅姸鎬�");
+ //System.out.println("鍦ㄧ嚎杞鏈浜庢殏鍋滅姸鎬�");
return false;
}
@@ -150,7 +150,7 @@
synchronized (lunxunzaixian.class) {
lunxunzaixian.class.notifyAll(); // 鍞ら啋绛夊緟鐨勭嚎绋�
}
- System.out.println("鍦ㄧ嚎杞宸叉仮澶�");
+ //System.out.println("鍦ㄧ嚎杞宸叉仮澶�");
return true;
}
@@ -195,7 +195,7 @@
public static void setPollingIntervals(int cycleMs, int slotMs) {
cycleInterval = Math.max(cycleMs, 1000); // 鏈�灏�1绉�
slotInterval = Math.max(slotMs, 50); // 鏈�灏�50姣
- System.out.println("鍦ㄧ嚎杞闂撮殧宸茶缃� - 鍛ㄦ湡闂撮殧: " + cycleInterval + "ms, 鍗℃Ы闂撮殧: " + slotInterval + "ms");
+ //System.out.println("鍦ㄧ嚎杞闂撮殧宸茶缃� - 鍛ㄦ湡闂撮殧: " + cycleInterval + "ms, 鍗℃Ы闂撮殧: " + slotInterval + "ms");
// 濡傛灉姝ｅ湪杩愯锛岄噸鏂板惎鍔ㄤ互搴旂敤鏂扮殑闂撮殧
if (isRunning.get()) {
@@ -275,7 +275,7 @@
private static class OnlinePollingTask implements Runnable {
@Override
public void run() {
- System.out.println("鍦ㄧ嚎杞绾跨▼寮�濮嬭繍琛�");
+ //System.out.println("鍦ㄧ嚎杞绾跨▼寮�濮嬭繍琛�");
while (isRunning.get() && !Thread.currentThread().isInterrupted() && !shouldStop.get()) {
try {
@@ -311,7 +311,7 @@
Thread.sleep(cycleInterval);
} catch (InterruptedException e) {
- System.out.println("鍦ㄧ嚎杞绾跨▼琚腑鏂�");
+ //System.out.println("鍦ㄧ嚎杞绾跨▼琚腑鏂�");
Thread.currentThread().interrupt();
break;
} catch (Exception e) {
@@ -328,7 +328,7 @@
}
}
- System.out.println("鍦ㄧ嚎杞绾跨▼缁撴潫杩愯");
+ //System.out.println("鍦ㄧ嚎杞绾跨▼缁撴潫杩愯");
}
/**
@@ -357,7 +357,7 @@
if (cardSlots.isEmpty()) {
if (lunxun.DEBUG_ENABLED) {
- System.out.println("娌℃湁鎵惧埌鏈夊崱鐨勫崱妲�");
+ //System.out.println("娌℃湁鎵惧埌鏈夊崱鐨勫崱妲�");
}
return true;
}
@@ -393,7 +393,7 @@
}
if (polledCount > 0 && lunxun.DEBUG_ENABLED) {
- System.out.println("鍦ㄧ嚎杞瀹屾垚锛屾垚鍔熸煡璇� " + polledCount + "/" + totalCardSlots + " 涓湁鍗″崱妲�");
+ //System.out.println("鍦ㄧ嚎杞瀹屾垚锛屾垚鍔熸煡璇� " + polledCount + "/" + totalCardSlots + " 涓湁鍗″崱妲�");
}
return polledCount > 0;
@@ -412,7 +412,7 @@
if (result) {
// 璁板綍璋冭瘯淇℃伅锛堝噺灏戣緭鍑洪鐜囷級
if (lunxun.DEBUG_ENABLED && (slotNumber == 1 || slotNumber % 10 == 0)) {
- System.out.println("鍦ㄧ嚎杞 - 鏌ヨ鏈夊崱鍗℃Ы " + slotNumber);
+ //System.out.println("鍦ㄧ嚎杞 - 鏌ヨ鏈夊崱鍗℃Ы " + slotNumber);
}
return true;
} else {
@@ -442,7 +442,7 @@
return 0;
}
- System.out.println("寮�濮嬬珛鍗宠疆璇㈡湁鍗″崱妲�...");
+ //System.out.println("寮�濮嬬珛鍗宠疆璇㈡湁鍗″崱妲�...");
OnlinePollingTask task = new OnlinePollingTask();
@@ -471,7 +471,7 @@
*/
public static boolean setOnlinePollingPaused(boolean paused) {
if (!isRunning.get()) {
- System.out.println("鍦ㄧ嚎杞鏈湪杩愯锛屾棤娉曡缃殏鍋滅姸鎬�");
+ //System.out.println("鍦ㄧ嚎杞鏈湪杩愯锛屾棤娉曡缃殏鍋滅姸鎬�");
return false;
}
diff --git a/src/home/CardMachineUI.java b/src/home/CardMachineUI.java
index 291cd45..63c01cd 100644
--- a/src/home/CardMachineUI.java
+++ b/src/home/CardMachineUI.java
@@ -87,7 +87,7 @@
startUIUpdates(); // UI鍒锋柊瀹氭椂鍣�
startSerialStatusMonitoring(); // 涓插彛鐘舵�佺洃鎺�
- System.out.println("涓荤晫闈㈠垵濮嬪寲瀹屾垚");
+ //System.out.println("涓荤晫闈㈠垵濮嬪寲瀹屾垚");
} catch (Exception e) {
e.printStackTrace();
JOptionPane.showMessageDialog(null,
@@ -133,7 +133,7 @@
try {
// 鍒濆鍖栧崱妲界鐞嗗櫒 - 蹇呴』棣栧厛鎵ц
slotManager = new SlotManager();
- System.out.println("鍗℃Ы绠＄悊鍣ㄥ垵濮嬪寲瀹屾垚");
+ //System.out.println("鍗℃Ы绠＄悊鍣ㄥ垵濮嬪寲瀹屾垚");
// 鐩存帴浣跨敤宸茬粡鍒濆鍖栫殑閰嶇疆绯荤粺
Chushihua configSystem = Chushihua.getInstance();
@@ -156,9 +156,9 @@
PICKUP_PASSWORD = configSystem.getMachineConfig().getFetchCardPassword();
}
- System.out.println("绯荤粺閰嶇疆鍒濆鍖栧畬鎴�");
- System.out.println("绠＄悊鍛樺瘑鐮侀暱搴�: " + (ADMIN_PASSWORD != null ? ADMIN_PASSWORD.length() : "null"));
- System.out.println("鍙栧崱瀵嗙爜闀垮害: " + (PICKUP_PASSWORD != null ? PICKUP_PASSWORD.length() : "null"));
+ //System.out.println("绯荤粺閰嶇疆鍒濆鍖栧畬鎴�");
+ //System.out.println("绠＄悊鍛樺瘑鐮侀暱搴�: " + (ADMIN_PASSWORD != null ? ADMIN_PASSWORD.length() : "null"));
+ //System.out.println("鍙栧崱瀵嗙爜闀垮害: " + (PICKUP_PASSWORD != null ? PICKUP_PASSWORD.length() : "null"));
} catch (Exception e) {
System.err.println("绯荤粺鍒濆鍖栧紓甯�: " + e.getMessage());
@@ -504,7 +504,7 @@
cardSlotsPanel.revalidate();
cardSlotsPanel.repaint();
-// System.out.println("鍗℃Ы鏄剧ず鏇存柊瀹屾垚: " + updatedSlots + " 涓垚鍔�, " + errorSlots + " 涓け璐�");
+// //System.out.println("鍗℃Ы鏄剧ず鏇存柊瀹屾垚: " + updatedSlots + " 涓垚鍔�, " + errorSlots + " 涓け璐�");
}
private Color brighterColor(Color color) {
@@ -585,8 +585,9 @@
boolean pickupSuccess = CardPickupDialog.showCardPickup(this, slotId, status);
if (pickupSuccess) {
- // 鍙栧崱鎴愬姛锛岀晫闈㈠凡缁忓湪瀵硅瘽妗嗕腑鏇存柊锛岃繖閲屼笉闇�瑕侀澶栨搷浣�
- System.out.println("鍗℃Ы " + slotId + " 鍙栧崱鎴愬姛");
+ // 鍙栧崱鎴愬姛锛岃皟鐢╟hanggehaska鏂规硶鏀瑰彉鍗℃Ы灞炴��
+ SlotManager.changgehaska(slotId, "1"); // "1"琛ㄧず绠＄悊鍛樻搷浣�
+ //System.out.println("鍗℃Ы " + slotId + " 鍙栧崱鎴愬姛锛屽凡鏇存柊鍗℃Ы鐘舵��");
}
}
@@ -604,7 +605,7 @@
// 鍋滄杞鏌ヨ
if (lunxun.isPolling()) {
lunxun.stopPolling();
- System.out.println("搴旂敤绋嬪簭鍏抽棴锛岃疆璇㈡煡璇㈠凡鍋滄");
+ //System.out.println("搴旂敤绋嬪簭鍏抽棴锛岃疆璇㈡煡璇㈠凡鍋滄");
}
// 鍋滄涓插彛鍗忚瑙ｆ瀽鍣紙鏂板锛�
@@ -784,7 +785,7 @@
if (lunxun.checkSerialConnection()) {
boolean resumed = lunxun.setPollingPaused(false);
if (resumed) {
- System.out.println("鍒囨崲鍒颁富椤甸潰锛岃疆璇㈡煡璇㈠凡鎭㈠");
+ //System.out.println("鍒囨崲鍒颁富椤甸潰锛岃疆璇㈡煡璇㈠凡鎭㈠");
}
} else {
System.err.println("鍒囨崲鍒颁富椤甸潰锛屼覆鍙ｆ湭杩炴帴锛屼繚鎸佽疆璇㈡殏鍋�");
diff --git a/src/home/Homein.java b/src/home/Homein.java
index 2ab0538..cecbe3d 100644
--- a/src/home/Homein.java
+++ b/src/home/Homein.java
@@ -49,23 +49,23 @@
*/
private static boolean initializeSystem() {
try {
- System.out.println("寮�濮嬬郴缁熷垵濮嬪寲娴佺▼...");
+ //System.out.println("寮�濮嬬郴缁熷垵濮嬪寲娴佺▼...");
// 1. 杩愯绯荤粺鍒濆鍖栫被 Chushihua
- System.out.println("姝ラ1: 鍒濆鍖栫郴缁熼厤缃�...");
+ //System.out.println("姝ラ1: 鍒濆鍖栫郴缁熼厤缃�...");
if (!initializeChushihua()) {
System.err.println("绯荤粺閰嶇疆鍒濆鍖栧け璐�");
return false;
}
// 2. 鍒濆鍖� SlotManager 绫�
- System.out.println("姝ラ2: 鍒濆鍖栧崱妲界鐞嗗櫒...");
+ //System.out.println("姝ラ2: 鍒濆鍖栧崱妲界鐞嗗櫒...");
if (!initializeSlotManager()) {
System.err.println("鍗℃Ы绠＄悊鍣ㄥ垵濮嬪寲澶辫触");
return false;
}
- System.out.println("绯荤粺鍒濆鍖栧畬鎴�");
+ //System.out.println("绯荤粺鍒濆鍖栧畬鎴�");
return true;
} catch (Exception e) {
@@ -84,11 +84,11 @@
boolean success = configSystem.initialize();
if (success) {
- System.out.println("鉁� 绯荤粺閰嶇疆鍒濆鍖栨垚鍔�");
- System.out.println(" 璁惧缂栧彿: " + configSystem.getMachineConfig().getMachineId());
- System.out.println(" 鍗℃Ы鎬绘暟: " + configSystem.getMachineConfig().getTotalSlots());
- System.out.println(" 杞闂撮殧: " + configSystem.getMachineConfig().getPollingInterval() + "ms");
- System.out.println(" 娉㈢壒鐜�: " + configSystem.getMachineConfig().getBaudrate());
+ //System.out.println("鉁� 绯荤粺閰嶇疆鍒濆鍖栨垚鍔�");
+ //System.out.println(" 璁惧缂栧彿: " + configSystem.getMachineConfig().getMachineId());
+ //System.out.println(" 鍗℃Ы鎬绘暟: " + configSystem.getMachineConfig().getTotalSlots());
+ //System.out.println(" 杞闂撮殧: " + configSystem.getMachineConfig().getPollingInterval() + "ms");
+ //System.out.println(" 娉㈢壒鐜�: " + configSystem.getMachineConfig().getBaudrate());
} else {
System.err.println("鉁� 绯荤粺閰嶇疆鍒濆鍖栧け璐�");
}
@@ -108,8 +108,8 @@
try {
// SlotManager 浼氬湪鏋勯�犲嚱鏁颁腑鑷姩鍒濆鍖栨墍鏈夊崱妲�
SlotManager slotManager = new SlotManager();
- System.out.println("鉁� 鍗℃Ы绠＄悊鍣ㄥ垵濮嬪寲鎴愬姛");
- System.out.println(" 鎬诲崱妲芥暟: " + slotManager.getTotalSlots());
+ //System.out.println("鉁� 鍗℃Ы绠＄悊鍣ㄥ垵濮嬪寲鎴愬姛");
+ //System.out.println(" 鎬诲崱妲芥暟: " + slotManager.getTotalSlots());
return true;
@@ -166,17 +166,17 @@
*/
private static boolean initializeSerialPort() {
try {
- System.out.println("姝ｅ湪鎵撳紑涓插彛杩炴帴瀵硅瘽妗�...");
+ //System.out.println("姝ｅ湪鎵撳紑涓插彛杩炴帴瀵硅瘽妗�...");
// 鏄剧ず涓插彛杩炴帴瀵硅瘽妗嗭紙妯℃�佸璇濇锛屼細闃诲鐩村埌鐢ㄦ埛鎿嶄綔锛�
// 鐢ㄦ埛蹇呴』鐐瑰嚮"杩炴帴涓插彛"鎸夐挳鎵嶄細瀹為檯杩炴帴
boolean connected = SerialPortConnectionDialog.showConnectionDialog(null);
if (connected) {
- System.out.println("鉁� 涓插彛杩炴帴鎴愬姛");
+ //System.out.println("鉁� 涓插彛杩炴帴鎴愬姛");
return true;
} else {
- System.out.println("鉁� 涓插彛杩炴帴澶辫触鎴栫敤鎴峰彇娑�");
+ //System.out.println("鉁� 涓插彛杩炴帴澶辫触鎴栫敤鎴峰彇娑�");
// 娣诲姞璇︾粏閿欒淇℃伅
JOptionPane.showMessageDialog(null,
"涓插彛杩炴帴澶辫触锛岃妫�鏌ヤ覆鍙ｈ澶囨槸鍚﹀彲鐢�",
@@ -211,7 +211,7 @@
boolean started = lunxun.startPolling();
if (started) {
- System.out.println("鉁� 杞鏌ヨ鍚姩鎴愬姛");
+ //System.out.println("鉁� 杞鏌ヨ鍚姩鎴愬姛");
return true;
} else {
System.err.println("鉁� 杞鏌ヨ鍚姩澶辫触");
@@ -229,11 +229,11 @@
*/
private static void showMainInterface() {
try {
- System.out.println("姝ｅ湪鍒涘缓涓荤晫闈�...");
+ //System.out.println("姝ｅ湪鍒涘缓涓荤晫闈�...");
// 纭繚杞鏈嶅姟宸插惎鍔�
if (!lunxun.isPolling()) {
- System.out.println("鍚姩杞鏈嶅姟...");
+ //System.out.println("鍚姩杞鏈嶅姟...");
startPollingService();
}
@@ -241,8 +241,8 @@
CardMachineUI mainUI = new CardMachineUI();
mainUI.setVisible(true);
- System.out.println("鉁� 涓荤晫闈㈠惎鍔ㄦ垚鍔�");
- System.out.println("搴旂敤绋嬪簭鍚姩瀹屾垚锛岃繘鍏ユ甯歌繍琛岀姸鎬�");
+ //System.out.println("鉁� 涓荤晫闈㈠惎鍔ㄦ垚鍔�");
+ //System.out.println("搴旂敤绋嬪簭鍚姩瀹屾垚锛岃繘鍏ユ甯歌繍琛岀姸鎬�");
// 娣诲姞鍏抽棴閽╁瓙锛岀‘淇濆簲鐢ㄧ▼搴忛��鍑烘椂姝ｇ‘娓呯悊璧勬簮
addShutdownHook(mainUI);
@@ -263,26 +263,26 @@
*/
private static void addShutdownHook(CardMachineUI mainUI) {
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
- System.out.println("搴旂敤绋嬪簭姝ｅ湪鍏抽棴锛屾墽琛屾竻鐞嗘搷浣�...");
+ //System.out.println("搴旂敤绋嬪簭姝ｅ湪鍏抽棴锛屾墽琛屾竻鐞嗘搷浣�...");
try {
// 鍋滄杞鏌ヨ
if (lunxun.isPolling()) {
- System.out.println("鍋滄杞鏌ヨ...");
+ //System.out.println("鍋滄杞鏌ヨ...");
lunxun.stopPolling();
}
// 鍏抽棴绯荤粺閰嶇疆
- System.out.println("鍏抽棴绯荤粺閰嶇疆...");
+ //System.out.println("鍏抽棴绯荤粺閰嶇疆...");
Chushihua.getInstance().shutdown();
// 鍏抽棴涓荤晫闈㈣祫婧�
if (mainUI != null) {
- System.out.println("鍏抽棴涓荤晫闈㈣祫婧�...");
+ //System.out.println("鍏抽棴涓荤晫闈㈣祫婧�...");
mainUI.dispose();
}
- System.out.println("搴旂敤绋嬪簭鍏抽棴瀹屾垚");
+ //System.out.println("搴旂敤绋嬪簭鍏抽棴瀹屾垚");
} catch (Exception e) {
System.err.println("搴旂敤绋嬪簭鍏抽棴杩囩▼涓彂鐢熷紓甯�: " + e.getMessage());
diff --git a/src/publicway/ProtocolParser01.java b/src/publicway/ProtocolParser01.java
index 4f0943c..3b402aa 100644
--- a/src/publicway/ProtocolParser01.java
+++ b/src/publicway/ProtocolParser01.java
@@ -116,9 +116,9 @@
String receivedCRC = hexData.substring(hexData.length() - 6);
byte[] cmdBytes = HexUtil.hexStringToBytes(hexData.replace(receivedCRC,""));
String crc = HexUtil.calculate(cmdBytes)+"00";
- System.out.println("收到的完整数据是："+hexData);
- System.out.println("收到数据校验码是："+receivedCRC);
- System.out.println("校验码是："+crc);
+ //System.out.println("收到的完整数据是："+hexData);
+ //System.out.println("收到数据校验码是："+receivedCRC);
+ //System.out.println("校验码是："+crc);
return receivedCRC.equalsIgnoreCase(crc);
} catch (Exception e) {
System.err.println("CRC校验异常: " + e.getMessage());
@@ -515,7 +515,7 @@
sb.append("9. 电压: ").append(String.format("%.2f", voltage));
sb.append("10. 电流: ").append(String.format("%.2f", current));
sb.append("数据长度: ").append(dataLength).append(" 字节");
-// System.out.println(sb.toString());
+// //System.out.println(sb.toString());
return sb.toString();
}
diff --git a/src/publicway/ProtocolParser51.java b/src/publicway/ProtocolParser51.java
index f1c2ab2..9019884 100644
--- a/src/publicway/ProtocolParser51.java
+++ b/src/publicway/ProtocolParser51.java
@@ -42,8 +42,8 @@
// 校验 CRC
// String calcCrc = CRC16Modbus.calculate(withoutCrc);
// if (!calcCrc.equals(crcHex)) {
-// System.out.println("calcCrc:"+calcCrc);
-// System.out.println("crcHex:"+crcHex);
+// //System.out.println("calcCrc:"+calcCrc);
+// //System.out.println("crcHex:"+crcHex);
// return 0;
// }
diff --git a/src/publicway/SerialProtocolParser.java b/src/publicway/SerialProtocolParser.java
index 2af77a8..f342178 100644
--- a/src/publicway/SerialProtocolParser.java
+++ b/src/publicway/SerialProtocolParser.java
@@ -46,7 +46,7 @@
*/
public void start() {
if (isRunning) {
- System.out.println("涓插彛鍗忚瑙ｆ瀽鍣ㄥ凡缁忓湪杩愯涓�");
+ //System.out.println("涓插彛鍗忚瑙ｆ瀽鍣ㄥ凡缁忓湪杩愯涓�");
return;
}
@@ -59,7 +59,7 @@
processorThread.setDaemon(true);
processorThread.start();
- System.out.println("涓插彛鍗忚瑙ｆ瀽鍣ㄥ凡鍚姩");
+ //System.out.println("涓插彛鍗忚瑙ｆ瀽鍣ㄥ凡鍚姩");
}
/**
@@ -98,7 +98,7 @@
batchQueue.clear();
bufferPosition = 0;
- System.out.println("涓插彛鍗忚瑙ｆ瀽鍣ㄥ凡鍋滄");
+ //System.out.println("涓插彛鍗忚瑙ｆ瀽鍣ㄥ凡鍋滄");
}
/**
@@ -113,7 +113,7 @@
*/
public void receiveData(byte[] rawData) {
if (!isRunning) {
- System.out.println("璀﹀憡: 涓插彛鍗忚瑙ｆ瀽鍣ㄦ湭鍚姩锛屽拷鐣ユ帴鏀剁殑鏁版嵁");
+ //System.out.println("璀﹀憡: 涓插彛鍗忚瑙ｆ瀽鍣ㄦ湭鍚姩锛屽拷鐣ユ帴鏀剁殑鏁版嵁");
return;
}
@@ -167,7 +167,7 @@
long maxMem = runtime.maxMemory();
if (usedMem > maxMem * 0.8) {
- System.out.println("鍐呭瓨浣跨敤鐜囪秴杩�80%锛屽綋鍓嶄娇鐢�: " + (usedMem / 1024 / 1024) + "MB");
+ //System.out.println("鍐呭瓨浣跨敤鐜囪秴杩�80%锛屽綋鍓嶄娇鐢�: " + (usedMem / 1024 / 1024) + "MB");
}
}
@@ -250,14 +250,14 @@
* 澶勭悊鏁版嵁鍖呯殑涓绘柟娉�
*/
private void processPackets() {
- System.out.println("涓插彛鏁版嵁鍖呭鐞嗙嚎绋嬪紑濮嬭繍琛�");
+ //System.out.println("涓插彛鏁版嵁鍖呭鐞嗙嚎绋嬪紑濮嬭繍琛�");
while (isRunning && !Thread.currentThread().isInterrupted()) {
try {
byte[] packet = dataQueue.take(); // 闃诲鐩村埌鏈夋暟鎹�
parsePacket(packet);
} catch (InterruptedException e) {
- System.out.println("涓插彛鏁版嵁鍖呭鐞嗙嚎绋嬭涓柇");
+ //System.out.println("涓插彛鏁版嵁鍖呭鐞嗙嚎绋嬭涓柇");
Thread.currentThread().interrupt();
break;
} catch (Exception e) {
@@ -266,7 +266,7 @@
}
}
- System.out.println("涓插彛鏁版嵁鍖呭鐞嗙嚎绋嬬粨鏉熻繍琛�");
+ //System.out.println("涓插彛鏁版嵁鍖呭鐞嗙嚎绋嬬粨鏉熻繍琛�");
}
/**
@@ -306,25 +306,25 @@
String hexPacket = bytesToHex(packet);
int result = ProtocolParser51.parse(hexPacket);
if (result == 1) {
- System.out.println("鍔熻兘鐮� 0x51 - 寮�闂ㄦ帶鍒舵垚鍔�");
+ //System.out.println("鍔熻兘鐮� 0x51 - 寮�闂ㄦ帶鍒舵垚鍔�");
} else {
- System.out.println("鍔熻兘鐮� 0x51 - 寮�闂ㄦ帶鍒跺け璐ユ垨鎶ユ枃涓嶅悎娉�");
+ //System.out.println("鍔熻兘鐮� 0x51 - 寮�闂ㄦ帶鍒跺け璐ユ垨鎶ユ枃涓嶅悎娉�");
}
break;
case FUNCTION_52:
- System.out.println("鍔熻兘鐮� 0x52 - LED浜害鎺у埗");
+ //System.out.println("鍔熻兘鐮� 0x52 - LED浜害鎺у埗");
break;
case FUNCTION_80:
- System.out.println("鍔熻兘鐮� 0x80 - 宸ュ崱鍗囩骇浣胯兘");
+ //System.out.println("鍔熻兘鐮� 0x80 - 宸ュ崱鍗囩骇浣胯兘");
break;
case FUNCTION_81:
- System.out.println("鍔熻兘鐮� 0x81 - 宸ヤ綔鍗″崌绾ф暟鎹寘");
+ //System.out.println("鍔熻兘鐮� 0x81 - 宸ヤ綔鍗″崌绾ф暟鎹寘");
break;
case FUNCTION_82:
- System.out.println("鍔熻兘鐮� 0x82 - 鍗曟澘鍗囩骇浣胯兘");
+ //System.out.println("鍔熻兘鐮� 0x82 - 鍗曟澘鍗囩骇浣胯兘");
break;
case FUNCTION_83:
- System.out.println("鍔熻兘鐮� 0x83 - 鍗曟澘鍗囩骇鏁版嵁鍖�");
+ //System.out.println("鍔熻兘鐮� 0x83 - 鍗曟澘鍗囩骇鏁版嵁鍖�");
break;
default:
System.err.println("鏈煡鍔熻兘鐮�: 0x" + Integer.toHexString(functionCode & 0xFF));
diff --git a/src/xitongshezhi/Charulog.java b/src/xitongshezhi/Charulog.java
index fd0a9e6..9015ef5 100644
--- a/src/xitongshezhi/Charulog.java
+++ b/src/xitongshezhi/Charulog.java
@@ -138,11 +138,11 @@
return key1.compareTo(key2);
});
- System.out.println("=== 鎿嶄綔鏃ュ織璁板綍 (鍏� " + entries.size() + " 鏉�) ===");
+ //System.out.println("=== 鎿嶄綔鏃ュ織璁板綍 (鍏� " + entries.size() + " 鏉�) ===");
for (Map.Entry<Object, Object> entry : entries) {
- System.out.println(entry.getValue());
+ //System.out.println(entry.getValue());
}
- System.out.println("=== 鏃ュ織缁撴潫 ===");
+ //System.out.println("=== 鏃ュ織缁撴潫 ===");
}
}
\ No newline at end of file
diff --git a/src/xitongshezhi/ConfigSet.java b/src/xitongshezhi/ConfigSet.java
index 98e5435..b31f830 100644
--- a/src/xitongshezhi/ConfigSet.java
+++ b/src/xitongshezhi/ConfigSet.java
@@ -79,7 +79,7 @@
if (lunxun.isPolling() && !lunxun.isPaused()) {
boolean paused = lunxun.setPollingPaused(true);
if (paused) {
- System.out.println("杩涘叆璁剧疆椤甸潰锛岃疆璇㈠凡鏆傚仠");
+ //System.out.println("杩涘叆璁剧疆椤甸潰锛岃疆璇㈠凡鏆傚仠");
} else {
System.err.println("杩涘叆璁剧疆椤甸潰锛屾殏鍋滆疆璇㈠け璐�");
}
@@ -98,7 +98,7 @@
if (lunxun.checkSerialConnection()) {
boolean resumed = lunxun.setPollingPaused(false);
if (resumed) {
- System.out.println("閫�鍑鸿缃〉闈紝杞宸叉仮澶�");
+ //System.out.println("閫�鍑鸿缃〉闈紝杞宸叉仮澶�");
} else {
System.err.println("閫�鍑鸿缃〉闈紝鎭㈠杞澶辫触");
}
@@ -107,7 +107,7 @@
}
}
} else {
- System.out.println("閫�鍑鸿缃〉闈紝淇濇寔鍘熸湁杞鐘舵�� - 杩愯: " + wasPollingRunning + ", 鏆傚仠: " + wasPollingPaused);
+ //System.out.println("閫�鍑鸿缃〉闈紝淇濇寔鍘熸湁杞鐘舵�� - 杩愯: " + wasPollingRunning + ", 鏆傚仠: " + wasPollingPaused);
}
}
diff --git a/src/xitongshezhi/SystemDebugDialog.java b/src/xitongshezhi/SystemDebugDialog.java
index 0da3321..08ca52c 100644
--- a/src/xitongshezhi/SystemDebugDialog.java
+++ b/src/xitongshezhi/SystemDebugDialog.java
@@ -552,7 +552,7 @@
// 濡傛灉鍐呭瓨浣跨敤瓒呰繃80%锛屽缓璁竻鐞�
if (usedMemory > maxMemory * 0.8) {
- System.out.println("鍐呭瓨浣跨敤璀﹀憡: " + usedMemory + "MB/" + maxMemory + "MB");
+ //System.out.println("鍐呭瓨浣跨敤璀﹀憡: " + usedMemory + "MB/" + maxMemory + "MB");
// 鍙�夛細鑷姩娓呯悊鏃ф暟鎹�
if (dataTextArea.getLineCount() > MAX_DISPLAY_LINES) {
clearData();
diff --git a/src/xitongshezhi/banbenguanli.java b/src/xitongshezhi/banbenguanli.java
index 73aa8cd..87b09ff 100644
--- a/src/xitongshezhi/banbenguanli.java
+++ b/src/xitongshezhi/banbenguanli.java
@@ -671,8 +671,8 @@
SwingWorker<Void, Integer> downloadWorker = new SwingWorker<Void, Integer>() {
@Override
protected Void doInBackground() throws Exception {
- System.out.println("寮�濮嬩笅杞斤紝URL: " + downloadUrl);
- System.out.println("浣跨敤鐨凾oken: " + loginToken);
+ //System.out.println("寮�濮嬩笅杞斤紝URL: " + downloadUrl);
+ //System.out.println("浣跨敤鐨凾oken: " + loginToken);
try {
URL url = new URL(downloadUrl);
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
@@ -682,7 +682,7 @@
// 娣诲姞璁よ瘉澶�
if (!loginToken.isEmpty()) {
connection.setRequestProperty("Authorization", loginToken);
- System.out.println("璁剧疆Authorization澶�: " + loginToken);
+ //System.out.println("璁剧疆Authorization澶�: " + loginToken);
}
connection.setConnectTimeout(10000);
diff --git a/src/xitongshezhi/kuaisuquka.java b/src/xitongshezhi/kuaisuquka.java
index c1ba92e..94f2958 100644
--- a/src/xitongshezhi/kuaisuquka.java
+++ b/src/xitongshezhi/kuaisuquka.java
@@ -159,7 +159,7 @@
private void recordPollingStateBeforeEntering() {
wasPollingRunning = chushihua.lunxun.isPolling();
wasPollingPaused = chushihua.lunxun.isPaused();
- System.out.println("杩涘叆蹇�熷彇鍗￠〉闈紝璁板綍杞鐘舵�� - 杩愯: " + wasPollingRunning + ", 鏆傚仠: " + wasPollingPaused);
+ //System.out.println("杩涘叆蹇�熷彇鍗￠〉闈紝璁板綍杞鐘舵�� - 杩愯: " + wasPollingRunning + ", 鏆傚仠: " + wasPollingPaused);
}
/**
@@ -168,7 +168,7 @@
private void pausePollingWhenEntering() {
if (chushihua.lunxun.isPolling() && !chushihua.lunxun.isPaused()) {
chushihua.lunxun.pausePolling();
- System.out.println("杩涘叆蹇�熷彇鍗￠〉闈紝杞宸叉殏鍋�");
+ //System.out.println("杩涘叆蹇�熷彇鍗￠〉闈紝杞宸叉殏鍋�");
}
}
@@ -180,10 +180,10 @@
if (wasPollingRunning && !wasPollingPaused) {
if (chushihua.lunxun.isPolling() && chushihua.lunxun.isPaused()) {
chushihua.lunxun.resumePolling();
- System.out.println("閫�鍑哄揩閫熷彇鍗￠〉闈紝杞宸叉仮澶�");
+ //System.out.println("閫�鍑哄揩閫熷彇鍗￠〉闈紝杞宸叉仮澶�");
}
} else {
- System.out.println("閫�鍑哄揩閫熷彇鍗￠〉闈紝淇濇寔鍘熸湁杞鐘舵�� - 杩愯: " + wasPollingRunning + ", 鏆傚仠: " + wasPollingPaused);
+ //System.out.println("閫�鍑哄揩閫熷彇鍗￠〉闈紝淇濇寔鍘熸湁杞鐘舵�� - 杩愯: " + wasPollingRunning + ", 鏆傚仠: " + wasPollingPaused);
}
}
@@ -474,7 +474,7 @@
boolean sent = Sendmsg.sendMessage(command);
if (sent) {
- System.out.println("鎴愬姛鍙戦�佸紑闂ㄦ寚浠ゅ埌鍗℃Ы " + slotId);
+ //System.out.println("鎴愬姛鍙戦�佸紑闂ㄦ寚浠ゅ埌鍗℃Ы " + slotId);
} else {
System.err.println("鍙戦�佸紑闂ㄦ寚浠ゅ埌鍗℃Ы " + slotId + " 澶辫触");
}
@@ -490,8 +490,8 @@
// 鏇存柊鍗℃Ы鐘舵�佷负鏃犲崱
slotStatuses.set(index, SlotStatus.NO_CARD);
- // 璋冪敤 SlotManager 鏇存柊鐘舵��
- slotManager.setSlotHasCard(slotId, "0");
+ // 璋冪敤 SlotManager 鐨刢hanggehaska鏂规硶鏇存柊鐘舵��
+ SlotManager.changgehaska(slotId, "1"); // "1"琛ㄧず绠＄悊鍛樻搷浣�
updateCardSlotsDisplay();
updateStatistics();
@@ -544,8 +544,8 @@
for (int i = 0; i < slotStatuses.size(); i++) {
if (slotStatuses.get(i) == SlotStatus.HAS_CARD) {
slotStatuses.set(i, SlotStatus.NO_CARD);
- // 璋冪敤 SlotManager 鏇存柊鐘舵��
- slotManager.setSlotHasCard(i + 1, "0");
+ // 璋冪敤 SlotManager 鐨刢hanggehaska鏂规硶鏇存柊鐘舵��
+ SlotManager.changgehaska(i + 1, "1"); // "1"琛ㄧず绠＄悊鍛樻搷浣�
openedCount++;
}
}
--
Gitblit v1.9.3