From 1f46976c9ee72d7889fceee968db9c8aef885eca Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 28 十月 2024 17:28:15 +0800
Subject: [PATCH] 远程监控中开关阀记录查询重构，增加了水价信息，调整了显示内容，优化SQL语句，开闭阀类型改为通信协议中的Common*.*.java中的统一匹配。
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/OpenTypeQO.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/OpenTypeQO.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/OpenTypeQO.java
index e9b97ec..4802787 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/OpenTypeQO.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/qo/OpenTypeQO.java
@@ -4,6 +4,7 @@
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
* @author ZhuBaoMin
@@ -13,11 +14,12 @@
*/
@Data
+@EqualsAndHashCode(callSuper = false)
public class OpenTypeQO {
/**
* 寮�闃�绫诲瀷
*/
- @NotNull(message = "寮�闃�绫诲瀷涓嶈兘涓虹┖")
+// @NotNull(message = "寮�闃�绫诲瀷涓嶈兘涓虹┖")
private Integer openType;
/**
@@ -30,6 +32,6 @@
* 缁撴潫鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @NotBlank(message = "缁撴潫鏃堕棿涓嶈兘涓虹┖")
+// @NotBlank(message = "缁撴潫鏃堕棿涓嶈兘涓虹┖")
private String timeStop;
}
--
Gitblit v1.8.0