From cfcfbf068acf9b9d509a99498346dcbcf101cdf9 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 14 十一月 2024 16:37:46 +0800
Subject: [PATCH] 白名单基础增删改查
---
ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 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 ba79174..4ff8e9e 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
@@ -8,12 +8,14 @@
import constant.ApiConstants;
import enumeration.ErrorType;
import enumeration.general.WorkOrderStatusEnum;
+import lombok.Data;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -63,10 +65,10 @@
if (-1 == item.getBlur()) {
this.genWorkOrder(workOrder, ErrorType.ABNORMAL_CLARITY, item.getDeviceId());
}
- // 浜害寮傚父
- if (-1 == item.getLight()) {
- this.genWorkOrder(workOrder, ErrorType.ABNORMAL_BRIGHTNESS, item.getDeviceId());
- }
+// // 浜害寮傚父
+// if (-1 == item.getLight()) {
+// this.genWorkOrder(workOrder, ErrorType.ABNORMAL_BRIGHTNESS, item.getDeviceId());
+// }
return workOrder;
}).collect(Collectors.toList());
workOrderService.innerAddWorkOrder(workOrderList);
@@ -104,11 +106,12 @@
public void videoOnlineCheck(List<VideoOnlineResult> dataList) {
List<WorkOrder> workOrderList = dataList.stream().map(item -> {
WorkOrder workOrder = new WorkOrder();
- if (-1 == item.getStatus()) {
+ if (ApiConstants.UY_OnlineSite_Offline.equals(item.getStatus()) ) {
this.genWorkOrder(workOrder, ErrorType.DEVICE_OFFLINE, item.getDeviceId());
- } else if (0 == item.getStatus()) {
- this.genWorkOrder(workOrder, ErrorType.UNKNOWN, item.getDeviceId());
}
+// else if (0 == item.getStatus()) {
+// this.genWorkOrder(workOrder, ErrorType.UNKNOWN, item.getDeviceId());
+// }
return workOrder;
}).collect(Collectors.toList());
workOrderService.innerAddWorkOrder(workOrderList);
@@ -116,21 +119,22 @@
@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();
List<WorkOrder> workOrderList = dataList.stream().map(item -> {
WorkOrder workOrder = new WorkOrder();
// osd鏃堕棿
@@ -158,9 +162,6 @@
* @param serialNumber 鍥芥爣鐮�
*/
private void genWorkOrder(WorkOrder workOrder, ErrorType errorType, String serialNumber) {
- if (! StringUtils.hasText(workOrder.getWorkOrderNo())) {
- workOrder.setWorkOrderNo(IdUtils.randomNO());
- }
if (CollectionUtils.isEmpty(workOrder.getErrorTypeList())) {
workOrder.setErrorTypeList(new ArrayList<>());
workOrder.getErrorTypeList().add(errorType.getValue());
--
Gitblit v1.8.0