更新

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hongxiang_device/HongXiangConveyorDeviceDriver.java

@@ -171,15 +171,17 @@ public class HongXiangConveyorDeviceDriver extends AbstractOpcDeviceDriver imple
             }
             logServer.deviceExecuteLog(this.device_code, "", "", "信号move：" + last_finish + "->" + finish);
         }
-
+        if (mode == 0) {
-
-        if (error != 0) {
             this.setIsonline(false);
+            message = "有报警";
+            //无报警
+        } else if (error != 0) {
             this.setIserror(true);
             message = "有报警";
             //无报警
         } else {
-
+            this.setIsonline(true);
+            this.setIserror(false);
             if (move == 0 && last_move == 1) {
                 //requireSucess = false;
             }
@@ -316,6 +318,9 @@ public class HongXiangConveyorDeviceDriver extends AbstractOpcDeviceDriver imple
         jo.put("device_name", this.getDevice().getDevice_name());
         jo.put("temperature", temperature);
         jo.put("finish", finish);
+        jo.put("isOnline", this.getIsonline());
+        jo.put("error", this.getError());
+        jo.put("isError", this.getIserror());
         jo.put("countdown_house", countdown_house);
         jo.put("countdown_min", countdown_min);
         jo.put("countdown_sec", countdown_sec);

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java

@@ -418,11 +418,9 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
 //        } else
         if (mode == 0) {
             this.setIsonline(false);
-            this.setIserror(true);
             message = "未联机";
             //有报警
         } else if (error != 0) {
-            this.setIsonline(false);
             this.setIserror(true);
             message = "有报警";
             //无报警

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java

@@ -238,7 +238,6 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
 //        } else
         if (mode == 0) {
             this.setIsonline(false);
-            this.setIserror(true);
             message = "未联机";
             //有报警
 //        } else if (error != 0) {
@@ -249,7 +248,11 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
         } else {
             this.setIsonline(true);
             this.setIserror(false);
-//            message = "";
+            if (error != 0) {
+                this.setIserror(true);
+                message = "有报警";
+            }
+
             Instruction instruction = null;
             List toInstructions;
 

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java

@@ -215,17 +215,17 @@ public class SiemensConveyorCkkDeviceDriver extends AbstractOpcDeviceDriver impl
 //        } else
         if (mode == 0) {
             this.setIsonline(false);
-            this.setIserror(true);
             message = "未联机";
-            //有报警
+            
-//        } else if (error != 0) {
-//            this.setIsonline(false);
-//            this.setIserror(true);
-//            message = "有报警";
-//            //无报警
         } else {
             this.setIsonline(true);
             this.setIserror(false);
+
+            if (error != 0) {
+                this.setIserror(true);
+                message = "有报警";
+            }
+
             Instruction instruction = null;
             List toInstructions;
 

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_labeling/SiemensConveyorLabelingDeviceDriver.java

@@ -224,7 +224,6 @@ public class SiemensConveyorLabelingDeviceDriver extends AbstractOpcDeviceDriver
     //        } else
     if (mode == 0) {
       this.setIsonline(false);
-      this.setIserror(true);
       message = "未联机";
       // 有报警
       //        } else if (error != 0) {
@@ -235,6 +234,10 @@ public class SiemensConveyorLabelingDeviceDriver extends AbstractOpcDeviceDriver
     } else {
       this.setIsonline(true);
       this.setIserror(false);
+      if (error != 0) {
+        this.setIserror(true);
+        message = "有报警";
+      }
       message = "";
       Instruction instruction = null;
       List toInstructions;

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java

@@ -684,11 +684,9 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
 //        } else
             if (mode == 0) {
             this.setIsonline(false);
-            this.setIserror(true);
             message = "未联机";
             //有报警
         } else if (error != 0) {
-            this.setIsonline(false);
             this.setIserror(true);
             message = "有报警";
             //无报警

acs/nladmin-system/src/main/java/org/nl/modules/logging/aspect/LogAspect.java

@@ -112,10 +112,10 @@ public class LogAspect {
                     json.put("browser", StringUtils.getBrowser(request));
                     json.put("exception_detail", IdUtil.getStringId());
                     json.put("create_time", DateUtil.now());
-                    json.put("return_result", JSONObject.parse(result.toString()));
+                    json.put("return_result", result.toString());
                     interfaceLog.insert(json);
                 } catch (Exception e) {
-
+                    e.printStackTrace();
                 }
             }
         } catch (Exception ex) {

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

@@ -117,21 +117,21 @@ https://juejin.cn/post/6844903775631572999
     <springProfile name="dev">
         <root level="info">
             <appender-ref ref="CONSOLE"/>
-            
+            <appender-ref ref="lokiAppender" />
             <appender-ref ref="asyncFileAppender"/>
         </root>
         <!--logmanage -->
         <logger name="org.nl.acs.log.service.impl.DeviceExecuteLogServiceImpl" level="info" additivity="false">
             <appender-ref ref="CONSOLE"/>
-            
+            <appender-ref ref="lokiAppender" />
         </logger>
         <logger name="jdbc.resultsettable" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
-            
+            <appender-ref ref="lokiAppender" />
         </logger>
         <logger name="org.openscada.opc.lib.da.Server" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
-            
+            <appender-ref ref="lokiAppender" />
         </logger>
         <!--logmanage -->
 
@@ -171,19 +171,20 @@ https://juejin.cn/post/6844903775631572999
     <springProfile name="prod">
         <root level="info">
             <appender-ref ref="ERROR"/>
+            <appender-ref ref="lokiAppender" />
             <appender-ref ref="asyncFileAppender"/>
         </root>
         <!--logmanage -->
         <logger name="org.nl.acs.log.service.impl.DeviceExecuteLogServiceImpl" level="info" additivity="false">
-            
+            <appender-ref ref="lokiAppender" />
         </logger>
         <logger name="jdbc.resultsettable" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
-            
+            <appender-ref ref="lokiAppender" />
         </logger>
         <logger name="org.openscada.opc.lib.da.Server" level="ERROR" additivity="false">
             <appender-ref ref="CONSOLE"/>
-            
+            <appender-ref ref="lokiAppender" />
         </logger>
         <!--logmanage -->