From c6976365d5bfb39a32db8b541b1fe3ceb30c7826 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 14 二月 2025 10:03:17 +0800
Subject: [PATCH] Merge branch 'dev'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/query/DataCenterQuery.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DataCenterQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DataCenterQuery.java
index 5019600..3f98a2a 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DataCenterQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DataCenterQuery.java
@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsQuery;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import utils.DateUtils;
import java.util.Date;
@@ -17,13 +18,14 @@
*/
@Data
public class DataCenterQuery extends AbsQuery {
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date date;
/** 寮�濮嬫椂闂� */
- @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date startTime;
/** 缁撴潫鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private Date endTime;
/** 鍏抽敭璇� */
@@ -40,14 +42,16 @@
/** 1 瑙嗛 2 杞﹁締 3 浜鸿劯 */
private Integer deviceType;
-
-
+ /** 涓嬫媺妗� */
+ private Integer option;
+ /** 鑰冩牳鐘舵�� */
+ private Integer examineStatus;
public void setTime() {
- if (Objects.nonNull(this.startTime)) {
- this.startTime = DateUtils.getDayStart(this.startTime);
+ if (Objects.nonNull(this.date)) {
+ this.startTime = DateUtils.getDayStart(this.date);
}
- if (Objects.nonNull(this.endTime)) {
- this.endTime = DateUtils.getDayEnd(this.endTime);
+ if (Objects.nonNull(this.date)) {
+ this.endTime = DateUtils.getDayEnd(this.date);
}
}
--
Gitblit v1.8.0