From 5a6c6d639469b070721122984f7808f70636c434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com> Date: Fri, 16 Sep 2022 10:03:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=96=87=E5=8F=AD=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/third/urls.py | 3 ++- apps/third/views.py | 24 +++++++++++++++--------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/apps/third/urls.py b/apps/third/urls.py index b1c5c934..219bf3c0 100755 --- a/apps/third/urls.py +++ b/apps/third/urls.py @@ -1,7 +1,7 @@ from email.mime import base from django.urls import path, include from rest_framework import routers -from apps.third.views import DahuaTestView, DhCommonViewSet, SpTestView, XxCommonViewSet, XxTestView +from apps.third.views import DahuaTestView, DhCommonViewSet, SpTestView, SpeakerViewSet, XxCommonViewSet, XxTestView from apps.third.views_d import BltViewSet, TDeviceViewSet, TlogViewSet API_BASE_URL = 'api/third/' @@ -10,6 +10,7 @@ HTML_BASE_URL = 'third/' router = routers.DefaultRouter() router.register('xunxi', XxCommonViewSet, basename='api_xunxi') router.register('dahua', DhCommonViewSet, basename='api_dahua') +router.register('speaker', SpeakerViewSet, basename='api_speaker') router.register('tdevice', TDeviceViewSet, basename='tdevice') router.register('tlog', TlogViewSet, basename='tlog') router.register('tdevice/blt', BltViewSet, basename='blt') diff --git a/apps/third/views.py b/apps/third/views.py index 1c75f54b..c08221b5 100755 --- a/apps/third/views.py +++ b/apps/third/views.py @@ -57,6 +57,21 @@ class SpTestView(APIView): return Response(res) +class SpeakerViewSet(CustomGenericViewSet): + """喇叭视图集 + + 喇叭视图集 + """ + @action(methods=['get'], detail=False, + permission_classes=[IsAuthenticated]) + def headers(self, request, pk=None): + """获取headers + + 获取headers + """ + return Response(spClient.headers()) + + class XxTestView(APIView): """ 寻息测试接口 @@ -157,15 +172,6 @@ class XxCommonViewSet(CreateModelMixin, CustomGenericViewSet): xxClient.subscribe('lowpower', '/api/third/xunxi/c_lowpower/') return Response() - @action(methods=['get'], detail=False, - permission_classes=[IsAuthenticated]) - def headers(self, request, pk=None): - """获取headers - - 获取headers - """ - return Response(xxClient.headers()) - @action(methods=['post'], detail=False, permission_classes=[IsAdminUser], serializer_class=serializers.Serializer)