From 6221c8b5df5eb0ee62dce79048c9c3f0dc3d0fc1 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 31 八月 2024 20:15:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/task/WorkOrderImgTask.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 018a2b0..0dffe4b 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;
@@ -38,11 +39,11 @@
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,
+ 32,
5000,
TimeUnit.SECONDS,
- new ArrayBlockingQueue<>(600),
+ new ArrayBlockingQueue<>(1000),
new ThreadPoolExecutor.CallerRunsPolicy()
);
@@ -52,7 +53,7 @@
Calendar ca = Calendar.getInstance();
ca.setTime(now);
ca.add(Calendar.DATE, -6);
- List<DeviceInfoVO> deviceList = workOrderService.hasErrorWorkOrderList(now, ca.getTime());
+ List<DeviceInfoVO> deviceList = workOrderService.hasErrorWorkOrderList(DateUtils.getDayStart(ca.getTime()), DateUtils.getDayEnd(now));
if (CollectionUtils.isEmpty(deviceList)) {
return;
}
--
Gitblit v1.8.0