推送消息修改

Controller/EquipmentInfo.py

@@ -113,7 +113,7 @@ class EquipmentInfo(View):
             else:
                 return response.json(500)
 
-    def query_infovv(self, request_dict, userID, response):
+    def query_infocc(self, request_dict, userID, response):
         page = int(request_dict.get('page', None))
         line = int(request_dict.get('line', None))
         nowTime = int(time.time())
@@ -176,6 +176,42 @@ class EquipmentInfo(View):
 
 
     def query_info(self, request_dict, userID, response):
+        page = int(request_dict.get('page', None))
+        line = int(request_dict.get('line', None))
+        if not page or not line:
+            return response.json(444, 'page,line')
+        qs = Equipment_Info.objects.filter(userID_id=userID)
+        uid = request_dict.get('uid', None)
+        if uid:
+            qs = qs.filter(devUid=uid)
+            dvqs = Device_Info.objects.filter(UID=uid).values('Type', 'NickName')
+            uid_type_dict = {uid: {'type': dvqs[0]['Type'], 'NickName': dvqs[0]['NickName']}}
+        else:
+            dvqs = Device_Info.objects.filter(userID_id=userID).values('UID', 'Type', 'NickName')
+            uid_type_dict = {}
+            for dv in dvqs:
+                uid_type_dict[dv['UID']] = {'type': dv['Type'], 'NickName': dv['NickName']}
+        if not qs.exists():
+            return response.json(0, {'datas': [], 'count': 0})
+        count = qs.count()
+        res = qs[(page - 1) * line:page * line]
+        send_json = CommonService.qs_to_dict(res)
+        res = []
+        for p in send_json['datas']:
+            p['fields']['viewAccont'] = ''
+            p['fields']['viewPwd'] = ''
+            devUid = p['fields']['devUid']
+            if devUid in uid_type_dict.keys():
+                p['fields']['uid_type'] = uid_type_dict[devUid]['type']
+                p['fields']['devNickName'] = uid_type_dict[devUid]['NickName']
+            else:
+                p['uid_type'] = ''
+            res.append(p)
+        return response.json(0, {'datas': res, 'count': count})
+
+        # return response.json(0, send_json)
+
+    def query_infovv(self, request_dict, userID, response):
         page = int(request_dict.get('page', None))
         line = int(request_dict.get('line', None))
         if not page or not line:
@@ -190,6 +226,7 @@ class EquipmentInfo(View):
         res = qs[(page - 1) * line:page * line]
         send_json = CommonService.qs_to_dict(res)
         res = []
+
         for p in send_json['datas']:
             p['fields']['viewAccont'] = ''
             p['fields']['viewPwd'] = ''