diff --git a/apps/third/serializers.py b/apps/third/serializers.py index a87d4c18..d74f9d66 100755 --- a/apps/third/serializers.py +++ b/apps/third/serializers.py @@ -5,6 +5,12 @@ from apps.third.models import TDevice from apps.utils.serializers import CustomModelSerializer +class TDeviceSerializer(CustomModelSerializer): + class Meta: + model = TDevice + fields = '__all__' + + class RequestCommonSerializer(serializers.Serializer): method_choice = ( ('post', 'post'), diff --git a/apps/third/views_d.py b/apps/third/views_d.py index 5b6d79a9..1d96d09e 100644 --- a/apps/third/views_d.py +++ b/apps/third/views_d.py @@ -1,5 +1,5 @@ from apps.third.models import TDevice -from apps.third.serializers import BindAreaSerializer, LabelLocationSerializer +from apps.third.serializers import BindAreaSerializer, LabelLocationSerializer, TDeviceSerializer from apps.utils.viewsets import CustomGenericViewSet from rest_framework.mixins import ListModelMixin from apps.third.clients import xxClient, dhClient, spClient @@ -25,6 +25,15 @@ class TDeviceViewSet(CustomGenericViewSet): """ request.data.update({'channelTypeList': ["1"]}) _, res = dhClient.request(**dhapis['channel_list'], json=request.data) + codes = [] + if res.get('pageData', None): + for i in res['pageData']: + codes.append(i['channelCode']) + tds_info = TDeviceSerializer(instance=TDevice.objects.filter(code__in=codes), many=True).data + for x in res['pageData']: + for y in tds_info: + if x['channelCode'] == y['code']: + x['my_info'] = y return Response(res) @action(methods=['post'], detail=False, perms_map={'post': '*'}, @@ -110,3 +119,7 @@ class TDeviceViewSet(CustomGenericViewSet): td.create_by = request.user td.save() return Response() + + +class TlogViewSet(ListModelMixin, CustomGenericViewSet): + pass \ No newline at end of file