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": [{