speakers可为空

This commit is contained in:
caoqianming 2022-06-18 09:13:37 +08:00
parent 3b412c62bd
commit 8789896800
4 changed files with 31 additions and 4 deletions

View File

@ -0,0 +1,19 @@
# Generated by Django 3.2.12 on 2022-06-17 09:40
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('third', '0001_initial'),
('ecm', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='eventcate',
name='speakers',
field=models.ManyToManyField(blank=True, to='third.TDevice', verbose_name='固定音响'),
),
]

View File

@ -20,7 +20,7 @@ class EventCate(CommonAModel):
name = models.CharField('名称', max_length=20, unique=True)
trigger = models.PositiveSmallIntegerField('触发方式', default=10, choices=EVENT_TRIGGER_CHOICES)
speaker_on = models.BooleanField('开启音响报警', default=True)
speakers = models.ManyToManyField(TDevice, verbose_name='固定音响')
speakers = models.ManyToManyField(TDevice, verbose_name='固定音响', blank=True)
filter_area_level = models.PositiveSmallIntegerField('固定音响区域级别过滤', choices=Area.AREA_LEVEL_CHOICES,
default=Area.AREA_LEVEL_1)

View File

@ -3,11 +3,18 @@ from apps.ecm.models import EventCate, Remind, NotifySetting, Event
from apps.utils.serializers import CustomModelSerializer
from rest_framework import serializers
from apps.system.serializers import UserSimpleSerializer
from apps.utils.constants import EXCLUDE_FIELDS
class EventCateCreateUpdateSerializer(CustomModelSerializer):
class Meta:
model = EventCate
exclude = EXCLUDE_FIELDS
class EventCateSimpleSerializer(CustomModelSerializer):
class Meta:
model = Event
model = EventCate
fields = ['id', 'name', 'code']

View File

@ -1,6 +1,6 @@
from apps.ecm.models import Event, EventCate, Remind, NotifySetting
from apps.ecm.serializers import (EventCateListSerializer, EventCateUpdateSerializer, EventHandleSerializer,
from apps.ecm.serializers import (EventCateCreateUpdateSerializer, EventCateListSerializer, EventCateUpdateSerializer, EventHandleSerializer,
EventSerializer, RemindSerializer, NotifySettingsSerializer)
from apps.utils.viewsets import CustomGenericViewSet, CustomModelViewSet
from rest_framework.mixins import UpdateModelMixin, ListModelMixin, RetrieveModelMixin, CreateModelMixin
@ -16,7 +16,8 @@ class EventCateViewSet(CreateModelMixin, UpdateModelMixin, ListModelMixin, Custo
perms_map = {'put': 'event_cate:update', 'post': 'event_cate:create'}
queryset = EventCate.objects.all()
list_serializer_class = EventCateListSerializer
update_serializer_class = EventCateUpdateSerializer
create_serializer_class = EventCateCreateUpdateSerializer
update_serializer_class = EventCateCreateUpdateSerializer
serializer_class = EventCateListSerializer