|
@@ -10,7 +10,7 @@ import time
|
|
|
from django.views.generic.base import View
|
|
|
|
|
|
from AnsjerPush.Config.gatewaySensorConfig import SENSOR_TYPE, EVENT_TYPE
|
|
|
-from Model.models import SensorRecord, GatewaySubDevice, GatewayPush, Device_Info, SceneLog, SmartScene, SocketInfo
|
|
|
+from Model.models import SensorRecord, GatewaySubDevice, GatewayPush, Device_Info, SceneLog, SmartScene
|
|
|
from Object.ResponseObject import ResponseObject
|
|
|
from Object.utils import LocalDateTimeUtil
|
|
|
from Service.CommonService import CommonService
|
|
@@ -312,13 +312,13 @@ class GatewayView(View):
|
|
|
return response.json(444)
|
|
|
now_time = int(time.time())
|
|
|
LOGGER.info('已订阅成功接收:事件类型{},状态:{}'.format(serial_number, status))
|
|
|
- socket_info_qs = SocketInfo.objects.filter(serial_number=serial_number).values('device_id')
|
|
|
- if not socket_info_qs.exists():
|
|
|
- return response.json(173)
|
|
|
+ # socket_info_qs = SocketInfo.objects.filter(serial_number=serial_number).values('device_id')
|
|
|
+ # if not socket_info_qs.exists():
|
|
|
+ # return response.json(173)
|
|
|
# 获取主用户设备id
|
|
|
log_dict = {
|
|
|
'status': int(status),
|
|
|
- 'device_id': socket_info_qs[0]['device_id'],
|
|
|
+ 'device_id': serial_number,
|
|
|
'created_time': now_time,
|
|
|
}
|
|
|
SceneLog.objects.create(**log_dict)
|