|
|
@@ -9,7 +9,6 @@ import time
|
|
|
import uuid
|
|
|
import datetime
|
|
|
|
|
|
-import pytz
|
|
|
from django.views import View
|
|
|
|
|
|
from Model.models import KVS, Device_User, Device_Info
|
|
|
@@ -275,8 +274,8 @@ class KVSView(View):
|
|
|
end_time = request_dict.get('endTime', None)
|
|
|
if not all([serial_number, start_time, end_time]):
|
|
|
return response.json(444)
|
|
|
- start_time = datetime.datetime.fromtimestamp(int(start_time)).astimezone(datetime.timezone.utc)
|
|
|
- end_time = datetime.datetime.fromtimestamp(int(end_time)).astimezone(datetime.timezone.utc)
|
|
|
+ start_time = datetime.datetime.fromtimestamp(int(start_time)) - datetime.timedelta(hours=8)
|
|
|
+ end_time = datetime.datetime.fromtimestamp(int(end_time)) - datetime.timedelta(hours=8)
|
|
|
try:
|
|
|
# kvs_qs = KVS.objects.filter(stream_name=serial_number)
|
|
|
# if not kvs_qs.exists():
|
|
|
@@ -315,8 +314,8 @@ class KVSView(View):
|
|
|
return response.json(444)
|
|
|
page = int(page)
|
|
|
size = int(size)
|
|
|
- start_time = datetime.datetime.fromtimestamp(int(start_time)).astimezone(datetime.timezone.utc)
|
|
|
- end_time = datetime.datetime.fromtimestamp(int(end_time)).astimezone(datetime.timezone.utc)
|
|
|
+ start_time = datetime.datetime.fromtimestamp(int(start_time)) - datetime.timedelta(hours=8)
|
|
|
+ end_time = datetime.datetime.fromtimestamp(int(end_time)) - datetime.timedelta(hours=8)
|
|
|
try:
|
|
|
# kvs_qs = KVS.objects.filter(stream_name=serial_number)
|
|
|
# if not kvs_qs.exists():
|
|
|
@@ -338,11 +337,11 @@ class KVSView(View):
|
|
|
stream_list = kinesis_fragments_obj.get_list_fragments(serial_number, start_time, end_time)[
|
|
|
(page - 1) * size:page * size]
|
|
|
for item in stream_list:
|
|
|
- temp_start_time = item['startTime'].astimezone(datetime.timezone.utc)
|
|
|
+ temp_start_time = (item['startTime'] - datetime.timedelta(hours=8)).replace(tzinfo=datetime.timezone.utc)
|
|
|
temp_end_time = temp_start_time + datetime.timedelta(seconds=300)
|
|
|
item['image'] = kinesis_images_obj.get_images(serial_number, temp_start_time, temp_end_time)
|
|
|
- item['startTime'] = int(time.mktime(item['startTime'].timetuple()))
|
|
|
- item['endTime'] = int(time.mktime(item['endTime'].timetuple()))
|
|
|
+ item['startTime'] = int(item['startTime'].timestamp())
|
|
|
+ item['endTime'] = int(item['endTime'].timestamp())
|
|
|
return response.json(0, stream_list)
|
|
|
except Exception as e:
|
|
|
print(e)
|
