From ca0b62c99a8206ca061baa98fc3d72ed79d512ee Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Wed, 5 Nov 2025 13:28:56 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E9=A9=B1=E5=8A=A8NULL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/config/application.yml | 2 +- .../java/org/nl/acs/agv/QueryAGVStatus.java | 3 + .../BoxManipulatorSiteDeviceDriver.java | 17 ++-- .../BeltConveyorDeviceDriver.java | 67 +++++++------- ...BoxPalletizingManipulatorDeviceDriver.java | 11 ++- .../DoubleBeltConveyorDeviceDriver.java | 12 ++- .../BoxStorageOutConveyorDeviceDriver.java | 5 +- .../BoxSubvolumesConveyorDeviceDriver.java | 5 +- ...nishedProductOutBindLableDeviceDriver.java | 5 +- .../FoldDiscSiteDeviceDriver.java | 5 +- ...ConveyorWithScannerWeightDeviceDriver.java | 31 ++----- .../UnBoxLableConveyorDeviceDriver.java | 6 +- .../BoxPackageManipulatorDeviceDriver.java | 5 +- .../BoxStorageManipulatorDeviceDriver.java | 5 +- .../ReturnGoodManipulatorDeviceDriver.java | 89 ++++++++++--------- .../rgv/OneRgvDeviceDriver.java | 15 ++-- .../StandardManipulatoDeviceDriver.java | 9 +- ...pedManipulatorManipulatorDeviceDriver.java | 5 +- ...TwoManipulatorManipulatorDeviceDriver.java | 6 +- .../PaperTubeConveyor2DeviceDriver.java | 13 ++- .../PaperTubePickSiteDeviceDriver.java | 8 +- .../device_driver/rgv/RgvDeviceDriver.java | 15 ++-- .../StandardStackerDeviceDriver.java | 6 +- .../BlankManipulatorDeviceDriver.java | 6 +- .../die_manipulator/DieManipulatorDriver.java | 16 ++-- .../ManipulatorAgvStationDeviceDriver.java | 13 +-- .../OvenGantryManipulatorDeviceDriver.java | 6 +- .../PlugPullDeviceSiteDeviceDriver.java | 5 +- .../PullHeadManipulatorDeviceDriver.java | 4 +- .../PullTailManipulatorDeviceDriver.java | 4 +- .../RangingStationsDeviceDriver.java | 16 ++-- .../raster/RasterDeviceDriver.java | 8 +- .../SlitTwoManipulatorDeviceDriver.java | 3 +- .../wms/service/impl/WmsToAcsServiceImpl.java | 2 +- 34 files changed, 235 insertions(+), 193 deletions(-) diff --git a/acs/nladmin-system/src/main/resources/config/application.yml b/acs/nladmin-system/src/main/resources/config/application.yml index 9d5b4935c..5a5b8e2f7 100644 --- a/acs/nladmin-system/src/main/resources/config/application.yml +++ b/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: diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/QueryAGVStatus.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/QueryAGVStatus.java index 67792f6f1..72c2c3afb 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/agv/QueryAGVStatus.java +++ b/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")); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/box_manipulator_site/BoxManipulatorSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/box_manipulator_site/BoxManipulatorSiteDeviceDriver.java index 626608dea..0e150e443 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/box_manipulator_site/BoxManipulatorSiteDeviceDriver.java +++ b/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(); - // feedMessage = var17.getMessage(); - 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); } if (mode == 0) { @@ -357,7 +364,7 @@ public class BoxManipulatorSiteDeviceDriver extends AbstractOpcDeviceDriver impl jo.put("isError", this.getIserror()); jo.put("message", LangProcess.msg(message)); jo.put("notCreateTaskMessage", notCreateTaskMessage); - jo.put("notCreateInstMessage", LangProcess.msg(notCreateInstMessage)); + jo.put("notCreateInstMessage", LangProcess.msg(notCreateInstMessage)); jo.put("feedMessage", LangProcess.msg(feedMessage)); jo.put("driver_type", "siemens_conveyor"); jo.put("is_click", true); 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 4416edeab..ed73df2df 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 @@ -253,7 +253,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements to_container_no = this.itemProtocol.getContainer_direction(); - if (move != last_move && last_move == 1 && mode > 0) { + if (move != last_move && last_move == 1 && mode > 0) { requireSucess = false; clearWrite(); } @@ -344,7 +344,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements case 4: //申请出货 if (move == 1 && !requireSucess) { - } + } break; @@ -355,30 +355,37 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements } catch (Exception var17) { this.iserror = true; - message = "读取信号值时出现异常"; - String extracted = DeviceErrorUtil.extracted(var17); - 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) - .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(); - } + message = "逻辑异常, 详情查看设备日志"; + this.message = "逻辑异常:" + Arrays.toString(var17.getStackTrace()); + LuceneLogDto logDto = LuceneLogDto.builder() + .device_code(device_code) + .content(this.device_code + "逻辑异常:" + Arrays.toString(var17.getStackTrace())) + .build(); + logDto.setLog_level(4); + luceneExecuteLogService.deviceExecuteLog(logDto); +// String extracted = DeviceErrorUtil.extracted(var17); +// 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) +// .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; @@ -455,12 +462,12 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements luceneExecuteLogService.deviceExecuteLog(logDto); HttpResponse httpResponse = acsToWmsService.applyTwo(param); JSONObject jsonObject = null; - if(ObjectUtil.isNotEmpty(httpResponse)){ + if (ObjectUtil.isNotEmpty(httpResponse)) { String body = httpResponse.body(); jsonObject = JSONObject.parseObject(body); } message = "申请空托盘出入库,返回参数:" + jsonObject; - if (ObjectUtil.isNotNull(jsonObject) && jsonObject.getInteger("status") == 200) { + if (ObjectUtil.isNotNull(jsonObject) && jsonObject.getInteger("status") == 200) { LuceneLogDto logDto2 = LuceneLogDto.builder() .device_code(device_code) .content("申请空托盘出入库,参数,接口返回:" + jsonObject) @@ -545,7 +552,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements if (ObjectUtil.isNotEmpty(byNextDeviceCodeFromCache)) { LuceneLogDto logDto = LuceneLogDto.builder() .device_code(device_code) - .content("存在到堆垛机对接位的就绪指令或者执行中的指令,"+"指令号为："+byNextDeviceCodeFromCache.getInstruction_code()) + .content("存在到堆垛机对接位的就绪指令或者执行中的指令," + "指令号为：" + byNextDeviceCodeFromCache.getInstruction_code()) .build(); logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); @@ -753,7 +760,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements log.error("指令创建失败!,{}", e.getMessage()); return false; } - if ("RK1002".equals(taskdto.getStart_device_code())){ + if ("RK1002".equals(taskdto.getStart_device_code())) { Device device = deviceAppService.findDeviceByCode("RK1003"); BeltConveyorDeviceDriver beltConveyorDeviceDriver1; if (device.getDeviceDriver() instanceof BeltConveyorDeviceDriver) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/box_palletizing_manipulator/BoxPalletizingManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/box_palletizing_manipulator/BoxPalletizingManipulatorDeviceDriver.java index d7b6977e6..012c7db35 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/box_palletizing_manipulator/BoxPalletizingManipulatorDeviceDriver.java +++ b/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()) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/DoubleBeltConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/DoubleBeltConveyorDeviceDriver.java index c40d4961c..c131558f5 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/double_belt_conveyor/DoubleBeltConveyorDeviceDriver.java +++ b/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(); - 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); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/BoxStorageOutConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/BoxStorageOutConveyorDeviceDriver.java index 3236e887e..7af699b68 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/BoxStorageOutConveyorDeviceDriver.java +++ b/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(); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/BoxSubvolumesConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/BoxSubvolumesConveyorDeviceDriver.java index 705c3b256..9ca98d95b 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/BoxSubvolumesConveyorDeviceDriver.java +++ b/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(); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java index 3cb8c974a..c9df8f391 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java +++ b/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(); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java index 4de0b9651..914a2247e 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java +++ b/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(); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java index 246e50729..c1a0711c4 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java +++ b/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); - 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) - .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(); - } + this.message = "逻辑异常, 详情查看设备日志"; + LuceneLogDto logDto = LuceneLogDto.builder() + .device_code(device_code) + .content(this.device_code + "逻辑异常:" + Arrays.toString(e.getStackTrace())) + .build(); + logDto.setLog_level(4); + luceneExecuteLogService.deviceExecuteLog(logDto); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java index cf52a52bf..d84654b3f 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java +++ b/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(); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java index 32e3dbc6d..26cf88768 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java +++ b/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(); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java index 1a082f99a..5d2906a73 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java +++ b/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(); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java index 34711a9b3..3f2218402 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java +++ b/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); - 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()) - .build(); - logDto.setLog_level(4); - luceneExecuteLogService.deviceExecuteLog(logDto); - // 打印堆栈跟踪信息到控制台 - log.info("捕获到的异常为 null,堆栈跟踪:\n" + stackTrace.toString()); - } - 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) - .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(); - } + this.message = "逻辑异常, 详情查看设备日志"; + LuceneLogDto logDto = LuceneLogDto.builder() + .device_code(device_code) + .content(this.device_code + "逻辑异常:" + Arrays.toString(e.getStackTrace())) + .build(); + logDto.setLog_level(4); + luceneExecuteLogService.deviceExecuteLog(logDto); +// log.error("空指针:{}",e); +// 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()) +// .build(); +// logDto.setLog_level(4); +// luceneExecuteLogService.deviceExecuteLog(logDto); +// // 打印堆栈跟踪信息到控制台 +// log.info("捕获到的异常为 null,堆栈跟踪:\n" + stackTrace.toString()); +// } +// 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) +// .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(); +// } } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/rgv/OneRgvDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/rgv/OneRgvDeviceDriver.java index e0ab4f603..58b15b846 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/rgv/OneRgvDeviceDriver.java +++ b/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.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * RGV @@ -180,9 +177,13 @@ public class OneRgvDeviceDriver extends AbstractOpcDeviceDriver implements Devic } catch (Exception var17) { - var17.printStackTrace(); - 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); } if (mode == 0) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/standard_manipulator/StandardManipulatoDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/standard_manipulator/StandardManipulatoDeviceDriver.java index ae2c2e809..191ed2f21 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/standard_manipulator/StandardManipulatoDeviceDriver.java +++ b/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.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 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(); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java index ae1d7b662..50b04ccc0 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java +++ b/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"; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/VolumeTwoManipulatorManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/VolumeTwoManipulatorManipulatorDeviceDriver.java index 19670bd55..a59e6c967 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/VolumeTwoManipulatorManipulatorDeviceDriver.java +++ b/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"; } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java index 9b790950c..b1f7345ed 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java +++ b/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(); - logServer.deviceExecuteLog(this.device_code, "", "", "读取信号值时出现异常:" + var17.getMessage() + ",this.itemProtocol is null:" + ObjectUtil.isEmpty(this.itemProtocol)); + this.iserror = true; + 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); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_pick_site/PaperTubePickSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_pick_site/PaperTubePickSiteDeviceDriver.java index 2315b6fb9..aee43a66d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/paper_tube_pick_site/PaperTubePickSiteDeviceDriver.java +++ b/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()) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDeviceDriver.java index 2b9bfa485..84abd82d7 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/rgv/RgvDeviceDriver.java +++ b/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.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * RGV @@ -203,9 +200,13 @@ public class RgvDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDr } catch (Exception var17) { - var17.printStackTrace(); - 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); } if (mode == 0) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java index 944995011..b1f8a1eb0 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java +++ b/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(); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/blank_manipulator/BlankManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/blank_manipulator/BlankManipulatorDeviceDriver.java index f28ac552a..1676035ee 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/blank_manipulator/BlankManipulatorDeviceDriver.java +++ b/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); } diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/die_manipulator/DieManipulatorDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/die_manipulator/DieManipulatorDriver.java index 336e73c07..527f5be48 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/die_manipulator/DieManipulatorDriver.java +++ b/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.LinkedHashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 管芯行架机械手 @@ -148,10 +145,13 @@ public class DieManipulatorDriver extends AbstractOpcDeviceDriver implements Dev y_position = this.itemProtocol.getY_position(); } catch (Exception var17) { - var17.printStackTrace(); - // feedMessage = var17.getMessage(); - 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); } if (mode == 0) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/manipulator_agv_station/ManipulatorAgvStationDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/manipulator_agv_station/ManipulatorAgvStationDeviceDriver.java index b2bb2cec6..6f1a47152 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/manipulator_agv_station/ManipulatorAgvStationDeviceDriver.java +++ b/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.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 行架-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()) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java index 0da5c506f..3f7da1c0c 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java +++ b/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(); - // feedMessage = var17.getMessage(); - + 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); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java index 7fe3c2654..5f7b40563 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/plug_pull_device_site/PlugPullDeviceSiteDeviceDriver.java +++ b/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) { - - 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); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java index db9a7c867..dcab81d16 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_head_manipulator/PullHeadManipulatorDeviceDriver.java +++ b/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); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java index fead4d8a0..f6d9fe1ef 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/pull_tail_manipulator/PullTailManipulatorDeviceDriver.java +++ b/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); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/ranging_stations/RangingStationsDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/ranging_stations/RangingStationsDeviceDriver.java index 73abec909..8b3b352c8 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/ranging_stations/RangingStationsDeviceDriver.java +++ b/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.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 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()) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/raster/RasterDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/raster/RasterDeviceDriver.java index d4cba5fed..f45df1bce 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/raster/RasterDeviceDriver.java +++ b/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()) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java index 4354d79b7..c3c12582d 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java +++ b/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); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index 56f787516..8ba4af5fc 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/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("给电气下发信号成功！");