Преглед изворни кода

修改查询子设备信息响应对象

locky пре 3 година
родитељ
комит
f8fa23612a

+ 2 - 0
Controller/SensorGateway/GatewayFamilyRoomController.py

@@ -54,6 +54,8 @@ class GatewayFamilyRoomView(View):
             return self.all_devices(request_dict, response)
         elif operation == 'devices-sort':    # 家庭设备排序
             return self.devices_sort(request_dict, response)
+        else:
+            return response.json(414)
 
     @classmethod
     def room_device_save(cls, app_user_id, request_dict, response):

+ 8 - 2
Controller/SensorGateway/SubDeviceController.py

@@ -121,7 +121,7 @@ class GatewaySubDeviceView(View):
     @staticmethod
     def query_sub_device(request_dict, response):
         """
-        查询子设备
+        查询子设备信息
         @param request_dict: 请求参数
         @request_dict gatewaySubId: 子设备id
         @param response: 响应对象
@@ -137,7 +137,13 @@ class GatewaySubDeviceView(View):
                                                                                              'mac', 'sensor_serial')
             if not gateway_sub_device_qs.exists():
                 return response.json(173)
-            return response.json(0, list(gateway_sub_device_qs))
+            res = {
+                'manufacturer': gateway_sub_device_qs[0]['manufacturer'],
+                'device_model': gateway_sub_device_qs[0]['device_model'],
+                'mac': gateway_sub_device_qs[0]['mac'],
+                'sensor_serial': gateway_sub_device_qs[0]['sensor_serial'],
+            }
+            return response.json(0, res)
         except Exception as e:
             return response.json(500, repr(e))