From fa074e6bfce456256a4f9aa42c89e69a0582f6e7 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 25 九月 2024 15:05:16 +0800
Subject: [PATCH] 大屏考核分数保留一位数
---
ycl-server/src/main/java/com/ycl/task/WorkOrderImgTask.java | 46 +++++++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 21 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 fe4d779..847391b 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,20 +39,25 @@
private final DeviceInfoMapper deviceInfoMapper;
private final WorkOrderCheckImgMapper workOrderCheckImgMapper;
- private static final ExecutorService executorService = new ThreadPoolExecutor(8,
- 24,
- 5000,
- TimeUnit.SECONDS,
- new ArrayBlockingQueue<>(10),
- new ThreadPoolExecutor.CallerRunsPolicy()
- );
+// private static final ExecutorService executorService = new ThreadPoolExecutor(8,
+// 10,
+// 5000,
+// TimeUnit.SECONDS,
+// new ArrayBlockingQueue<>(1024),
+// 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;
}
+ log.info("姝ゆ鍏辨娴嬪伐鍗曞浘鐗囧伐鍗曟暟" + deviceList.size());
// 鏌ュ嚭鍥芥爣璁惧锛屽氨涓�鏉℃暟鎹�
List<DeviceInfo> gbDevices = new LambdaQueryChainWrapper<>(deviceInfoMapper)
.orderByDesc(DeviceInfo::getUpdateTime)
@@ -60,19 +67,16 @@
return;
}
for (DeviceInfoVO deviceInfo : deviceList) {
- executorService.submit(() -> {
- // 鍥芥爣璁惧鐨勭紪鐮佸氨鏄彇瑙嗛娴佺殑璁惧缂栫爜锛屽浗鏍囪澶囧氨涓�涓�傚浗鏍囪澶囩殑姣忎竴涓�氶亾浠ｈ〃涓�涓憚鍍忓ご锛屼篃灏辨槸璁惧id鏄彇娴佺殑閫氶亾id
- String frameImg = workOrderService.getFrameImgByDevice(gbDevices.get(0).getDeviceId(), deviceInfo.getDeviceId(), deviceInfo.getWorkOrderNo());
- if (StringUtils.hasText(frameImg)) {
- WorkOrderCheckImg img = new WorkOrderCheckImg();
- img.setWorkOrderNo(deviceInfo.getWorkOrderNo());
- img.setImgUrl(frameImg);
- img.setCreateTime(new Date());
- workOrderCheckImgMapper.insert(img);
- }
- });
+ // 鍥芥爣璁惧鐨勭紪鐮佸氨鏄彇瑙嗛娴佺殑璁惧缂栫爜锛屽浗鏍囪澶囧氨涓�涓�傚浗鏍囪澶囩殑姣忎竴涓�氶亾浠ｈ〃涓�涓憚鍍忓ご锛屼篃灏辨槸璁惧id鏄彇娴佺殑閫氶亾id
+ String frameImg = workOrderService.getFrameImgByDevice(gbDevices.get(0).getDeviceId(), deviceInfo.getDeviceId(), deviceInfo.getWorkOrderNo());
+ if (StringUtils.hasText(frameImg)) {
+ WorkOrderCheckImg img = new WorkOrderCheckImg();
+ img.setWorkOrderNo(deviceInfo.getWorkOrderNo());
+ img.setImgUrl(frameImg);
+ img.setCreateTime(new Date());
+ workOrderCheckImgMapper.insert(img);
+ }
}
- executorService.shutdown();
}
}
--
Gitblit v1.8.0