fix(api): cmdb trigger

Author: pycook

cmdb-api/api/commands/click_cmdb.py

@@ -262,6 +262,9 @@ def cmdb_trigger():
                 i = 0
                 triggers = CITypeTrigger.get_by(to_dict=False, __func_isnot__key_attr_id=None)
                 for trigger in triggers:
+                    if not trigger.option.get('enable'):
+                        continue
+
                     try:
                         ready_cis = CITriggerManager.waiting_cis(trigger)
                     except Exception as e:

cmdb-api/api/lib/cmdb/ci.py

@@ -1721,6 +1721,9 @@ def fire_by_trigger(cls, trigger, operate_type, ci_dict, record_id=None):
 
     @classmethod
     def waiting_cis(cls, trigger):
+        if not trigger.option.get('enable'):
+            return []
+
         now = datetime.datetime.today()
 
         config = trigger.option.get('notifies') or {}
@@ -1731,7 +1734,12 @@ def waiting_cis(cls, trigger):
 
         value_table = TableMap(attr=attr).table
 
-        values = value_table.get_by(attr_id=attr.id, to_dict=False)
+        values = (
+            value_table.get_by(attr_id=attr.id, to_dict=False, only_query=True)
+            .join(CI, CI.id == value_table.ci_id)
+            .filter(CI.type_id == trigger.type_id)
+            .filter(CI.deleted.is_(False))
+        )
 
         result = []
         for v in values:
@@ -1754,6 +1762,9 @@ def trigger_notify(cls, trigger, ci, only_test=False):
         :param only_test:
         :return:
         """
+        if not only_test and not trigger.option.get('enable'):
+            return False
+
         if (trigger.option.get('notifies', {}).get('notify_at') == datetime.datetime.now().strftime("%H:%M") or
             not trigger.option.get('notifies', {}).get('notify_at')) or only_test: