Merge remote-tracking branch 'remotes/localServer/pzb' into test

Controller/EquipmentInfo.py

@@ -14,7 +14,7 @@ from Service.CommonService import CommonService
 from Service.ModelService import ModelService
 
 '''
-http://192.168.136.45:8077/equipment/info?token=test&devUid=2N1K3LE78TYJ38CE111A&Channel=0&eventType=1&eventTime=1234567890&operation=add&alarm=21342134&receiveTime=1234567891234567
+http://192.168.136.45:8077/equipment/info?token=test&operation=add&devUid=2N1K3LE78TYJ38CE111A&Channel=0&eventType=1&eventTime=1234567890&operation=add&alarm=21342134&receiveTime=1234567891234567
 http://test.dvema.com/equipment/info?token=test&operation=query&page=1&line=10
 http://192.168.136.45:8077/equipment/info?token=test&operation=delete&devUid=UKPAH63V23U4ZHEB111A&id=5&id=6&id=7
 http://192.168.136.40:8077/equipment/info?token=test&operation=update&devUid=UKPAH63V23U4ZHEB111A&id=3&id=4
@@ -191,20 +191,26 @@ class EquipmentInfo(View):
             send_json = CommonService.qs_to_dict(res)
             send_json['count'] = count
             return response.json(0, send_json)
-
+    # 管理员查询指定用户的推送信息接口
     def query_all_info(self, request_dict, userID, response):
         page = int(request_dict.get('page', None))
         line = int(request_dict.get('line', None))
-        userID_id = request_dict.get('userID_id', None)
+        username = request_dict.get('username', None)
         if not page or not line:
             return response.json(444, 'page,line')
+        user = Device_User.objects.filter(username=username)
+        if not user.exists():
+            return response.json(104)
+        users = CommonService.qs_to_dict(user)
+        # 从字典类型中找到对应的pk值，即是userID
+        user_id = users.get('datas')[0].get('pk')
         check_perm = ModelService.check_perm(userID=userID, permID=30)
         if not check_perm:
             return response.json(404)
-        uid_list = Device_Info.objects.filter(userID_id=userID_id).values_list('UID', flat=True)
+        uid_list = Device_Info.objects.filter(userID_id=user_id).values_list('UID', flat=True)
         if not len(uid_list):
             return response.json(0, {'datas': [], 'count': 0})
-        qs = Equipment_Info.objects.filter(userID_id=userID_id).order_by('-id')
+        qs = Equipment_Info.objects.filter(userID_id=user_id).order_by('-id')
         if not qs.exists():
             return response.json(0, {'datas': [], 'count': 0})
         count = qs.count()
@@ -213,6 +219,7 @@ class EquipmentInfo(View):
         send_json['count'] = count
         return response.json(0, send_json)
 
+    # 管理员的删除推送信息的接口
     def delete_by_admin(self, request_dict, userID, response):
         id_list = request_dict.getlist('id', None)
         if not len(id_list):