日志优化

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);

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;
                     }

acs/nladmin-system/nlsso-server/src/main/resources/log/AgvNdcOneDeviceDriver.xml

@@ -26,7 +26,7 @@
         <!-- 设置队列大小，根据您的需求调整 -->
         <queueSize>512</queueSize>
     </appender>
-    <logger name="org.nl.acs.device_driver.basedriver.agv.ndcone.AgvNdcOneDeviceDrive" level="info" additivity="true">
+    <logger name="org.nl.acs.device_driver.basedriver.agv.ndcone.AgvNdcOneDeviceDriver" level="info" additivity="true">
         <appender-ref ref="asyncFileAppender"/>
     </logger>
 </included>

acs/nladmin-system/nlsso-server/src/main/resources/log/AutoCreateInst.xml

@@ -26,7 +26,7 @@
         <!-- 设置队列大小，根据您的需求调整 -->
         <queueSize>512</queueSize>
     </appender>
-    <logger name="org.nl.modules.quartz.task.AutoCreateInst" level="info" additivity="true">
+    <logger name="org.nl.quartz.task.AutoCreateInst" level="info" additivity="true">
         <appender-ref ref="asyncFileAppender"/>
     </logger>
 </included>

acs/nladmin-system/nlsso-server/src/main/resources/log/LnshRGVDeviceDriver.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<included>
-    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
-    <property name="LOG_HOME" value="${logPath}"/>
-    <!-- 按照每天生成日志文件 -->
-    <appender name="LnshRGVDeviceDriver" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/RGV日志/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>15</maxHistory>
-            <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>100MB</maxFileSize>
-            <!--所有日志最多占多大容量-->
-            <totalSizeCap>2GB</totalSizeCap>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>${log.charset}</charset>
-        </encoder>
-
-    </appender>
-    <appender name="asyncFileAppender" class="ch.qos.logback.classic.AsyncAppender">
-        <appender-ref ref="LnshRGVDeviceDriver" />
-        <!-- 设置队列大小，根据您的需求调整 -->
-        <queueSize>512</queueSize>
-    </appender>
-    <logger name="org.nl.acs.device_driver.lnsh.lnsh_rgv.LnshRGVDeviceDriver" level="info" additivity="true">
-        <appender-ref ref="asyncFileAppender"/>
-    </logger>
-</included>

acs/nladmin-system/nlsso-server/src/main/resources/log/Lucene.xml

@@ -34,7 +34,7 @@
       </logger>-->
 
     <!-- 打印sql -->
-    <logger name="org.nl.modules.lucene.service.impl.LuceneExecuteLogServiceImpl" level="info" additivity="true">
+    <logger name="org.nl.system.service.lucene.impl.LuceneExecuteLogServiceImpl" level="info" additivity="true">
         <appender-ref ref="FILE_LUCENE"/>
         <appender-ref ref="asyncLuceneAppender"/>
     </logger>

acs/nladmin-system/nlsso-server/src/main/resources/log/NDCSocketConnectionAutoRun.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<included>
-    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
-    <property name="LOG_HOME" value="${logPath}"/>
-    <!-- 按照每天生成日志文件 -->
-    <appender name="NDCSocketConnectionAutoRun" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/NDC交互日志/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>15</maxHistory>
-            <!--单个日志最大容量 至少10MB才能看得出来-->
-            <maxFileSize>100MB</maxFileSize>
-            <!--所有日志最多占多大容量-->
-            <totalSizeCap>2GB</totalSizeCap>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <charset>${log.charset}</charset>
-        </encoder>
-
-    </appender>
-    <appender name="asyncFileAppender" class="ch.qos.logback.classic.AsyncAppender">
-        <appender-ref ref="NDCSocketConnectionAutoRun" />
-        <!-- 设置队列大小，根据您的需求调整 -->
-        <queueSize>512</queueSize>
-    </appender>
-    <logger name="org.nl.start.auto.run.NDCSocketConnectionAutoRun" level="info" additivity="true">
-        <appender-ref ref="asyncFileAppender"/>
-    </logger>
-</included>

acs/nladmin-system/nlsso-server/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml

@@ -27,7 +27,7 @@
       </logger>-->
 
     <!-- 打印sql -->
-    <logger name="org.nl.start.auto.run.OneNDCSocketConnectionAutoRun" level="info" additivity="false">
+    <logger name="org.nl.acs.auto.run.OneNDCSocketConnectionAutoRun" level="info" additivity="false">
         <appender-ref ref="OneNDCSocketConnectionAutoRun"/>
     </logger>
 </included>

acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml

@@ -27,7 +27,7 @@ https://juejin.cn/post/6844903775631572999
     <include resource="log/NDCSocketConnectionAutoRun.xml"/>
     <include resource="log/AgvNdcOneDeviceDriver.xml"/>
     <include resource="log/NDCAgvServiceImpl.xml"/>
-    <include resource="log/LnshRGVDeviceDriver.xml"/>
+    <include resource="log/Lucene.xml"/>
 
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <!--        控制台高亮-->