From a1fa7f56d0b99e30ada3b2f8d90c19787973fb53 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 06 九月 2024 15:14:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/query/DataCenterQuery.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 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 ed35144..293fe40 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
@@ -1,9 +1,13 @@
package com.ycl.platform.domain.query;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsQuery;
import lombok.Data;
+import utils.DateUtils;
import java.util.Date;
+import java.util.List;
+import java.util.Objects;
/**
* 鏁版嵁涓績鏌ヨ
@@ -15,9 +19,11 @@
public class DataCenterQuery extends AbsQuery {
/** 寮�濮嬫椂闂� */
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date startTime;
/** 缁撴潫鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date endTime;
/** 鍏抽敭璇� */
@@ -25,4 +31,18 @@
/** 鍔ㄦ�佸垪鐨勮〃鏄庢潯浠� */
private String tableName = "t_monitor";
+
+ /** 鏁版嵁绫诲瀷锛�0 鍏ㄩ儴 1鐪佸巺 */
+ private Integer dataType = 0;
+
+
+ public void setTime() {
+ if (Objects.nonNull(this.startTime)) {
+ this.startTime = DateUtils.getDayStart(this.startTime);
+ }
+ if (Objects.nonNull(this.endTime)) {
+ this.endTime = DateUtils.getDayEnd(this.endTime);
+ }
+ }
+
}
--
Gitblit v1.8.0