|
@@ -23,7 +23,7 @@ import subprocess
|
|
from model.models import UserModel, UidRtspModel
|
|
from model.models import UserModel, UidRtspModel
|
|
from object.tkObject import tkObject
|
|
from object.tkObject import tkObject
|
|
from service.CommonService import CommonService
|
|
from service.CommonService import CommonService
|
|
-
|
|
|
|
|
|
+from object.RedisObject import RedisObject
|
|
|
|
|
|
SERVER_PREFIX = 'http://www.dvema.com'
|
|
SERVER_PREFIX = 'http://www.dvema.com'
|
|
|
|
|
|
@@ -191,7 +191,12 @@ class oa2RtspStartView(TemplateView):
|
|
'''
|
|
'''
|
|
access_token = request_dict.get("access_token", '')
|
|
access_token = request_dict.get("access_token", '')
|
|
id = request_dict.get("id", '')
|
|
id = request_dict.get("id", '')
|
|
-
|
|
|
|
|
|
+ redisObj = RedisObject(db=9)
|
|
|
|
+ key = '{UID}_rtsp_key'.format(UID=id)
|
|
|
|
+ redis_data = redisObj.get_data(key=key)
|
|
|
|
+ if redis_data:
|
|
|
|
+ res_json = eval(redis_data)
|
|
|
|
+ return JsonResponse(res_json, safe=False)
|
|
user_qs = UserModel.objects.filter(access_token=access_token)
|
|
user_qs = UserModel.objects.filter(access_token=access_token)
|
|
if user_qs.exists():
|
|
if user_qs.exists():
|
|
userID = user_qs[0].userID
|
|
userID = user_qs[0].userID
|
|
@@ -220,6 +225,7 @@ class oa2RtspStartView(TemplateView):
|
|
'authorizationTypes': ['NONE'],
|
|
'authorizationTypes': ['NONE'],
|
|
'uri': 'rtsp://rtsp.zositech.xyz:443/{stream_name}'.format(stream_name=ur_qs[0]['rtsp_url'])
|
|
'uri': 'rtsp://rtsp.zositech.xyz:443/{stream_name}'.format(stream_name=ur_qs[0]['rtsp_url'])
|
|
}
|
|
}
|
|
|
|
+ redisObj.set_data(key=key,val=str(res_json))
|
|
return JsonResponse(res_json, safe=False)
|
|
return JsonResponse(res_json, safe=False)
|
|
else:
|
|
else:
|
|
return JsonResponse({'msg': 'wrong'})
|
|
return JsonResponse({'msg': 'wrong'})
|
|
@@ -234,6 +240,9 @@ class oa2RtspStartView(TemplateView):
|
|
return
|
|
return
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
class oa2DiscoveryDevice(TemplateView):
|
|
class oa2DiscoveryDevice(TemplateView):
|
|
def post(self, request, *args, **kwargs):
|
|
def post(self, request, *args, **kwargs):
|
|
request.encoding = 'utf-8'
|
|
request.encoding = 'utf-8'
|