From df6bc44422110fa911c8666dfb4d97dcabb0328b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 31 八月 2024 12:24:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml |    2 +-
 ycl-server/src/main/java/com/ycl/task/OsdTask.java            |   19 +++++++++----------
 ycl-server/src/main/java/com/ycl/task/MonitorTask.java        |    1 +
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
index ff8dc82..f6267aa 100644
--- a/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/MonitorTask.java
@@ -160,6 +160,7 @@
         TMonitor monitor = new TMonitor();
         if (monitorVOMap.containsKey(result.getSerialNumber().getValue())) {
             monitor.setId(monitorVOMap.get(result.getSerialNumber().getValue()).getId());
+            monitor.setDeviceType(monitorVOMap.get(result.getSerialNumber().getValue()).getDeviceType());
         }
 
         monitor.setSerialNumber(result.getSerialNumber().getValue());
diff --git a/ycl-server/src/main/java/com/ycl/task/OsdTask.java b/ycl-server/src/main/java/com/ycl/task/OsdTask.java
index 75443d2..2da5834 100644
--- a/ycl-server/src/main/java/com/ycl/task/OsdTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/OsdTask.java
@@ -62,14 +62,6 @@
     @Autowired
     private UYErrorTypeCheckService uyErrorTypeCheckService;
 
-    private static final ExecutorService executorService = new ThreadPoolExecutor(8,
-            24,
-            5000,
-            TimeUnit.SECONDS,
-            new ArrayBlockingQueue<>(1000),
-            new ThreadPoolExecutor.CallerRunsPolicy()
-    );
-
     /**
      * 閫氳繃鏌ongoDB姣忔棩涓�鏈轰竴妗f暟鎹幏鍙栬澶噄p
      * 閫氳繃璁惧ip銆佸搧鐗岃皟鐢ㄤ笉鍚宎pi鑾峰彇osd淇℃伅
@@ -80,7 +72,7 @@
         log.info("寮�濮嬭幏鍙朞SD");
 //            YSApi.getOsd("51.95.66.42",YSUserName,YSPassword);
 
-        DHApi.getOsd("51.95.67.189",DHUserName,DHPassword);
+//        DHApi.getOsd("51.95.67.189",DHUserName,DHPassword);
         //鎵归噺淇敼娴峰悍鍝佺墝闆嗗悎
         List<String> hkList = new ArrayList<>();
         //鎵归噺淇敼澶у崕鍝佺墝闆嗗悎
@@ -94,9 +86,15 @@
         //闇�瑕佽�冩牳鐨勬暟鎹�
         List<String> serialNumbers = oneMachineFileResults.stream().map(result -> result.getSerialNumber().getValue()).collect(Collectors.toList());
         if(!CollectionUtils.isEmpty(serialNumbers)) {
+            ExecutorService executorService = new ThreadPoolExecutor(8,
+                    24,
+                    5000,
+                    TimeUnit.SECONDS,
+                    new ArrayBlockingQueue<>(1000),
+                    new ThreadPoolExecutor.CallerRunsPolicy()
+            );
             List<TMonitor> monitors = monitorMapper.selectByNumbers(serialNumbers);
             monitors = monitors.stream().filter(monitor -> !StringUtils.isEmpty(monitor.getIp()) && !"127.0.0.1".equals(monitor.getIp())).collect(Collectors.toList());
-//            monitors = monitors.stream().filter(monitor -> monitor.getId() < 7000).collect(Collectors.toList());
             log.info("澶勭悊鏁版嵁澶у皬{}", monitors.size());
             for (TMonitor monitor : monitors) {
                 executorService.submit(() -> {
@@ -126,6 +124,7 @@
                     }
                 });
             }
+            //涓嶅啀鎺ユ敹鏂颁换鍔�
             executorService.shutdown();
             try {
                 // 绛夊緟鎵�鏈変换鍔″畬鎴愶紝鏈�澶氱瓑寰�10绉掞紙鍙互鏍规嵁闇�瑕佽皟鏁达級
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 2dba5e9..f57cebe 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -240,7 +240,7 @@
         SELECT wo.id,wo.work_order_no,wo.unit_id,woet.error_name as errorType,woet.distribute_time,woar.create_time as auditTime
         FROM t_work_order wo
         LEFT JOIN t_work_order_error_type woet ON woet.work_order_no = wo.work_order_no
-        LEFT JOIN t_work_order_auditing_record woar ON woar.work_order_id = wo.id
+        LEFT JOIN t_work_order_auditing_record woar ON woar.work_order_no = wo.work_order_no
         WHERE wo.deleted = 0 AND wo.status = #{status}  AND woar.result = #{auditStatus}
         AND wo.deduct = 0 AND woar.create_time between #{startTime} and #{endTime}
     </select>

--
Gitblit v1.8.0