From c8df02a7b07086e17bacda6cdc015d76ac1f82fe Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期三, 04 九月 2024 17:16:58 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-pojo/src/main/java/com/ycl/platform/domain/query/DataCenterQuery.java | 18 ++++++++++++++++++ 1 files changed, 18 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 b813bbe..0430254 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,13 +19,27 @@ public class DataCenterQuery extends AbsQuery { /** 寮�濮嬫椂闂� */ + @JsonFormat(pattern = "yyyy-MM-dd") private Date startTime; /** 缁撴潫鏃堕棿 */ + @JsonFormat(pattern = "yyyy-MM-dd") private Date endTime; /** 鍏抽敭璇� */ private String keyword; + /** 鍔ㄦ�佸垪鐨勮〃鏄庢潯浠� */ + private String tableName = "t_monitor"; + + + 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