|
@@ -155,6 +155,8 @@ class DevicePushService:
|
|
cls.is_send_app_push(
|
|
cls.is_send_app_push(
|
|
params['event_type'], params['event_tag'], params['app_push_config'], params['app_push'], uid)
|
|
params['event_type'], params['event_tag'], params['app_push_config'], params['app_push'], uid)
|
|
|
|
|
|
|
|
+ equipment_info_list = []
|
|
|
|
+ equipment_info_model = EquipmentInfoService.randoms_choice_equipment_info()
|
|
for up in params['uid_set_push_list']:
|
|
for up in params['uid_set_push_list']:
|
|
lang = up['lang']
|
|
lang = up['lang']
|
|
tz = up['tz']
|
|
tz = up['tz']
|
|
@@ -175,8 +177,22 @@ class DevicePushService:
|
|
# 保存推送消息
|
|
# 保存推送消息
|
|
else:
|
|
else:
|
|
params['userID_id'] = user_id
|
|
params['userID_id'] = user_id
|
|
- cls.save_equipment_info(**params)
|
|
|
|
-
|
|
|
|
|
|
+ equipment_info_list.append(
|
|
|
|
+ equipment_info_model(
|
|
|
|
+ device_user_id=params['userID_id'],
|
|
|
|
+ event_time=params['n_time'],
|
|
|
|
+ event_type=params['event_type'],
|
|
|
|
+ device_uid=params['uid'],
|
|
|
|
+ device_nick_name=params['nickname'],
|
|
|
|
+ channel=params['channel'],
|
|
|
|
+ alarm='Motion \tChannel:{}'.format(params['channel']),
|
|
|
|
+ is_st=params['is_st'],
|
|
|
|
+ add_time=int(time.time()),
|
|
|
|
+ storage_location=params['storage_location'],
|
|
|
|
+ event_tag=params['event_tag'],
|
|
|
|
+ answer_status=True if params['dealings_type'] == 1 else False
|
|
|
|
+ )
|
|
|
|
+ )
|
|
saved_user_id_list.append(user_id)
|
|
saved_user_id_list.append(user_id)
|
|
|
|
|
|
# 推送
|
|
# 推送
|
|
@@ -216,6 +232,8 @@ class DevicePushService:
|
|
# 写入系统消息
|
|
# 写入系统消息
|
|
if sys_msg_list:
|
|
if sys_msg_list:
|
|
SysMsgModel.objects.bulk_create(sys_msg_list)
|
|
SysMsgModel.objects.bulk_create(sys_msg_list)
|
|
|
|
+ if equipment_info_list:
|
|
|
|
+ equipment_info_model.objects.bulk_create(equipment_info_list)
|
|
|
|
|
|
return True
|
|
return True
|
|
except Exception as e:
|
|
except Exception as e:
|