Browse Source

插座上报电源开关记录,记录设备时间为准

zhangdongming 2 years ago
parent
commit
cd54b49e4c
1 changed files with 2 additions and 1 deletions
  1. 2 1
      Controller/gatewayController.py

+ 2 - 1
Controller/gatewayController.py

@@ -410,6 +410,7 @@ class GatewayView(View):
             switch_key = 'LOOCAM:SOCKET:SERIAL:NUMBER:{}'
             redis_obj = RedisObject(db=7)
             serial_number = request_dict.get('serialNumber', None)
+            device_time = request_dict.get('deviceTime', None)
             status = request_dict.get('status', None)
             if not all([serial_number, status]):
                 return response.json(444)
@@ -418,7 +419,7 @@ class GatewayView(View):
             switch = redis_obj.get_data(switch_key)
             if switch and int(switch) == status:
                 return response.json(0, "电源开关状态重复上报")
-            now_time = int(time.time())
+            now_time = int(device_time) if device_time else int(time.time())
             LOGGER.info('已订阅成功接收:事件类型{},状态:{}'.format(serial_number, status))
             # 获取主用户设备id
             log_dict = {