From 6ca5b4d4ddb8ff8c67c0dea6ece5e3dbd136d1fa Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期三, 31 七月 2024 11:11:10 +0800 Subject: [PATCH] 优云对接client --- ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/SnapshotDataMonitorResult.java | 3 ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/SnapshotDelayMonitorResult.java | 3 ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceSamplingResult.java | 3 ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/QueryVqdResult.java | 246 ++++++++++++++++++++++++ ycl-server/src/main/java/com/ycl/feign/UYClient.java | 26 ++ ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDeviceInspectionResult.java | 3 ycl-server/src/main/java/com/ycl/calculate/CarSiteOnlineCalculation.java | 2 ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CrossDetailResult.java | 3 ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/VideoQualityParam.java | 31 +++ ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/MonitoringDetailResult.java | 3 ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/CameraResult.java | 1 ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java | 1 ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OnlineResult.java | 1 ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceInspectionResult.java | 3 ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CodeByAreaResult.java | 3 ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/VehicleDeviceSamplingResult.java | 3 ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/AttrRecognitionMonitorResult.java | 3 ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/VideoQualityResult.java | 66 ++++++ ycl-server/src/main/java/com/ycl/task/HKTask.java | 5 ycl-pojo/src/main/java/com/ycl/platform/domain/result/BaseResult.java | 2 ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/MonitorResourceResult.java | 3 ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/PicAccessResult.java | 3 ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/QueryVqdParam.java | 136 +++++++++++++ ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdMonitorResult.java | 1 ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/OrganizationTreeResult.java | 3 ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/DataIntegrityMonitoringResult.java | 3 ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CarDetectResult.java | 3 ycl-server/src/main/java/com/ycl/task/UYTask.java | 14 ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CoordinateByAreaResult.java | 3 ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/CriteriaResult.java | 3 ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/FaceDetectResult.java | 3 31 files changed, 545 insertions(+), 41 deletions(-) diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/QueryVqdParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/QueryVqdParam.java new file mode 100644 index 0000000..2357dc2 --- /dev/null +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/QueryVqdParam.java @@ -0,0 +1,136 @@ +package com.ycl.platform.domain.param.UY; + +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 鍥惧儚妫�娴嬭瘖鏂粨鏋� + */ +@Data +@Accessors(chain = true) +public class QueryVqdParam { + /** + * 绉熸埛id + */ + private String tenantId; + /** + * 琛屾斂鍖哄煙缂栫爜 + */ + private String arealayerno; + /** + * 妯$硦 1:姝e父 0锛氭湭鐭� -1锛氬紓甯� + */ + private String blur; + /** + * 棰滆壊 1:姝e父 0锛氭湭鐭� -1锛氬紓甯� + */ + private String color; + /** + * 鎽勫儚鏈哄浗鏍嘔D + */ + private String deviceId; + /** + * 鎽勫儚鏈哄悕绉� + */ + private String deviceName; + /** + * 鎺掑簭鏂瑰紡 鍙�夊�间负 desc锛氬�掑簭鎺掑簭 asc锛氭搴忔帓搴� 榛樿鍊掑簭鎺掑簭 + */ + private String direction; + /** + * 0锛氬疄鏃剁爜娴佽瘖鏂� 1锛氬巻鍙茬爜娴佽瘖鏂� + */ + private Integer groupFlag; + /** + * 璇婃柇鍒嗙粍ID + */ + private String groupId; + /** + * 鍥惧儚璐ㄩ噺鐘舵�� 1:姝e父 0锛氭湭鐭� -1锛氬紓甯� + */ + private String imgStatus; + /** + * 浜害 1:姝e父 0锛氭湭鐭� -1锛氬紓甯� + */ + private String light; + /** + * 鍦ㄧ嚎鐘舵�� 1:鍦ㄧ嚎 0锛氭湭鐭� -1锛氱绾� + */ + private String onlineStatus; + /** + * 鍒嗛〉椤电爜,榛樿浠�1寮�濮� + */ + private Integer pageNum; + /** + * 鍒嗛〉澶у皬,榛樿1000 + */ + private Integer pageSize; + /** + * 鍥芥爣骞冲彴ID + */ + private String platId; + /** + * 閬尅 1:姝e父 0锛氭湭鐭� -1锛氬紓甯� + */ + private String shade; + /** + * 鎶栧姩 1:姝e父 0锛氭湭鐭� -1锛氬紓甯� + */ + private String shake; + /** + * 鏃犱俊鍙� 1:鏈変俊鍙� 0锛氭湭鐭� -1锛氭棤淇″彿 + */ + private String signal; + /** + * 淇″彿鐘舵�� 1:鏈変俊鍙� 0锛氭湭鐭� -1锛氭棤淇″彿 + */ + private String signalStatus; + /** + * 闆姳 1:姝e父 0锛氭湭鐭� -1锛氬紓甯� + */ + private String snow; + /** + * 鎺掑簭鐨勫瓧娈� 鎸夋寚瀹氬瓧娈垫帓搴� 榛樿鎸夋媺鐮佹祦鏃堕棿鎺掑簭 + */ + private String sortedField; + /** + * 鏉$汗 1:姝e父 0锛氭湭鐭� -1锛氬紓甯� + */ + private String stripe; + /** + * 璇婃柇浠诲姟鍒涘缓鏃堕棿 + */ + private String taskCreateTime; + /** + * 璇婃柇浠诲姟澶嶆牳鏃堕棿 + */ + private String taskRecheckTime; + /** + * 瑙嗛璇婃柇鐘舵�� + */ + private String videoDiagStatus; + /** + * 瑙嗛娴佽瘖鏂紑濮嬫椂闂� + */ + private String videoDiagTimeBegin; + /** + * 瑙嗛娴佽瘖鏂粨鏉熸椂闂� + */ + private String videoDiagTimeEnd; + /** + * 鑾峰彇瑙嗛娴佺姸鎬� + */ + private String videoGetStatus; + /** + * 瑙嗛娴佽幏鍙栨椂闂村紑濮嬫椂闂� + */ + private String videoGetTimeBegin; + /** + * 瑙嗛娴佽幏鍙栨椂闂寸粨鏉熸椂闂� + */ + private String videoGetTimeEnd; + /** + * 鏄惁闇�瑕佸垎椤佃繑鍥炵粨鏋滐紝褰撲负true鏃秔ageSize鍜宲ageNum鍙傛暟澶辨晥 + */ + private Boolean withOutPaging; +} diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/VideoQualityParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/VideoQualityParam.java new file mode 100644 index 0000000..dcd9db6 --- /dev/null +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/VideoQualityParam.java @@ -0,0 +1,31 @@ +package com.ycl.platform.domain.param.UY; + +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 瑙嗛鍥惧儚璐ㄩ噺 + */ +@Data +@Accessors(chain = true) +public class VideoQualityParam { + /** 鍖哄煙缂栫爜 */ + private String arealayerno; + private Object[] dbConditionItems; + /** 璁惧 ID */ + private String deviceId; + /** 璁惧鍚嶇О */ + private String deviceName; + /** 鍔ㄦ�佹潯浠� */ + private String dynamicConditionJson; + /** 鎺掑簭瀛楁 */ + private String field; + /** 鎺掑簭鏂瑰紡锛宒esc: 闄嶅簭, asc: 鍗囧簭 */ + private String order; + /** 鍒嗛〉椤电爜 */ + private Integer pageNum; + /** 鍒嗛〉澶у皬 */ + private Integer pageSize; + /** 鐘舵�� */ + private Integer status; +} diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/BaseResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/BaseResult.java similarity index 85% rename from ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/BaseResult.java rename to ycl-pojo/src/main/java/com/ycl/platform/domain/result/BaseResult.java index 48d2cae..9680e21 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/HK/BaseResult.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/BaseResult.java @@ -1,4 +1,4 @@ -package com.ycl.platform.domain.result.HK; +package com.ycl.platform.domain.result; import lombok.Data; import org.bson.types.ObjectId; 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 1292dc4..e376fad 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 @@ -1,5 +1,6 @@ package com.ycl.platform.domain.result.HK; +import com.ycl.platform.domain.result.BaseResult; import lombok.Data; import org.springframework.data.mongodb.core.mapping.Document; @@ -10,7 +11,7 @@ */ @Data @Document(collection = "attr_recognition_monitor") -public class AttrRecognitionMonitorResult extends BaseResult{ +public class AttrRecognitionMonitorResult extends BaseResult { /** * 鍗″彛鍐呯爜鎴栭噰闆嗚澶囧唴鐮侊紝dataType涓�1鏃惰〃绀哄崱鍙e唴鐮侊紝dataType涓�11鏃惰〃绀洪噰闆嗚澶囧唴鐮� 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 1aaff1a..448e475 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 @@ -1,5 +1,6 @@ package com.ycl.platform.domain.result.HK; +import com.ycl.platform.domain.result.BaseResult; import lombok.Data; import org.springframework.data.mongodb.core.mapping.Document; @@ -10,7 +11,7 @@ */ @Data @Document(collection = "car_detect") -public class CarDetectResult extends BaseResult{ +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 e675069..f87a3e9 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 @@ -1,5 +1,6 @@ package com.ycl.platform.domain.result.HK; +import com.ycl.platform.domain.result.BaseResult; import lombok.Data; import org.springframework.data.mongodb.core.mapping.Document; @@ -10,7 +11,7 @@ */ @Data @Document(collection = "code_by_area") -public class CodeByAreaResult extends BaseResult{ +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 71cb1fe..42dc94b 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 @@ -1,5 +1,6 @@ package com.ycl.platform.domain.result.HK; +import com.ycl.platform.domain.result.BaseResult; import lombok.Data; import org.springframework.data.mongodb.core.mapping.Document; @@ -10,7 +11,7 @@ */ @Data @Document(collection = "coordinate_by_area") -public class CoordinateByAreaResult extends BaseResult{ +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 cdd9242..81287fd 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 @@ -1,5 +1,6 @@ package com.ycl.platform.domain.result.HK; +import com.ycl.platform.domain.result.BaseResult; import lombok.Data; import org.springframework.data.mongodb.core.mapping.Document; @@ -10,7 +11,7 @@ */ @Data @Document(collection = "criteria") -public class CriteriaResult extends BaseResult{ +public class CriteriaResult extends BaseResult { /** * 浜鸿劯璇勫垎浣庢爣鍑嗭紝渚嬪锛�0.4 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 fc05ba6..e954bbf 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 @@ -1,5 +1,6 @@ package com.ycl.platform.domain.result.HK; +import com.ycl.platform.domain.result.BaseResult; import lombok.Data; import org.springframework.data.mongodb.core.mapping.Document; @@ -10,7 +11,7 @@ */ @Data @Document(collection = "cross_detail") -public class CrossDetailResult extends BaseResult{ +public class CrossDetailResult extends BaseResult { /** * 缁勭粐缂栧彿锛岀敤浜庢煡璇㈣缁勭粐鍙婂叾鎵�鏈変笅绾х粍缁囧崱鍙e紓甯告儏鍐点�傝嫢涓嶄紶锛岃繑鍥炴墍鏈夊崱鍙e紓甯歌鎯呫�� 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 11e4a58..f48fab5 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 @@ -1,5 +1,6 @@ package com.ycl.platform.domain.result.HK; +import com.ycl.platform.domain.result.BaseResult; import lombok.Data; import org.springframework.data.mongodb.core.mapping.Document; @@ -10,7 +11,7 @@ */ @Data @Document(collection = "data_integrity_monitoring") -public class DataIntegrityMonitoringResult extends BaseResult{ +public class DataIntegrityMonitoringResult extends BaseResult { /** * 鍗″彛鍐呯爜鎴栭噰闆嗚澶囧唴鐮侊紝dataType涓�1鏃惰〃绀哄崱鍙e唴鐮侊紝dataType涓�11鏃惰〃绀洪噰闆嗚澶囧唴鐮� 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 d78f981..5bded9b 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 @@ -1,5 +1,6 @@ package com.ycl.platform.domain.result.HK; +import com.ycl.platform.domain.result.BaseResult; import lombok.Data; import org.springframework.data.mongodb.core.mapping.Document; @@ -10,7 +11,7 @@ */ @Data @Document(collection = "face_detect") -public class FaceDetectResult extends BaseResult{ +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 fd2b8e6..6bf7b78 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 @@ -1,5 +1,6 @@ package com.ycl.platform.domain.result.HK; +import com.ycl.platform.domain.result.BaseResult; import lombok.Data; import org.springframework.data.mongodb.core.mapping.Document; @@ -10,7 +11,7 @@ */ @Data @Document(collection = "face_device_inspection") -public class FaceDeviceInspectionResult extends BaseResult{ +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 05fb202..be04912 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 @@ -1,5 +1,6 @@ package com.ycl.platform.domain.result.HK; +import com.ycl.platform.domain.result.BaseResult; import lombok.Data; import org.springframework.data.mongodb.core.mapping.Document; @@ -10,7 +11,7 @@ */ @Data @Document(collection = "face_device_sampling") -public class FaceDeviceSamplingResult extends BaseResult{ +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 7270a38..69e5211 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 @@ -1,5 +1,6 @@ package com.ycl.platform.domain.result.HK; +import com.ycl.platform.domain.result.BaseResult; import lombok.Data; import org.springframework.data.mongodb.core.mapping.Document; @@ -11,7 +12,7 @@ */ @Data @Document(collection = "monitor_resource") -public class MonitorResourceResult extends BaseResult{ +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 0a2f7ea..11bf95c 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 @@ -1,5 +1,6 @@ package com.ycl.platform.domain.result.HK; +import com.ycl.platform.domain.result.BaseResult; import lombok.Data; import org.springframework.data.mongodb.core.mapping.Document; @@ -10,7 +11,7 @@ */ @Data @Document(collection = "monitoring_detail") -public class MonitoringDetailResult extends BaseResult{ +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 67735f7..1530159 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 @@ -1,5 +1,6 @@ package com.ycl.platform.domain.result.HK; +import com.ycl.platform.domain.result.BaseResult; import lombok.Data; import org.springframework.data.mongodb.core.mapping.Document; @@ -12,7 +13,7 @@ */ @Data @Document(collection = "organization_tree") -public class OrganizationTreeResult extends BaseResult{ +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 51b0175..198895e 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 @@ -1,5 +1,6 @@ package com.ycl.platform.domain.result.HK; +import com.ycl.platform.domain.result.BaseResult; import lombok.Data; import org.springframework.data.mongodb.core.mapping.Document; @@ -10,7 +11,7 @@ */ @Data @Document(collection = "pic_access") -public class PicAccessResult extends BaseResult{ +public class PicAccessResult extends BaseResult { /** * 鏁版嵁绫诲瀷涓�1鏃惰〃绀哄崱鍙e唴鐮侊紝鏁版嵁绫诲瀷涓�2鎴�11鏃惰〃绀轰汉鑴搁噰闆嗚澶囧唴鐮� 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 ce8d7ae..20f8da0 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 @@ -1,5 +1,6 @@ package com.ycl.platform.domain.result.HK; +import com.ycl.platform.domain.result.BaseResult; import lombok.Data; import org.springframework.data.mongodb.core.mapping.Document; @@ -10,7 +11,7 @@ */ @Data @Document(collection = "snapshot_data_monitor") -public class SnapshotDataMonitorResult extends BaseResult{ +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 4a2dffe..3c826f5 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 @@ -1,5 +1,6 @@ package com.ycl.platform.domain.result.HK; +import com.ycl.platform.domain.result.BaseResult; import lombok.Data; import org.springframework.data.mongodb.core.mapping.Document; @@ -10,7 +11,7 @@ */ @Data @Document(collection = "snapshop_delay_monitor") -public class SnapshotDelayMonitorResult extends BaseResult{ +public class SnapshotDelayMonitorResult extends BaseResult { private Integer dataType; /** * dataType涓�1锛氬崱鍙e唴鐮� dataType涓�2鎴�11锛氶噰闆嗚澶囧唴鐮� 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 fdb3827..0f87d90 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 @@ -1,5 +1,6 @@ package com.ycl.platform.domain.result.HK; +import com.ycl.platform.domain.result.BaseResult; import lombok.Data; import org.springframework.data.mongodb.core.mapping.Document; @@ -10,7 +11,7 @@ */ @Data @Document(collection = "vehicle_device_inspection") -public class VehicleDeviceInspectionResult extends BaseResult{ +public class VehicleDeviceInspectionResult extends BaseResult { /** * 璁惧缂栧彿锛宒ataType涓�1鏃惰〃绀哄崱鍙e唴鐮侊紝dataType涓�11鏃惰〃绀洪噰闆嗚澶囧唴鐮� 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 0a6341b..349f687 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 @@ -1,5 +1,6 @@ package com.ycl.platform.domain.result.HK; +import com.ycl.platform.domain.result.BaseResult; import lombok.Data; import org.springframework.data.mongodb.core.mapping.Document; @@ -10,7 +11,7 @@ */ @Data @Document(collection = "vehicle_device_sampling") -public class VehicleDeviceSamplingResult extends BaseResult{ +public class VehicleDeviceSamplingResult extends BaseResult { /** * 鍗″彛鍐呯爜鎴栭噰闆嗚澶囧唴鐮侊紝dataType涓�1鏃惰〃绀哄崱鍙e唴鐮侊紝dataType涓�11鏃惰〃绀洪噰闆嗚澶囧唴鐮� diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/CameraResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/CameraResult.java index 033e8b3..51eaa5c 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/CameraResult.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/CameraResult.java @@ -1,6 +1,5 @@ package com.ycl.platform.domain.result.UY; -import com.ycl.platform.domain.result.HK.BaseResult; import lombok.Data; import java.util.Date; 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 57b2253..c5884ff 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,5 @@ package com.ycl.platform.domain.result.UY; -import com.ycl.platform.domain.result.HK.BaseResult; import lombok.Data; /** 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 31bdc75..8ac3736 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,5 @@ package com.ycl.platform.domain.result.UY; -import com.ycl.platform.domain.result.HK.BaseResult; import lombok.Data; import java.util.List; 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 new file mode 100644 index 0000000..d076629 --- /dev/null +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/QueryVqdResult.java @@ -0,0 +1,246 @@ +package com.ycl.platform.domain.result.UY; + +import lombok.Data; + +/** + * 鍥惧儚鐩戞祴璇婃柇缁撴灉 + */ +@Data +public class QueryVqdResult { + /** + * + */ + private String arealayerPath; + /** + * 琛屾斂鍖哄垝缂栫爜 + */ + private String arealayernoCode; + /** + * 琛屾斂鍖哄垝鍚嶇О + */ + private String arealayernoName; + /** + * + */ + private String binaryTenantId; + /** + * 妯$硦 + */ + private Integer blur; + /** + * 妯$硦鍘熷鍒嗗�� + */ + private Integer blurRaw; + /** + * 妯$硦闃堝�� + */ + private Integer blurThreshold; + /** + * 棰滆壊 + */ + private Integer color; + /** + * 棰滆壊鍘熷鍒嗗�� + */ + private Integer colorRaw; + /** + * 棰滆壊闃堝�� + */ + private Integer colorThreshold; + /** + * + */ + private String decodeInfo; + /** + * 璁惧 ID + */ + private String deviceId; + /** + * 璁惧 IP + */ + private String deviceIp; + /** + * 璁惧鍚嶇О + */ + private String deviceName; + /** + * + */ + private String extJson; + /** + * + */ + private String frameLostRate; + /** + * + */ + private String groupId; + /** + * + */ + private String id; + /** + * + */ + private Integer ifmDelay; + /** + * 鍥惧儚鍦板潃 + */ + private String imagePath; + /** + * 鍥惧儚璐ㄩ噺鐘舵�� 1:姝e父 0锛氭湭鐭� -1锛氬紓甯� + */ + private Integer imgStatus; + /** + * + */ + private Boolean inTime; + /** + * 缁村害 + */ + private String latitude; + /** + * 浜害 + */ + private Integer light; + /** + * 浜害鍘熷鍒嗗�� + */ + private Integer lightRaw; + /** + * 浜害闃堝�� + */ + private Integer lightThreshold; + /** + * 缁忓害 + */ + private String longitude; + /** + * 鍦ㄧ嚎鐘舵�� 1:鍦ㄧ嚎 0锛氭湭鐭� -1锛氱绾� + */ + private Integer onlineStatus; + /** + * + */ + private String originalPlatId; + /** + * + */ + private String payloadType; + /** + * + */ + private String pixelInfo; + /** + * 鍥芥爣骞冲彴ID + */ + private String platId; + /** + * 閬尅 + */ + private Integer shade; + /** + * 閬尅鍘熷鍒嗗�� + */ + private Integer shadeRaw; + /** + * 閬尅闃堝�� + */ + private Integer shadeThreshold; + /** + * 鎶栧姩 + */ + private Integer shake; + /** + * 鎶栧姩鍘熷鍒嗗�� + */ + private Integer shakeRaw; + /** + * 鎶栧姩闃堝�� + */ + private Integer shakeThreshold; + /** + * 淇″彿 + */ + private Integer signal; + /** + * 淇″彿鍘熷鍒嗗�� + */ + private Integer signalRaw; + /** + * 淇″彿鐘舵�� 鏃犱俊鍙� 1:鏈変俊鍙� 0锛氭湭鐭� -1锛氭棤淇″彿 + */ + private Integer signalStatus; + /** + * 淇″彿闃堝�� + */ + private Integer signalThreshold; + /** + * + */ + private Integer sipDelay; + /** + * 闆姳 + */ + private Integer snow; + /** + * 闆姳鍘熷鍒嗗�� + */ + private Integer snowRaw; + /** + * 闆姳闃堝�� + */ + private Integer snowThreshold; + /** + * 鏉$汗 + */ + private Integer stripe; + /** + * 鏉$汗鍘熷鍒嗗�� + */ + private Integer stripeRaw; + /** + * 鏉$汗闃堝�� + */ + private Integer stripeThreshold; + /** + * + */ + private String tags; + /** + * + */ + private String taskCreateTime; + /** + * + */ + private String taskRecheckTime; + /** + * + */ + private String tenantId; + /** + * + */ + private Integer videoDelay; + /** + * + */ + private Integer videoDiagStatus; + /** + * + */ + private String videoDiagTime; + /** + * + */ + private Integer videoGetStatus; + /** + * + */ + private String videoGetTime; + /** + * + */ + private Integer vqdAtNight; +} 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 d5ac0ac..86f5770 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,5 @@ package com.ycl.platform.domain.result.UY; -import com.ycl.platform.domain.result.HK.BaseResult; import lombok.Data; import java.util.Date; 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 new file mode 100644 index 0000000..0a16fc4 --- /dev/null +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/VideoQualityResult.java @@ -0,0 +1,66 @@ +package com.ycl.platform.domain.result.UY; + +import lombok.Data; + +/** + * 瑙嗛鍥惧儚璐ㄩ噺 + */ +@Data +public class VideoQualityResult { + /** 琛屾斂鍖哄垝缂栫爜 */ + private String arealayernoCode; + /** 琛屾斂鍖哄垝鍚嶇О */ + private String arealayernoName; + /** 妯$硦 */ + private Integer blur; + /** 妯$硦鍘熷鍒嗗�� */ + private Integer blurRaw; + /** 棰滆壊 */ + private Integer color; + /** 棰滆壊鍘熷鍒嗗�� */ + private Integer colorRaw; + /** 鎽勫儚鏈�-鍥芥爣id */ + private String deviceId; + /** 鎽勫儚鏈篿p */ + private String deviceIp; + /** 鎽勫儚鏈鸿澶囧悕绉� */ + private String deviceName; + /** 缁熻绾害 */ + private String dim; + /** 鍥惧儚鏄惁姝e父 -1锛氬紓甯革紝1姝e父锛�0锛氭湭璇婃柇*/ + private Integer isImgAbnormal; + /** 淇″彿鏄惁涓㈠け -1锛氬紓甯革紝1姝e父锛�0锛氭湭璇婃柇*/ + private Integer isSignalMiss; + /** 浜害 */ + private Integer light; + /** 浜害鍘熷鍒嗗�� */ + private Integer lightRaw; + /** 閬尅 */ + private Integer shade; + /** 閬尅鍘熷鍒嗗�� */ + private Integer shadeRaw; + /** 鎶栧姩 */ + private Integer shake; + /** 鎶栧姩鍘熷鍒嗗�� */ + private Integer shakeRaw; + /** 鏃犱俊鍙� */ + private Integer signal; + /** 鏃犱俊鍙峰師濮嬪垎鍊� */ + private Integer signalRaw; + /** 闆姳 */ + private Integer snow; + /** 闆姳鍘熷鍒嗗�� */ + private Integer snowRaw; + /** 鎺掑簭灞炴�� */ + private String sortFiled; + /** 璇婃柇鐘舵�佺紪鐮� -1锛氬紓甯革紝1锛氭甯革紝0锛氭湭璇婃柇 */ + private String status; + /** 璇婃柇鐘舵�佸悕绉� */ + private String statusName; + /** 鏉$汗 */ + private Integer stripe; + /** 鏉$汗鍘熷鍒嗗�� */ + private Integer stripeRaw; + /** 璇婃柇鏃堕棿 */ + private String vqdTime; +} diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarSiteOnlineCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarSiteOnlineCalculation.java index e06b6fb..9cf047a 100644 --- a/ycl-server/src/main/java/com/ycl/calculate/CarSiteOnlineCalculation.java +++ b/ycl-server/src/main/java/com/ycl/calculate/CarSiteOnlineCalculation.java @@ -143,6 +143,4 @@ checkIndexCar.setViewConnectStability(viewConnectStability); return checkIndexCar; } - - } 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 5cb01dc..5286b2a 100644 --- a/ycl-server/src/main/java/com/ycl/feign/UYClient.java +++ b/ycl-server/src/main/java/com/ycl/feign/UYClient.java @@ -1,10 +1,9 @@ package com.ycl.feign; import com.alibaba.fastjson2.JSONObject; -import com.ycl.platform.domain.param.UY.CameraParam; -import com.ycl.platform.domain.param.UY.OnlineParam; -import com.ycl.platform.domain.param.UY.RecordMetaDSumParam; +import com.ycl.platform.domain.param.UY.*; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -27,7 +26,7 @@ * @return 鏌ヨ鎽勫儚鏈烘竻鍗曢泦鍚� */ @GetMapping("/VIID/Cameras") - JSONObject cameraList(@RequestParam CameraParam cameraParam); + JSONObject cameraList(@SpringQueryMap CameraParam cameraParam); /** * 鐐逛綅鍦ㄧ嚎 @@ -36,7 +35,7 @@ * @return 鏌ヨ鍦ㄧ嚎缁熻鍒楄〃 */ @GetMapping("/openapi/v1/report/online/list") - JSONObject onlineList(@RequestParam OnlineParam onlineParam); + JSONObject onlineList(@SpringQueryMap OnlineParam onlineParam); /** * 褰曞儚鍙敤 @@ -50,4 +49,21 @@ @GetMapping("/api/v1/app/osdMonitor/list") JSONObject osdMonitorList(); + /** + * 鍥惧儚妫�娴嬭瘖鏂粨鏋� + * + * @param param + * @return + */ + @GetMapping("/openapi/v1/vqdMonitor/queryVqdResult") + JSONObject queryVqdResult(@SpringQueryMap QueryVqdParam param); + + /** + * 瑙嗛鍥惧儚璐ㄩ噺 + * + * @param param + * @return + */ + @GetMapping("/api/v1/app/report/vqd/detail/list") + JSONObject queryVqdResult(@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 78c1ccf..69e7a29 100644 --- a/ycl-server/src/main/java/com/ycl/task/HKTask.java +++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java @@ -2,9 +2,8 @@ import com.alibaba.fastjson2.JSONObject; import com.mongodb.client.result.DeleteResult; -import com.ycl.calculate.CalculationStrategy; -import com.ycl.factory.IndexCalculationFactory; import com.ycl.platform.domain.param.HK.*; +import com.ycl.platform.domain.result.BaseResult; import com.ycl.platform.domain.result.HK.*; import com.ycl.platform.service.ICheckIndexCarService; import com.ycl.platform.service.ICheckIndexFaceService; @@ -20,9 +19,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; -import org.springframework.util.unit.DataUnit; -import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; 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 4d94bba..be50d01 100644 --- a/ycl-server/src/main/java/com/ycl/task/UYTask.java +++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java @@ -1,5 +1,6 @@ package com.ycl.task; +import com.ycl.platform.domain.param.UY.OnlineParam; import com.ycl.platform.service.IYwThresholdService; import com.ycl.feign.UYClient; import lombok.extern.slf4j.Slf4j; @@ -49,8 +50,12 @@ } //鍥惧儚鐩戞祴璇婃柇缁撴灉 - public void task2() { + public void queryVqdResultTask() { //鐐逛綅鍦ㄧ嚎鐜� + log.info("寮�濮嬫墽琛屽浘鍍忕洃娴嬭瘖鏂粨鏋滄暟鎹悓姝�"); + + + log.info("缁撴潫鎵ц鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁鍚屾"); } //褰曞儚鍙敤 @@ -58,10 +63,5 @@ //褰曞儚鍙敤鐜� } - private String getToday() { - Date date = new Date(); - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - String today = sdf.format(date); - return today; - } + } -- Gitblit v1.8.0