From 1b39f39eacfcd1f8bb46d261686e81a2ad9bafbd Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 十二月 2024 17:24:27 +0800
Subject: [PATCH] 视频时间差阈值
---
ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java | 76 ++++++++++++++++++++++----------------
1 files changed, 44 insertions(+), 32 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java
index 5d6f54d..6d642bd 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java
@@ -1,12 +1,19 @@
package com.ycl.platform.service.impl;
+import com.ycl.platform.controller.YwThresholdController;
import com.ycl.platform.domain.entity.WorkOrder;
+import com.ycl.platform.domain.entity.YwThreshold;
import com.ycl.platform.domain.result.UY.*;
+import com.ycl.platform.service.IYwThresholdService;
import com.ycl.platform.service.UYErrorTypeCheckService;
import com.ycl.platform.service.WorkOrderService;
+import com.ycl.utils.DateUtils;
import com.ycl.utils.uuid.IdUtils;
import constant.ApiConstants;
+import constant.YwThreadConstants;
+import enumeration.CompareType;
import enumeration.ErrorType;
+import enumeration.general.BusinessTypeEnum;
import enumeration.general.WorkOrderStatusEnum;
import lombok.Data;
import lombok.RequiredArgsConstructor;
@@ -17,6 +24,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -28,7 +36,7 @@
public class UYErrorTypeCheckServiceImpl implements UYErrorTypeCheckService {
private final WorkOrderService workOrderService;
-
+ private final IYwThresholdService ywThresholdService;
/**
* 鍥惧儚妫�娴嬬敓鎴愬伐鍗�
*
@@ -45,26 +53,26 @@
if (-1 == item.getSigna1() ) {
this.genWorkOrder(workOrder, ErrorType.SIGNAL_LOSS, item.getDeviceId());
}
-// // 鐢婚潰鍋忚壊
-// if (-1 == item.getColor()) {
-// this.genWorkOrder(workOrder, ErrorType.SCREEN_COLOR_DEVIATION, item.getDeviceId());
-// }
-// // 闆姳骞叉壈
-// if (-1 == item.getSnow()) {
-// this.genWorkOrder(workOrder, ErrorType.SNOW_STORM, item.getDeviceId());
-// }
-// // 鏉＄汗骞叉壈
-// if (-1 == item.getStripe()) {
-// this.genWorkOrder(workOrder, ErrorType.STRIPE_INTERFERENCE, item.getDeviceId());
-// }
+ // 鐢婚潰鍋忚壊
+ if (-1 == item.getColor()) {
+ this.genWorkOrder(workOrder, ErrorType.SCREEN_COLOR_DEVIATION, item.getDeviceId());
+ }
+ // 闆姳骞叉壈
+ if (-1 == item.getSnow()) {
+ this.genWorkOrder(workOrder, ErrorType.SNOW_STORM, item.getDeviceId());
+ }
+ // 鏉＄汗骞叉壈
+ if (-1 == item.getStripe()) {
+ this.genWorkOrder(workOrder, ErrorType.STRIPE_INTERFERENCE, item.getDeviceId());
+ }
// 鐢婚潰閬尅
if (-1 == item.getShade()) {
this.genWorkOrder(workOrder, ErrorType.SCREEN_OCCLUSION, item.getDeviceId());
}
-// // 娓呮櫚搴﹀紓甯�
-// if (-1 == item.getBlur()) {
-// this.genWorkOrder(workOrder, ErrorType.ABNORMAL_CLARITY, item.getDeviceId());
-// }
+ // 娓呮櫚搴﹀紓甯�
+ if (-1 == item.getBlur()) {
+ this.genWorkOrder(workOrder, ErrorType.ABNORMAL_CLARITY, item.getDeviceId());
+ }
// // 浜害寮傚父
// if (-1 == item.getLight()) {
// this.genWorkOrder(workOrder, ErrorType.ABNORMAL_BRIGHTNESS, item.getDeviceId());
@@ -119,28 +127,24 @@
@Override
public void recordMetaDSumCheck(List<RecordMetaDSumResult> dataList) {
- List<WorkOrder> workOrderList = dataList.stream().map(item -> {
- WorkOrder workOrder = new WorkOrder();
- if (0 == item.getRecordStatus()) {
- this.genWorkOrder(workOrder, ErrorType.VIDEO_LOSS, item.getDeviceId());
- } else if (-1 == item.getRecordStatus()) {
- this.genWorkOrder(workOrder, ErrorType.VIDEO_NONE, item.getDeviceId());
- }
- return workOrder;
- }).collect(Collectors.toList());
- workOrderService.innerAddWorkOrder(workOrderList);
+// List<WorkOrder> workOrderList = dataList.stream().map(item -> {
+// WorkOrder workOrder = new WorkOrder();
+// if (0 == item.getRecordStatus()) {
+// this.genWorkOrder(workOrder, ErrorType.VIDEO_LOSS, item.getDeviceId());
+// } else if (-1 == item.getRecordStatus()) {
+// this.genWorkOrder(workOrder, ErrorType.VIDEO_NONE, item.getDeviceId());
+// }
+// return workOrder;
+// }).collect(Collectors.toList());
+// workOrderService.innerAddWorkOrder(workOrderList);
}
@Override
public void osdCheck(List<OsdCheckResult> dataList) {
- Date now = new Date();
+ Map<String, YwThreshold> ywThresholdMap = ywThresholdService.getYwThresholdMap(BusinessTypeEnum.VIDEO.name());
List<WorkOrder> workOrderList = dataList.stream().map(item -> {
WorkOrder workOrder = new WorkOrder();
- // osd鏃堕棿
- if (!ApiConstants.OSD_Correct.equals(item.getOsdTimeCorrect())) {
- this.genWorkOrder(workOrder, ErrorType.CLOCK_SKEW, item.getDeviceNo());
- }
// osd淇℃伅
if (!ApiConstants.OSD_Correct.equals(item.getOsdProvinceCorrect())
|| (!ApiConstants.OSD_Correct.equals(item.getOsdCityCorrect()))
@@ -149,6 +153,14 @@
) {
this.genWorkOrder(workOrder, ErrorType.OSD_ERROR, item.getDeviceNo());
}
+ // osd鏃堕棿 鏃堕棿闇�瑕佽蛋闃堝�兼鏌� 杩欓噷闇�瑕佹妸鏃堕棿鏀惧湪鍚庨潰锛氬鏋滄椂闂村浜庡緟涓嬪彂鐨勯槇鍊奸偅涔堝伐鍗曠姸鎬佷細鏀逛负寰呬笅鍙戠殑宸ュ崟
+// if (!ApiConstants.OSD_Correct.equals(item.getOsdTimeCorrect())) {
+// this.genWorkOrder(workOrder, ErrorType.CLOCK_SKEW, item.getDeviceNo());
+// }
+ long checkTime = item.getCheckTime().getTime();
+ long osdTime = item.getSetTime().getTime();
+ Long timeDiff = (checkTime - osdTime) / 1000;
+ ywThresholdService.check(YwThreadConstants.Video_DiffTime,timeDiff ,item.getDeviceNo(),ywThresholdMap,workOrder,CompareType.MORE_THAN_EQ,ErrorType.CLOCK_SKEW.getValue());
return workOrder;
}).collect(Collectors.toList());
workOrderService.innerAddWorkOrder(workOrderList);
--
Gitblit v1.8.0