From 836ec39fdad422b1a148699a4c5fb8c5b4d395f0 Mon Sep 17 00:00:00 2001
From: zuoxiao <lf_zuo@163.com>
Date: 星期三, 25 六月 2025 11:04:33 +0800
Subject: [PATCH] feat(card): 添加管理类型卡写卡功能并优化卡片相关逻辑- 在 OperateTypeENUM 中添加 SUPPLEMENT 和 MANAGEMENT_CARD_WRITE 枚举值 - 在 SeManagementCard 中添加 cancelTime 和 state 字段 - 更新相关 mapper 和 XML 文件以支持新增字段 - 修改 CardSv 中的回调处理逻辑，支持管理类型卡写卡 - 优化 CreateManagementCardDto 中识别码的示例值
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeUnReported.java | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeUnReported.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeUnReported.java
index 63194d6..8fa92b8 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeUnReported.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSt/VoIntakeUnReported.java
@@ -1,6 +1,8 @@
package com.dy.pipIrrGlobal.voSt;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
/**
@@ -10,19 +12,14 @@
* @Description
*/
@Data
-public class VoIntakeUnReported {
-
- /**
- * 鍙栨按鍙ｇ紪鍙�
- */
- private String intakeNum;
+@JsonPropertyOrder({ "intakeId", "intakeNum", "blockName", "lng", "lat"
+ ,"rtuAddr"
+})
+@EqualsAndHashCode(callSuper=false)
+public class VoIntakeUnReported extends VoIntake{
/**
* 闃�鎺у櫒鍦板潃
*/
- private String rtuAddr;
- /**
- * 闃�鎺у櫒鏃堕棿
- */
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private String rtuDt;
+ public String rtuAddr;
+
}
--
Gitblit v1.8.0