|
|
@@ -10,6 +10,7 @@ import time
|
|
|
|
|
|
from django.views.generic.base import View
|
|
|
|
|
|
+from Model.models import UidPushModel
|
|
|
from Object.ResponseObject import ResponseObject
|
|
|
from Object.utils import LocalDateTimeUtil
|
|
|
from Service.CommonService import CommonService
|
|
|
@@ -41,13 +42,24 @@ class GatewayView(View):
|
|
|
event_type = request_dict.get('event_type', None)
|
|
|
alarm = request_dict.get('alarm', None)
|
|
|
logger.info('---调用网关推送接口--- request_dict:{}'.format(request_dict))
|
|
|
- if not all([src_addr, event_type, alarm]):
|
|
|
+ if not all([serial_number, src_addr, event_type, alarm]):
|
|
|
return response.json(444)
|
|
|
|
|
|
equipment_info_list = []
|
|
|
now_time = int(time.time())
|
|
|
device_user_id = '160879593527813800138000'
|
|
|
try:
|
|
|
+ '''
|
|
|
+ # 查询推送数据
|
|
|
+ uid_push_qs = UidPushModel.objects.filter(uid_set__uid=serial_number, uid_set__detect_status=1). \
|
|
|
+ values('token_val', 'app_type', 'appBundleId', 'm_code', 'push_type', 'userID_id', 'userID__NickName',
|
|
|
+ 'lang', 'm_code', 'tz', 'uid_set__nickname', 'uid_set__detect_interval', 'uid_set__detect_group',
|
|
|
+ 'uid_set__channel')
|
|
|
+ if not uid_push_qs.exists():
|
|
|
+ return response.json(173)
|
|
|
+ uid_push_list = [uid_push for uid_push in uid_push_qs]
|
|
|
+ '''
|
|
|
+
|
|
|
event_type = int(event_type)
|
|
|
local_date_time = CommonService.get_now_time_str(n_time=now_time, tz=0, lang='cn')
|
|
|
local_date_time = local_date_time[:10]
|
|
|
@@ -68,4 +80,5 @@ class GatewayView(View):
|
|
|
EquipmentInfoService.equipment_info_bulk_create(week, equipment_info_list)
|
|
|
return response.json(0)
|
|
|
except Exception as e:
|
|
|
+ logger.info('---网关推送接口异常--- {}'.format(repr(e)))
|
|
|
return response.json(500, repr(e))
|
