From 5bd22a1c186211ef93327951fc5237a8b85c2ba0 Mon Sep 17 00:00:00 2001
From: tuqiang <437016993@qq.com>
Date: Thu, 6 Feb 2025 08:34:11 +0800
Subject: [PATCH] =?UTF-8?q?add:=E6=96=B0=E5=A2=9E=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../belt_conveyor/BeltConveyorDeviceDriver.java  |  7 +++++++
 .../service/impl/InstructionServiceImpl.java     | 16 ++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java
index 8134df794..65b183682 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java
@@ -257,6 +257,13 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements
                         update_instruction_status();
                     } catch (Exception e) {
                         e.printStackTrace();
+                        log.error("更新指令失败原因:{}", e.getMessage());
+                        LuceneLogDto logDto = LuceneLogDto.builder()
+                                .device_code(device_code)
+                                .content("设备号" + device_code + "报错原因:" + e.getMessage())
+                                .build();
+                        logDto.setLog_level(4);
+                        luceneExecuteLogService.deviceExecuteLog(logDto);
                     }
                 });
                 if (null != inst) {
diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
index d0034f1d5..6ad6891ff 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
@@ -1188,7 +1188,13 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
             this.create(instdto);
         } catch (Exception e) {
             e.printStackTrace();
-            log.error("完成并创建下一条指令{}", e.getMessage());
+            log.error("完成并创建下一条指令失败原因:{}", e.getMessage());
+            LuceneLogDto logDto = LuceneLogDto.builder()
+                    .device_code(dto.getTask_code())
+                    .content("任务号" + dto.getTask_code() + "报错原因:" + e.getMessage())
+                    .build();
+            logDto.setLog_level(4);
+            luceneExecuteLogService.deviceExecuteLog(logDto);
         }
     }
 
@@ -1251,7 +1257,13 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
             this.create(instdto);
         } catch (Exception e) {
             e.printStackTrace();
-            log.error("完成并创建下一条指令{}", e.getMessage());
+            log.error("完成并创建下一条指令失败原因:{}", e.getMessage());
+            LuceneLogDto logDto = LuceneLogDto.builder()
+                    .device_code(dto.getTask_code())
+                    .content("任务号" + dto.getTask_code() + "报错原因:" + e.getMessage())
+                    .build();
+            logDto.setLog_level(4);
+            luceneExecuteLogService.deviceExecuteLog(logDto);
         }
     }