From eb0e29e72049bc65f943cc864929c332b07f25d0 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 03 三月 2025 20:56:46 +0800
Subject: [PATCH] 导出osd问题 以及缺少小时改分钟
---
ycl-server/src/main/java/com/ycl/task/WorkOrderImgTask.java | 49 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 41 insertions(+), 8 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 2464693..28ec3f1 100644
--- a/ycl-server/src/main/java/com/ycl/task/WorkOrderImgTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/WorkOrderImgTask.java
@@ -1,16 +1,32 @@
package com.ycl.task;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import com.ycl.config.PlatformConfig;
import com.ycl.platform.domain.entity.DeviceInfo;
+import com.ycl.platform.domain.entity.WorkOrderCheckImg;
import com.ycl.platform.domain.vo.DeviceInfoVO;
import com.ycl.platform.mapper.DeviceInfoMapper;
+import com.ycl.platform.mapper.WorkOrderCheckImgMapper;
import com.ycl.platform.service.WorkOrderService;
+import com.ycl.utils.DateUtils;
+import com.ycl.utils.uuid.IdUtils;
+import constant.Constants;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.bytedeco.javacv.FFmpegFrameGrabber;
+import org.bytedeco.javacv.Frame;
+import org.bytedeco.javacv.Java2DFrameConverter;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
import java.util.List;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.ExecutorService;
@@ -30,21 +46,28 @@
private final WorkOrderService workOrderService;
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();
+ public void run() throws FFmpegFrameGrabber.Exception {
+ // 鏌ュ嚭鏈�杩戜竴鍛ㄧ殑鏁呴殰鐨勮澶�
+ 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;
}
+ log.info("姝ゆ鍏辨娴嬪伐鍗曞浘鐗囧伐鍗曟暟" + deviceList.size());
+ // 鏌ュ嚭鍥芥爣璁惧锛屽氨涓�鏉℃暟鎹�
List<DeviceInfo> gbDevices = new LambdaQueryChainWrapper<>(deviceInfoMapper)
.orderByDesc(DeviceInfo::getUpdateTime)
.last("limit 1")
@@ -55,12 +78,22 @@
for (DeviceInfoVO deviceInfo : deviceList) {
executorService.submit(() -> {
// 鍥芥爣璁惧鐨勭紪鐮佸氨鏄彇瑙嗛娴佺殑璁惧缂栫爜锛屽浗鏍囪澶囧氨涓�涓�傚浗鏍囪澶囩殑姣忎竴涓�氶亾浠ｈ〃涓�涓憚鍍忓ご锛屼篃灏辨槸璁惧id鏄彇娴佺殑閫氶亾id
- String frameImg = workOrderService.getFrameImgByDevice(gbDevices.get(0).getDeviceId(), deviceInfo.getDeviceId());
+ String frameImg = null;
+ try {
+ frameImg = workOrderService.getFrameImgByDevice(gbDevices.get(0).getDeviceId(), deviceInfo.getDeviceId(), deviceInfo.getWorkOrderNo());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
if (StringUtils.hasText(frameImg)) {
- workOrderService.updateImgById(deviceInfo.getWorkOrderId(), frameImg);
+ WorkOrderCheckImg img = new WorkOrderCheckImg();
+ img.setWorkOrderNo(deviceInfo.getWorkOrderNo());
+ img.setImgUrl(frameImg);
+ img.setCreateTime(new Date());
+ workOrderCheckImgMapper.insert(img);
}
});
}
+ log.info("宸ュ崟妫�娴嬪浘鐗囩粨鏉�");
}
}
--
Gitblit v1.8.0