|
@@ -543,6 +543,7 @@ class DetectControllerViewV2(View):
|
|
|
channel = params['channel']
|
|
channel = params['channel']
|
|
|
event_time = params['event_time']
|
|
event_time = params['event_time']
|
|
|
event_type = int(params['event_type'])
|
|
event_type = int(params['event_type'])
|
|
|
|
|
+ event_tag = params['event_tag']
|
|
|
img_list = []
|
|
img_list = []
|
|
|
img_url = ''
|
|
img_url = ''
|
|
|
if is_st == 1:
|
|
if is_st == 1:
|
|
@@ -588,7 +589,7 @@ class DetectControllerViewV2(View):
|
|
|
img_url = aws_s3_cn.generate_presigned_url(
|
|
img_url = aws_s3_cn.generate_presigned_url(
|
|
|
'get_object', Params=params, ExpiresIn=300)
|
|
'get_object', Params=params, ExpiresIn=300)
|
|
|
img_list.append(img_url)
|
|
img_list.append(img_url)
|
|
|
- ai_event_type_list = EquipmentInfoService.get_combo_types(event_type, params['event_tag'])
|
|
|
|
|
|
|
+ ai_event_type_list = EquipmentInfoService.get_combo_types(event_type, event_tag)
|
|
|
msg_data = {
|
|
msg_data = {
|
|
|
"id": "",
|
|
"id": "",
|
|
|
"status": False,
|
|
"status": False,
|
|
@@ -604,7 +605,7 @@ class DetectControllerViewV2(View):
|
|
|
"receiveTime": 0,
|
|
"receiveTime": 0,
|
|
|
"addTime": 0,
|
|
"addTime": 0,
|
|
|
"borderCoords": "",
|
|
"borderCoords": "",
|
|
|
- "eventTag": params['event_tag'],
|
|
|
|
|
|
|
+ "eventTag": event_tag,
|
|
|
"img": img_url,
|
|
"img": img_url,
|
|
|
"img_list": img_list,
|
|
"img_list": img_list,
|
|
|
"uid_type": 0,
|
|
"uid_type": 0,
|
|
@@ -614,7 +615,7 @@ class DetectControllerViewV2(View):
|
|
|
except Exception as e:
|
|
except Exception as e:
|
|
|
LOGGER.error('消息跳转异常:, errLine:{}, errMsg:{}'
|
|
LOGGER.error('消息跳转异常:, errLine:{}, errMsg:{}'
|
|
|
.format(e.__traceback__.tb_lineno, repr(e)))
|
|
.format(e.__traceback__.tb_lineno, repr(e)))
|
|
|
-
|
|
|
|
|
|
|
+ return []
|
|
|
|
|
|
|
|
def do_transfer(self, request_dict, response, userID):
|
|
def do_transfer(self, request_dict, response, userID):
|
|
|
event_time = request_dict.get('eventTime', None)
|
|
event_time = request_dict.get('eventTime', None)
|
|
@@ -654,6 +655,7 @@ class DetectControllerViewV2(View):
|
|
|
|
|
|
|
|
if msg_data:
|
|
if msg_data:
|
|
|
msg_dict = json.loads(msg_data)
|
|
msg_dict = json.loads(msg_data)
|
|
|
|
|
+ LOGGER.info(f'缓存数据:{msg_dict}')
|
|
|
params = {'redis_obj': redis_obj, 'is_st': msg_dict['is_st'], 'region': region, 'aws_s3': aws_s3,
|
|
params = {'redis_obj': redis_obj, 'is_st': msg_dict['is_st'], 'region': region, 'aws_s3': aws_s3,
|
|
|
'storage_location': msg_dict['storage_location'], 'aws_s3_cn': aws_s3_cn,
|
|
'storage_location': msg_dict['storage_location'], 'aws_s3_cn': aws_s3_cn,
|
|
|
'uid': uid, 'channel': channel, 'event_type': event_type, 'oss_img_bucket': oss_img_bucket,
|
|
'uid': uid, 'channel': channel, 'event_type': event_type, 'oss_img_bucket': oss_img_bucket,
|
