优化已被绑定设备返回提示

Controller/SensorGateway/EquipmentFamilyController.py

@@ -147,15 +147,22 @@ class EquipmentFamilyView(View):
         # type 可能为0
         if not all([nick_name, serial_number, device_type]):
             return response.json(444, {'param': 'nick_name, serial_number, device_type'})
-        device_info_qs = Device_Info.objects.filter(serial_number=serial_number)
+        device_info_qs = Device_Info.objects.filter(serial_number=serial_number,isShare=False)
         if device_info_qs:
-            # 判断设备是否已存在
-            if device_info_qs[0].isExist == 1:
+            qs = device_info_qs.values('userID__NickName', 'NickName','userID_id')
+            nickname = qs[0]['NickName']
+            device_user_id = qs[0]['userID_id']
+            if device_user_id == user_id:
                 return response.json(174)
             else:
-                device_info_qs.delete()
+                res = {
+                    'bindUser': qs[0]['userID__NickName'],
+                    'bindDeviceName': nickname,
+                }
+                return response.json(15, res=res)
         try:
             with transaction.atomic():
+                family_id = int(family_id)
                 # 格式化后的日期时间
                 now_time = CommonService.timestamp_to_str(int(time.time()))
                 device_id = CommonService.getUserID(getUser=False)