From 43a889d3f0c50d139461a60ccaba2eb058d19975 Mon Sep 17 00:00:00 2001
From: zuoxiao <lf_zuo@163.com>
Date: 星期三, 25 六月 2025 09:44:02 +0800
Subject: [PATCH] feat(card): 添加未写卡状态并更新相关逻辑
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeManagementCard.java | 2 +-
pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardSv.java | 2 +-
pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml | 2 +-
README.md | 41 +++++++++++++++++++++++++++++++++++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/enums/ManagementCardStateENUM.java | 3 ++-
5 files changed, 46 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index 8797567..82aa550 100644
--- a/README.md
+++ b/README.md
@@ -58,6 +58,47 @@
- **宸ュ叿闆�**: Hutool 5.8.22
- **鏃ュ織妗嗘灦**: Log4j2 2.20.0
+## ID鐢熸垚鍣ㄤ娇鐢ㄨ鏄�
+
+绯荤粺浣跨敤鑷畾涔夌殑IDLongGenerator鏉ョ敓鎴愬敮涓�鐨凩ong鍨婭D锛岀‘淇濆湪鍒嗗竷寮忕幆澧冧笅鐨処D鍞竴鎬с��
+
+### IDLongGenerator鐗规��
+
+- **鏍煎紡**: `骞存湀鏃ユ椂鍒嗙` + `3浣嶈嚜澧炲簭鍒梎 + `2浣嶇郴缁熷悗缂�`
+- **闀垮害**: 19浣嶆暟瀛楋紙濡傦細20231218104504069**00**锛�
+- **骞跺彂鎬�**: 鏀寔鍚屼竴绉掑唴鐢熸垚1000涓笉鍚孖D
+- **鍒嗗竷寮�**: 閫氳繃鍚庣紑鍖哄垎涓嶅悓瀛愮郴缁燂紝閬垮厤ID鍐茬獊
+
+### 浣跨敤鏂瑰紡
+
+```java
+// 渚濊禆娉ㄥ叆
+@Autowired
+private IDLongGenerator idLongGenerator;
+
+// 鐢熸垚ID
+Long id = idLongGenerator.generate();
+```
+
+### 搴旂敤鍦烘櫙
+
+- **绠＄悊鍗″垱寤�**: createManagementCard鏂规硶涓娇鐢↖DLongGenerator鐢熸垚绠＄悊鍗D
+- **瀹炰綋涓婚敭**: 鎵�鏈変笟鍔″疄浣撶殑涓婚敭ID鐢熸垚
+- **璁㈠崟鍙�**: 涓氬姟娴佹按鍙风敓鎴�
+- **鏃ュ織璁板綍**: 鎿嶄綔璁板綍鐨勫敮涓�鏍囪瘑
+
+### 閰嶇疆璇存槑
+
+绯荤粺鍚姩鏃朵細鑷姩璁剧疆ID鍚庣紑锛屼笉鍚岀殑鏈嶅姟妯″潡浣跨敤涓嶅悓鐨勫悗缂�鏉ラ伩鍏岻D鍐茬獊锛�
+
+```xml
+<!-- web.xml鎴朣pring閰嶇疆 -->
+<context-param>
+ <param-name>idSuffix</param-name>
+ <param-value>01</param-value> <!-- 涓嶅悓鏈嶅姟浣跨敤涓嶅悓鍚庣紑 -->
+</context-param>
+```
+
## 寮�鍙戠幆澧冩惌寤�
### 鍓嶇疆鏉′欢
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeManagementCard.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeManagementCard.java
index bdfee9a..0c86dea 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeManagementCard.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeManagementCard.java
@@ -109,7 +109,7 @@
private Date cancelDt;
/**
- * 鍗＄墖鐘舵��;1-姝ｅ父锛�2-宸叉敞閿�锛�3-宸叉寕澶�
+ * 鍗＄墖鐘舵��;1-姝ｅ父锛�2-宸叉敞閿�锛�3-宸叉寕澶憋紝4-鏈啓鍗�
*/
@NotNull(message = "鍗＄墖鐘舵�佷笉鑳戒负绌�")
private Byte state;
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
index e595e8f..76c469e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/SeClientCardMapper.xml
@@ -868,7 +868,7 @@
<!--妫�鏌ュ崱鍦板潃鏄惁宸插瓨鍦紙绠＄悊鍗¤〃 + 鍐滄埛姘村崱琛級-->
<select id="checkCardAddrExists" resultType="java.lang.Long">
SELECT COUNT(*) AS totalCount FROM (
- -- 妫�鏌ョ鐞嗗崱琛ㄤ腑姝ｅ父(1)鍜屾寕澶�(3)鐘舵�佺殑璁板綍
+ -- 妫�鏌ョ鐞嗗崱琛ㄤ腑姝ｅ父(1)鍜屾寕澶�(3)鐘舵�佺殑璁板綍锛屾帓闄ゅ凡娉ㄩ攢(2)鍜屾湭鍐欏崱(4)
SELECT card_addr FROM se_management_card
WHERE card_addr = #{cardAddr}
AND state IN (1, 3)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardSv.java
index 674f238..f41c589 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/CardSv.java
@@ -1330,7 +1330,7 @@
.domain(dto.getDomain())
.openClostTime(dto.getOpenClostTime())
.remarks(dto.getRemarks())
- .state(ManagementCardStateENUM.NORMAL.getCode()) // 榛樿鐘舵�佷负姝ｅ父
+ .state(ManagementCardStateENUM.UNWRITTEN.getCode()) // 榛樿鐘舵�佷负鏈啓鍗�
.build();
// 鎻掑叆鏁版嵁搴�
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/enums/ManagementCardStateENUM.java b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/enums/ManagementCardStateENUM.java
index 1eecaa4..685faae 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/enums/ManagementCardStateENUM.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-terminal/src/main/java/com/dy/pipIrrTerminal/card/enums/ManagementCardStateENUM.java
@@ -15,7 +15,8 @@
public enum ManagementCardStateENUM {
NORMAL((byte) 1, "姝ｅ父"),
CANCELLED((byte) 2, "宸叉敞閿�"),
- LOSS((byte) 3, "宸叉寕澶�");
+ LOSS((byte) 3, "宸叉寕澶�"),
+ UNWRITTEN((byte) 4, "鏈啓鍗�");
private final Byte code;
private final String message;
--
Gitblit v1.8.0