From 8297013f990a5440fa8bebb8c0eb9fb0f6af4862 Mon Sep 17 00:00:00 2001 From: zuoxiao <lf_zuo@163.com> Date: 星期三, 25 六月 2025 09:30:26 +0800 Subject: [PATCH] feat(card): 添加管理卡状态枚举并更新相关逻辑 --- pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoSe/SeManagementCard.java | 68 ++++++++++++++++++++-------------- 1 files changed, 40 insertions(+), 28 deletions(-) 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 9daf090..bdfee9a 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 @@ -20,7 +20,7 @@ * @Description 鍏呭�兼満鐢ㄧ鐞嗗崱 */ -@TableName(value="se_management_card", autoResultMap = true) +@TableName(value = "se_management_card", autoResultMap = true) @Data @Builder @ToString @@ -30,76 +30,88 @@ public static final long serialVersionUID = 202506240651001L; /** - * 涓婚敭 - */ - @JSONField(serializeUsing= ObjectWriterImplToString.class) + * 涓婚敭 + */ + @JSONField(serializeUsing = ObjectWriterImplToString.class) @TableId(type = IdType.INPUT) private Long id; /** - * 閫氳鍗忚 - */ + * 閫氳鍗忚 + */ @NotBlank(message = "閫氳鍗忚涓嶈兘涓虹┖") private String protocol; /** - * 鍗$墖鍦板潃 - */ + * 鍗$墖鍦板潃 + */ @NotBlank(message = "鍗$墖鍦板潃涓嶈兘涓虹┖") private String cardAddr; /** - * 璇嗗埆鐮� - */ + * 璇嗗埆鐮� + */ @NotBlank(message = "璇嗗埆鐮佷笉鑳戒负绌�") private String securityCode; /** - * 鍗$墖绫诲瀷;2-璁剧疆鍖哄煙琛ㄥ彿鍗★紝3-鍙栨暟鍗★紝4-妫�鏌ュ崱锛�5-娴嬭瘯鍗★紝6-娓呴浂鍗★紝7-IP璁剧疆鍗★紝8-鍩熷悕璁剧疆鍗★紝9-GPS鍗★紝10-鏃堕棿閰嶇疆鍗� - */ + * 鍗$墖绫诲瀷;2-璁剧疆鍖哄煙琛ㄥ彿鍗★紝3-鍙栨暟鍗★紝4-妫�鏌ュ崱锛�5-娴嬭瘯鍗★紝6-娓呴浂鍗★紝7-IP璁剧疆鍗★紝8-鍩熷悕璁剧疆鍗★紝9-GPS鍗★紝10-鏃堕棿閰嶇疆鍗� + */ @NotNull(message = "鍗$墖绫诲瀷涓嶈兘涓虹┖") private Byte cardType; /** - * 寮�鍗℃椂闂� - */ + * 寮�鍗℃椂闂� + */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @NotNull(message = "寮�鍗℃椂闂翠笉鑳戒负绌�") private Date createTime; /** - * 璁㈠崟鍙� - */ + * 璁㈠崟鍙� + */ private String orderNo; /** - * 5绾ц鏀垮尯鍒掔紪鐮� - */ + * 5绾ц鏀垮尯鍒掔紪鐮� + */ private String districtCode; /** - * 椤圭洰缂栫爜 - */ + * 椤圭洰缂栫爜 + */ private Integer projectNo; /** - * IP鍦板潃 - */ + * IP鍦板潃 + */ private String ip; /** - * 鍩熷悕 - */ + * 鍩熷悕 + */ private String domain; /** - * 寮�鍏抽榾鏃堕棿 - */ + * 寮�鍏抽榾鏃堕棿 + */ private Integer openClostTime; /** - * 澶囨敞淇℃伅 - */ + * 澶囨敞淇℃伅 + */ private String remarks; + /** + * 娉ㄩ攢鏃堕棿 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date cancelDt; + + /** + * 鍗$墖鐘舵��;1-姝e父锛�2-宸叉敞閿�锛�3-宸叉寕澶� + */ + @NotNull(message = "鍗$墖鐘舵�佷笉鑳戒负绌�") + private Byte state; + } \ No newline at end of file -- Gitblit v1.8.0