Merge branch 'main' of http://39.98.89.94:3000/xiaoguo75131/PVDEMCS

PVDEMCS/PVDEMCS/Devices/Impl/DeviceRun.cs

@@ -186,15 +186,15 @@ namespace PVDEMCS.Devices.Impl
                                 !startStop.ObjectValue.IsNullOrEmpty() &&
                                 !fault.ObjectValue.IsNullOrEmpty())
                             {
-                                var state = EquipmentState.Run;
-
-                                if (fault.GetValue<bool>())
+                                var state = EquipmentState.Stop;
+                                //如果运行状态比警告状态高，这里先判断运行状态，如果运行状态为false，在判断警告状态
+                                if (startStop.GetValue<bool>())
                                 {
-                                    state = EquipmentState.Alarm;
+                                    state = EquipmentState.Run;
                                 }
-                                else if (!startStop.GetValue<bool>())
+                                else if (fault.GetValue<bool>())
                                 {
-                                    state = EquipmentState.Stop;
+                                    state = EquipmentState.Alarm;
                                 }
                                 equipmentRecordService.AddUpdateEquipmentRecord(id, state, DateTime.Now);
                             }