From dffa4edacd228bb7aa385525e4a30db2384bc78f Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期五, 30 八月 2024 17:40:32 +0800
Subject: [PATCH] feat:更新图像资源到index表并展示

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/UYErrorTypeCheckServiceImpl.java |   47 ++++++++++++++++++++++++++++++++---------------
 1 files changed, 32 insertions(+), 15 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 d68398a..ba79174 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,6 +5,7 @@
 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.RequiredArgsConstructor;
@@ -33,42 +34,37 @@
      */
     @Override
     public void imageDetectionCheck(List<ImageDetectionResult> dataList) {
-        List<WorkOrder> workOrderList = dataList.stream().filter(item -> 0 == item.getSigna1()
-                || 0 == item.getColor()
-                || 0 == item.getSnow()
-                || 0 == item.getStripe()
-                || 0 == item.getShade()
-                || 0 == item.getBlur()
-                || 0 == item.getLight()
+        List<WorkOrder> workOrderList = dataList.stream().filter(item -> -1 == item.getSignal()
+                || -1 == item.getImage()
         )
         .map(item -> {
             WorkOrder workOrder = new WorkOrder();
             // 淇″彿缂哄け
-            if (0 == item.getSigna1() ) {
+            if (-1 == item.getSigna1() ) {
                 this.genWorkOrder(workOrder, ErrorType.SIGNAL_LOSS, item.getDeviceId());
             }
             // 鐢婚潰鍋忚壊
-            if ( 0 == item.getColor()) {
+            if (-1 == item.getColor()) {
                 this.genWorkOrder(workOrder, ErrorType.SCREEN_COLOR_DEVIATION, item.getDeviceId());
             }
             // 闆姳骞叉壈
-            if ( 0 == item.getSnow()) {
+            if (-1 == item.getSnow()) {
                 this.genWorkOrder(workOrder, ErrorType.SNOW_STORM, item.getDeviceId());
             }
             // 鏉$汗骞叉壈
-            if (0 == item.getStripe()) {
+            if (-1 == item.getStripe()) {
                 this.genWorkOrder(workOrder, ErrorType.STRIPE_INTERFERENCE, item.getDeviceId());
             }
             // 鐢婚潰閬尅
-            if (0 == item.getShade()) {
+            if (-1 == item.getShade()) {
                 this.genWorkOrder(workOrder, ErrorType.SCREEN_OCCLUSION, item.getDeviceId());
             }
             // 娓呮櫚搴﹀紓甯�
-            if (0 == item.getBlur()) {
+            if (-1 == item.getBlur()) {
                 this.genWorkOrder(workOrder, ErrorType.ABNORMAL_CLARITY, item.getDeviceId());
             }
             // 浜害寮傚父
-            if (0 == item.getLight()) {
+            if (-1 == item.getLight()) {
                 this.genWorkOrder(workOrder, ErrorType.ABNORMAL_BRIGHTNESS, item.getDeviceId());
             }
             return workOrder;
@@ -133,6 +129,27 @@
     }
 
 
+    @Override
+    public void osdCheck(List<OsdCheckResult> dataList) {
+        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()))
+                    || (!ApiConstants.OSD_Correct.equals(item.getOsdPartCorrect()))
+                    || (!ApiConstants.OSD_Correct.equals(item.getOsdNameCorrect()))
+            ) {
+                this.genWorkOrder(workOrder, ErrorType.OSD_ERROR, item.getDeviceNo());
+            }
+            return workOrder;
+        }).collect(Collectors.toList());
+        workOrderService.innerAddWorkOrder(workOrderList);
+    }
+
     /**
      * 宸ュ崟淇℃伅
      *
@@ -142,7 +159,7 @@
      */
     private void genWorkOrder(WorkOrder workOrder, ErrorType errorType, String serialNumber) {
         if (! StringUtils.hasText(workOrder.getWorkOrderNo())) {
-            workOrder.setWorkOrderNo(IdUtils.timeAddRandomNO(5));
+            workOrder.setWorkOrderNo(IdUtils.randomNO());
         }
         if (CollectionUtils.isEmpty(workOrder.getErrorTypeList())) {
             workOrder.setErrorTypeList(new ArrayList<>());

--
Gitblit v1.8.0