fix: kep断连处理

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java

@@ -288,6 +288,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements
                     case 2:
                         //申请任务
                         if (move == 1 && !requireSucess) {
+
                             instruction_require();
                         } else {
                             String remark = "";
@@ -335,7 +336,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements
                     .build();
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);
-            
+            message = "读取信号值时出现异常";
             var17.printStackTrace();
         }
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/ItemProtocol.java

@@ -139,8 +139,7 @@ public class    ItemProtocol {
             setIsonline(true);
             return value;
         }
-        return 0;
+        return value;
-
     }
 
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/BoxStorageOutConveyorDeviceDriver.java

@@ -246,7 +246,7 @@ public class BoxStorageOutConveyorDeviceDriver extends AbstractOpcDeviceDriver i
                     .build();
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);
-            
+            message = "读取信号值时出现异常";
             var17.printStackTrace();
         }
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_storage_out_conveyor/ItemProtocol.java

@@ -139,7 +139,7 @@ public class ItemProtocol {
             setIsonline(true);
             return value;
         }
-        return 0;
+        return value;
 
     }
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/BoxSubvolumesConveyorDeviceDriver.java

@@ -269,7 +269,7 @@ public class BoxSubvolumesConveyorDeviceDriver extends AbstractOpcDeviceDriver i
                     .build();
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);
-            
+            message = "读取信号值时出现异常";
             var17.printStackTrace();
         }
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/box_subvolumes_conveyor/ItemProtocol.java

@@ -142,7 +142,7 @@ public class ItemProtocol {
             setIsonline(true);
             return value;
         }
-        return 0;
+        return value;
 
     }
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/FinishedProductOutBindLableDeviceDriver.java

@@ -301,7 +301,7 @@ public class FinishedProductOutBindLableDeviceDriver extends AbstractOpcDeviceDr
                     .build();
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);
-            
+            message = "读取信号值时出现异常";
             var17.printStackTrace();
         }
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/finished_product_out_with_bind_lable_conveyor/ItemProtocol.java

@@ -194,7 +194,7 @@ public class ItemProtocol {
             setIsonline(true);
             return value;
         }
-        return 0;
+        return value;
 
     }
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/FoldDiscSiteDeviceDriver.java

@@ -294,7 +294,7 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements
                     .build();
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);
-            
+            message = "读取信号值时出现异常";
             var17.printStackTrace();
 
         }

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/fold_disc_site/ItemProtocol.java

@@ -112,7 +112,7 @@ public class ItemProtocol {
             setIsonline(true);
             return value;
         }
-        return 0;
+        return value;
     }
 
     public String getOpcStringValue(String protocol) {

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java

@@ -380,7 +380,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
                     .build();
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);
-            
+            message = "读取信号值时出现异常";
             e.printStackTrace();
         }
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ItemProtocol.java

@@ -178,7 +178,7 @@ public class ItemProtocol {
             setIsonline(true);
             return value;
         }
-        return 0;
+        return value;
     }
 
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/ItemProtocol.java

@@ -178,7 +178,7 @@ public class ItemProtocol {
             setIsonline(true);
             return value;
         }
-        return 0;
+        return value;
 
     }
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java

@@ -219,7 +219,7 @@ public class UnBoxLableConveyorDeviceDriver extends AbstractOpcDeviceDriver impl
                     .build();
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);
-            
+            message = "读取信号值时出现异常";
             e.printStackTrace();
         }
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java

@@ -201,7 +201,7 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                 //有报警
             } else if (error != 0) {
                 this.setIserror(true);
-                message = "有报警";
+                message = "universal_message3";
                 //无报警
             } else {
                 this.setIsonline(true);
@@ -249,7 +249,7 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                     .build();
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);
-            
+            message = "universal_remark8";
             e.printStackTrace();
         }
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/ItemProtocol.java

@@ -211,7 +211,7 @@ public class ItemProtocol {
             setIsonline(true);
             return value;
         }
-        return 0;
+        return value;
 
     }
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/BoxStorageManipulatorDeviceDriver.java

@@ -220,7 +220,7 @@ public class BoxStorageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                     .build();
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);
-            
+            message = "universal_remark8";
             e.printStackTrace();
 
         }

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_storage_manipulator/ItemProtocol.java

@@ -199,7 +199,7 @@ public class ItemProtocol {
             setIsonline(true);
             return value;
         }
-        return 0;
+        return value;
 
     }
     public String getOpcStringValue(String protocol) {

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ItemProtocol.java

@@ -184,7 +184,7 @@ public class ItemProtocol {
             setIsonline(true);
             return value;
         }
-        return 0;
+        return value;
     }
 
     public static List<ItemDto> getReadableItemDtos() {

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/return_good_manipulator/ReturnGoodManipulatorDeviceDriver.java

@@ -234,7 +234,7 @@ public class ReturnGoodManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                     .build();
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);
-            
+            message = "universal_remark8";
             e.printStackTrace();
         }
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/ItemProtocol.java

@@ -182,7 +182,7 @@ public class ItemProtocol {
             setIsonline(true);
             return value;
         }
-        return 0;
+        return value;
     }
 
     public float getOpcFloatValue(String protocol) {

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/trapped_manipulator/TrappedManipulatorManipulatorDeviceDriver.java

@@ -226,7 +226,7 @@ public class TrappedManipulatorManipulatorDeviceDriver extends AbstractOpcDevice
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);
             var17.printStackTrace();
-
+            message = "universal_remark8";
         }
 
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/ItemProtocol.java

@@ -177,7 +177,7 @@ public class ItemProtocol {
             setIsonline(true);
             return value;
         }
-        return 0;
+        return value;
     }
 
     public float getOpcFloatValue(String protocol) {

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/VolumeTwoManipulatorManipulatorDeviceDriver.java

@@ -267,6 +267,7 @@ public class VolumeTwoManipulatorManipulatorDeviceDriver extends AbstractOpcDevi
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);
             var17.printStackTrace();
+            message = "universal_remark8";
 
         }
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/ItemProtocol.java

@@ -273,7 +273,7 @@ public class ItemProtocol {
             setIsonline(true);
             return value;
         }
-        return 0;
+        return value;
     }
 
     public String getOpcStringValue(String protocol) {

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java

@@ -581,6 +581,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
                     .build();
             logDto.setLog_level(4);
             luceneExecuteLogService.deviceExecuteLog(logDto);
+            message = "universal_remark8";
 
             var17.printStackTrace();
         }
@@ -749,7 +750,6 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
                             .build();
                     logDto2.setLog_level(4);
                     luceneExecuteLogService.deviceExecuteLog(logDto2);
-                    this.message = "申请更新点位,参数,接口返回:" + jo;
                     String poinCode = jo.getString("point_code");
                     String vehicleCode = jo.getString("vehicle_code");
                     if (StrUtil.isNotEmpty(poinCode)) {
@@ -793,7 +793,6 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
                         .build();
                 logDto2.setLog_level(4);
                 luceneExecuteLogService.deviceExecuteLog(logDto2);
-                this.message = "申请更新点位,参数,接口返回:" + jo;
             }
         }
     }

acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal.properties

@@ -23,6 +23,7 @@ universal_remark4=\u5F53\u524D\u4E0A\u62A5\u4EFB\u52A1\u53F7(task)\u5E94\u8BE5\u
 universal_remark5=\u53F3\u51FB\u8BE5\u56FE\u6807,\u5C06\u8BF7\u6C42\u4EFB\u52A1\u590D\u4F4D\u6807\u8BB0(requireSucess)\u6539\u4E3A\u5426\u3002
 universal_remark6=\u524D\u5DE5\u4F4D\u6709\u8D27
 universal_remark7=\u540E\u5DE5\u4F4D\u6709\u8D27
+universal_remark8=\u8BFB\u53D6\u4FE1\u53F7\u503C\u65F6\u51FA\u73B0\u5F02\u5E38
 universal_notCreateInstMessage=\u672A\u627E\u5230\u5173\u8054\u8BBE\u5907\u7684\u4EFB\u52A1\uFF0C\u6307\u4EE4\u65E0\u6CD5\u521B\u5EFA
 universal_message1=\u653E\u8D27\u5B8C\u6210
 universal_message2=\u653E\u8D27\u5931\u8D25

acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_en_US.properties

@@ -24,6 +24,7 @@ universal_remark4=The current report task ID should be 0
 universal_remark5=Right-click the icon and change the Request task reset flag (requireSucess) to No
 universal_remark6=The front station is in stock
 universal_remark7=The rear station is in stock
+universal_remark8=An exception occurred while reading the signal value
 universal_message1=Release completed
 universal_message2=Delivery failure
 universal_message3=Have an alarm

acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_in_ID.properties

@@ -22,6 +22,7 @@ universal_remark4=Kita tugaskan tugaskan task
 universal_remark5=Klik kanan pada ikon dan ubah not (requicess) untuk penugasan ulang
 universal_remark6=Stasiun depan tersedia
 universal_remark7=Stasiun belakang tersedia
+universal_remark8=Sebuah anomali muncul ketika membaca nilai sinyal
 universal_message1=Pengiriman selesai
 universal_message2=Gagal memasukkan barang
 universal_message3=Alarm berbunyi

acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_zh_CN.properties

@@ -22,6 +22,8 @@ universal_remark4=\u5F53\u524D\u4E0A\u62A5\u4EFB\u52A1\u53F7(task)\u5E94\u8BE5\u
 universal_remark5=\u53F3\u51FB\u8BE5\u56FE\u6807,\u5C06\u8BF7\u6C42\u4EFB\u52A1\u590D\u4F4D\u6807\u8BB0(requireSucess)\u6539\u4E3A\u5426\u3002
 universal_remark6=\u524D\u5DE5\u4F4D\u6709\u8D27
 universal_remark7=\u540E\u5DE5\u4F4D\u6709\u8D27
+universal_remark8=\u8BFB\u53D6\u4FE1\u53F7\u503C\u65F6\u51FA\u73B0\u5F02\u5E38
+
 universal_message1=\u653E\u8D27\u5B8C\u6210
 universal_message2=\u653E\u8D27\u5931\u8D25
 universal_message3=\u6709\u62A5\u8B66