rev:驱动NULL

acs/nladmin-system/src/main/resources/config/application.yml

@@ -2,7 +2,7 @@ spring:
   freemarker:
     check-template-location: false
   profiles:
-    active: dev
+    active: prod
   jackson:
     time-zone: GMT+8
   data:

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/QueryAGVStatus.java

@@ -29,6 +29,9 @@ public class QueryAGVStatus {
     public void run() throws Exception {
 
         HttpResponse response = agvService.queryXZAgvInstStatus();
+        if (response == null) {
+            return;
+        }
         JSONObject jo = JSONArray.parseObject(response.body());
 
         JSONArray ja = JSONArray.parseArray(jo.getString("list"));

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/box_manipulator_site/BoxManipulatorSiteDeviceDriver.java

@@ -29,8 +29,11 @@ import org.nl.acs.route.service.impl.RouteLineServiceImpl;
 import org.nl.acs.task.service.TaskService;
 import org.nl.config.SpringContextHolder;
 import org.nl.config.language.LangProcess;
+import org.nl.config.lucene.service.LuceneExecuteLogService;
+import org.nl.config.lucene.service.dto.LuceneLogDto;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -57,6 +60,7 @@ public class BoxManipulatorSiteDeviceDriver extends AbstractOpcDeviceDriver impl
     DeviceExtraService deviceExtraService = SpringContextHolder.getBean(DeviceExtraServiceImpl.class);
     @Autowired
     DeviceErrorLogService errorLogServer = SpringContextHolder.getBean(DeviceErrorLogServiceImpl.class);
+    LuceneExecuteLogService luceneExecuteLogService = SpringContextHolder.getBean("luceneExecuteLogServiceImpl");
 
     //工作模式
     int mode = 0;
@@ -239,10 +243,13 @@ public class BoxManipulatorSiteDeviceDriver extends AbstractOpcDeviceDriver impl
             }
 
         } catch (Exception var17) {
-            var17.printStackTrace();
+            this.message = "逻辑异常, 详情查看设备日志";
-            //            feedMessage = var17.getMessage();
+            LuceneLogDto logDto = LuceneLogDto.builder()
-            logServer.deviceExecuteLog(this.device_code, "", "", "读取信号值时出现异常:" + var17.getMessage() + ",this.itemProtocol is null:" + ObjectUtil.isEmpty(this.itemProtocol));
+                    .device_code(device_code)
-
+                    .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace()))
+                    .build();
+            logDto.setLog_level(4);
+            luceneExecuteLogService.deviceExecuteLog(logDto);
         }
 
         if (mode == 0) {

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java

@@ -355,30 +355,37 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements
 
         } catch (Exception var17) {
             this.iserror = true;
-            message = "读取信号值时出现异常";
+            message = "逻辑异常, 详情查看设备日志";
-            String extracted = DeviceErrorUtil.extracted(var17);
+            this.message = "逻辑异常:" + Arrays.toString(var17.getStackTrace());
-            if (var17 instanceof NullPointerException) {
-                message += " - 空指针异常";
-                // 记录详细的堆栈跟踪信息
-                StringWriter sw = new StringWriter();
-                PrintWriter pw = new PrintWriter(sw);
-                var17.printStackTrace(pw);
-                String stackTrace = sw.toString();
             LuceneLogDto logDto = LuceneLogDto.builder()
                     .device_code(device_code)
-                        .content(this.device_code + extracted + ",报错信息:" + var17.getMessage() + ",堆栈跟踪:" + stackTrace)
+                    .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace()))
                     .build();
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);
-            } else {
+//            String extracted = DeviceErrorUtil.extracted(var17);
-                LuceneLogDto logDto = LuceneLogDto.builder()
+//            if (var17 instanceof NullPointerException) {
-                        .device_code(device_code)
+//                message += " - 空指针异常";
-                        .content(this.device_code + extracted + ",报错信息:" + var17.getMessage())
+//                // 记录详细的堆栈跟踪信息
-                        .build();
+//                StringWriter sw = new StringWriter();
-                logDto.setLog_level(4);
+//                PrintWriter pw = new PrintWriter(sw);
-                luceneExecuteLogService.deviceExecuteLog(logDto);
+//                var17.printStackTrace(pw);
-                var17.printStackTrace();
+//                String stackTrace = sw.toString();
-            }
+//                LuceneLogDto logDto = LuceneLogDto.builder()
+//                        .device_code(device_code)
+//                        .content(this.device_code + extracted + ",报错信息:" + var17.getMessage() + ",堆栈跟踪:" + stackTrace)
+//                        .build();
+//                logDto.setLog_level(4);
+//                luceneExecuteLogService.deviceExecuteLog(logDto);
+//            } else {
+//                LuceneLogDto logDto = LuceneLogDto.builder()
+//                        .device_code(device_code)
+//                        .content(this.device_code + extracted + ",报错信息:" + var17.getMessage())
+//                        .build();
+//                logDto.setLog_level(4);
+//                luceneExecuteLogService.deviceExecuteLog(logDto);
+//                var17.printStackTrace();
+//            }
         }
 
         last_heartbeat = heartbeat;

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/box_palletizing_manipulator/BoxPalletizingManipulatorDeviceDriver.java

@@ -22,6 +22,8 @@ import org.nl.acs.route.service.RouteLineService;
 import org.nl.acs.task.service.TaskService;
 import org.nl.config.SpringContextHolder;
 import org.nl.config.language.LangProcess;
+import org.nl.config.lucene.service.LuceneExecuteLogService;
+import org.nl.config.lucene.service.dto.LuceneLogDto;
 import org.openscada.opc.lib.da.Server;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -49,6 +51,7 @@ public class BoxPalletizingManipulatorDeviceDriver extends AbstractOpcDeviceDriv
     AcsToWmsService acsToWmsService = SpringContextHolder.getBean("acsToWmsServiceImpl");
     @Autowired
     DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
+    LuceneExecuteLogService luceneExecuteLogService = SpringContextHolder.getBean("luceneExecuteLogServiceImpl");
 
     //工作模式
     int mode = 0;
@@ -226,7 +229,13 @@ public class BoxPalletizingManipulatorDeviceDriver extends AbstractOpcDeviceDriv
             }
 
         } catch (Exception var17) {
-            return;
+            this.message = "逻辑异常, 详情查看设备日志";
+            LuceneLogDto logDto = LuceneLogDto.builder()
+                    .device_code(device_code)
+                    .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace()))
+                    .build();
+            logDto.setLog_level(4);
+            luceneExecuteLogService.deviceExecuteLog(logDto);
         }
 
         if (!this.itemProtocol.getIsonline()) {

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/DoubleBeltConveyorDeviceDriver.java

@@ -32,6 +32,8 @@ import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.config.SpringContextHolder;
+import org.nl.config.lucene.service.LuceneExecuteLogService;
+import org.nl.config.lucene.service.dto.LuceneLogDto;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.*;
@@ -54,6 +56,7 @@ public class DoubleBeltConveyorDeviceDriver extends AbstractOpcDeviceDriver impl
     AcsToWmsService acsToWmsService = SpringContextHolder.getBean(AcsToWmsServiceImpl.class);
     DeviceExecuteLogService logServer = SpringContextHolder.getBean(DeviceExecuteLogService.class);
     AgvService agvService = SpringContextHolder.getBean(AgvService.class);
+    LuceneExecuteLogService luceneExecuteLogService = SpringContextHolder.getBean("luceneExecuteLogServiceImpl");
 
     private Date instruction_update_time = new Date();
     private Date require_apply_strangulation_time = new Date();
@@ -235,8 +238,13 @@ public class DoubleBeltConveyorDeviceDriver extends AbstractOpcDeviceDriver impl
             }
 
         } catch (Exception var17) {
-            var17.printStackTrace();
+            this.message = "逻辑异常, 详情查看设备日志";
-            logServer.deviceExecuteLog(this.device_code, "", "", "读取信号值时出现异常:" + var17.getMessage() + ",this.itemProtocol is null:" + ObjectUtil.isEmpty(this.itemProtocol));
+            LuceneLogDto logDto = LuceneLogDto.builder()
+                    .device_code(device_code)
+                    .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace()))
+                    .build();
+            logDto.setLog_level(4);
+            luceneExecuteLogService.deviceExecuteLog(logDto);
         }
 
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/BoxStorageOutConveyorDeviceDriver.java

@@ -242,14 +242,13 @@ public class BoxStorageOutConveyorDeviceDriver extends AbstractOpcDeviceDriver i
             }
         } catch (Exception var17) {
             this.iserror = true;
+            this.message = "逻辑异常, 详情查看设备日志";
             LuceneLogDto logDto = LuceneLogDto.builder()
                     .device_code(device_code)
-                    .content(this.device_code+ "读取信号值时出现异常:" + var17.getMessage() + ",this.itemProtocol is null")
+                    .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace()))
                     .build();
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);
-            message = "读取信号值时出现异常";
-            var17.printStackTrace();
         }
 
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/BoxSubvolumesConveyorDeviceDriver.java

@@ -266,14 +266,13 @@ public class BoxSubvolumesConveyorDeviceDriver extends AbstractOpcDeviceDriver i
             }
         } catch (Exception var17) {
             this.iserror = true;
+            this.message = "逻辑异常, 详情查看设备日志";
             LuceneLogDto logDto = LuceneLogDto.builder()
                     .device_code(device_code)
-                    .content(this.device_code + "读取信号值时出现异常:" + var17.getMessage() + ",this.itemProtocol is null")
+                    .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace()))
                     .build();
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);
-            message = "读取信号值时出现异常";
-            var17.printStackTrace();
         }
 
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java

@@ -297,14 +297,13 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr
 
         } catch (Exception var17) {
             this.iserror = true;
+            this.message = "逻辑异常, 详情查看设备日志";
             LuceneLogDto logDto = LuceneLogDto.builder()
                     .device_code(device_code)
-                    .content(this.device_code + "读取信号值时出现异常:" + var17.getMessage() + ",this.itemProtocol is null")
+                    .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace()))
                     .build();
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);
-            message = "读取信号值时出现异常";
-            var17.printStackTrace();
         }
 
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java

@@ -287,14 +287,13 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements
 
         } catch (Exception var17) {
             this.iserror = true;
+            this.message = "逻辑异常, 详情查看设备日志";
             LuceneLogDto logDto = LuceneLogDto.builder()
                     .device_code(device_code)
-                    .content(this.device_code + "读取信号值时出现异常:" + var17.getMessage() + ",this.itemProtocol is null")
+                    .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace()))
                     .build();
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);
-            message = "读取信号值时出现异常";
-            var17.printStackTrace();
 
         }
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java

@@ -402,30 +402,13 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
             }
         } catch (Exception e) {
             this.iserror = true;
-            log.error("空指针:{}", e);
+            this.message = "逻辑异常, 详情查看设备日志";
-            String extracted = DeviceErrorUtil.extracted(e);
-            if (e instanceof NullPointerException) {
-                message += " - 空指针异常";
-                // 记录详细的堆栈跟踪信息
-                StringWriter sw = new StringWriter();
-                PrintWriter pw = new PrintWriter(sw);
-                e.printStackTrace(pw);
-                String stackTrace = sw.toString();
             LuceneLogDto logDto = LuceneLogDto.builder()
                     .device_code(device_code)
-                        .content(this.device_code + extracted + ",报错信息:" + e.getMessage() + ",堆栈跟踪:" + stackTrace)
+                    .content(this.device_code + "逻辑异常:" + Arrays.toString(e.getStackTrace()))
                     .build();
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);
-            } else {
-                LuceneLogDto logDto = LuceneLogDto.builder()
-                        .device_code(device_code)
-                        .content(this.device_code + extracted + ",报错信息:" + e.getMessage())
-                        .build();
-                logDto.setLog_level(4);
-                luceneExecuteLogService.deviceExecuteLog(logDto);
-                e.printStackTrace();
-            }
         }
 
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java

@@ -209,6 +209,7 @@ public class UnBoxLableConveyorDeviceDriver extends AbstractOpcDeviceDriver impl
                     //不允许开盖，完成出库任务，自动去扫码位
                     if (instruction == null || StrUtil.isEmpty(instruction.getVehicle_code())) {
                         message = "指令信息不存在或者任务托盘码为空，无法开盖";
+                        return;
                     }
                     applyUnbox(instruction.getVehicle_code());
 
@@ -216,14 +217,13 @@ public class UnBoxLableConveyorDeviceDriver extends AbstractOpcDeviceDriver impl
             }
         } catch (Exception e) {
             this.iserror = true;
+            this.message = "逻辑异常, 详情查看设备日志";
             LuceneLogDto logDto = LuceneLogDto.builder()
                     .device_code(device_code)
-                    .content(this.device_code + "读取信号值时出现异常:" + e.getMessage() + ",this.itemProtocol is null")
+                    .content(this.device_code + "逻辑异常:" + Arrays.toString(e.getStackTrace()))
                     .build();
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);
-            message = "读取信号值时出现异常";
-            e.printStackTrace();
         }
 
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java

@@ -243,14 +243,13 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
             }
         } catch (Exception e) {
             this.iserror = true;
+            this.message = "逻辑异常, 详情查看设备日志";
             LuceneLogDto logDto = LuceneLogDto.builder()
                     .device_code(device_code)
-                    .content(this.device_code + "读取信号值时出现异常:" + e.getMessage() + ",this.itemProtocol is null")
+                    .content(this.device_code + "逻辑异常:" + Arrays.toString(e.getStackTrace()))
                     .build();
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);
-            message = "universal_remark8";
-            e.printStackTrace();
         }
 
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java

@@ -214,14 +214,13 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
 
         } catch (Exception e) {
             this.iserror = true;
+            this.message = "逻辑异常, 详情查看设备日志";
             LuceneLogDto logDto = LuceneLogDto.builder()
                     .device_code(device_code)
-                    .content(this.device_code + "读取信号值时出现异常:" + e.getMessage() + ",this.itemProtocol is null")
+                    .content(this.device_code + "逻辑异常:" + Arrays.toString(e.getStackTrace()))
                     .build();
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);
-            message = "universal_remark8";
-            e.printStackTrace();
 
         }
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java

@@ -231,47 +231,54 @@ public class ReturnGoodManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
 
         } catch (Exception e) {
             this.iserror = true;
-            log.error("空指针:{}",e);
+            this.message = "逻辑异常, 详情查看设备日志";
-            String extracted = DeviceErrorUtil.extracted(e);
-            if (e == null) {
-                message += " - 捕获到的异常为 null";
-                // 获取堆栈跟踪信息
-                StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace();
-                StringBuilder stackTrace = new StringBuilder();
-                for (StackTraceElement element : stackTraceElements) {
-                    stackTrace.append(element.toString()).append("\n");
-                }
             LuceneLogDto logDto = LuceneLogDto.builder()
                     .device_code(device_code)
-                        .content(this.device_code + ",捕获到的异常为 null,堆栈跟踪:\n" + stackTrace.toString())
+                    .content(this.device_code + "逻辑异常:" + Arrays.toString(e.getStackTrace()))
                     .build();
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);
-                // 打印堆栈跟踪信息到控制台
+//            log.error("空指针:{}",e);
-                log.info("捕获到的异常为 null,堆栈跟踪:\n" + stackTrace.toString());
+//            String extracted = DeviceErrorUtil.extracted(e);
-            }
+//            if (e == null) {
-            if (e instanceof NullPointerException) {
+//                message += " - 捕获到的异常为 null";
-                message += " - 空指针异常";
+//                // 获取堆栈跟踪信息
-                // 记录详细的堆栈跟踪信息
+//                StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace();
-                StringWriter sw = new StringWriter();
+//                StringBuilder stackTrace = new StringBuilder();
-                PrintWriter pw = new PrintWriter(sw);
+//                for (StackTraceElement element : stackTraceElements) {
-                e.printStackTrace(pw);
+//                    stackTrace.append(element.toString()).append("\n");
-                String stackTrace = sw.toString();
+//                }
-                LuceneLogDto logDto = LuceneLogDto.builder()
+//                LuceneLogDto logDto = LuceneLogDto.builder()
-                        .device_code(device_code)
+//                        .device_code(device_code)
-                        .content(this.device_code + extracted + ",报错信息:" + e.getMessage() + ",堆栈跟踪:" + stackTrace)
+//                        .content(this.device_code + ",捕获到的异常为 null,堆栈跟踪:\n" + stackTrace.toString())
-                        .build();
+//                        .build();
-                logDto.setLog_level(4);
+//                logDto.setLog_level(4);
-                luceneExecuteLogService.deviceExecuteLog(logDto);
+//                luceneExecuteLogService.deviceExecuteLog(logDto);
-            } else {
+//                // 打印堆栈跟踪信息到控制台
-                LuceneLogDto logDto = LuceneLogDto.builder()
+//                log.info("捕获到的异常为 null,堆栈跟踪:\n" + stackTrace.toString());
-                        .device_code(device_code)
+//            }
-                        .content(this.device_code + extracted + ",报错信息:" + e.getMessage())
+//            if (e instanceof NullPointerException) {
-                        .build();
+//                message += " - 空指针异常";
-                logDto.setLog_level(4);
+//                // 记录详细的堆栈跟踪信息
-                luceneExecuteLogService.deviceExecuteLog(logDto);
+//                StringWriter sw = new StringWriter();
-                e.printStackTrace();
+//                PrintWriter pw = new PrintWriter(sw);
-            }
+//                e.printStackTrace(pw);
+//                String stackTrace = sw.toString();
+//                LuceneLogDto logDto = LuceneLogDto.builder()
+//                        .device_code(device_code)
+//                        .content(this.device_code + extracted + ",报错信息:" + e.getMessage() + ",堆栈跟踪:" + stackTrace)
+//                        .build();
+//                logDto.setLog_level(4);
+//                luceneExecuteLogService.deviceExecuteLog(logDto);
+//            } else {
+//                LuceneLogDto logDto = LuceneLogDto.builder()
+//                        .device_code(device_code)
+//                        .content(this.device_code + extracted + ",报错信息:" + e.getMessage())
+//                        .build();
+//                logDto.setLog_level(4);
+//                luceneExecuteLogService.deviceExecuteLog(logDto);
+//                e.printStackTrace();
+//            }
         }
 
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/rgv/OneRgvDeviceDriver.java

@@ -36,10 +36,7 @@ import org.nl.config.lucene.service.LuceneExecuteLogService;
 import org.nl.config.lucene.service.dto.LuceneLogDto;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.util.Date;
+import java.util.*;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * RGV
@@ -180,9 +177,13 @@ public class OneRgvDeviceDriver extends AbstractOpcDeviceDriver implements Devic
 
 
         } catch (Exception var17) {
-            var17.printStackTrace();
+            this.message = "逻辑异常, 详情查看设备日志";
-            logServer.deviceExecuteLog(this.device_code, "", "", "读取信号值时出现异常:" + var17.getMessage() + ",this.itemProtocol is null:" + ObjectUtil.isEmpty(this.itemProtocol));
+            LuceneLogDto logDto = LuceneLogDto.builder()
-
+                    .device_code(device_code)
+                    .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace()))
+                    .build();
+            logDto.setLog_level(4);
+            luceneExecuteLogService.deviceExecuteLog(logDto);
         }
 
         if (mode == 0) {

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/standard_manipulator/StandardManipulatoDeviceDriver.java

@@ -36,10 +36,7 @@ import org.nl.config.lucene.service.LuceneExecuteLogService;
 import org.nl.config.lucene.service.dto.LuceneLogDto;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.util.Date;
+import java.util.*;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * RGV
@@ -184,13 +181,13 @@ public class StandardManipulatoDeviceDriver extends AbstractOpcDeviceDriver impl
 
         } catch (Exception var17) {
             this.iserror = true;
+            this.message = "逻辑异常, 详情查看设备日志";
             LuceneLogDto logDto = LuceneLogDto.builder()
                     .device_code(device_code)
-                    .content(this.device_code + "读取信号值时出现异常:" + var17.getMessage() + ",this.itemProtocol is null")
+                    .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace()))
                     .build();
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);
-            var17.printStackTrace();
 
         }
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java

@@ -219,14 +219,13 @@ public class TrappedManipulatorManipulatorDeviceDriver extends AbstractOpcDevice
 
         } catch (Exception var17) {
             this.iserror = true;
+            this.message = "逻辑异常, 详情查看设备日志";
             LuceneLogDto logDto = LuceneLogDto.builder()
                     .device_code(device_code)
-                    .content(this.device_code + "读取信号值时出现异常:" + Arrays.toString(var17.getStackTrace()))
+                    .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace()))
                     .build();
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);
-            var17.printStackTrace();
-            message = "universal_remark8";
         }
 
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/VolumeTwoManipulatorManipulatorDeviceDriver.java

@@ -270,14 +270,14 @@ public class VolumeTwoManipulatorManipulatorDeviceDriver extends AbstractOpcDevi
 
         } catch (Exception var17) {
             this.iserror = true;
+            this.iserror = true;
+            this.message = "逻辑异常, 详情查看设备日志";
             LuceneLogDto logDto = LuceneLogDto.builder()
                     .device_code(device_code)
-                    .content(this.device_code + "读取信号值时出现异常:" + Arrays.toString(var17.getStackTrace()) + ",this.itemProtocol is null")
+                    .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace()))
                     .build();
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);
-            var17.printStackTrace();
-            message = "universal_remark8";
 
         }
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java

@@ -31,6 +31,8 @@ import org.nl.acs.route.service.RouteLineService;
 import org.nl.acs.task.service.TaskService;
 import org.nl.acs.task.service.dto.TaskDto;
 import org.nl.config.SpringContextHolder;
+import org.nl.config.lucene.service.LuceneExecuteLogService;
+import org.nl.config.lucene.service.dto.LuceneLogDto;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.*;
@@ -61,6 +63,7 @@ public class PaperTubeConveyor2DeviceDriver extends AbstractOpcDeviceDriver impl
     AgvService agvService = SpringContextHolder.getBean(AgvService.class);
     @Autowired
     DeviceErrorLogService deviceErrorLogService = SpringContextHolder.getBean(DeviceErrorLogServiceImpl.class);
+    LuceneExecuteLogService luceneExecuteLogService = SpringContextHolder.getBean("luceneExecuteLogServiceImpl");
 
     private Date instruction_update_time = new Date();
     private Date require_apply_strangulation_time = new Date();
@@ -304,8 +307,14 @@ public class PaperTubeConveyor2DeviceDriver extends AbstractOpcDeviceDriver impl
             }
 
         } catch (Exception var17) {
-            var17.printStackTrace();
+            this.iserror = true;
-            logServer.deviceExecuteLog(this.device_code, "", "", "读取信号值时出现异常:" + var17.getMessage() + ",this.itemProtocol is null:" + ObjectUtil.isEmpty(this.itemProtocol));
+            this.message = "逻辑异常, 详情查看设备日志";
+            LuceneLogDto logDto = LuceneLogDto.builder()
+                    .device_code(device_code)
+                    .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace()))
+                    .build();
+            logDto.setLog_level(4);
+            luceneExecuteLogService.deviceExecuteLog(logDto);
         }
 
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_pick_site/PaperTubePickSiteDeviceDriver.java

@@ -277,7 +277,13 @@ public class PaperTubePickSiteDeviceDriver extends AbstractOpcDeviceDriver imple
                 }
             }
         } catch (Exception var17) {
-            return;
+            this.message = "逻辑异常, 详情查看设备日志";
+            LuceneLogDto logDto = LuceneLogDto.builder()
+                    .device_code(device_code)
+                    .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace()))
+                    .build();
+            logDto.setLog_level(4);
+            luceneExecuteLogService.deviceExecuteLog(logDto);
         }
 
         if (!this.itemProtocol.getIsonline()) {

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDeviceDriver.java

@@ -41,10 +41,7 @@ import org.nl.config.lucene.service.LuceneExecuteLogService;
 import org.nl.config.lucene.service.dto.LuceneLogDto;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.util.Date;
+import java.util.*;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * RGV
@@ -203,9 +200,13 @@ public class RgvDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDr
 
 
         } catch (Exception var17) {
-            var17.printStackTrace();
+            this.message = "逻辑异常, 详情查看设备日志";
-            logServer.deviceExecuteLog(this.device_code, "", "", "读取信号值时出现异常:" + var17.getMessage() + ",this.itemProtocol is null:" + ObjectUtil.isEmpty(this.itemProtocol));
+            LuceneLogDto logDto = LuceneLogDto.builder()
-
+                    .device_code(device_code)
+                    .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace()))
+                    .build();
+            logDto.setLog_level(4);
+            luceneExecuteLogService.deviceExecuteLog(logDto);
         }
 
         if (mode == 0) {

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java

@@ -573,15 +573,13 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
 
         } catch (Exception var17) {
             this.iserror = true;
+            this.message = "逻辑异常, 详情查看设备日志";
             LuceneLogDto logDto = LuceneLogDto.builder()
                     .device_code(device_code)
-                    .content(this.device_code + "读取信号值时出现异常:" + var17.getMessage() + ",this.itemProtocol is null")
+                    .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace()))
                     .build();
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);
-            message = "universal_remark8";
-
-            var17.printStackTrace();
         }
 
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/blank_manipulator/BlankManipulatorDeviceDriver.java

@@ -311,12 +311,12 @@ public class BlankManipulatorDeviceDriver extends AbstractOpcDeviceDriver implem
 
 
         } catch (Exception var17) {
-            var17.printStackTrace();
+            this.message = "逻辑异常, 详情查看设备日志";
             LuceneLogDto logDto = LuceneLogDto.builder()
                     .device_code(device_code)
-                    .content("读取信号值时出现异常:" + var17.getMessage() + ",this.itemProtocol is null:" + ObjectUtil.isEmpty(this.itemProtocol))
+                    .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace()))
                     .build();
-            logDto.setLog_level(2);
+            logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);
 
         }

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/die_manipulator/DieManipulatorDriver.java

@@ -38,10 +38,7 @@ import org.nl.config.lucene.service.LuceneExecuteLogService;
 import org.nl.config.lucene.service.dto.LuceneLogDto;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.util.Date;
+import java.util.*;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 管芯行架机械手
@@ -148,10 +145,13 @@ public class DieManipulatorDriver extends AbstractOpcDeviceDriver implements Dev
             y_position = this.itemProtocol.getY_position();
 
         } catch (Exception var17) {
-            var17.printStackTrace();
+            this.message = "逻辑异常, 详情查看设备日志";
-            //            feedMessage = var17.getMessage();
+            LuceneLogDto logDto = LuceneLogDto.builder()
-            logServer.deviceExecuteLog(this.device_code, "", "", "读取信号值时出现异常:" + var17.getMessage() + ",this.itemProtocol is null:" + ObjectUtil.isEmpty(this.itemProtocol));
+                    .device_code(device_code)
-
+                    .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace()))
+                    .build();
+            logDto.setLog_level(4);
+            luceneExecuteLogService.deviceExecuteLog(logDto);
         }
 
         if (mode == 0) {

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/manipulator_agv_station/ManipulatorAgvStationDeviceDriver.java

@@ -30,10 +30,7 @@ import org.nl.config.lucene.service.LuceneExecuteLogService;
 import org.nl.config.lucene.service.dto.LuceneLogDto;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.util.Date;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 行架-agv对接位
@@ -126,7 +123,13 @@ public class ManipulatorAgvStationDeviceDriver extends AbstractOpcDeviceDriver i
                 this.setRequireSucess(false);
             }
         } catch (Exception var17) {
-            return;
+            this.message = "逻辑异常, 详情查看设备日志";
+            LuceneLogDto logDto = LuceneLogDto.builder()
+                    .device_code(device_code)
+                    .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace()))
+                    .build();
+            logDto.setLog_level(4);
+            luceneExecuteLogService.deviceExecuteLog(logDto);
         }
 
         if (!this.itemProtocol.getIsonline()) {

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java

@@ -219,12 +219,10 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
             }
 
         } catch (Exception var17) {
-            var17.printStackTrace();
+            this.message = "逻辑异常, 详情查看设备日志";
-            //            feedMessage = var17.getMessage();
-
             LuceneLogDto logDto = LuceneLogDto.builder()
                     .device_code(device_code)
-                    .content(this.device_code + "读取信号值时出现异常:" + Arrays.toString(var17.getStackTrace()))
+                    .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace()))
                     .build();
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java

@@ -223,11 +223,10 @@ public class PlugPullDeviceSiteDeviceDriver extends AbstractOpcDeviceDriver impl
             toSize3 = this.itemProtocol.getTo_size3();
             toSize4 = this.itemProtocol.getTo_size4();
         } catch (Exception var17) {
-
+            this.message = "逻辑异常, 详情查看设备日志";
-            var17.printStackTrace();
             LuceneLogDto logDto = LuceneLogDto.builder()
                     .device_code(device_code)
-                    .content(this.device_code + "读取信号值时出现异常:" + Arrays.toString(var17.getStackTrace()))
+                    .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace()))
                     .build();
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java

@@ -392,10 +392,10 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
             }
 
         } catch (Exception var17) {
-            var17.printStackTrace();
+            this.message = "逻辑异常, 详情查看设备日志";
             LuceneLogDto logDto = LuceneLogDto.builder()
                     .device_code(device_code)
-                    .content(this.device_code + "读取信号值时出现异常:" + Arrays.toString(var17.getStackTrace()))
+                    .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace()))
                     .build();
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java

@@ -306,10 +306,10 @@ public class PullTailManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
             }
 
         } catch (Exception var17) {
-            var17.printStackTrace();
+            this.message = "逻辑异常, 详情查看设备日志";
             LuceneLogDto logDto = LuceneLogDto.builder()
                     .device_code(device_code)
-                    .content(this.device_code + "读取信号值时出现异常:" + Arrays.toString(var17.getStackTrace()))
+                    .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace()))
                     .build();
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/ranging_stations/RangingStationsDeviceDriver.java

@@ -29,12 +29,11 @@ import org.nl.acs.task.service.mapper.TaskMapper;
 import org.nl.acs.utils.ConvertUtil;
 import org.nl.common.utils.CodeUtil;
 import org.nl.config.SpringContextHolder;
+import org.nl.config.lucene.service.LuceneExecuteLogService;
+import org.nl.config.lucene.service.dto.LuceneLogDto;
 import org.openscada.opc.lib.da.Server;
 
-import java.util.Date;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * AGV站点-测距
@@ -55,6 +54,7 @@ public class RangingStationsDeviceDriver extends AbstractOpcDeviceDriver impleme
 
     TaskMapper taskMapper;
     AcsToWmsService acsToWmsService = SpringContextHolder.getBean("acsToWmsServiceImpl");
+    LuceneExecuteLogService luceneExecuteLogService = SpringContextHolder.getBean(LuceneExecuteLogService.class);
 
     String container;
     String container_type_desc;
@@ -173,7 +173,13 @@ public class RangingStationsDeviceDriver extends AbstractOpcDeviceDriver impleme
 
 
         } catch (Exception var17) {
-            return;
+            this.message = "逻辑异常, 详情查看设备日志";
+            LuceneLogDto logDto = LuceneLogDto.builder()
+                    .device_code(devicecode)
+                    .content(this.devicecode + "逻辑异常:" + Arrays.toString(var17.getStackTrace()))
+                    .build();
+            logDto.setLog_level(4);
+            luceneExecuteLogService.deviceExecuteLog(logDto);
         }
 
         if (!this.itemProtocol.getIsonline()) {

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/raster/RasterDeviceDriver.java

@@ -116,7 +116,13 @@ public class RasterDeviceDriver extends AbstractOpcDeviceDriver implements Devic
                 this.setRequireSucess(false);
             }
         } catch (Exception var17) {
-            return;
+            this.message = "逻辑异常, 详情查看设备日志";
+            LuceneLogDto logDto = LuceneLogDto.builder()
+                    .device_code(device_code)
+                    .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace()))
+                    .build();
+            logDto.setLog_level(4);
+            luceneExecuteLogService.deviceExecuteLog(logDto);
         }
 
         if (!this.itemProtocol.getIsonline()) {

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java

@@ -190,9 +190,10 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
 
 
         } catch (Exception var17) {
+            this.message = "逻辑异常, 详情查看设备日志";
             LuceneLogDto logDto = LuceneLogDto.builder()
                     .device_code(device_code)
-                    .content(this.device_code + "读取信号值时出现异常:" + Arrays.toString(var17.getStackTrace()))
+                    .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace()))
                     .build();
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java

@@ -787,7 +787,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
                         map.put("to_qty3", to_qty1);
                     }
                 }
-
+                map.put("to_command", 7);
                 log.info("下发电气信号--------------:参数" + map);
                 paperTubePickSiteDeviceDriver.writing(map);
                 log.info("给电气下发信号成功！");