From da426ecaf4fd047c6cb43cd9a0c1288e39c4e91d Mon Sep 17 00:00:00 2001
From: lohir <3399054449@qq.com>
Date: 星期三, 23 十月 2024 11:24:57 +0800
Subject: [PATCH] 完成运维考核-工单白名单-新增、删除
---
ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java | 70 +++++++++++++++++-----------------
1 files changed, 35 insertions(+), 35 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 d62ea12..5d6f54d 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
@@ -5,14 +5,17 @@
import com.ycl.platform.service.UYErrorTypeCheckService;
import com.ycl.platform.service.WorkOrderService;
import com.ycl.utils.uuid.IdUtils;
+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;
@@ -33,8 +36,7 @@
*/
@Override
public void imageDetectionCheck(List<ImageDetectionResult> dataList) {
- List<WorkOrder> workOrderList = dataList.stream().filter(item -> 0 == item.getSigna1()
- || -1 == item.getSignal()
+ List<WorkOrder> workOrderList = dataList.stream().filter(item -> -1 == item.getSignal()
|| -1 == item.getImage()
)
.map(item -> {
@@ -43,30 +45,30 @@
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.getLight()) {
- this.genWorkOrder(workOrder, ErrorType.ABNORMAL_BRIGHTNESS, 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());
+// }
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);
@@ -130,19 +133,19 @@
@Override
- public void osdCheck(List<PyOsdResult> dataList) {
+ public void osdCheck(List<OsdCheckResult> dataList) {
+ Date now = new Date();
List<WorkOrder> workOrderList = dataList.stream().map(item -> {
WorkOrder workOrder = new WorkOrder();
// osd鏃堕棿
- if (!item.getCheckTime().equals(item.getSetTime())) {
+ if (!ApiConstants.OSD_Correct.equals(item.getOsdTimeCorrect())) {
this.genWorkOrder(workOrder, ErrorType.CLOCK_SKEW, item.getDeviceNo());
}
// osd淇℃伅
- if (!"璁剧疆姝ｇ‘".equals(item.getOsd1Province())
- || (!"璁剧疆姝ｇ‘".equals(item.getOsd1City()))
- || (!"璁剧疆姝ｇ‘".equals(item.getOsd1Part()))
- || (!"璁剧疆姝ｇ‘".equals(item.getOsd1TimeFormat()))
- || (!"璁剧疆姝ｇ‘".equals(item.getOsd1OSD()))
+ if (!ApiConstants.OSD_Correct.equals(item.getOsdProvinceCorrect())
+ || (!ApiConstants.OSD_Correct.equals(item.getOsdCityCorrect()))
+ || (!ApiConstants.OSD_Correct.equals(item.getOsdPartCorrect()))
+ || (!ApiConstants.OSD_Correct.equals(item.getOsdNameCorrect()))
) {
this.genWorkOrder(workOrder, ErrorType.OSD_ERROR, item.getDeviceNo());
}
@@ -159,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