gtz

Ansjer/test/thumnber.py

@@ -21,7 +21,7 @@ auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
 bucket_name = 'cnvod1'
 endpoint = 'oss-cn-shenzhen.aliyuncs.com'
 bucket = oss2.Bucket(auth, endpoint, bucket_name)
-ts = '8YFJNFJRTHBRZ5X4111A/vod1/1556003252/ts0.ts'
+ts = '8YFJNFJRTHBRZ5X4111A/vod1/1556510197/ts0.ts'
 url = bucket.sign_url('GET', ts, 36000, params={'x-oss-process': 'hls/sign'})
 urllst = url.split('?')
 url_start = urllib.parse.unquote(urllst[0])

Controller/CloudVod.py

@@ -709,10 +709,10 @@ class CloudVodView(View):
             .values("time", "sec", "bucket__bucket", "bucket__endpoint", "bucket__region")
         vod_play_list = []
         print(vodqs)
+        auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
         for vod in vodqs:
             bucket_name = vod["bucket__bucket"]
             endpoint = vod["bucket__endpoint"]
-            auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
             bucket = oss2.Bucket(auth, endpoint, bucket_name)
             m3u8 = '{uid}/vod{channel}/{time}/{time}.m3u8'. \
                 format(uid=uid, channel=channel, time=vod['time'])

Controller/DetectController.py

@@ -95,10 +95,13 @@ class DetectControllerView(View):
         auth = oss2.Auth('LTAIyMkGfEdogyL9', '71uIjpsqVOmF7DAITRyRuc259jHOjO')
         bucket = oss2.Bucket(auth, 'oss-cn-shenzhen.aliyuncs.com', 'apg')
         for p in qr:
-            if p['is_st'] == '1':
-                p['img'] = bucket.sign_url('GET',
-                                           '{uid}/{channel}/{time}.jpeg'.format(uid=p['devUid'], channel=p['Channel'],
-                                                                                time=p['eventTime']), 300)
+            if p['is_st'] == 1:
+                p['img'] = bucket.sign_url('GET','{uid}/{channel}/{time}.jpeg'.
+                                           format(uid=p['devUid'], channel=p['Channel'], time=p['eventTime']), 300)
+            elif p['is_st'] == 2:
+                # img_list = []
+
+                p['gif'] = []
             uid_type_s = ''
             if p['devUid'] in uid_type_dict.keys():
                 uid_type_s = uid_type_dict[p['devUid']]
@@ -226,7 +229,7 @@ class NotificationView(View):
                 # self.do_save_equipment_info(ua, n_time, channel, event_type, is_st)
             # 需求不一样，所以这么做的
             self.do_bulk_create_info(uaqs, n_time, channel, event_type, is_st)
-            if is_st == '0':
+            if is_st == '0' or is_st == '2':
                 return JsonResponse(status=200, data={'code': 0, 'msg': 'success'})
             else:
                 # Endpoint以杭州为例，其它Region请按实际情况填写。

Controller/EquipmentStatus.py

@@ -16,6 +16,7 @@ import urllib.parse
 from Ansjer.config import BASE_DIR
 from django.http import JsonResponse
 from django.views.decorators.csrf import csrf_exempt
+import ipdb
 
 from Model.models import Device_Info
 from Object.ResponseObject import ResponseObject
@@ -83,7 +84,7 @@ def updateIP(request):
         print(repr(e))
     return response.json(0, {'area': area})
 
-import ipdb
+
 def getTZ(request):
     request.encoding = 'utf-8'
     if request.method == 'GET':
@@ -106,8 +107,8 @@ def getTZ(request):
             info = db.find_map(ip, lang)
             # tz = info.timezone
             # of = info.utc_offset
-            from var_dump import var_dump
-            var_dump(info)
+            # from var_dump import var_dump
+            # var_dump(info)
             return JsonResponse(status=200, data={'code': 0, 'msg': 'success', 'data': info})
         else:
             return JsonResponse(status=200,data={'code':404,'msg':'令牌错误'})

Model/models.py

@@ -333,7 +333,7 @@ class Equipment_Info(models.Model):
     eventTime = models.CharField(blank=True, default='', max_length=16, verbose_name=u'设备报警时间')
     receiveTime = models.CharField(blank=True, default='', max_length=16, verbose_name=u'接收到报警时间')
     userID = models.ForeignKey(Device_User, null=True, blank=True, to_field='userID', on_delete=models.CASCADE)
-    is_st = models.SmallIntegerField(default=0, verbose_name='是否截图')  # 0 否,1 是
+    is_st = models.SmallIntegerField(default=0, verbose_name='是否截图')  # 0 否,1 是图，2,视频
 
     def __str__(self):
         return self.id