zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

event serializer 返回详细信息

This commit is contained in:
曹前明 2022-07-02 16:14:16 +08:00
parent 366a3a7616
commit c9dd869aa4
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/ecm/serializers.py
View File

@ -1,4 +1,4 @@
from apps.am.serializers import AreaSimpleSerializer from apps.am.serializers import AreaSerializer, AreaSimpleSerializer
from apps.ecm.models import AlgoChannel, EventCate, Remind, NotifySetting, Event from apps.ecm.models import AlgoChannel, EventCate, Remind, NotifySetting, Event
from apps.third.serializers import TDeviceSimpleSerializer from apps.third.serializers import TDeviceSimpleSerializer
from apps.third.models import TDevice from apps.third.models import TDevice
@ -7,6 +7,7 @@ from rest_framework import serializers
from apps.system.serializers import UserSimpleSerializer from apps.system.serializers import UserSimpleSerializer
from apps.utils.constants import EXCLUDE_FIELDS from apps.utils.constants import EXCLUDE_FIELDS
from rest_framework.exceptions import ParseError from rest_framework.exceptions import ParseError
from apps.hrm.serializers import EmployeeSerializer
class EventCateCreateUpdateSerializer(CustomModelSerializer): class EventCateCreateUpdateSerializer(CustomModelSerializer):
@ -72,9 +73,9 @@ class NotifySettingsSerializer(CustomModelSerializer):
class EventSerializer(serializers.ModelSerializer): class EventSerializer(serializers.ModelSerializer):
area_name = serializers.CharField(source='area.name', read_only=True) area_ = AreaSerializer(source='area', read_only=True)
cate_ = EventCateSimpleSerializer(source='cate', read_only=True) cate_ = EventCateSimpleSerializer(source='cate', read_only=True, many=True)
people_name = serializers.CharField(source='people.name', read_only=True) employee_ = EmployeeSerializer(source='employee', read_only=True)
handle_user_name = serializers.CharField(source='handle_user.name', read_only=True) handle_user_name = serializers.CharField(source='handle_user.name', read_only=True)
class Meta: class Meta:

1
apps/ecm/views.py
View File

@ -58,6 +58,7 @@ class EventViewSet(ListModelMixin, RetrieveModelMixin, CustomGenericViewSet):
perms_map = {'get': 'event:view'} perms_map = {'get': 'event:view'}
queryset = Event.objects.all() queryset = Event.objects.all()
serializer_class = EventSerializer serializer_class = EventSerializer
select_related_fields = ['area', 'cate', 'handle_people', 'handle_user']
@transaction.atomic @transaction.atomic
@action(methods=['post'], detail=True, perms_map={'post': 'event:handle'}, @action(methods=['post'], detail=True, perms_map={'post': 'event:handle'},

2
apps/third/speaker.py
View File

@ -135,7 +135,7 @@ class SpClient:
"level": 99804, "level": 99804,
"name": "实时播放", "name": "实时播放",
"tid": "x", "tid": "x",
"vol": 70, "vol": 50,
"type": 5, "type": 5,
"uid": "y", "uid": "y",
"urls": [{ "urls": [{