From a8c87a18fed28e8cd06b20de9def11631f80ab96 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 31 七月 2024 16:21:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DataCenter/LabeledCorrectlyVO.java | 40 ++++++++++++++++----
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DataCenter/ImportantCmdImageVO.java | 34 +++++++++++++----
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DataCenter/VideoUseableVO.java | 38 +++++++++++++++---
3 files changed, 89 insertions(+), 23 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DataCenter/ImportantCmdImageVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DataCenter/ImportantCmdImageVO.java
index 80858f4..aedc60f 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DataCenter/ImportantCmdImageVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DataCenter/ImportantCmdImageVO.java
@@ -14,15 +14,33 @@
@Data
public class ImportantCmdImageVO {
- /** 鍦ㄧ嚎鏁伴噺 */
- private Integer onlineNum;
+ /** 鍖哄煙璺緞淇℃伅 */
+ private String arealayerPath;
- /** 鎶芥煡鎬绘暟 */
- private Integer selectedTotal;
+ /** */
+ private String arealayernoCode;
- /** 閲嶇偣鎸囨尌鍥惧儚鍦ㄧ嚎鐜� */
- private BigDecimal rate;
+ /** */
+ private String arealayernoName;
- /** 鏈堜唤 */
- private Date month;
+ /** */
+ private String binaryTenantId;
+
+ /** */
+ private Integer blur;
+
+ /** */
+ private Integer blurRaw;
+
+ /** */
+ private Integer blurThreshold;
+
+ /** */
+ private Integer color;
+
+ /** */
+ private Integer colorRaw;
+
+ /** */
+ private Integer colorThreshold;
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DataCenter/LabeledCorrectlyVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DataCenter/LabeledCorrectlyVO.java
index 18bb315..6c43f64 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DataCenter/LabeledCorrectlyVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DataCenter/LabeledCorrectlyVO.java
@@ -14,15 +14,39 @@
@Data
public class LabeledCorrectlyVO {
- /** 姝g‘鏁伴噺 */
- private Integer correctNum;
+ /** 鍖哄煙璺緞淇℃伅 */
+ private String arealayerPath;
- /** 鎶芥煡鎬绘暟 */
- private Integer selectedTotal;
+ /** 鍖哄煙鍚嶇О */
+ private String arealayername;
- /** 鏍囨敞姝g‘鐜� */
- private BigDecimal rate;
+ /** 鍖哄煙缂栫爜 */
+ private String arealayerno;
- /** 鏈堜唤 */
- private Date month;
+ /** 璁惧ID */
+ private String deviceId;
+
+ /** 璁惧鍚嶇О */
+ private String deviceName;
+
+ /** 鍥剧墖涓婄殑瀛楀箷鏃堕棿鍜屾憚鍍忔満鎷夌爜娴佹椂闂村樊鏄惁澶т簬鏈�澶у�� */
+ private String diff;
+
+ /** 鍥剧墖涓婄殑瀛楀箷鏃堕棿鍜屾憚鍍忔満鎷夌爜娴佹椂闂村樊锛屽崟浣�(绉�), -1 琛ㄧず鏈煡 */
+ private Integer diffTime;
+
+ /** ip */
+ private String ip;
+
+ /** 鍥剧墖 ocr 璇嗗埆缁撴灉 */
+ private String ocrResult;
+
+ /** 鍥剧墖鍦板潃 */
+ private String imgPath;
+
+ /** 鐘舵�佺爜锛�0锛氭甯� */
+ private String statusCode;
+
+ /** 鍥剧墖涓婄殑瀛楀箷鏃堕棿鍜屾憚鍍忔満鎷夌爜娴佹椂闂村樊锛屽崟浣�(绉�) */
+ private String osdFormat;
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DataCenter/VideoUseableVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DataCenter/VideoUseableVO.java
index cabbce8..82ef771 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DataCenter/VideoUseableVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DataCenter/VideoUseableVO.java
@@ -14,14 +14,38 @@
@Data
public class VideoUseableVO {
- /** 褰撴湀璁ゅ畾鐨勮�冩牳妗f鏁� */
- private Integer currentMonthDocumentNum;
+ private String id;
- /** 鍏ㄥ勾鐣欏瓨妗f鏁� */
- private Integer fullYearDocumentNum;
+ /** 琛屾斂鍖哄煙鍚嶇О */
+ private String arealayername;
- private BigDecimal rate;
+ /** 琛屾斂鍖哄煙ID */
+ private String arealayerno;
- /** 鏈堜唤 */
- private Date month;
+ /** 鍒涘缓鏃堕棿 */
+ private Date createTime;
+
+ /** 鎽勫儚鏈篒D */
+ private String deviceId;
+
+ /** 鎽勫儚鏈哄悕绉� */
+ private String deviceName;
+
+ /** 缂哄け鏃堕暱 */
+ private Double missDuration;
+
+ /** 鍥芥爣骞冲彴ID */
+ private String platId;
+
+ /** 褰曞儚鏃堕暱 */
+ private Double recordDuration;
+
+ /** 褰曞儚瀹屾暣鐘舵�� 1锛氬畬鏁� 0锛氶棿姝� -1锛氬紓甯� */
+ private Integer recordStatus;
+
+ /** 缁熻鏃堕棿 */
+ private Date statTime;
+
+ /** 绉熸埛ID */
+ private String tenantId;
}
--
Gitblit v1.8.0