Jelajahi Sumber

improve switch logic

highing666 3 tahun lalu
induk
melakukan
92dd11e175
1 mengubah file dengan 13 tambahan dan 10 penghapusan
  1. 13 10
      app/controllers/equipment/ahu/switch.py

+ 13 - 10
app/controllers/equipment/ahu/switch.py

@@ -18,16 +18,19 @@ class AHUSwitch(Switch):
     def break_time_action(self, begin: str, end: str, day_type: str) -> str:
         if self._equip.in_cloud_status:
             if day_type == 'WeekDay':
-                switch_flag = True
-                if begin <= end:
-                    if begin <= self._now_time <= end:
-                        switch_flag = False
-                else:
-                    if not end <= self._now_time <= begin:
-                        switch_flag = False
-
-                if not switch_flag and self._equip.running_status:
-                    action = 'off'
+                if begin and end:
+                    switch_flag = True
+                    if begin <= end:
+                        if begin <= self._now_time <= end:
+                            switch_flag = False
+                    else:
+                        if not end <= self._now_time <= begin:
+                            switch_flag = False
+
+                    if not switch_flag and self._equip.running_status:
+                        action = 'off'
+                    else:
+                        action = 'hold'
                 else:
                     action = 'hold'
             else: