diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/baoshijian/BaoshijianSiteDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/baoshijian/BaoshijianSiteDeviceDriver.java
index a902234..89cb9df 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/baoshijian/BaoshijianSiteDeviceDriver.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/tianneng/baoshijian/BaoshijianSiteDeviceDriver.java
@@ -94,7 +94,7 @@ public class BaoshijianSiteDeviceDriver extends AbstractOpcDeviceDriver implemen
private Date instruction_require_time = new Date();
private Date instruction_finished_time = new Date();
- private int instruction_require_time_out;
+ private int instruction_require_time_out=1000;
boolean in = false;
boolean out =false;
@@ -181,6 +181,12 @@ public class BaoshijianSiteDeviceDriver extends AbstractOpcDeviceDriver implemen
x36 = this.itemProtocol.getX36();
x37 = this.itemProtocol.getX37();
+ Date date = new Date();
+ if (date.getTime() - this.instruction_require_time.getTime() < (long) this.instruction_require_time_out) {
+ log.trace("触发时间因为小于{}毫秒,而被无视", this.instruction_require_time_out);
+ return;
+ }
+
if (x1 != last_x1 && x1 == 0) {
log.info("设备{}反馈收片任务完成", this.device_code);
this.writing("x6", 0);
diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
index d6ba183..274d3a0 100644
--- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
+++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
@@ -253,9 +253,8 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
log.warn("{} 所有内容都为空, all_null:{} ,暂定{}ms", tag, all_null, 5000);
}
ThreadUtl.sleep((long) (5000));
+ break start;
}
-
- ++this.all_null;
} else {
this.all_null = 0;
}
diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/log/AgvNdcOneDeviceDriver.xml b/acs/nladmin-system/nlsso-server/src/main/resources/log/AgvNdcOneDeviceDriver.xml
index 5ea9f1d..96e6c0a 100644
--- a/acs/nladmin-system/nlsso-server/src/main/resources/log/AgvNdcOneDeviceDriver.xml
+++ b/acs/nladmin-system/nlsso-server/src/main/resources/log/AgvNdcOneDeviceDriver.xml
@@ -26,7 +26,7 @@
512
-
+
diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/log/AutoCreateInst.xml b/acs/nladmin-system/nlsso-server/src/main/resources/log/AutoCreateInst.xml
index 46daf98..4466239 100644
--- a/acs/nladmin-system/nlsso-server/src/main/resources/log/AutoCreateInst.xml
+++ b/acs/nladmin-system/nlsso-server/src/main/resources/log/AutoCreateInst.xml
@@ -26,7 +26,7 @@
512
-
+
diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/log/LnshRGVDeviceDriver.xml b/acs/nladmin-system/nlsso-server/src/main/resources/log/LnshRGVDeviceDriver.xml
deleted file mode 100644
index 436236e..0000000
--- a/acs/nladmin-system/nlsso-server/src/main/resources/log/LnshRGVDeviceDriver.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
- ${LOG_HOME}/RGV日志/%d{yyyy-MM-dd}.%i.log
-
- 15
-
- 100MB
-
- 2GB
-
-
-
- %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n
- ${log.charset}
-
-
-
-
-
-
- 512
-
-
-
-
-
diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/log/Lucene.xml b/acs/nladmin-system/nlsso-server/src/main/resources/log/Lucene.xml
index 9fecc86..a0d4a5c 100644
--- a/acs/nladmin-system/nlsso-server/src/main/resources/log/Lucene.xml
+++ b/acs/nladmin-system/nlsso-server/src/main/resources/log/Lucene.xml
@@ -34,7 +34,7 @@
-->
-
+
diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/log/NDCSocketConnectionAutoRun.xml b/acs/nladmin-system/nlsso-server/src/main/resources/log/NDCSocketConnectionAutoRun.xml
deleted file mode 100644
index 4b8a81a..0000000
--- a/acs/nladmin-system/nlsso-server/src/main/resources/log/NDCSocketConnectionAutoRun.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
- ${LOG_HOME}/NDC交互日志/%d{yyyy-MM-dd}.%i.log
-
- 15
-
- 100MB
-
- 2GB
-
-
-
- %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n
- ${log.charset}
-
-
-
-
-
-
- 512
-
-
-
-
-
diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml b/acs/nladmin-system/nlsso-server/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml
index 6c2075c..fe51913 100644
--- a/acs/nladmin-system/nlsso-server/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml
+++ b/acs/nladmin-system/nlsso-server/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml
@@ -27,7 +27,7 @@
-->
-
+
diff --git a/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml b/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
index 6eda7ef..90c076e 100644
--- a/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
+++ b/acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml
@@ -27,7 +27,7 @@ https://juejin.cn/post/6844903775631572999
-
+