修改utc时间

Controller/AWS/KVSController.py

@@ -13,13 +13,11 @@ import pytz
 from django.views import View
 
 from Model.models import KVS, Device_User, Device_Info
-from Object.AWS.AmazonKVSUtil import AmazonKVSObject
 from Object.AWS.AmazonKinesisVideoUtil import AmazonKinesisVideoObject, AmazonKVAMObject
 from Object.RedisObject import RedisObject
 from Object.ResponseObject import ResponseObject
 from Ansjer.config import ACCESS_KEY_ID, SECRET_ACCESS_KEY, REGION_NAME, SERVER_DOMAIN
 from Object.TokenObject import TokenObject
-from Service.CommonService import CommonService
 
 
 class UserRelatedView(View):
@@ -277,8 +275,9 @@ 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(pytz.utc)
-        end_time = datetime.datetime.fromtimestamp(int(end_time)).astimezone(pytz.utc)
+        utc_timezone = pytz.timezone("UTC")
+        start_time = datetime.datetime.fromtimestamp(int(start_time)).astimezone(utc_timezone)
+        end_time = datetime.datetime.fromtimestamp(int(end_time)).astimezone(utc_timezone)
         try:
             # kvs_qs = KVS.objects.filter(stream_name=serial_number)
             # if not kvs_qs.exists():
@@ -317,8 +316,9 @@ class KVSView(View):
             return response.json(444)
         page = int(page)
         size = int(size)
-        start_time = datetime.datetime.fromtimestamp(int(start_time)).astimezone(pytz.utc)
-        end_time = datetime.datetime.fromtimestamp(int(end_time)).astimezone(pytz.utc)
+        utc_timezone = pytz.timezone("UTC")
+        start_time = datetime.datetime.fromtimestamp(int(start_time)).astimezone(utc_timezone)
+        end_time = datetime.datetime.fromtimestamp(int(end_time)).astimezone(utc_timezone)
         try:
             # kvs_qs = KVS.objects.filter(stream_name=serial_number)
             # if not kvs_qs.exists():
@@ -340,7 +340,7 @@ 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(pytz.utc)
+                temp_start_time = item['startTime'].astimezone(utc_timezone)
                 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()))