channel_list

Controller/EquipmentManager.py

@@ -589,7 +589,7 @@ def queryInterface(request):
                 uid_list.append(dvl['UID'])
         ubqs = UID_Bucket.objects.filter(uid__in=uid_list). \
             values('bucket__content', 'status', 'channel', 'endTime', 'uid')
-        upqs = UID_Preview.objects.filter(uid__in=uid_list).values('id', 'uid', 'channel')
+        upqs = UID_Preview.objects.filter(uid__in=uid_list).order_by('channel').values('id', 'uid', 'channel')
         auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
         uidPreview_bucket = oss2.Bucket(auth, 'oss-cn-shenzhen.aliyuncs.com', 'apg')
         nowTime = int(time.time())
@@ -603,7 +603,7 @@ def queryInterface(request):
             p['preview'] = []
             for up in upqs:
                 if p['UID'] == up['uid']:
-                    obj = 'uid_preview/{uid}/{channel}.png'.format(uid=up['uid'], channel=up['channel'])
+                    obj = 'uid_preview/{uid}/channel_{channel}.png'.format(uid=up['uid'], channel=up['channel'])
                     img_sign = uidPreview_bucket.sign_url('GET', obj, 300)
                     p['preview'].append(img_sign)
             data.append(p)

Controller/UIDPreview.py

@@ -88,7 +88,7 @@ class UIDPreview(View):
                         return response.json(177)
                     else:
                         if is_update:
-                            obj = 'uid_preview/{uid}/{channel}.png'.format(uid=uid, channel=channel)
+                            obj = 'uid_preview/{uid}/channel_{channel}.png'.format(uid=uid, channel=channel)
                             # 设置此签名URL在60秒内有效。
                             url = bucket.sign_url('PUT', obj, 7200)
                             return response.json(0, url)
@@ -107,7 +107,7 @@ class UIDPreview(View):
                         print(repr(e))
                         return response.json(178)
                     else:
-                        obj = 'uid_preview/{uid}/{channel}.png'.format(uid=uid, channel=channel)
+                        obj = 'uid_preview/{uid}/channel_{channel}.png'.format(uid=uid, channel=channel)
                         # 设置此签名URL在60秒内有效。
                         url = bucket.sign_url('PUT', obj, 7200)
                         return response.json(0, url)