From 3b0516a2959e25576e4f3fda697a3b025d06c8c9 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 24 六月 2025 14:09:07 +0800
Subject: [PATCH] 每日录像可用指标添加日志，修改大屏为查看当前月平均
---
ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java
index 5514e75..78f45f2 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/YwPointForm.java
@@ -6,9 +6,6 @@
import com.ycl.system.domain.group.Add;
import com.ycl.platform.base.AbsForm;
import com.ycl.platform.domain.entity.YwPoint;
-import enumeration.general.ImportantTagEnum;
-import enumeration.general.ProvinceTagEnum;
-import jakarta.validation.constraints.NotEmpty;
import org.springframework.beans.BeanUtils;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
@@ -18,9 +15,7 @@
import lombok.Data;
import lombok.experimental.Accessors;
-import java.time.LocalDateTime;
import java.util.Date;
-import java.util.List;
/**
* 杩愮淮鐐逛綅琛ㄥ崟
@@ -37,7 +32,6 @@
@ApiModelProperty("鐐逛綅鍚嶇О")
private String pointName;
- @NotNull(message = "杩愮淮鍗曚綅涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("杩愮淮鍗曚綅")
private Integer unitId;
@@ -45,18 +39,27 @@
@ApiModelProperty("鐩戠閮ㄩ棬")
private Long deptId;
- @ApiModelProperty("鐪佸巺鐐逛綅鏍囩")
- private ProvinceTagEnum provinceTag;
+ @ApiModelProperty("鐪佸巺瑙嗛鐐逛綅鏍囩")
+ private Boolean provinceTagVideo;
+ @ApiModelProperty("鐪佸巺杞﹁締鐐逛綅鏍囩")
+ private Boolean provinceTagCar;
+ @ApiModelProperty("鐪佸巺浜鸿劯鐐逛綅鏍囩")
+ private Boolean provinceTagFace;
+
@ApiModelProperty("閲嶇偣鐐逛綅鏍囩")
- private ImportantTagEnum importantTag;
+ private Boolean importantTag;
+
+ @ApiModelProperty("閲嶇偣鎸囨尌鍥惧儚鏍囩")
+ private Boolean importantCommandImageTag;
+
+ @ApiModelProperty("閮ㄧ骇鏍囩")
+ private Boolean deptTag;
+
@ApiModelProperty("杩愮淮鐘舵��")
private String status;
@ApiModelProperty("澶囨敞")
private String remark;
-
- @ApiModelProperty("绫诲瀷")
- private Short category;
@ApiModelProperty("璁惧缂栧彿")
private String serialNumber;
@@ -71,6 +74,18 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date recoveryTime;
+ @ApiModelProperty("鐐逛綅寮�濮嬫椂闂�")
+ @TableField("start_time")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date startTime;
+
+ @ApiModelProperty("鐐逛綅缁撴潫鏃堕棿")
+ @TableField("end_time")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date endTime;
+
+ private String username;
+ private String password;
public static YwPoint getEntityByForm(@NonNull YwPointForm form, YwPoint entity) {
if(entity == null) {
entity = new YwPoint();
--
Gitblit v1.8.0