From a15a8cfd7b01ce4bba6fe9fd876f6704ca23a12d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 07 一月 2025 16:40:32 +0800
Subject: [PATCH] 1、取水口用水日统计表中增加金额、次数字段； 2、优化或重写“累计流量超过指定值的取水口”、“累计流量低于指定值的取水口”、“指定时间段内用水量超过指定值的取水口”、“指定时间段内消费金额超过指定值的取水口”几个统计查询； 3、改“指定时间段内用水时长超过指定值的取水口”为“指定时间段内用水次数超过指定值的取水口”
---
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