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-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Alarm.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Alarm.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Alarm.java
index 43917f6..60f6875 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Alarm.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/common/dto/Alarm.java
@@ -1,6 +1,9 @@
package com.dy.pipIrrRemote.common.dto;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.NotBlank;
import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
* @author ZhuBaoMin
@@ -10,16 +13,25 @@
*/
@Data
+@EqualsAndHashCode(callSuper=true)
public class Alarm extends DtoBase {
public static final long serialVersionUID = 202407041337001L;
/**
- * 鍓╀綑姘撮噺鎶ヨ鍊�
+ * 鍔熻兘鐮�
*/
- private Integer waterAlarm;
+ @NotBlank(message = "鍔熻兘鐮佷笉鑳戒负绌�")
+ private String commandCode;
/**
- * 鍓╀綑閲戦鎶ヨ鍊�
+ * 鐢垫睜鐢靛帇鎶ヨ鍊�(澶т簬0.1)
*/
- private Integer moneyAlarm;
+ @DecimalMin(value = "1.0", message = "鐢ㄦ埛浣欓鎶ヨ鍊间笉鑳藉皬浜�1.0")
+ public Double batteryVoltAlarm;
+
+ /**
+ * 鐢ㄦ埛浣欓鎶ヨ鍊�(澶т簬1.0)
+ */
+ @DecimalMin(value = "1.0", message = "鐢ㄦ埛浣欓鎶ヨ鍊间笉鑳藉皬浜�1.0")
+ private Double remainMoneyAlarm;
}
--
Gitblit v1.8.0