From d4c89bc50fbabf4f0eb0438ae25296e8aee57326 Mon Sep 17 00:00:00 2001 From: yanps Date: Fri, 23 Feb 2024 15:38:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?opt:=20=E4=B8=89=E8=89=B2=E7=81=AF=E5=9B=9E?= =?UTF-8?q?=E9=80=80,OPC=E8=BF=9E=E6=8E=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OvenGantryManipulatorDeviceDriver.java | 4 +-- .../StandardInspectSiteDeviceDriver.java | 11 +++---- .../org/nl/acs/opc/DeviceExecuteAutoRun.java | 10 +++++- acs/nladmin-ui/package.json | 1 + acs/nladmin-ui/src/main.js | 3 ++ acs/nladmin-ui/src/views/login.vue | 31 ++++++++++++++++++- 6 files changed, 49 insertions(+), 11 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java index cd2ae858a..7ddac7db0 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java @@ -1143,7 +1143,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i } } - /*if (nextDevice.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { + if (nextDevice.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) nextDevice.getDeviceDriver(); // hongXiangConveyorDeviceDriver.writing("to_close_door", "1"); @@ -1162,7 +1162,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i } } - }*/ + } this.writing("to_command", "5"); this.setNow_steps_type(6); this.setNow_steps_type(0); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java index 921fc4484..6f891983c 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java @@ -130,7 +130,6 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp @Override public void execute() { - String message = null; try { device_code = this.getDeviceCode(); mode = this.itemProtocol.getMode(); @@ -162,13 +161,12 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp message = "未联机"; //有报警 - } else { + } else if (error != 0) { + this.setIserror(true); + message = "有报警"; + }else { this.setIsonline(true); this.setIserror(false); - if (error != 0) { - this.setIserror(true); - message = "有报警"; - } message = ""; Instruction instruction = null; List toInstructions; @@ -179,7 +177,6 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp case 2: break; } - } last_mode = mode; last_error = error; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceExecuteAutoRun.java b/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceExecuteAutoRun.java index 9aaf6e918..c02ecf414 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceExecuteAutoRun.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceExecuteAutoRun.java @@ -2,7 +2,10 @@ package org.nl.acs.opc; import lombok.extern.slf4j.Slf4j; import org.nl.acs.auto.run.AbstractAutoRunnable; +import org.nl.acs.auto.run.AutoRunService; import org.nl.acs.device_driver.driver.ExecutableDeviceDriver; +import org.nl.acs.udw.UnifiedDataAccessor; +import org.nl.acs.udw.UnifiedDataAccessorFactory; import org.nl.config.thread.TheadFactoryName; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -15,6 +18,8 @@ import java.util.concurrent.*; public class DeviceExecuteAutoRun extends AbstractAutoRunnable { @Autowired DeviceAppService deviceAppService; + @Autowired + private AutoRunService autoRunService; int cache_thread = 3; int corePoolSize = 50; @@ -78,6 +83,10 @@ public class DeviceExecuteAutoRun extends AbstractAutoRunnable { log.info("设备执行线程等待opc同步线程..."); Thread.sleep(1000L); if (i > 60) { + UnifiedDataAccessor accessor_value = UnifiedDataAccessorFactory.getAccessor(OpcConfig.udw_opc_value_key); + if(accessor_value.getAllKey().size() < 1){ + autoRunService.startThread("DeviceOpcSynchronizeAutoRun"); + } log.info("设备执行线程放弃等待opc同步线程..."); break; } @@ -109,7 +118,6 @@ public class DeviceExecuteAutoRun extends AbstractAutoRunnable { if (!this.runs.keySet().contains(deviceDriver.getDeviceCode())) { this.runs.put(deviceDriver.getDeviceCode(), runnable); } - runnable.setIndex(this.runs); this.executorService.submit(runnable); } diff --git a/acs/nladmin-ui/package.json b/acs/nladmin-ui/package.json index 1a4eb1107..5ec620d73 100644 --- a/acs/nladmin-ui/package.json +++ b/acs/nladmin-ui/package.json @@ -72,6 +72,7 @@ "vue-echarts": "^5.0.0-beta.0", "vue-highlightjs": "^1.3.3", "vue-image-crop-upload": "^2.5.0", + "vue-particles": "^1.0.9", "vue-print-nb": "^1.7.5", "vue-router": "3.0.2", "vue-seamless-scroll": "^1.1.23", diff --git a/acs/nladmin-ui/src/main.js b/acs/nladmin-ui/src/main.js index 1fe4089b3..5259b8e31 100644 --- a/acs/nladmin-ui/src/main.js +++ b/acs/nladmin-ui/src/main.js @@ -9,6 +9,9 @@ import 'font-awesome/css/font-awesome.css' import mavonEditor from 'mavon-editor' import 'mavon-editor/dist/css/index.css' +import VueParticles from 'vue-particles' +Vue.use(VueParticles) + // 数据字典 import dict from './components/Dict' diff --git a/acs/nladmin-ui/src/views/login.vue b/acs/nladmin-ui/src/views/login.vue index b246c984e..f4a8ad033 100644 --- a/acs/nladmin-ui/src/views/login.vue +++ b/acs/nladmin-ui/src/views/login.vue @@ -1,5 +1,23 @@