From dcd338e5fa63369389db7ce9d39ea57e46d136cc Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 4 Aug 2023 14:53:51 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20mpointstat=E5=A2=9E=E5=8A=A0=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/enm/serializers.py | 4 ++++ apps/enm/views.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/enm/serializers.py b/apps/enm/serializers.py index 58449f8c..cac16b31 100644 --- a/apps/enm/serializers.py +++ b/apps/enm/serializers.py @@ -11,6 +11,7 @@ class MpointSerializer(CustomModelSerializer): mgroup_name = serializers.CharField(source='mgroup.name', read_only=True) belong_dept_name = serializers.CharField(source='belong_dept.name', read_only=True) ep_monitored_name = serializers.CharField(source='ep_monitored.name', read_only=True) + ep_monitored_power_kw = serializers.CharField(source='ep_monitored.power_kw', read_only=True) ep_belong_name = serializers.CharField(source='ep_belong.name', read_only=True) material_name = serializers.CharField(source='material.name', read_only=True) formula = serializers.CharField(allow_blank=True) @@ -53,7 +54,10 @@ class MpointStatSerializer(CustomModelSerializer): mpoint_name = serializers.CharField(source='mpoint.name', read_only=True) ep_monitored_name = serializers.CharField(source='mpoint.ep_monitored.name', read_only=True) ep_monitored_number = serializers.CharField(source='mpoint.ep_monitored.number', read_only=True) + ep_monitored_power_kw= serializers.CharField(source='mpoint.ep_monitored.power_kw', read_only=True) ep_belong_name = serializers.CharField(source='mpoint.ep_belong.name', read_only=True) + mgroup_name = serializers.CharField(source='mgroup.name', read_only=True) + belong_dept_name = serializers.CharField(source='mgroup.belong_dept.name', read_only=True) class Meta: model = MpointStat fields = '__all__' diff --git a/apps/enm/views.py b/apps/enm/views.py index 53938597..e783f352 100644 --- a/apps/enm/views.py +++ b/apps/enm/views.py @@ -43,7 +43,7 @@ class MpointStatViewSet(BulkCreateModelMixin, BulkDestroyModelMixin, ListModelMi perms_map = {'get': '*', 'post': 'mpointstat.create', 'delete': 'mpointstat.delete'} queryset = MpointStat.objects.all() serializer_class = MpointStatSerializer - select_related_fields = ['mpoint'] + select_related_fields = ['mpoint', 'mpoint__ep_monitored', 'mpoint__ep_belong', 'mgroup', 'mgroup__belong_dept'] filterset_class = MpointStatFilter def perform_create(self, serializer):