修改子设备接口参数

Controller/SensorGateway/SubDeviceController.py

@@ -60,13 +60,13 @@ class GatewaySubDeviceView(View):
         @param response: 响应对象
         @return: response 响应对象
         """
-        serial_number = request_dict.get('serial_number', None)
-        device_type = int(request_dict.get('device_type', None))
-        nickname = request_dict.get('nickname', None)
-        request_dict.get('ieee_addr', None)
-        src_addr = request_dict.get('src_addr', None)
-        family_id = request_dict.get('family_id', None)
-        room_id = request_dict.get('room_id', None)
+        serial_number = request_dict.get('serialNumber', None)
+        device_type = int(request_dict.get('deviceType', None))
+        nickname = request_dict.get('nickName', None)
+        ieee_addr = request_dict.get('ieeeAddr', None)
+        src_addr = request_dict.get('srcAddr', None)
+        family_id = request_dict.get('familyId', None)
+        room_id = request_dict.get('roomId', None)
 
         if not all([serial_number, device_type, nickname, src_addr, family_id, room_id]):
             return response.json(444)
@@ -78,8 +78,8 @@ class GatewaySubDeviceView(View):
             device_id = device_info_qs[0]['id']
             with transaction.atomic():
                 sub_device = GatewaySubDevice.objects.create(device_id=device_id, device_type=device_type,
-                                                             nickname=nickname, src_addr=src_addr, status=1,
-                                                             created_time=now_time, updated_time=now_time)
+                                                             nickname=nickname, ieee_addr=ieee_addr, src_addr=src_addr,
+                                                             status=1, created_time=now_time, updated_time=now_time)
                 FamilyRoomDevice.objects.create(family_id=family_id, room_id=room_id, device_id=device_id,
                                                 sub_device=sub_device, created_time=now_time, updated_time=now_time)
             return response.json(0)
@@ -96,7 +96,7 @@ class GatewaySubDeviceView(View):
         @param response: 响应对象
         @return: response
         """
-        serial_number = request_dict.get('serial_number', None)
+        serial_number = request_dict.get('serialNumber', None)
 
         if not all([serial_number]):
             return response.json(444)
@@ -107,8 +107,8 @@ class GatewaySubDeviceView(View):
             device_id = device_info_qs[0]['id']
             count = GatewaySubDevice.objects.filter(device_id=device_id).count()
             gateway_sub_device_qs = GatewaySubDevice.objects.filter(device_id=device_id).values('device_type',
-                                                                                                'nickname', 'src_addr',
-                                                                                                'status')
+                                                                                                'nickname', 'ieee_addr',
+                                                                                                'src_addr', 'status')
             gateway_sub_device_list = [gateway_sub_device for gateway_sub_device in gateway_sub_device_qs]
             res = {
                 'count': count,
@@ -165,7 +165,7 @@ class GatewaySubDeviceView(View):
         @param response: 响应对象
         @return: response
         """
-        sub_device_id = request_dict.get('sub_device_id', None)
+        sub_device_id = request_dict.get('subDeviceId', None)
 
         if not all([sub_device_id]):
             return response.json(444)