From 2acd216d333258bdc6155a09936f17e3cd37a434 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 19 Jul 2023 17:24:45 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20eventcate=20code=20=E4=B8=8D=E5=94=AF?= =?UTF-8?q?=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/0010_alter_eventcate_code.py | 18 ++++++++++++++++++ apps/ecm/models.py | 2 +- apps/ecm/service.py | 2 +- 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 apps/ecm/migrations/0010_alter_eventcate_code.py diff --git a/apps/ecm/migrations/0010_alter_eventcate_code.py b/apps/ecm/migrations/0010_alter_eventcate_code.py new file mode 100644 index 00000000..c82013f4 --- /dev/null +++ b/apps/ecm/migrations/0010_alter_eventcate_code.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.12 on 2023-07-19 09:24 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ecm', '0009_auto_20230323_1740'), + ] + + operations = [ + migrations.AlterField( + model_name='eventcate', + name='code', + field=models.CharField(max_length=20, verbose_name='标识'), + ), + ] diff --git a/apps/ecm/models.py b/apps/ecm/models.py index 06a21e56..7a7a6d04 100644 --- a/apps/ecm/models.py +++ b/apps/ecm/models.py @@ -16,7 +16,7 @@ class EventCate(CommonAModel): (10, '监控'), (20, '定位') ) - code = models.CharField('标识', max_length=20, unique=True) + code = models.CharField('标识', max_length=20) name = models.CharField('名称', max_length=20, unique=True) priority = models.PositiveSmallIntegerField('优先级', default=1, help_text='1-99') trigger = models.PositiveSmallIntegerField('触发方式', default=10, choices=EVENT_TRIGGER_CHOICES) diff --git a/apps/ecm/service.py b/apps/ecm/service.py index fe75ddd0..1635c8ff 100644 --- a/apps/ecm/service.py +++ b/apps/ecm/service.py @@ -316,7 +316,7 @@ def dispatch_dahua_event(data: dict): else: global_img_o = dhClient.get_full_pic(data['info']['alarmPicture']) happen_time = timestamp_to_time(int(data['info']['alarmDate'])) - algo_channels = AlgoChannel.objects.filter(vchannel=vchannel, algo__self_algo=True).exclude( + algo_channels = AlgoChannel.objects.filter(vchannel=vchannel).exclude( algo__code=None).order_by('algo__priority', 'algo__create_time').values('id', 'algo', 'algo__code') cates = [] # 触发的事件种类 algo_codes = [] # 需要执行的ai算法