From 01a30369e55a754c28dec4939a99e59aefecdc60 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 08 八月 2024 20:48:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdMonitorResult.java | 220 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 149 insertions(+), 71 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdMonitorResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdMonitorResult.java
index 531246b..03a8166 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdMonitorResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdMonitorResult.java
@@ -1,10 +1,12 @@
package com.ycl.platform.domain.result.UY;
import com.ycl.platform.domain.result.BaseResult;
+import io.swagger.models.auth.In;
import lombok.Data;
import org.springframework.data.mongodb.core.index.TextIndexed;
import org.springframework.data.mongodb.core.mapping.Document;
+import java.util.Date;
import java.util.List;
/**
@@ -17,111 +19,187 @@
@Document(collection = "uy_osd_monitor")
public class OsdMonitorResult extends BaseResult {
- /**
- * 鍖哄煙璺緞淇℃伅
- */
- @TextIndexed
- private String arealayerPath;
+ private Integer areaInfoFormat;
/**
- * 鍖哄煙鍚嶇О
+ * 杈栧尯淇℃伅
*/
- @TextIndexed
+ private String areaInfoMessage;
+
+ /**
+ * 琛屾斂鍖哄煙
+ */
private String arealayername;
- /**
- * 鍖哄煙缂栫爜
- */
+
private String arealayerno;
+
+ private Integer audited;
+
/**
- * 璁惧 ID
+ * 瀹℃牳鏃堕棿
*/
- @TextIndexed
+ private Date auditedTime;
+
+
+ private Integer cameraInfoFormat;
+
+ /**
+ * 鎽勫儚鏈轰俊鎭�
+ */
+ private String cameraInfoMessage;
+
+ /**
+ * 璁惧ID
+ */
private String deviceId;
/**
* 璁惧鍚嶇О
*/
- @TextIndexed
private String deviceName;
/**
- * 鍥剧墖涓婄殑瀛楀箷鏃堕棿鍜屾憚鍍忔満鎷夌爜娴佹椂闂村樊鏄惁澶т簬鏈�澶у��
+ * ip鍦板潃
*/
- private String diff;
-
- /**
- * 鍥剧墖涓婄殑瀛楀箷鏃堕棿鍜屾憚鍍忔満鎷夌爜娴佹椂闂村樊锛屽崟浣�(绉�), -1 琛ㄧず鏈煡
- */
- private Integer diffTime;
-
- /**
- * IP 鍦板潃
- */
- @TextIndexed
private String ip;
- /**
- * 鍥剧墖 ocr 璇嗗埆缁撴灉
- */
- private OcrResult ocrResult;
+
+ private Integer locationInfoFormat;
/**
- * 鍥剧墖鍦板潃
+ * 鍦扮偣淇℃伅
*/
- private String imgPath;
+ private String locationInfoMessage;
/**
- * 鐘舵�佺爜锛�0锛氭甯�
+ * ocr淇℃伅
*/
- private Integer statusCode;
+ private String ocrMessage;
/**
- * 鍥剧墖涓婄殑瀛楀箷鏃堕棿鍜屾憚鍍忔満鎷夌爜娴佹椂闂村樊锛屽崟浣�(绉�)
+ * ocr鐘舵��
*/
- private String osdFormat;
+ private Integer ocrStatus;
/**
- * osd 淇℃伅
+ * ocr璇嗗埆鏃堕棿
*/
- private OsdInfo osdInfo;
+ private Date ocrTime;
+
+ private Integer timeInfoFormat;
/**
- * 鍥剧墖涓婄殑瀛楀箷鏃堕棿
+ * 鏃堕棿淇℃伅
*/
- private String osdTime;
+ private Integer timeInfoMessage;
- /**
- * 鎽勫儚鏈烘爣绛�
- */
- private List<String> tags;
-
- /**
- * 鏇存柊鏃堕棿
- */
- private String updateTime;
-
- /**
- * 瑙嗛鐮佹祦鑾峰彇鏃堕棿
- */
- private String videoGetTime;
-
- /**
- * OCR璇嗗埆缁撴灉鐨勫唴閮ㄧ被
- */
- @Data
- public static class OcrResult {
- private List<String> data;
- }
-
- /**
- * osd淇℃伅鐨勫唴閮ㄧ被
- */
- @Data
- public static class OsdInfo {
- private String timeInfo;
- private String positionInfo;
- private String cameraInfo;
- }
+// /**
+// * 鍖哄煙璺緞淇℃伅
+// */
+// @TextIndexed
+// private String arealayerPath;
+//
+// /**
+// * 鍖哄煙鍚嶇О
+// */
+// @TextIndexed
+// private String arealayername;
+//
+// /**
+// * 鍖哄煙缂栫爜
+// */
+// private String arealayerno;
+//
+// /**
+// * 璁惧 ID
+// */
+// @TextIndexed
+// private String deviceId;
+//
+// /**
+// * 璁惧鍚嶇О
+// */
+// @TextIndexed
+// private String deviceName;
+//
+// /**
+// * 鍥剧墖涓婄殑瀛楀箷鏃堕棿鍜屾憚鍍忔満鎷夌爜娴佹椂闂村樊鏄惁澶т簬鏈�澶у��
+// */
+// private String diff;
+//
+// /**
+// * 鍥剧墖涓婄殑瀛楀箷鏃堕棿鍜屾憚鍍忔満鎷夌爜娴佹椂闂村樊锛屽崟浣�(绉�), -1 琛ㄧず鏈煡
+// */
+// private Integer diffTime;
+//
+// /**
+// * IP 鍦板潃
+// */
+// @TextIndexed
+// private String ip;
+//
+// /**
+// * 鍥剧墖 ocr 璇嗗埆缁撴灉
+// */
+// private OcrResult ocrResult;
+//
+// /**
+// * 鍥剧墖鍦板潃
+// */
+// private String imgPath;
+//
+// /**
+// * 鐘舵�佺爜锛�0锛氭甯�
+// */
+// private Integer statusCode;
+//
+// /**
+// * 鍥剧墖涓婄殑瀛楀箷鏃堕棿鍜屾憚鍍忔満鎷夌爜娴佹椂闂村樊锛屽崟浣�(绉�)
+// */
+// private String osdFormat;
+//
+// /**
+// * osd 淇℃伅
+// */
+// private OsdInfo osdInfo;
+//
+// /**
+// * 鍥剧墖涓婄殑瀛楀箷鏃堕棿
+// */
+// private String osdTime;
+//
+// /**
+// * 鎽勫儚鏈烘爣绛�
+// */
+// private List<String> tags;
+//
+// /**
+// * 鏇存柊鏃堕棿
+// */
+// private String updateTime;
+//
+// /**
+// * 瑙嗛鐮佹祦鑾峰彇鏃堕棿
+// */
+// private String videoGetTime;
+//
+// /**
+// * OCR璇嗗埆缁撴灉鐨勫唴閮ㄧ被
+// */
+// @Data
+// public static class OcrResult {
+// private List<String> data;
+// }
+//
+// /**
+// * osd淇℃伅鐨勫唴閮ㄧ被
+// */
+// @Data
+// public static class OsdInfo {
+// private String timeInfo;
+// private String positionInfo;
+// private String cameraInfo;
+// }
}
--
Gitblit v1.8.0