1一键解绑调整

zhmes-agecal-system/src/main/java/com/zehong/system/netty/event/CalibrationResultEventHandler.java

@@ -137,6 +137,7 @@ public class CalibrationResultEventHandler {
         // moduleStatus 模块状态
         // simCardStatus 串口状态
         for (PalletDeviceBinding palletDeviceBinding : palletDeviceBindings) {
+            if(StringUtils.isBlank(palletDeviceBinding.getMotherboardCode())) continue;
             if(("1".equals(palletDeviceBinding.getDeviceStatus())
             || "3".equals(palletDeviceBinding.getDeviceStatus())
             || "4".equals(palletDeviceBinding.getDeviceStatus()))
@@ -145,14 +146,26 @@ public class CalibrationResultEventHandler {
             && "1".equals(palletDeviceBinding.getRealTimeStatus())
             && "4".equals(palletDeviceBinding.getCalibrationConcentrationStatus())
             && palletDeviceBinding.getWriteSelfCheckStatus() == 1
-            && palletDeviceBinding.getRelayStatus() == 1
-            && palletDeviceBinding.getPulseStatus() == 1
             && palletDeviceBinding.getModuleStatus() == 1
             && palletDeviceBinding.getSimCardStatus() == 1
             && palletDeviceBinding.getNetworkStatus() == 1) {
                 palletDeviceBinding.setStandardInspectResult("1");
-            } else {
-                palletDeviceBinding.setStandardInspectResult("0");
+            }
+
+            if(!"2".equals(palletDeviceBinding.getReadingMode())) {
+                if(palletDeviceBinding.getRelayStatus() == 1) {
+                    palletDeviceBinding.setStandardInspectResult("1");
+                } else {
+                    palletDeviceBinding.setStandardInspectResult("0");
+                }
+            }
+
+            if(!"1".equals(palletDeviceBinding.getReadingMode())) {
+                if(palletDeviceBinding.getPulseStatus() == 1) {
+                    palletDeviceBinding.setStandardInspectResult("1");
+                } else {
+                    palletDeviceBinding.setStandardInspectResult("0");
+                }
             }
         }
     }

zhmes-agecal-system/src/main/java/com/zehong/system/service/impl/PalletDeviceBindingServiceImpl.java

@@ -377,14 +377,14 @@ public class PalletDeviceBindingServiceImpl implements IPalletDeviceBindingServi
                         // 处理错误数据逻辑，再弄个错误数据的表
                         if(StringUtils.isNotBlank(data)) {
                             // 存失败记录
-                            processPalletDeviceUploadFailure(palletDeviceBindings,data);
+                            processPalletDeviceUploadFailure(mesDeviceDomains,data);
                         } else{
-                            iPalletDeviceUploadFailureService.batchInsertRealTimeData(palletDeviceBindings);
+                            iPalletDeviceUploadFailureService.batchInsertRealTimeData(mesDeviceDomains);
                         }
                     }
                 }
             } catch (Exception e) {
-                iPalletDeviceUploadFailureService.batchInsertRealTimeData(palletDeviceBindings);
+                iPalletDeviceUploadFailureService.batchInsertRealTimeData(mesDeviceDomains);
             }
         }
     }