|
@@ -174,8 +174,6 @@ class testView(View):
|
|
|
return self.oci_oss(request, response)
|
|
|
elif operation == 'genericReportPush': # 设备上传日志
|
|
|
return self.generic_report_push(request_dict, response)
|
|
|
- elif operation == 'genericReportGet': # 获取设备上传日志
|
|
|
- return self.generic_report_get(request_dict, response)
|
|
|
else:
|
|
|
return response.json(414)
|
|
|
|
|
@@ -1206,24 +1204,8 @@ class testView(View):
|
|
|
def generic_report_push(request_dict, response):
|
|
|
try:
|
|
|
LOGGER.info('设备上传数据:{}'.format(request_dict))
|
|
|
+ LOGGER.info('设备上传数据:{}'.format(request_dict.get('E20')))
|
|
|
return response.json(0)
|
|
|
except Exception as e:
|
|
|
return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
|
|
|
|
|
|
- @staticmethod
|
|
|
- def generic_report_get(request_dict, response):
|
|
|
- uid = request_dict.get('uid', None)
|
|
|
- event_type = request_dict.get('event_type', None)
|
|
|
- if not all([uid, event_type]):
|
|
|
- return response.json()
|
|
|
- try:
|
|
|
- serial_number = CommonService.query_serial_with_uid(uid)
|
|
|
- msg = {
|
|
|
- "reporttype": event_type
|
|
|
- }
|
|
|
- topic_name = 'ansjer/generic/{}/report/get'.format(serial_number)
|
|
|
- result = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg)
|
|
|
-
|
|
|
- return response.json(0)
|
|
|
- except Exception as e:
|
|
|
- return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
|