posf

Controller/EquipmentManager.py

@@ -172,7 +172,6 @@ def queryUserEquipmentInterface(request):
     if tko.code != 0:
         return response.json(tko.code)
     userID = tko.userID
-    ModelService.check_permission(userID,40)
     if not userID:
         return response.json(104)
     dvqs = Device_Info.objects.filter(userID_id=userID)

Controller/shareUserPermission.py

@@ -10,6 +10,7 @@ from Service.CommonService import CommonService
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from django.db.models import Q
+from Service.ModelService import ModelService
 
 
 class searchUserView(View):
@@ -191,7 +192,9 @@ class shareUserEquipmentView(View):
                     dictLen += 1
                     continue
                 else:
-                    eqDict['primaryUserID'] = eqDict.pop('userID')
+                    puserId = eqDict.pop('userID')
+                    eqDict['primaryUserID'] = puserId
+                    eqDict['primaryMaster'] = ModelService.get_user_name(puserId)
                     eqDict['isShare'] = True
                     eqDict['userID_id'] = GuestID
                     eqDict['id'] = CommonService.getUserID(getUser=False)
@@ -212,7 +215,9 @@ class shareUserEquipmentView(View):
                         if shareEquipment:
                             dictLen += 1
                         else:
-                            eqDict['primaryUserID'] = eqDict.pop('userID')
+                            puserId = eqDict.pop('userID')
+                            eqDict['primaryUserID'] = puserId
+                            eqDict['primaryMaster'] = ModelService.get_user_name(puserId)
                             eqDict['isShare'] = True
                             eqDict['userID_id'] = GuestID
                             eqDict['id'] = CommonService.getUserID(getUser=False)

Service/ModelService.py

@@ -93,13 +93,4 @@ class ModelService:
             if access_log.id:
                 return True
             else:
-                return False
-
-    # 判断设备账户信息是否正确
-    @staticmethod
-    def device_auth(UID, View_Account, View_Password, ChannelIndex):
-        device_info_queryset = Device_Info.objects.filter(UID=UID, View_Account=View_Account,
-                                                          View_Password=View_Password, ChannelIndex=ChannelIndex)
-        if device_info_queryset.exists():
-            return True
-        return False
+                return False