From fdcdd41fba7874c045766e3dea54d56d70df73ef Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 12 五月 2025 10:06:50 +0800
Subject: [PATCH] (部级录像可用率,重点录像可用率,录像可用率)计算可用率

---
 ycl-server/src/main/java/com/ycl/task/WorkOrderTask.java |   29 ++++++++++++++++++-----------
 1 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/task/WorkOrderTask.java b/ycl-server/src/main/java/com/ycl/task/WorkOrderTask.java
index 2f65607..55403c3 100644
--- a/ycl-server/src/main/java/com/ycl/task/WorkOrderTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/WorkOrderTask.java
@@ -15,6 +15,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
@@ -82,29 +83,35 @@
         }
     }
 
-    public static List<String> errType = new ArrayList<>(List.of("OSD","ABNORMALPIC","DEVICEOFFLINE"));
+    public static List<String> errType = new ArrayList<>(List.of("鍥惧儚寮傚父","OSD寮傚父","璁惧绂荤嚎"));
     //宸ュ崟涓嬪彂瀹氭椂浠诲姟锛� 宸ュ崟鍥犱负鏇存柊瀵艰嚧 鐘舵�佸彉涓哄緟涓嬪彂锛屾牴鎹敊璇被鍨嬪皢闇�瑕佺洿鎺ヤ笅鍙戝伐鍗�
-    //绂荤嚎锛屽浘褰㈠紓甯革紝osd閿欒
+    //绂荤嚎锛屽浘鍍忓紓甯革紝osd閿欒
     public void workOrderDistribute(){
         //鏌ヨ浠婃棩寰呬笅鍙戝伐鍗�
         Date now = new Date();
         Date startDate = DateUtils.getDayStart(now);
         Date endDate = DateUtils.getDayEnd(now);
         //鑾峰緱浠婃棩宸ュ崟
-        List<WorkOrderVO> list = workOrderService.distributeList(startDate,endDate);
+        List<WorkOrderVO> list = workOrderService.distributeList();
+        log.error("鑾峰緱宸ュ崟:{}",list);
         List<String> workOrderNos = new ArrayList<>();
         for (WorkOrderVO workOrderVO : list){
-           for (String errType : workOrderVO.getErrorTypeList()){
-               if (WorkOrderTask.errType.contains(errType)){
-                   //鍒ゆ柇宸ュ崟鏄惁鍖呭惈errType涓殑閿欒绫诲瀷
-                   workOrderNos.add(workOrderVO.getWorkOrderNo());
-                   break;
-               }
-           }
+            List<String> errTypeArray = Arrays.stream(workOrderVO.getErrorType().split("銆�")).toList();
+            for (String errType : errTypeArray) {
+                if (WorkOrderTask.errType.contains(errType)) {
+                    //鍒ゆ柇宸ュ崟鏄惁鍖呭惈errType涓殑閿欒绫诲瀷
+                    workOrderNos.add(workOrderVO.getWorkOrderNo());
+                    break;
+                }
+            }
+
         }
+        log.error("宸ュ崟鎵撳嵃{}",workOrderNos);
         DistributeWorkOrderQuery distributeWorkOrderQuery = new DistributeWorkOrderQuery();
         distributeWorkOrderQuery.setWorkOrderNOList(workOrderNos);
         //涓嬪彂鎺ュ彛
-        workOrderService.selectedIdsDistribute(distributeWorkOrderQuery);
+        if(!CollectionUtils.isEmpty(workOrderNos)){
+            workOrderService.selectedIdsDistribute(distributeWorkOrderQuery);
+        }
     }
 }

--
Gitblit v1.8.0