From ee03b526152d335dd1e42bc01a1f717d1205204c Mon Sep 17 00:00:00 2001 From: zxl <763096477@qq.com> Date: 星期一, 26 五月 2025 15:27:04 +0800 Subject: [PATCH] (部级录像可用率,重点录像可用率,录像可用率)计算可用率bug修复,hk接口bug修复, --- ycl-pojo/src/main/java/com/ycl/platform/domain/query/DataCenterQuery.java | 31 +++++++++++++++++++++++++------ 1 files changed, 25 insertions(+), 6 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 293fe40..1c78898 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") private Date startTime; /** 缁撴潫鏃堕棿 */ - @JsonFormat(pattern = "yyyy-MM-dd") private Date endTime; /** 鍏抽敭璇� */ @@ -35,14 +37,31 @@ /** 鏁版嵁绫诲瀷锛�0 鍏ㄩ儴 1鐪佸巺 */ private Integer dataType = 0; + /** 鏍囩锛�1 閮ㄧ骇 2 鐪佸巺 3 閲嶇偣 4 閲嶇偣鎸囨尌鍥惧儚 5 鏂拌澶� */ + private Integer deptTag; + /** 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); } } + /** + * 鏌ヨ鍔ㄦ�佸垪鏁版嵁id + */ + private Integer DyId; + /** + * 鏌ヨ鍔ㄦ�佸垪鏁版嵁value 鐢ㄤ簬鍖归厤鍊� + */ + private String DyValue; + } -- Gitblit v1.8.0