修改国内正式时区配置,查询访问记录数据按时间倒序

AdminController/LogManagementController.py

@@ -83,7 +83,8 @@ class LogManagementView(View):
                     'method': requsetobj.method,
                     'url': requsetobj.url,
                     'parameter': requsetobj.parameter,
-                    'execute_time': round(requsetobj.execute_time, 2),  # 时间保留小数点后两位
+                    # 时间保留小数点后两位
+                    'execute_time': round(requsetobj.execute_time, 2),
                     'status_code': requsetobj.status_code,
                     'reason_phrase': requsetobj.reason_phrase,
                     'add_time': requsetobj.add_time.strftime("%Y-%m-%d %H:%M:%S"),
@@ -108,27 +109,43 @@ class LogManagementView(View):
         try:
             if serial_number or uid:
                 if serial_number:
-                    iot_device_info_qs = iotdeviceInfoModel.objects.filter(serial_number__contains=serial_number)
+                    iot_device_info_qs = iotdeviceInfoModel.objects.filter(
+                        serial_number__contains=serial_number)
                 if uid:
-                    iot_device_info_qs = iotdeviceInfoModel.objects.filter(uid__contains=uid)
+                    iot_device_info_qs = iotdeviceInfoModel.objects.filter(
+                        uid__contains=uid)
                 if not iot_device_info_qs.exists():
                     return response.json(0)
                 total = len(iot_device_info_qs)
-                iot_device_info_qs = iot_device_info_qs.values('serial_number', 'uid', 'thing_name', 'thing_groups',
-                                                               'add_time', 'update_time')[(page - 1) * line:page * line]
+                iot_device_info_qs = iot_device_info_qs.values(
+                    'serial_number',
+                    'uid',
+                    'thing_name',
+                    'thing_groups',
+                    'add_time',
+                    'update_time')[
+                    (page - 1) * line:page * line]
             else:
                 total = iotdeviceInfoModel.objects.filter().count()
-                iot_device_info_qs = iotdeviceInfoModel.objects.filter().values('serial_number', 'uid', 'thing_name',
-                                                                                'thing_groups', 'add_time', 'update_time')[(page - 1) * line:page * line]
+                iot_device_info_qs = iotdeviceInfoModel.objects.filter().values(
+                    'serial_number',
+                    'uid',
+                    'thing_name',
+                    'thing_groups',
+                    'add_time',
+                    'update_time')[
+                    (page - 1) * line:page * line]
 
             iot_device_info_list = CommonService.qs_to_list(iot_device_info_qs)
             # 获取序列号的uid
             for iot_device_info in iot_device_info_list:
                 if not iot_device_info['uid']:
-                    device_info_qs = Device_Info.objects.filter(serial_number__contains=iot_device_info['serial_number']).values('UID')
+                    device_info_qs = Device_Info.objects.filter(
+                        serial_number__contains=iot_device_info['serial_number']).values('UID')
                     if device_info_qs.exists():
                         iot_device_info['uid'] = device_info_qs[0]['UID']
-            return response.json(0, {'list': iot_device_info_list, 'total': total})
+            return response.json(
+                0, {'list': iot_device_info_list, 'total': total})
         except Exception as e:
             print(e)
             return response.json(500, repr(e))
@@ -143,7 +160,9 @@ class LogManagementView(View):
 
         try:
             # 获取数据组织将要请求的url
-            iot = iotdeviceInfoModel.objects.filter(thing_name=thing_name).values('endpoint', 'token_iot_number')
+            iot = iotdeviceInfoModel.objects.filter(
+                thing_name=thing_name).values(
+                'endpoint', 'token_iot_number')
             if not iot.exists():
                 return response.json(10043)
             endpoint = iot[0]['endpoint']
@@ -155,8 +174,10 @@ class LogManagementView(View):
             url = 'https://{}/topics/{}'.format(endpoint, topic_name)
             authorizer_name = 'Ansjer_Iot_Auth'
             signature = CommonService.rsa_sign(Token)  # Token签名
-            headers = {'x-amz-customauthorizer-name': authorizer_name, 'Token': Token,
-                       'x-amz-customauthorizer-signature': signature}
+            headers = {
+                'x-amz-customauthorizer-name': authorizer_name,
+                'Token': Token,
+                'x-amz-customauthorizer-signature': signature}
             msg = eval(msg)
             r = requests.post(url=url, headers=headers, json=msg, timeout=2)
             if r.status_code == 200:
@@ -184,18 +205,23 @@ class LogManagementView(View):
         try:
             if user or operation or status:
                 if user:
-                    access_log_qs = Access_Log.objects.filter(user__contains=user)
+                    access_log_qs = Access_Log.objects.filter(
+                        user__contains=user)
                 if operation:
-                    access_log_qs = Access_Log.objects.filter(operation__contains=operation)
+                    access_log_qs = Access_Log.objects.filter(
+                        operation__contains=operation)
                 if status:
                     access_log_qs = Access_Log.objects.filter(status=status)
                 if not access_log_qs.exists():
                     return response.json(0)
                 total = access_log_qs.count()
-                access_log_qs = access_log_qs.values('user', 'operation', 'ip', 'status', 'content', 'time')[(page - 1) * line:page * line]
+                access_log_qs = access_log_qs.order_by('-time').values(
+                    'user', 'operation', 'ip', 'status', 'content', 'time')[
+                    (page - 1) * line:page * line]
             else:
                 total = Access_Log.objects.count()
-                access_log_qs = Access_Log.objects.filter().values('user', 'operation', 'ip', 'status', 'content', 'time')[(page - 1) * line:page * line]
+                access_log_qs = Access_Log.objects.filter().order_by('-time').values('user',
+                                                                                     'operation', 'ip', 'status', 'content', 'time')[(page - 1) * line:page * line]
             access_log_list = CommonService.qs_to_list(access_log_qs)
             return response.json(0, {'list': access_log_list, 'total': total})
         except Exception as e:
@@ -216,16 +242,20 @@ class LogManagementView(View):
         try:
             if uid or serial_number:
                 if uid:
-                    device_log_qs = DeviceLogModel.objects.filter(uid__contains=uid)
+                    device_log_qs = DeviceLogModel.objects.filter(
+                        uid__contains=uid)
                 if serial_number:
-                    device_log_qs = DeviceLogModel.objects.filter(serial_number__contains=serial_number)
+                    device_log_qs = DeviceLogModel.objects.filter(
+                        serial_number__contains=serial_number)
                 if not device_log_qs.exists():
                     return response.json(0)
                 total = device_log_qs.count()
-                device_log_qs = device_log_qs.order_by('-add_time').values()[(page - 1) * line:page * line]
+                device_log_qs = device_log_qs.order_by(
+                    '-add_time').values()[(page - 1) * line:page * line]
             else:
                 total = DeviceLogModel.objects.count()
-                device_log_qs = DeviceLogModel.objects.filter().order_by('-add_time').values()[(page - 1) * line:page * line]
+                device_log_qs = DeviceLogModel.objects.filter().order_by(
+                    '-add_time').values()[(page - 1) * line:page * line]
             device_log_list = CommonService.qs_to_list(device_log_qs)
             return response.json(0, {'list': device_log_list, 'total': total})
         except Exception as e:

Ansjer/cn_config/formal_settings.py

@@ -135,7 +135,7 @@ TIME_ZONE = 'Asia/Shanghai'
 # TIME_ZONE = 'UTC'
 USE_I18N = True
 USE_L10N = True
-USE_TZ = True
+USE_TZ = False
 
 # 跨域增加忽略
 CORS_ALLOW_CREDENTIALS = True