From 2a4c9ce6415d964638e4cc9b48a5740ee944a27d Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Sat, 6 May 2023 18:09:32 +0800 Subject: [PATCH] =?UTF-8?q?rev=20=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rdManipulatorStackingSiteDeviceDriver.java | 12 ++++++++++ .../service/impl/StageActorServiceImpl.java | 24 +++++++++++++++++++ .../src/main/resources/config/application.yml | 2 +- qd/src/views/acs/monitor/device/index.vue | 3 +++ 4 files changed, 40 insertions(+), 1 deletion(-) diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_stacking_site/StandardManipulatorStackingSiteDeviceDriver.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_stacking_site/StandardManipulatorStackingSiteDeviceDriver.java index adec384..0c41a79 100644 --- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_stacking_site/StandardManipulatorStackingSiteDeviceDriver.java +++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_stacking_site/StandardManipulatorStackingSiteDeviceDriver.java @@ -376,6 +376,7 @@ public class StandardManipulatorStackingSiteDeviceDriver extends AbstractOpcDevi } if (StrUtil.isEmpty(device_code)) { + message = "未找到符合条件的终点设备!"; throw new RuntimeException("该设备未找到对应路由"); } @@ -393,11 +394,13 @@ public class StandardManipulatorStackingSiteDeviceDriver extends AbstractOpcDevi Device nextDevice = appService.findDeviceByCode(this.device_code); if (ObjectUtil.isNotEmpty(startDevice.getIslock())) { if (startDevice.getIslock().equals("true")) { + message = "起点设备:" + device_code + "被锁定!"; throw new RuntimeException("该设备已被锁定"); } } if (ObjectUtil.isNotEmpty(nextDevice.getIslock())) { if (nextDevice.getIslock().equals("true")) { + message = "当前设备被锁定!"; throw new RuntimeException("该设备已被锁定"); } } @@ -457,6 +460,7 @@ public class StandardManipulatorStackingSiteDeviceDriver extends AbstractOpcDevi } } if (StrUtil.isEmpty(next_device_code)) { + message = "未找到符合条件的终点设备!"; throw new RuntimeException("该设备未找到对应路由"); } dto.setStart_point_code(this.device_code); @@ -524,6 +528,7 @@ public class StandardManipulatorStackingSiteDeviceDriver extends AbstractOpcDevi } if (StrUtil.isEmpty(start_device_code)) { + message = "未找到符合条件的终点设备!"; throw new RuntimeException("该设备未找到对应路由"); } dto.setStart_point_code(start_device_code); @@ -621,6 +626,7 @@ public class StandardManipulatorStackingSiteDeviceDriver extends AbstractOpcDevi } if (StrUtil.isEmpty(next_device_code)) { + message = "未找到符合条件的终点设备!"; throw new RuntimeException("该设备未找到对应路由"); } dto.setStart_point_code(this.device_code); @@ -637,11 +643,13 @@ public class StandardManipulatorStackingSiteDeviceDriver extends AbstractOpcDevi Device nextDevice = appService.findDeviceByCode(next_device_code); if (ObjectUtil.isNotEmpty(startDevice.getIslock())) { if (startDevice.getIslock().equals("true")) { + message = "当前设备被锁定!"; throw new RuntimeException("起点设备已被锁定"); } } if (ObjectUtil.isNotEmpty(nextDevice.getIslock())) { if (nextDevice.getIslock().equals("true")) { + message = "终点设备:" + next_device_code + "被锁定!"; throw new RuntimeException("终点设备已被锁定"); } } @@ -707,6 +715,7 @@ public class StandardManipulatorStackingSiteDeviceDriver extends AbstractOpcDevi } if (StrUtil.isEmpty(next_device_code)) { + message = "未找到符合条件的终点设备!"; throw new RuntimeException("该设备未找到对应路由"); } dto.setStart_point_code(this.device_code); @@ -778,6 +787,7 @@ public class StandardManipulatorStackingSiteDeviceDriver extends AbstractOpcDevi } if (StrUtil.isEmpty(next_device_code)) { + message = "未找到符合条件的终点设备!"; throw new RuntimeException("该设备未找到对应路由"); } dto.setStart_point_code(this.device_code); @@ -848,6 +858,7 @@ public class StandardManipulatorStackingSiteDeviceDriver extends AbstractOpcDevi } if (StrUtil.isEmpty(next_device_code)) { + message = "未找到符合条件的终点设备!"; throw new RuntimeException("该设备未找到对应路由"); } dto.setStart_point_code(this.device_code); @@ -944,6 +955,7 @@ public class StandardManipulatorStackingSiteDeviceDriver extends AbstractOpcDevi } if (StrUtil.isEmpty(next_device_code)) { + message = "未找到符合条件的终点设备!"; throw new RuntimeException("该设备未找到对应路由"); } diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/stage/service/impl/StageActorServiceImpl.java b/hd/nladmin-system/src/main/java/org/nl/acs/stage/service/impl/StageActorServiceImpl.java index 73adeb0..4d04dfb 100644 --- a/hd/nladmin-system/src/main/java/org/nl/acs/stage/service/impl/StageActorServiceImpl.java +++ b/hd/nladmin-system/src/main/java/org/nl/acs/stage/service/impl/StageActorServiceImpl.java @@ -369,6 +369,7 @@ public class StageActorServiceImpl implements StageActorService { jo.put("isError", standardCoveyorControlDeviceDriver.getIserror()); jo.put("requestSucess", standardCoveyorControlDeviceDriver.getRequireSucess()); jo.put("applySucess", standardCoveyorControlDeviceDriver.getApplySucess()); + jo.put("islock", StrUtil.equals("true",device.getIslock()) ? "是" : "否"); jo.put("message", standardCoveyorControlDeviceDriver.getMessage()); } else if (device.getDeviceDriver() instanceof StandardAutodoorDeviceDriver) { standardAutodoorDeviceDriver = (StandardAutodoorDeviceDriver) device.getDeviceDriver(); @@ -391,6 +392,7 @@ public class StageActorServiceImpl implements StageActorService { jo.put("action", action); jo.put("isOnline", true); jo.put("error", standardAutodoorDeviceDriver.getError()); + jo.put("islock", StrUtil.equals("true",device.getIslock()) ? "是" : "否"); jo.put("isError", standardAutodoorDeviceDriver.getIserror()); } else if (device.getDeviceDriver() instanceof StandardCoveyorMonitorDeviceDriver) { standardCoveyorMonitorDeviceDriver = (StandardCoveyorMonitorDeviceDriver) device.getDeviceDriver(); @@ -419,6 +421,7 @@ public class StageActorServiceImpl implements StageActorService { obj.put("device_name", standardCoveyorMonitorDeviceDriver.getDevice().getDevice_name()); jo.put("mode", mode); jo.put("move", move); + jo.put("islock", StrUtil.equals("true",device.getIslock()) ? "是" : "否"); jo.put("hasGoods", standardCoveyorMonitorDeviceDriver.getHasGoods()); jo.put("isOnline", standardCoveyorMonitorDeviceDriver.getIsonline()); jo.put("error", standardCoveyorMonitorDeviceDriver.getError()); @@ -451,6 +454,7 @@ public class StageActorServiceImpl implements StageActorService { obj.put("device_name", standardCoveyorControlWithScannerDeviceDriver.getDevice().getDevice_name()); jo.put("mode", mode); jo.put("move", move); + jo.put("islock", StrUtil.equals("true",device.getIslock()) ? "是" : "否"); jo.put("hasGoods", standardCoveyorControlWithScannerDeviceDriver.getHasGoods()); jo.put("isOnline", standardCoveyorControlWithScannerDeviceDriver.getIsonline()); jo.put("error", standardCoveyorControlWithScannerDeviceDriver.getError()); @@ -492,6 +496,7 @@ public class StageActorServiceImpl implements StageActorService { obj.put("device_name", standardCoveyorControlWithPlcScannerDeviceDriver.getDevice().getDevice_name()); jo.put("mode", mode); jo.put("move", move); + jo.put("islock", StrUtil.equals("true",device.getIslock()) ? "是" : "否"); jo.put("hasGoods", standardCoveyorControlWithPlcScannerDeviceDriver.getHasGoods()); jo.put("isOnline", standardCoveyorControlWithPlcScannerDeviceDriver.getIsonline()); jo.put("error", standardCoveyorControlWithPlcScannerDeviceDriver.getError()); @@ -527,6 +532,7 @@ public class StageActorServiceImpl implements StageActorService { obj.put("device_name", standardInspectSiteDevicedriver.getDevice().getDevice_name()); jo.put("mode", mode); jo.put("move", move); + jo.put("islock", StrUtil.equals("true",device.getIslock()) ? "是" : "否"); jo.put("hasGoods", standardInspectSiteDevicedriver.getHasGoods()); jo.put("isOnline", standardInspectSiteDevicedriver.getIsonline()); jo.put("error", standardInspectSiteDevicedriver.getError()); @@ -554,6 +560,7 @@ public class StageActorServiceImpl implements StageActorService { obj.put("device_name", nonLineInspectSiteDeviceDriver.getDevice().getDevice_name()); jo.put("mode", mode); jo.put("move", move); + jo.put("islock", StrUtil.equals("true",device.getIslock()) ? "是" : "否"); jo.put("isOnline", nonLineInspectSiteDeviceDriver.getIs_online()); jo.put("hasGoods", nonLineInspectSiteDeviceDriver.getHasGoods()); jo.put("error", nonLineInspectSiteDeviceDriver.getError()); @@ -603,6 +610,7 @@ public class StageActorServiceImpl implements StageActorService { obj.put("device_name", standardManipulatorInspectSiteDeviceDriver.getDevice().getDevice_name()); jo.put("mode", mode); jo.put("move", move); + jo.put("islock", StrUtil.equals("true",device.getIslock()) ? "是" : "否"); jo.put("action", action); jo.put("io_action", io_action); jo.put("hasGoods", standardManipulatorInspectSiteDeviceDriver.getHasGoods()); @@ -650,6 +658,7 @@ public class StageActorServiceImpl implements StageActorService { obj.put("device_name", nonLineManipulatorInspectSiteDeviceDriver.getDevice().getDevice_name()); jo.put("mode", mode); jo.put("move", move); + jo.put("islock", StrUtil.equals("true",device.getIslock()) ? "是" : "否"); jo.put("action", action); jo.put("io_action", io_action); jo.put("hasGoods", nonLineManipulatorInspectSiteDeviceDriver.getHasGoods()); @@ -679,6 +688,7 @@ public class StageActorServiceImpl implements StageActorService { obj.put("device_name", standardEmptyPalletSiteDeviceDriver.getDevice().getDevice_name()); jo.put("mode", mode); jo.put("move", move); + jo.put("islock", StrUtil.equals("true",device.getIslock()) ? "是" : "否"); //点击弹出 jo.put("is_click", true); jo.put("number", standardEmptyPalletSiteDeviceDriver.getNumber()); @@ -701,6 +711,7 @@ public class StageActorServiceImpl implements StageActorService { } obj.put("device_name", standardOrdinarySiteDeviceDriver.getDevice().getDevice_name()); jo.put("move", move); + jo.put("islock", StrUtil.equals("true",device.getIslock()) ? "是" : "否"); jo.put("hasGoods", standardOrdinarySiteDeviceDriver.getHasGoods()); jo.put("isOnline", true); //点击弹出 @@ -730,6 +741,7 @@ public class StageActorServiceImpl implements StageActorService { jo.put("isOnline", true); //点击弹出 jo.put("is_click", true); + jo.put("islock", StrUtil.equals("true",device.getIslock()) ? "是" : "否"); jo.put("device_type", device.getDevice_type()); jo.put("error", yzjaSpecialDeviceDriver.getError()); jo.put("isError", yzjaSpecialDeviceDriver.getIserror()); @@ -755,6 +767,7 @@ public class StageActorServiceImpl implements StageActorService { jo.put("isOnline", true); //点击弹出 jo.put("is_click", true); + jo.put("islock", StrUtil.equals("true",device.getIslock()) ? "是" : "否"); jo.put("device_type", device.getDevice_type()); jo.put("error", specialOrdinarySiteDeviceDriver.getError()); jo.put("isError", specialOrdinarySiteDeviceDriver.getIserror()); @@ -795,12 +808,14 @@ public class StageActorServiceImpl implements StageActorService { jo.put("device_type", device.getDevice_type()); //点击弹出 jo.put("is_click", true); + jo.put("islock", StrUtil.equals("true",device.getIslock()) ? "是" : "否"); jo.put("ip", standardScannerDeviceDriver.getIp()); jo.put("container", StrUtil.isEmpty(standardScannerDeviceDriver.readBarcode()) ? "" : standardScannerDeviceDriver.readBarcode()); } else if (device.getDeviceDriver() instanceof WeighingSiteDeviceDriver) { weighingSiteDeviceDriver = (WeighingSiteDeviceDriver) device.getDeviceDriver(); obj.put("device_name", weighingSiteDeviceDriver.getDevice().getDevice_name()); jo.put("isOnline", true); + jo.put("islock", StrUtil.equals("true",device.getIslock()) ? "是" : "否"); jo.put("instruction_message", weighingSiteDeviceDriver.getInst_message()); } else if (device.getDeviceDriver() instanceof MachinesSiteDeviceDriver) { machinesSiteDeviceDriver = (MachinesSiteDeviceDriver) device.getDeviceDriver(); @@ -822,6 +837,7 @@ public class StageActorServiceImpl implements StageActorService { } obj.put("device_name", machinesSiteDeviceDriver.getDevice().getDevice_name()); jo.put("mode", mode); + jo.put("islock", StrUtil.equals("true",device.getIslock()) ? "是" : "否"); jo.put("io_action", io_action); jo.put("isOnline", machinesSiteDeviceDriver.getIsonline()); } @@ -879,6 +895,7 @@ public class StageActorServiceImpl implements StageActorService { jo.put("move", move); jo.put("action", action); jo.put("io_action", io_action); + jo.put("islock", StrUtil.equals("true",device.getIslock()) ? "是" : "否"); jo.put("hasGoods", standardManipulatorStackingSiteDeviceDriver.getHasGoods()); jo.put("isOnline", standardManipulatorStackingSiteDeviceDriver.getIsonline()); jo.put("error", standardManipulatorStackingSiteDeviceDriver.getError()); @@ -906,6 +923,7 @@ public class StageActorServiceImpl implements StageActorService { obj.put("device_name", ndxySpecialDeviceDriver.getDevice().getDevice_name()); jo.put("mode", mode); jo.put("move", move); + jo.put("islock", StrUtil.equals("true",device.getIslock()) ? "是" : "否"); jo.put("hasGoods", ndxySpecialDeviceDriver.getHasGoods()); jo.put("isOnline", ndxySpecialDeviceDriver.getIsonline()); jo.put("error", ndxySpecialDeviceDriver.getError()); @@ -933,6 +951,7 @@ public class StageActorServiceImpl implements StageActorService { obj.put("device_name", ndxySpecialTwoDeviceDriver.getDevice().getDevice_name()); jo.put("mode", mode); jo.put("move", move); + jo.put("islock", StrUtil.equals("true",device.getIslock()) ? "是" : "否"); jo.put("hasGoods", ndxySpecialTwoDeviceDriver.getHasGoods()); jo.put("isOnline", ndxySpecialTwoDeviceDriver.getIsonline()); jo.put("error", ndxySpecialTwoDeviceDriver.getError()); @@ -960,6 +979,7 @@ public class StageActorServiceImpl implements StageActorService { obj.put("devicede_name", standardRGVDeviceDriver.getDevice().getDevice_name()); jo.put("mode", mode); jo.put("move", move); + jo.put("islock", StrUtil.equals("true",device.getIslock()) ? "是" : "否"); jo.put("hasGoods", standardRGVDeviceDriver.getHasGoods()); jo.put("isOnline", standardRGVDeviceDriver.getIsonline()); jo.put("error", standardRGVDeviceDriver.getError()); @@ -987,6 +1007,7 @@ public class StageActorServiceImpl implements StageActorService { obj.put("device_name", ykbkSpecialDeviceDriver.getDevice().getDevice_name()); jo.put("mode", mode); jo.put("move", move); + jo.put("islock", StrUtil.equals("true",device.getIslock()) ? "是" : "否"); jo.put("hasGoods", ykbkSpecialDeviceDriver.getHasGoods()); jo.put("isOnline", ykbkSpecialDeviceDriver.getIsonline()); jo.put("error", ykbkSpecialDeviceDriver.getError()); @@ -1015,6 +1036,7 @@ public class StageActorServiceImpl implements StageActorService { obj.put("device_name", standardPhotoelectricInspectSiteDeviceDriver.getDevice().getDevice_name()); jo.put("mode", mode); jo.put("move", move); + jo.put("islock", StrUtil.equals("true",device.getIslock()) ? "是" : "否"); jo.put("hasGoods", standardPhotoelectricInspectSiteDeviceDriver.getHasGoods()); jo.put("isOnline", standardPhotoelectricInspectSiteDeviceDriver.getIsonline()); jo.put("error", standardPhotoelectricInspectSiteDeviceDriver.getError()); @@ -1028,6 +1050,7 @@ public class StageActorServiceImpl implements StageActorService { jo.put("isOnline", true); //点击弹出 jo.put("is_click", true); + jo.put("islock", StrUtil.equals("true",device.getIslock()) ? "是" : "否"); jo.put("device_type", device.getDevice_type()); jo.put("error", electricFenceDeviceDriver.getError()); jo.put("isError", electricFenceDeviceDriver.getIserror()); @@ -1049,6 +1072,7 @@ public class StageActorServiceImpl implements StageActorService { jo.put("isOnline", true); //点击弹出 jo.put("is_click", true); + jo.put("islock", StrUtil.equals("true",device.getIslock()) ? "是" : "否"); jo.put("device_type", device.getDevice_type()); jo.put("error", ssjCacheSiteDeviceDriver.getError()); jo.put("isError", ssjCacheSiteDeviceDriver.getIserror()); diff --git a/hd/nladmin-system/src/main/resources/config/application.yml b/hd/nladmin-system/src/main/resources/config/application.yml index 2e814bc..1733121 100644 --- a/hd/nladmin-system/src/main/resources/config/application.yml +++ b/hd/nladmin-system/src/main/resources/config/application.yml @@ -2,7 +2,7 @@ spring: freemarker: check-template-location: false profiles: - active: prod + active: dev jackson: time-zone: GMT+8 data: diff --git a/qd/src/views/acs/monitor/device/index.vue b/qd/src/views/acs/monitor/device/index.vue index 49f6683..b532e07 100644 --- a/qd/src/views/acs/monitor/device/index.vue +++ b/qd/src/views/acs/monitor/device/index.vue @@ -389,6 +389,9 @@ export default { } else if (val === 'applySucess') { const obj = { name: '是否申请指令', value: data[val] } arr.push(obj) + } else if (val === 'islock') { + const obj = { name: '锁定', value: data[val] } + arr.push(obj) } else if (val === 'message') { const obj = { name: '说明', value: data[val] } arr.push(obj)