|
@@ -65,7 +65,6 @@ class NotificationView(View):
|
|
|
is_st = request_dict.get('is_st', None)
|
|
is_st = request_dict.get('is_st', None)
|
|
|
company_secrete = request_dict.get('company_secrete', None)
|
|
company_secrete = request_dict.get('company_secrete', None)
|
|
|
region = request_dict.get('region', None)
|
|
region = request_dict.get('region', None)
|
|
|
- electricity = request_dict.get('electricity', None)
|
|
|
|
|
|
|
|
|
|
if not all([channel, n_time]):
|
|
if not all([channel, n_time]):
|
|
|
return JsonResponse(status=200, data={
|
|
return JsonResponse(status=200, data={
|
|
@@ -168,7 +167,7 @@ class NotificationView(View):
|
|
|
msg_title = self.get_msg_title(appBundleId=appBundleId, nickname=nickname)
|
|
msg_title = self.get_msg_title(appBundleId=appBundleId, nickname=nickname)
|
|
|
# 发送内容
|
|
# 发送内容
|
|
|
msg_text = self.get_msg_text(channel=channel, n_time=n_time, lang=lang, tz=tz,
|
|
msg_text = self.get_msg_text(channel=channel, n_time=n_time, lang=lang, tz=tz,
|
|
|
- event_type=event_type, electricity=electricity)
|
|
|
|
|
|
|
+ event_type=event_type)
|
|
|
kwag_args['appBundleId'] = appBundleId
|
|
kwag_args['appBundleId'] = appBundleId
|
|
|
kwag_args['token_val'] = token_val
|
|
kwag_args['token_val'] = token_val
|
|
|
kwag_args['msg_title'] = msg_title
|
|
kwag_args['msg_title'] = msg_title
|
|
@@ -190,7 +189,7 @@ class NotificationView(View):
|
|
|
now_time = int(time.time())
|
|
now_time = int(time.time())
|
|
|
if is_sys_msg:
|
|
if is_sys_msg:
|
|
|
sys_msg_text = self.get_msg_text(channel=channel, n_time=n_time, lang=lang, tz=tz,
|
|
sys_msg_text = self.get_msg_text(channel=channel, n_time=n_time, lang=lang, tz=tz,
|
|
|
- event_type=event_type, electricity=electricity, is_sys=1)
|
|
|
|
|
|
|
+ event_type=event_type, is_sys=1)
|
|
|
sys_msg_list.append(SysMsgModel(
|
|
sys_msg_list.append(SysMsgModel(
|
|
|
userID_id=userID_id,
|
|
userID_id=userID_id,
|
|
|
msg=sys_msg_text,
|
|
msg=sys_msg_text,
|
