From fd6b5b5db74f326a972e4c6e8d3dafcbc2e99c37 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 7 Sep 2023 10:28:17 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84enm=5Falarm=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E7=9A=84enm=5Fdata=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/enm/tasks.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/enm/tasks.py b/apps/enm/tasks.py index 04b1ecbf..067e620a 100644 --- a/apps/enm/tasks.py +++ b/apps/enm/tasks.py @@ -634,7 +634,7 @@ def enm_alarm(year_s: int, month_s: int, day_s: int): from apps.mtm.models import Goal from apps.ecm.service import notify_event now = timezone.now() - event_cate, _ = EventCate.objects.get_or_create(code='consume_exceed', defaults={'name': '能耗超过目标值', 'code': 'consume_exceed', 'triger': 30}) + event_cate, _ = EventCate.objects.get_or_create(code='consume_exceed', defaults={'name': '能耗超过目标值', 'code': 'consume_exceed', 'trigger': 30}) for item in enm_alarms_list: mgroups = Mgroup.objects.filter(name=item[0]) for mgroup in mgroups: @@ -651,7 +651,7 @@ def enm_alarm(year_s: int, month_s: int, day_s: int): event.obj_cate = 'enm' event.happen_time = now event.voice_msg = f'{mgroup_name}{item[2]}超过设定目标值' - event.enm_data = {'mgroup': mgroup.id, 'mgroup_name': mgroup.name, 'type': f'{goal_cate_str}.exceed', 'year_s': year_s, 'month_s': month_s, 'day_s': day_s, 'val': real_val, 'goal_val': goal_val} + event.enm_data = {'mgroup': mgroup.id, 'mgroup_name': mgroup.name, 'type': f'{goal_cate_str}.exceed', 'year_s': year_s, 'month_s': month_s, 'day_s': day_s, 'val': real_val, 'goal_val': goal_val, 'enstat': enstat.id} event.save() Eventdo.objects.get_or_create(cate=event_cate, event=event, defaults={ 'cate': event_cate,