From a6077217e25f5804027194a5c2848e773eda1abd Mon Sep 17 00:00:00 2001
From: 张世豪 <979909237@qq.com>
Date: 星期五, 21 十一月 2025 15:47:17 +0800
Subject: [PATCH] 修改
---
src/chushihua/SlotManager.java | 48 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 36 insertions(+), 12 deletions(-)
diff --git a/src/chushihua/SlotManager.java b/src/chushihua/SlotManager.java
index 19ce442..b85cb60 100644
--- a/src/chushihua/SlotManager.java
+++ b/src/chushihua/SlotManager.java
@@ -5,7 +5,8 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import xitongshezhi.Fkj;
+import dialog.Dingshidialog;
+import home.Fkj;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -204,8 +205,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 +224,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());
}
}
@@ -318,6 +319,7 @@
/**
* 鏍规嵁鐘舵�佺爜鍜屾晠闅滅爜鍒ゆ柇鏄惁鏈夊崱 - 浼樺寲鐗堟湰
*/
+ @SuppressWarnings("unused")
private String determineHasCardFromStatus(int status, int fault) {
// 浼樺寲锛氫娇鐢ㄦ暟鍊兼瘮杈冩浛浠ｅ瓧绗︿覆鎿嶄綔
if (fault != 0) {
@@ -415,7 +417,7 @@
slot.setFault(UNKNOWN_VALUE);
slot.setUpdateTime(UNKNOWN_VALUE);
}
- System.out.println("鎵�鏈夊崱妲界姸鎬佸凡閲嶇疆涓烘湭鐭�");
+ //System.out.println("鎵�鏈夊崱妲界姸鎬佸凡閲嶇疆涓烘湭鐭�");
}
@@ -453,8 +455,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());
}
/**
@@ -521,14 +523,36 @@
if ("0000".equals(oldCardNumber) && !"0000".equals(newCardNumber)) {
// 鍦ㄤ簨浠跺垎鍙戠嚎绋嬩腑鏄剧ず瀵硅瘽妗�
javax.swing.SwingUtilities.invokeLater(() -> {
- xitongshezhi.Dingshidialog.showTimedDialog(
+ Dingshidialog.showTimedDialog(
null, // 鐖剁獥鍙ｏ紝鍙互涓簄ull
5, // 鏄剧ず3绉�
- "杩樺崱鎴愬姛锛屾劅璋㈡偍鐨勪娇鐢�",
- "" // 闊抽鏂囦欢锛屽彲浠ヤ负绌�
+ slotNumber+"鍙峰崱妲借繕鍗℃垚鍔熸劅璋㈡偍鐨勪娇鐢�"
);
});
- 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, int caozuo) {
+ if (!isValidSlotNumber(slotNumber)) {
+ return false;
+ }
+ Fkj slot = slotArray[slotNumber - 1];
+ slot.setHasCard("0");
+ slot.setCardNumber("0000");
+ slot.setUpdateTime(getCurrentTime());
+
+ // 璁板綍鍙栧崱鏃ュ織
+ String operator =caozuo==1? "绠＄悊鍛�" : "绯荤粺";
+ String logMessage = String.format("鍙栧崱鎿嶄綔锛氬崱妲�%d琚�%s鍙栧崱", slotNumber, operator);
+ dialog.Charulog.logOperation(logMessage);
+
+ return true;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3