From b14531e3b850fe6d2fa916ba7b88b3e2bd2ff30a Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 11 九月 2024 16:47:48 +0800
Subject: [PATCH] OSD加标签

---
 ycl-server/src/main/java/com/ycl/task/WorkOrderImgTask.java |   20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/task/WorkOrderImgTask.java b/ycl-server/src/main/java/com/ycl/task/WorkOrderImgTask.java
index b5fd4d7..8adb134 100644
--- a/ycl-server/src/main/java/com/ycl/task/WorkOrderImgTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/WorkOrderImgTask.java
@@ -7,6 +7,7 @@
 import com.ycl.platform.mapper.DeviceInfoMapper;
 import com.ycl.platform.mapper.WorkOrderCheckImgMapper;
 import com.ycl.platform.service.WorkOrderService;
+import com.ycl.utils.DateUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.bytedeco.javacv.FFmpegFrameGrabber;
@@ -15,6 +16,7 @@
 import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.ArrayBlockingQueue;
@@ -37,17 +39,21 @@
     private final DeviceInfoMapper deviceInfoMapper;
     private final WorkOrderCheckImgMapper workOrderCheckImgMapper;
 
-    private static final ExecutorService executorService = new ThreadPoolExecutor(8,
-            24,
+    private static final ExecutorService executorService = new ThreadPoolExecutor(16,
+            128,
             5000,
             TimeUnit.SECONDS,
-            new ArrayBlockingQueue<>(10),
+            new ArrayBlockingQueue<>(1000),
             new ThreadPoolExecutor.CallerRunsPolicy()
     );
 
     public void run() {
-        // 鏌ュ嚭鏁呴殰鐨勮澶�
-        List<DeviceInfoVO> deviceList = workOrderService.hasErrorWorkOrderList();
+        // 鏌ュ嚭鏈�杩戜竴鍛ㄧ殑鏁呴殰鐨勮澶�
+        Date now = new Date();
+        Calendar ca = Calendar.getInstance();
+        ca.setTime(now);
+        ca.add(Calendar.DATE, -6);
+        List<DeviceInfoVO> deviceList = workOrderService.hasErrorWorkOrderList(DateUtils.getDayStart(ca.getTime()), DateUtils.getDayEnd(now));
         if (CollectionUtils.isEmpty(deviceList)) {
             return;
         }
@@ -60,7 +66,7 @@
             return;
         }
         for (DeviceInfoVO deviceInfo : deviceList) {
-//            executorService.submit(() -> {
+            executorService.submit(() -> {
                 // 鍥芥爣璁惧鐨勭紪鐮佸氨鏄彇瑙嗛娴佺殑璁惧缂栫爜锛屽浗鏍囪澶囧氨涓�涓�傚浗鏍囪澶囩殑姣忎竴涓�氶亾浠h〃涓�涓憚鍍忓ご锛屼篃灏辨槸璁惧id鏄彇娴佺殑閫氶亾id
                 String frameImg = workOrderService.getFrameImgByDevice(gbDevices.get(0).getDeviceId(), deviceInfo.getDeviceId(), deviceInfo.getWorkOrderNo());
                 if (StringUtils.hasText(frameImg)) {
@@ -70,7 +76,7 @@
                     img.setCreateTime(new Date());
                     workOrderCheckImgMapper.insert(img);
                 }
-//            });
+            });
         }
     }
 

--
Gitblit v1.8.0