|
|
@@ -161,6 +161,7 @@ class DevicePushService:
|
|
|
|
|
|
save_equipment_info = False
|
|
|
equipment_info_key = EquipmentInfoService.randoms_choice_equipment_info_key()
|
|
|
+ LOGGING.info('***保存推送消息uid:{},push_list:{}'.format(uid, params['uid_set_push_list']))
|
|
|
for up in params['uid_set_push_list']:
|
|
|
lang = up['lang']
|
|
|
tz = up['tz']
|
|
|
@@ -201,6 +202,7 @@ class DevicePushService:
|
|
|
# 保存到redis列表
|
|
|
equipment_info_value = json.dumps(equipment_info_kwargs)
|
|
|
redis_obj.rpush(equipment_info_key, equipment_info_value)
|
|
|
+ LOGGING.info('***保存推送消息uid:{},time:{},user_id:{}'.format(uid, params['n_time'], user_id))
|
|
|
saved_user_id_list.append(user_id)
|
|
|
|
|
|
# 推送
|
|
|
@@ -254,20 +256,20 @@ class DevicePushService:
|
|
|
|
|
|
if end != 0:
|
|
|
equipment_info_redis_list = redis_obj.lrange(equipment_info_key, 0, end)
|
|
|
- redis_obj.ltrim(equipment_info_key, end+1, -1)
|
|
|
+ redis_obj.ltrim(equipment_info_key, end + 1, -1)
|
|
|
|
|
|
for equipment_info in equipment_info_redis_list:
|
|
|
equipment_info_data = eval(equipment_info)
|
|
|
# 设备昵称存在表情,解码utf-8
|
|
|
if equipment_info_data.get('device_nick_name') is not None:
|
|
|
- equipment_info_data['device_nick_name'] = equipment_info_data['device_nick_name'].\
|
|
|
+ equipment_info_data['device_nick_name'] = equipment_info_data['device_nick_name']. \
|
|
|
encode('UTF-8', 'ignore').decode('UTF-8')
|
|
|
equipment_info_list.append(equipment_info_model(**equipment_info_data))
|
|
|
equipment_info_model.objects.bulk_create(equipment_info_list)
|
|
|
|
|
|
return True
|
|
|
except Exception as e:
|
|
|
- LOGGING.info('推送消息或存表异常: error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
|
|
|
+ LOGGING.info('推送消息或存表异常uid{}: error_line:{}, error_msg:{}'.format(uid, e.__traceback__.tb_lineno, repr(e)))
|
|
|
return False
|
|
|
|
|
|
@classmethod
|
zhangdongming