优化网关/插座查询接口

Controller/SensorGateway/GatewayDeviceController.py

@@ -297,7 +297,10 @@ class GatewayDeviceView(View):
                 'start': False,
             }
             if device_qs['device__Type'] == 201:
-                socket_data = cls.smart_socket(device_id, response)
+                socket_info_qs = SocketInfo.objects.filter(device_id=device_id)
+                if not socket_info_qs.exists():
+                    return response.json(173)
+                socket_data = cls.smart_socket(device_id)
                 gateway['power'] = socket_data['power']
                 gateway['electricity'] = socket_data['electricity']
                 gateway['countDownTime'] = socket_data['countDownTime']
@@ -348,7 +351,7 @@ class GatewayDeviceView(View):
             return response.json(500)
 
     @classmethod
-    def smart_socket(cls, device_id, response):
+    def smart_socket(cls, device_id):
         """
         查詢插座信息
         """
@@ -365,8 +368,6 @@ class GatewayDeviceView(View):
         socket_info_qs = SocketInfo.objects.filter(device_id=device_id).values('online', 'type_switch',
                                                                                'status',
                                                                                'count_down_time', 'start')
-        if not socket_info_qs.exists():
-            return response.json(173)
         # 插座信息
         data['socketStatus'] = socket_info_qs[0]['status'] if socket_info_qs[0]['status'] else False
         data['start'] = socket_info_qs[0]['start'] if socket_info_qs[0]['status'] else False