From 29fbb07e30eab4b8092a7600a0ef0e39db1de1f2 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 25 九月 2024 14:35:00 +0800
Subject: [PATCH] 工单号生成修改

---
 ycl-server/src/main/java/com/ycl/task/WorkOrderImgTask.java |   35 +++++++++++++++++------------------
 1 files changed, 17 insertions(+), 18 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 ea99d70..847391b 100644
--- a/ycl-server/src/main/java/com/ycl/task/WorkOrderImgTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/WorkOrderImgTask.java
@@ -39,13 +39,13 @@
     private final DeviceInfoMapper deviceInfoMapper;
     private final WorkOrderCheckImgMapper workOrderCheckImgMapper;
 
-    private static final ExecutorService executorService = new ThreadPoolExecutor(8,
-            10,
-            5000,
-            TimeUnit.SECONDS,
-            new ArrayBlockingQueue<>(1024),
-            new ThreadPoolExecutor.CallerRunsPolicy()
-    );
+//    private static final ExecutorService executorService = new ThreadPoolExecutor(8,
+//            10,
+//            5000,
+//            TimeUnit.SECONDS,
+//            new ArrayBlockingQueue<>(1024),
+//            new ThreadPoolExecutor.CallerRunsPolicy()
+//    );
 
     public void run() {
         // 鏌ュ嚭鏈�杩戜竴鍛ㄧ殑鏁呴殰鐨勮澶�
@@ -57,6 +57,7 @@
         if (CollectionUtils.isEmpty(deviceList)) {
             return;
         }
+        log.info("姝ゆ鍏辨娴嬪伐鍗曞浘鐗囧伐鍗曟暟" + deviceList.size());
         // 鏌ュ嚭鍥芥爣璁惧锛屽氨涓�鏉℃暟鎹�
         List<DeviceInfo> gbDevices = new LambdaQueryChainWrapper<>(deviceInfoMapper)
                 .orderByDesc(DeviceInfo::getUpdateTime)
@@ -66,17 +67,15 @@
             return;
         }
         for (DeviceInfoVO deviceInfo : deviceList) {
-            executorService.submit(() -> {
-                // 鍥芥爣璁惧鐨勭紪鐮佸氨鏄彇瑙嗛娴佺殑璁惧缂栫爜锛屽浗鏍囪澶囧氨涓�涓�傚浗鏍囪澶囩殑姣忎竴涓�氶亾浠h〃涓�涓憚鍍忓ご锛屼篃灏辨槸璁惧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);
-                }
-            });
+            // 鍥芥爣璁惧鐨勭紪鐮佸氨鏄彇瑙嗛娴佺殑璁惧缂栫爜锛屽浗鏍囪澶囧氨涓�涓�傚浗鏍囪澶囩殑姣忎竴涓�氶亾浠h〃涓�涓憚鍍忓ご锛屼篃灏辨槸璁惧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);
+            }
         }
     }
 

--
Gitblit v1.8.0