From 9b10f135f3015c2175e54870d783fea9b8d8dea1 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 31 七月 2024 18:17:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/SnapshotDataMonitorResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/SnapshotDelayMonitorResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceSamplingResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/QueryVqdResult.java | 5
ycl-server/src/main/java/com/ycl/feign/UYClient.java | 7
ycl-common/src/main/java/constant/ApiConstants.java | 3
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceInspectionResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CrossDetailResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/MonitoringDetailResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java | 5
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/DataCenter/LabeledCorrectlyVO.java | 40 +++++-
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OnlineResult.java | 5
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceInspectionResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CodeByAreaResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceSamplingResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/AttrRecognitionMonitorResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/VideoQualityResult.java | 5
ycl-server/src/main/java/com/ycl/task/HKTask.java | 7 -
ycl-pojo/src/main/java/com/ycl/platform/domain/result/BaseResult.java | 6
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/MonitorResourceResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/PicAccessResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdMonitorResult.java | 5
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OneMachineFileResult.java | 5
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/OrganizationTreeResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/DataIntegrityMonitoringResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/OneMachineFileParam.java | 2
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 +++++-
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CarDetectResult.java | 2
ycl-server/src/main/java/com/ycl/task/UYTask.java | 128 ++++++++++++++++----
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CoordinateByAreaResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CriteriaResult.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDetectResult.java | 2
33 files changed, 243 insertions(+), 88 deletions(-)
diff --git a/ycl-common/src/main/java/constant/ApiConstants.java b/ycl-common/src/main/java/constant/ApiConstants.java
index c5b77ba..c4fcf99 100644
--- a/ycl-common/src/main/java/constant/ApiConstants.java
+++ b/ycl-common/src/main/java/constant/ApiConstants.java
@@ -5,7 +5,8 @@
*/
public class ApiConstants {
//鎴愬姛鐘舵�佺爜
- public final static String successCode = "0";
+ public final static String HKSuccessCode = "0";
+ public final static Integer UYSuccessCode = 200;
public final static Integer pageNo = 1;
public final static Integer pageSize = 5000;
//璇锋眰鍙傛暟dataType-鍗″彛杩囪溅
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/CameraParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/OneMachineFileParam.java
similarity index 91%
rename from ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/CameraParam.java
rename to ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/OneMachineFileParam.java
index 0a74a9d..efdfe1b 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/CameraParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/OneMachineFileParam.java
@@ -12,7 +12,7 @@
@Data
@Accessors(chain = true)
-public class CameraParam {
+public class OneMachineFileParam {
/**
* 鍒嗛〉
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/BaseResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/BaseResult.java
index 9680e21..54a2676 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/BaseResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/BaseResult.java
@@ -2,6 +2,7 @@
import lombok.Data;
import org.bson.types.ObjectId;
+import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.Id;
import java.util.Date;
@@ -9,9 +10,10 @@
@Data
public class BaseResult {
@Id
- private ObjectId id;
+ private ObjectId mongoId;
/**
* 鏁版嵁鏃ユ湡
*/
- private Date createTime;
+ @CreatedDate
+ private Date mongoCreateTime;
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/AttrRecognitionMonitorResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/AttrRecognitionMonitorResult.java
index e376fad..37b6b22 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/AttrRecognitionMonitorResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/AttrRecognitionMonitorResult.java
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "attr_recognition_monitor")
+@Document(collection = "hk_attr_recognition_monitor")
public class AttrRecognitionMonitorResult extends BaseResult {
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CarDetectResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CarDetectResult.java
index 448e475..3d9c2a5 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CarDetectResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CarDetectResult.java
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "car_detect")
+@Document(collection = "hk_car_detect")
public class CarDetectResult extends BaseResult {
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CodeByAreaResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CodeByAreaResult.java
index f87a3e9..e91e938 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CodeByAreaResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CodeByAreaResult.java
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "code_by_area")
+@Document(collection = "hk_code_by_area")
public class CodeByAreaResult extends BaseResult {
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CoordinateByAreaResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CoordinateByAreaResult.java
index 42dc94b..f829d1f 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CoordinateByAreaResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CoordinateByAreaResult.java
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "coordinate_by_area")
+@Document(collection = "hk_coordinate_by_area")
public class CoordinateByAreaResult extends BaseResult {
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CriteriaResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CriteriaResult.java
index 81287fd..61dda11 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CriteriaResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CriteriaResult.java
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "criteria")
+@Document(collection = "hk_criteria")
public class CriteriaResult extends BaseResult {
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CrossDetailResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CrossDetailResult.java
index e954bbf..72b6697 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CrossDetailResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CrossDetailResult.java
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "cross_detail")
+@Document(collection = "hk_cross_detail")
public class CrossDetailResult extends BaseResult {
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/DataIntegrityMonitoringResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/DataIntegrityMonitoringResult.java
index f48fab5..685e7e4 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/DataIntegrityMonitoringResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/DataIntegrityMonitoringResult.java
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "data_integrity_monitoring")
+@Document(collection = "hk_data_integrity_monitoring")
public class DataIntegrityMonitoringResult extends BaseResult {
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDetectResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDetectResult.java
index 5bded9b..60c1e10 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDetectResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDetectResult.java
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "face_detect")
+@Document(collection = "hk_face_detect")
public class FaceDetectResult extends BaseResult {
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceInspectionResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceInspectionResult.java
index 6bf7b78..c762e90 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceInspectionResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceInspectionResult.java
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "face_device_inspection")
+@Document(collection = "hk_face_device_inspection")
public class FaceDeviceInspectionResult extends BaseResult {
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceSamplingResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceSamplingResult.java
index be04912..b4019bd 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceSamplingResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceSamplingResult.java
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "face_device_sampling")
+@Document(collection = "hk_face_device_sampling")
public class FaceDeviceSamplingResult extends BaseResult {
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/MonitorResourceResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/MonitorResourceResult.java
index 69e5211..53d0e89 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/MonitorResourceResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/MonitorResourceResult.java
@@ -11,7 +11,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "monitor_resource")
+@Document(collection = "hk_monitor_resource")
public class MonitorResourceResult extends BaseResult {
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/MonitoringDetailResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/MonitoringDetailResult.java
index 11bf95c..4aa4930 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/MonitoringDetailResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/MonitoringDetailResult.java
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "monitoring_detail")
+@Document(collection = "hk_monitoring_detail")
public class MonitoringDetailResult extends BaseResult {
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/OrganizationTreeResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/OrganizationTreeResult.java
index 1530159..a8e21d0 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/OrganizationTreeResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/OrganizationTreeResult.java
@@ -12,7 +12,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "organization_tree")
+@Document(collection = "hk_organization_tree")
public class OrganizationTreeResult extends BaseResult {
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/PicAccessResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/PicAccessResult.java
index 198895e..4c33109 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/PicAccessResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/PicAccessResult.java
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "pic_access")
+@Document(collection = "hk_pic_access")
public class PicAccessResult extends BaseResult {
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/SnapshotDataMonitorResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/SnapshotDataMonitorResult.java
index 20f8da0..7b56100 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/SnapshotDataMonitorResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/SnapshotDataMonitorResult.java
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "snapshot_data_monitor")
+@Document(collection = "hk_snapshot_data_monitor")
public class SnapshotDataMonitorResult extends BaseResult {
/**
* 鏁版嵁绫诲瀷
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/SnapshotDelayMonitorResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/SnapshotDelayMonitorResult.java
index 3c826f5..2f394fd 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/SnapshotDelayMonitorResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/SnapshotDelayMonitorResult.java
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "snapshop_delay_monitor")
+@Document(collection = "hk_snapshop_delay_monitor")
public class SnapshotDelayMonitorResult extends BaseResult {
private Integer dataType;
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceInspectionResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceInspectionResult.java
index 0f87d90..dca7d43 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceInspectionResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceInspectionResult.java
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "vehicle_device_inspection")
+@Document(collection = "hk_vehicle_device_inspection")
public class VehicleDeviceInspectionResult extends BaseResult {
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceSamplingResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceSamplingResult.java
index 349f687..c7428d1 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceSamplingResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceSamplingResult.java
@@ -10,7 +10,7 @@
* @author gonghl
*/
@Data
-@Document(collection = "vehicle_device_sampling")
+@Document(collection = "hk_vehicle_device_sampling")
public class VehicleDeviceSamplingResult extends BaseResult {
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OneMachineFileResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OneMachineFileResult.java
index 454143c..f6d6087 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OneMachineFileResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OneMachineFileResult.java
@@ -1,6 +1,8 @@
package com.ycl.platform.domain.result.UY;
+import com.ycl.platform.domain.result.BaseResult;
import lombok.Data;
+import org.springframework.data.mongodb.core.mapping.Document;
import java.util.Date;
@@ -11,7 +13,8 @@
* @since 2024-4-19 11:33:34
*/
@Data
-public class OneMachineFileResult {
+@Document(collection = "uy_one_machine_file")
+public class OneMachineFileResult extends BaseResult {
/**
* 璁惧缂栫爜锛�20浣嶏細涓績缂栫爜銆佽涓氱紪鐮併�佽澶囩被鍨嬨�佺綉缁滄爣璇嗐�佽澶囧簭鍙凤紝涓庤仈缃戝钩鍙�/鍏变韩骞冲彴鍥芥爣缂栫爜涓�鑷淬��
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OnlineResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OnlineResult.java
index c5884ff..101416b 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OnlineResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OnlineResult.java
@@ -1,6 +1,8 @@
package com.ycl.platform.domain.result.UY;
+import com.ycl.platform.domain.result.BaseResult;
import lombok.Data;
+import org.springframework.data.mongodb.core.mapping.Document;
/**
* 鐐逛綅鍦ㄧ嚎鐜�
@@ -9,7 +11,8 @@
* @since 2024-4-19 11:37:30
*/
@Data
-public class OnlineResult{
+@Document(collection = "uy_online")
+public class OnlineResult extends BaseResult {
/**
* 琛屾斂鍖哄垝缂栫爜
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 8ac3736..7141e2a 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,6 +1,8 @@
package com.ycl.platform.domain.result.UY;
+import com.ycl.platform.domain.result.BaseResult;
import lombok.Data;
+import org.springframework.data.mongodb.core.mapping.Document;
import java.util.List;
@@ -11,7 +13,8 @@
* @since 2024-4-19 11:52:09
*/
@Data
-public class OsdMonitorResult {
+@Document(collection = "uy_osd_monitor")
+public class OsdMonitorResult extends BaseResult {
/**
* 鍖哄煙璺緞淇℃伅
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/QueryVqdResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/QueryVqdResult.java
index d076629..79667e5 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/QueryVqdResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/QueryVqdResult.java
@@ -1,12 +1,15 @@
package com.ycl.platform.domain.result.UY;
+import com.ycl.platform.domain.result.BaseResult;
import lombok.Data;
+import org.springframework.data.mongodb.core.mapping.Document;
/**
* 鍥惧儚鐩戞祴璇婃柇缁撴灉
*/
@Data
-public class QueryVqdResult {
+@Document(collection = "uy_query_vqd")
+public class QueryVqdResult extends BaseResult {
/**
*
*/
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java
index 86f5770..f356f79 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java
@@ -1,6 +1,8 @@
package com.ycl.platform.domain.result.UY;
+import com.ycl.platform.domain.result.BaseResult;
import lombok.Data;
+import org.springframework.data.mongodb.core.mapping.Document;
import java.util.Date;
@@ -10,7 +12,8 @@
* @author gonghl
*/
@Data
-public class RecordMetaDSumResult{
+@Document(collection = "uy_record_meta_d_sum")
+public class RecordMetaDSumResult extends BaseResult {
/**
* 琛屾斂鍖哄煙鍚嶇О
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/VideoQualityResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/VideoQualityResult.java
index 0a16fc4..7fb3597 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/VideoQualityResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/VideoQualityResult.java
@@ -1,12 +1,15 @@
package com.ycl.platform.domain.result.UY;
+import com.ycl.platform.domain.result.BaseResult;
import lombok.Data;
+import org.springframework.data.mongodb.core.mapping.Document;
/**
* 瑙嗛鍥惧儚璐ㄩ噺
*/
@Data
-public class VideoQualityResult {
+@Document(collection = "uy_video_quality")
+public class VideoQualityResult extends BaseResult {
/** 琛屾斂鍖哄垝缂栫爜 */
private String arealayernoCode;
/** 琛屾斂鍖哄垝鍚嶇О */
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 {
- /** 姝ｇ‘鏁伴噺 */
- private Integer correctNum;
+ /** 鍖哄煙璺緞淇℃伅 */
+ private String arealayerPath;
- /** 鎶芥煡鎬绘暟 */
- private Integer selectedTotal;
+ /** 鍖哄煙鍚嶇О */
+ private String arealayername;
- /** 鏍囨敞姝ｇ‘鐜� */
- 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 {
- /** 褰撴湀璁ゅ畾鐨勮�冩牳妗ｆ鏁� */
- private Integer currentMonthDocumentNum;
+ private String id;
- /** 鍏ㄥ勾鐣欏瓨妗ｆ鏁� */
- 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;
}
diff --git a/ycl-server/src/main/java/com/ycl/feign/UYClient.java b/ycl-server/src/main/java/com/ycl/feign/UYClient.java
index 5286b2a..44d25b8 100644
--- a/ycl-server/src/main/java/com/ycl/feign/UYClient.java
+++ b/ycl-server/src/main/java/com/ycl/feign/UYClient.java
@@ -8,7 +8,6 @@
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
/**
* @author gonghl
@@ -22,11 +21,11 @@
/**
* 涓�鏈轰竴妗�
*
- * @param cameraParam 璇锋眰鍙傛暟
+ * @param oneMachineFileParam 璇锋眰鍙傛暟
* @return 鏌ヨ鎽勫儚鏈烘竻鍗曢泦鍚�
*/
@GetMapping("/VIID/Cameras")
- JSONObject cameraList(@SpringQueryMap CameraParam cameraParam);
+ JSONObject oneMachineFile(@SpringQueryMap OneMachineFileParam oneMachineFileParam);
/**
* 鐐逛綅鍦ㄧ嚎
@@ -65,5 +64,5 @@
* @return
*/
@GetMapping("/api/v1/app/report/vqd/detail/list")
- JSONObject queryVqdResult(@SpringQueryMap VideoQualityParam param);
+ JSONObject videoQuality(@SpringQueryMap VideoQualityParam param);
}
diff --git a/ycl-server/src/main/java/com/ycl/task/HKTask.java b/ycl-server/src/main/java/com/ycl/task/HKTask.java
index 69e7a29..fccbe9f 100644
--- a/ycl-server/src/main/java/com/ycl/task/HKTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java
@@ -301,7 +301,7 @@
//瑙ｆ瀽鏁版嵁
private <T> List<T> getDataList(JSONObject faceJsonObject, Class<T> resultClass, String message) {
- if (faceJsonObject != null && ApiConstants.successCode.equals(faceJsonObject.getString("code"))) {
+ if (faceJsonObject != null && ApiConstants.HKSuccessCode.equals(faceJsonObject.getString("code"))) {
JSONObject data = faceJsonObject.getJSONObject("data");
if (data == null) {
log.error(message, faceJsonObject);
@@ -311,11 +311,6 @@
if (CollectionUtils.isEmpty(list)) {
log.error(message, data);
return null;
- }
- for (T t : list) {
- if (t instanceof BaseResult) {
- ((BaseResult) t).setCreateTime(new Date());
- }
}
return list;
} else {
diff --git a/ycl-server/src/main/java/com/ycl/task/UYTask.java b/ycl-server/src/main/java/com/ycl/task/UYTask.java
index be50d01..3d2f545 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -1,15 +1,28 @@
package com.ycl.task;
-import com.ycl.platform.domain.param.UY.OnlineParam;
-import com.ycl.platform.service.IYwThresholdService;
+import com.alibaba.fastjson2.JSONObject;
+import com.mongodb.client.result.DeleteResult;
import com.ycl.feign.UYClient;
+import com.ycl.platform.domain.param.UY.OneMachineFileParam;
+import com.ycl.platform.domain.param.UY.QueryVqdParam;
+import com.ycl.platform.domain.param.UY.RecordMetaDSumParam;
+import com.ycl.platform.domain.result.UY.OneMachineFileResult;
+import com.ycl.platform.domain.result.UY.QueryVqdResult;
+import com.ycl.platform.domain.result.UY.RecordMetaDSumResult;
+import com.ycl.platform.service.IYwThresholdService;
+import com.ycl.utils.DateUtils;
+import constant.ApiConstants;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
-import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
@Slf4j
@@ -23,45 +36,106 @@
@Autowired
private IYwThresholdService ywThresholdService;
- private final static Integer pageNo = 1;
- private final static Integer pageSize = 5000;
- //鎴愬姛鐘舵�佺爜
- private final static String successCode = "0";
-
- //杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉
- public void VehicleDeviceInspectionTask() {
- log.info("寮�濮嬫墽琛岃溅杈嗚澶囧叏妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
-
- log.info("缁撴潫杞﹁締璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
- }
-
-
- public void FaceDeviceInspectionTask() {
- log.info("寮�濮嬫墽琛屼汉鑴歌澶囧叏妫�鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
-
- log.info("缁撴潫浜鸿劯璁惧鍏ㄦ鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
- }
+ @Value("${youYun.tenantId}")
+ private String tenantId;
//涓�鏈轰竴妗�
- public void task1() {
+ public void monitorTask() {
//涓�鏈轰竴妗ｅ悎鏍肩巼
// 涓�鏈轰竴妗ｆ敞鍐岀巼
// 妗ｆ鑰冩牳姣�
+ log.info("寮�濮嬫墽琛屼竴鏈轰竴妗ｆ暟鎹悓姝�");
+ OneMachineFileParam param = new OneMachineFileParam();
+ JSONObject jsonObject = uyClient.oneMachineFile(param);
+ if (jsonObject != null) {
+ JSONObject cameraList = jsonObject.getJSONObject("CameraList");
+ if (cameraList != null) {
+ List<OneMachineFileResult> data = cameraList.getList("data", OneMachineFileResult.class);
+ if (!CollectionUtils.isEmpty(data)) {
+ //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
+ Query query = new Query(Criteria
+ .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+ DeleteResult result = mongoTemplate.remove(query, OneMachineFileResult.class);
+ //瀛樻斁鍦╩ongo涓�
+ mongoTemplate.insert(data);
+ } else {
+ log.error("涓�鏈轰竴妗ｆ暟鎹负绌簕}", cameraList);
+ }
+ } else {
+ log.error("涓�鏈轰竴妗ｆ暟鎹负绌簕}", jsonObject);
+ }
+ } else {
+ log.error("涓�鏈轰竴妗ｆ暟鎹负绌�");
+ }
+ log.info("缁撴潫鎵ц涓�鏈轰竴妗ｆ暟鎹悓姝�");
}
//鍥惧儚鐩戞祴璇婃柇缁撴灉
public void queryVqdResultTask() {
//鐐逛綅鍦ㄧ嚎鐜�
+ //瑙嗛鍥惧儚璐ㄩ噺
log.info("寮�濮嬫墽琛屽浘鍍忕洃娴嬭瘖鏂粨鏋滄暟鎹悓姝�");
-
-
+ QueryVqdParam param = new QueryVqdParam();
+ param.setTenantId(tenantId);
+ JSONObject jsonObject = uyClient.queryVqdResult(param);
+ if (jsonObject != null) {
+ Integer statusCode = jsonObject.getInteger("statusCode");
+ if (ApiConstants.UYSuccessCode.equals(statusCode)) {
+ JSONObject data = jsonObject.getJSONObject("data");
+ if (data != null) {
+ List<QueryVqdResult> records = data.getList("records", QueryVqdResult.class);
+ if (!CollectionUtils.isEmpty(records)) {
+ //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
+ Query query = new Query(Criteria
+ .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+ DeleteResult result = mongoTemplate.remove(query, QueryVqdResult.class);
+ //瀛樻斁鍦╩ongo涓�
+ mongoTemplate.insert(records);
+ } else {
+ log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁涓虹┖{}", data);
+ }
+ } else {
+ log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁涓虹┖{}", jsonObject);
+ }
+ } else {
+ log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉璇锋眰澶辫触{}", jsonObject);
+ }
+ } else {
+ log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁涓虹┖");
+ }
log.info("缁撴潫鎵ц鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁鍚屾");
}
//褰曞儚鍙敤
- public void task3() {
+ public void recordMetaDSumTask() {
//褰曞儚鍙敤鐜�
+ log.info("寮�濮嬫墽琛屽綍鍍忓彲鐢ㄦ暟鎹悓姝�");
+ RecordMetaDSumParam param = new RecordMetaDSumParam();
+ JSONObject jsonObject = uyClient.recordMetaDSumList(param);
+ if (jsonObject != null) {
+ if (jsonObject.getBoolean("success")) {
+ JSONObject data = jsonObject.getJSONObject("data");
+ if (data != null) {
+ List<RecordMetaDSumResult> records = data.getList("records", RecordMetaDSumResult.class);
+ if (!CollectionUtils.isEmpty(records)) {
+ //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
+ Query query = new Query(Criteria
+ .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+ DeleteResult result = mongoTemplate.remove(query, RecordMetaDSumResult.class);
+ //瀛樻斁鍦╩ongo涓�
+ mongoTemplate.insert(records);
+ } else {
+ log.error("褰曞儚鍙敤鏁版嵁涓虹┖{}", data);
+ }
+ } else {
+ log.error("褰曞儚鍙敤鏁版嵁涓虹┖{}", jsonObject);
+ }
+ } else {
+ log.error("褰曞儚鍙敤鏁版嵁涓虹┖{}", jsonObject);
+ }
+ } else {
+ log.error("褰曞儚鍙敤鏁版嵁涓虹┖");
+ }
+ log.info("缁撴潫鎵ц褰曞儚鍙敤鏁版嵁鍚屾");
}
-
-
}
--
Gitblit v1.8.0