修改更新子设备信息接口

Controller/SensorGateway/SubDeviceController.py

@@ -130,32 +130,25 @@ class GatewaySubDeviceView(View):
         传感器修改
         @param user_id: 登录用户id
         @param request_dict: 请求参数
+        @request_dict gateway_sub_id: 子设备id
+        @request_dict nickName: 设备名
+        @request_dict room_id: 房间id
         @param response: 响应结果
         @return: list
         """
-        serial_number = request_dict.get('serialNumber', None)
+        gateway_sub_id = int(request_dict.get('gatewaySubId', None))
         nickName = request_dict.get('nickName', None)
-        gateway_sub_id = request_dict.get('gatewaySubId', None)
-        family_id = request_dict.get('familyId', None)
         room_id = request_dict.get('roomId', None)
-        if not all([serial_number, gateway_sub_id]):
+        if not all([gateway_sub_id]):
             return response.json(444)
         try:
-            gateway_sub_id = int(gateway_sub_id)
-            device_info_qs = Device_Info.objects.filter(userID_id=user_id, serial_number=serial_number).values('id')
-            if not device_info_qs.exists():
-                return response.json(14)
             gateway_sub_qs = GatewaySubDevice.objects.filter(id=gateway_sub_id)
             if not gateway_sub_qs.exists():
                 return response.json(173)
             if nickName:
                 gateway_sub_qs.update(nickname=nickName)
-                return response.json(0)
-            elif all([family_id, room_id]):
-                device_id = device_info_qs.first()['id']
-                room_id = int(room_id)
-                FamilyRoomDevice.objects.filter(device_id=device_id, sub_device=gateway_sub_id) \
-                    .update(room_id=room_id)
+            elif room_id:
+                FamilyRoomDevice.objects.filter(sub_device=gateway_sub_id).update(room_id=room_id)
             return response.json(0)
         except Exception as e:
             print(e.args)