|
|
@@ -136,6 +136,8 @@ class DevicePushService:
|
|
|
if CONFIG_INFO != CONFIG_CN:
|
|
|
detect_interval = new_detect_interval if new_detect_interval > 0 else detect_interval
|
|
|
detect_interval = 60 if detect_interval < 60 else detect_interval
|
|
|
+ else: # 国内推送兼容问题，有值并且大于旧消息间隔则使用new_detect_interval
|
|
|
+ detect_interval = new_detect_interval if new_detect_interval > detect_interval else detect_interval
|
|
|
redis_obj.set_data(key=name, val=1, expire=detect_interval - 5)
|
|
|
|
|
|
@classmethod
|
|
|
@@ -254,13 +256,13 @@ 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)
|
zhangdongming