From c83101eb62f5d4906b9c01ceea6b21a37f9e84d8 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 18 十一月 2025 09:24:53 +0800
Subject: [PATCH] bug修复
---
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdMonitorResult.java | 112 +++++++++++++++++++++++---------------------------------
1 files changed, 46 insertions(+), 66 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 7141e2a..ae832f1 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,9 +1,13 @@
package com.ycl.platform.domain.result.UY;
+import com.fasterxml.jackson.annotation.JsonFormat;
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;
/**
@@ -16,23 +20,40 @@
@Document(collection = "uy_osd_monitor")
public class OsdMonitorResult extends BaseResult {
- /**
- * 鍖哄煙璺緞淇℃伅
- */
- private String arealayerPath;
+ private Integer areaInfoFormat;
/**
- * 鍖哄煙鍚嶇О
+ * 杈栧尯淇℃伅
+ */
+ private String areaInfoMessage;
+
+ /**
+ * 琛屾斂鍖哄煙
*/
private String arealayername;
- /**
- * 鍖哄煙缂栫爜
- */
+
private String arealayerno;
+
+ private Integer audited;
+
/**
- * 璁惧 ID
+ * 瀹℃牳鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date auditedTime;
+
+
+ private Integer cameraInfoFormat;
+
+ /**
+ * 鎽勫儚鏈轰俊鎭�
+ */
+ private String cameraInfoMessage;
+
+ /**
+ * 璁惧ID
*/
private String deviceId;
@@ -42,80 +63,39 @@
private String deviceName;
/**
- * 鍥剧墖涓婄殑瀛楀箷鏃堕棿鍜屾憚鍍忔満鎷夌爜娴佹椂闂村樊鏄惁澶т簬鏈�澶у��
- */
- private String diff;
-
- /**
- * 鍥剧墖涓婄殑瀛楀箷鏃堕棿鍜屾憚鍍忔満鎷夌爜娴佹椂闂村樊锛屽崟浣�(绉�), -1 琛ㄧず鏈煡
- */
- private Integer diffTime;
-
- /**
- * IP 鍦板潃
+ * ip鍦板潃
*/
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;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ 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;
- }
}
--
Gitblit v1.8.0