Sfoglia il codice sorgente

fix:设备添加

chenjunkai 6 anni fa
parent
commit
0fe8bb1398
1 ha cambiato i file con 23 aggiunte e 19 eliminazioni
  1. 23 19
      Controller/EquipmentManager.py

+ 23 - 19
Controller/EquipmentManager.py

@@ -82,25 +82,29 @@ def addNewUserEquipmentInterface(request):
                     UID = deviceData.get('UID', '')
                     re_uid = re.compile(r'^[A-Za-z0-9]{20}$')
                     if re_uid.match(UID):
-                        is_bind = Device_Info.objects.filter(UID=UID, isShare=False)
-                        # 判断是否有已绑定用户
-                        if not is_bind.exists():
-                            userDevice = Device_Info(id=CommonService.getUserID(getUser=False), userID_id=userID,
-                                                     **deviceData)
-                            userDevice.save()
-                        else:
-                            # 分享添加
-                            if 'isShare' in deviceData:
-                                deviceData['isShare'] = True
-                            else:
-                                deviceData['isShare'] = True
-                            bind_userID = is_bind[0].userID_id
-                            userDevice = Device_Info(id=CommonService.getUserID(getUser=False),
-                                                     userID_id=userID,
-                                                     primaryUserID=bind_userID,
-                                                     primaryMaster=ModelService.get_user_name(bind_userID),
-                                                     **deviceData)
-                            userDevice.save()
+                        userDevice = Device_Info(id=CommonService.getUserID(getUser=False), userID_id=userID,
+                                                 **deviceData)
+                        userDevice.save()
+
+                        # is_bind = Device_Info.objects.filter(UID=UID, isShare=False)
+                        # # 判断是否有已绑定用户
+                        # if not is_bind.exists():
+                        #     userDevice = Device_Info(id=CommonService.getUserID(getUser=False), userID_id=userID,
+                        #                              **deviceData)
+                        #     userDevice.save()
+                        # else:
+                        #     # 分享添加
+                        #     if 'isShare' in deviceData:
+                        #         deviceData['isShare'] = True
+                        #     else:
+                        #         deviceData['isShare'] = True
+                        #     bind_userID = is_bind[0].userID_id
+                        #     userDevice = Device_Info(id=CommonService.getUserID(getUser=False),
+                        #                              userID_id=userID,
+                        #                              primaryUserID=bind_userID,
+                        #                              primaryMaster=ModelService.get_user_name(bind_userID),
+                        #                              **deviceData)
+                        #     userDevice.save()
                     else:
                         return response.json(444, 'UID')