Browse Source

revise log bug

chenzk 1 week ago
parent
commit
55a8267d33

+ 10 - 3
CyberX8_RT/Devices/Reservoir/StandardHotReservoirDevice.cs

@@ -1097,14 +1097,21 @@ namespace CyberX8_RT.Devices.Reservoir
         /// <returns></returns>
         public bool DIReplenOn(bool showError)
         {
+            ReservoirEntity entity = Singleton<RouteManager>.Instance.GetModule<ReservoirEntity>(Module);
             if (ReservoirData.WaterLevel > SC.GetValue<double>($"Reservoir.{Module}.HighLevel"))
             {
-                LOG.WriteLog(eEvent.ERR_RESERVOIR, Module, "Highlevel is activate");
+                if(entity!=null && !entity.IsError)
+                {
+                    LOG.WriteLog(eEvent.ERR_RESERVOIR, Module, "Highlevel is activate");
+                }
                 return false;
             }
-            if (!_reservoirData.LowLevel) //信号是相反的
+            if(!_reservoirData.LowLevel) //信号是相反的
             {
-                LOG.WriteLog(eEvent.ERR_RESERVOIR, Module, $"WaterLevel low is Activate");
+                if (entity != null && !entity.IsError)
+                {
+                    LOG.WriteLog(eEvent.ERR_RESERVOIR, Module, $"WaterLevel low is Activate");
+                }
                 return false;
             }
             bool preCondition = CheckPreDiReplenCondition(showError);

+ 5 - 17
CyberX8_RT/Devices/Reservoir/TotalReservoirDevice.cs

@@ -187,7 +187,7 @@ namespace CyberX8_RT.Devices.Reservoir
             {
                 ReservoirItem reservoirItem = ReservoirItemManager.Instance.GetReservoirItem(module);
                 ReservoirEntity reservoirEntity = Singleton<RouteManager>.Instance.GetModule<ReservoirEntity>(module);
-                if (reservoirEntity != null)
+                if (reservoirEntity != null && !reservoirEntity.IsError)
                 {
                     if (reservoirItem.SubType == STRATUS)
                     {
@@ -201,22 +201,10 @@ namespace CyberX8_RT.Devices.Reservoir
                             reservoirDevice.AutoDireplen();
                         }
                     }
-                    else
-                    {
-                        CompactMembranReservoirDevice reservoirDevice = DEVICE.GetDevice<CompactMembranReservoirDevice>(module);
-                        if (reservoirDevice.IsDireplenOn)
-                        {
-                            break;
-                        }
-                        if (reservoirDevice.AnNeedDireplen && !reservoirDevice.IsDireplenOn)
-                        {
-                            reservoirDevice.AutoANDiReplen();
-                        }
-                        else if (reservoirDevice.CANeedDiReplen && !reservoirDevice.IsDireplenOn)
-                        {
-                            reservoirDevice.AutoCADiReplen();
-                        }
-                    }
+                }
+                else
+                {
+                    continue;
                 }
             }
             return true;