|
@@ -8,7 +8,7 @@ from Object.ResponseObject import ResponseObject
|
|
|
from Object.TokenObject import TokenObject
|
|
|
from Service.CommonService import CommonService
|
|
|
from Model.models import Device_Info, RequestRecordModel, iotdeviceInfoModel, Access_Log, DeviceLogModel, LogModel, \
|
|
|
- AppLogModel, AppScannedSerial
|
|
|
+ AppLogModel, AppScannedSerial, StsFrequency
|
|
|
from Ansjer.config import REGION_NAME, ACCESS_KEY_ID, SECRET_ACCESS_KEY, LOG_BUCKET
|
|
|
|
|
|
|
|
@@ -53,6 +53,8 @@ class LogManagementView(View):
|
|
|
return self.getAppLogList(request_dict, response)
|
|
|
elif operation == 'getScanLog': # 获取app日志
|
|
|
return self.getScanLog(request_dict, response)
|
|
|
+ elif operation == 'getAlarmLog': # 获取app日志
|
|
|
+ return self.getAlarmLog(request_dict, response)
|
|
|
else:
|
|
|
return response.json(404)
|
|
|
|
|
@@ -376,10 +378,30 @@ class LogManagementView(View):
|
|
|
count = scan_log_qs.count()
|
|
|
scan_log_qs = scan_log_qs.order_by('-add_time').values(
|
|
|
'serial', 'ip', 'add_time', 'update_time')[
|
|
|
- (page - 1) * line:page * line]
|
|
|
+ (page - 1) * line:page * line]
|
|
|
scan_log_list = list(scan_log_qs)
|
|
|
return response.json(
|
|
|
0, {'list': scan_log_list, 'total': count})
|
|
|
except Exception as e:
|
|
|
print(e)
|
|
|
return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
|
|
|
+
|
|
|
+ def getAlarmLog(self, request_dict, response):
|
|
|
+ pageNo = request_dict.get('pageNo', None)
|
|
|
+ pageSize = request_dict.get('pageSize', None)
|
|
|
+
|
|
|
+ if not all([pageNo, pageSize]):
|
|
|
+ return response.json(444)
|
|
|
+
|
|
|
+ page = int(pageNo)
|
|
|
+ line = int(pageSize)
|
|
|
+
|
|
|
+ try:
|
|
|
+ alarm_log_qs = StsFrequency.objects.all()
|
|
|
+ count = alarm_log_qs.count()
|
|
|
+ alarm_log_qs = alarm_log_qs.order_by('-updateTime').values('id', 'uid', 'frequency', 'updateTime')[
|
|
|
+ (page - 1) * line:page * line]
|
|
|
+ return response.json(0, {'list': list(alarm_log_qs), 'total': count})
|
|
|
+ except Exception as e:
|
|
|
+ print(e)
|
|
|
+ return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
|