From c9dd869aa414ad55f9c4f05b4bec66bd44e49f17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Sat, 2 Jul 2022 16:14:16 +0800
Subject: [PATCH] =?UTF-8?q?event=20serializer=20=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E8=AF=A6=E7=BB=86=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/ecm/serializers.py | 9 +++++----
 apps/ecm/views.py       | 1 +
 apps/third/speaker.py   | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/apps/ecm/serializers.py b/apps/ecm/serializers.py
index dc74aa9c..b708df6b 100644
--- a/apps/ecm/serializers.py
+++ b/apps/ecm/serializers.py
@@ -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.third.serializers import TDeviceSimpleSerializer
 from apps.third.models import TDevice
@@ -7,6 +7,7 @@ from rest_framework import serializers
 from apps.system.serializers import UserSimpleSerializer
 from apps.utils.constants import EXCLUDE_FIELDS
 from rest_framework.exceptions import ParseError
+from apps.hrm.serializers import EmployeeSerializer
 
 
 class EventCateCreateUpdateSerializer(CustomModelSerializer):
@@ -72,9 +73,9 @@ class NotifySettingsSerializer(CustomModelSerializer):
 
 
 class EventSerializer(serializers.ModelSerializer):
-    area_name = serializers.CharField(source='area.name', read_only=True)
-    cate_ = EventCateSimpleSerializer(source='cate', read_only=True)
-    people_name = serializers.CharField(source='people.name', read_only=True)
+    area_ = AreaSerializer(source='area', read_only=True)
+    cate_ = EventCateSimpleSerializer(source='cate', read_only=True, many=True)
+    employee_ = EmployeeSerializer(source='employee', read_only=True)
     handle_user_name = serializers.CharField(source='handle_user.name', read_only=True)
 
     class Meta:
diff --git a/apps/ecm/views.py b/apps/ecm/views.py
index d484a580..63d79386 100644
--- a/apps/ecm/views.py
+++ b/apps/ecm/views.py
@@ -58,6 +58,7 @@ class EventViewSet(ListModelMixin, RetrieveModelMixin, CustomGenericViewSet):
     perms_map = {'get': 'event:view'}
     queryset = Event.objects.all()
     serializer_class = EventSerializer
+    select_related_fields = ['area', 'cate', 'handle_people', 'handle_user']
 
     @transaction.atomic
     @action(methods=['post'], detail=True, perms_map={'post': 'event:handle'},
diff --git a/apps/third/speaker.py b/apps/third/speaker.py
index 985f1de2..dc3255a7 100644
--- a/apps/third/speaker.py
+++ b/apps/third/speaker.py
@@ -135,7 +135,7 @@ class SpClient:
                 "level": 99804,
                 "name": "实时播放",
                 "tid": "x",
-                "vol": 70,
+                "vol": 50,
                 "type": 5,
                 "uid": "y",
                 "urls": [{