Controller/DeviceReportController.py

@@ -52,7 +52,8 @@ class DeviceReportView(View):
                 'wake_sleep': wake_sleep,
                 'working_hours': self.parse_int_param(data, 'workingHours'),
                 'battery_level': self.parse_int_param(data, 'batteryLevel'),
-                'report_time': self.parse_int_param(data, 'reportTime') - 10800,
+                'report_time': self.parse_int_param(data, 'reportTime') - 3600,
+                'channel': int(data.get('channel', 1))
             }
 
             # 时间戳验证

Service/PushService.py

@@ -242,10 +242,10 @@ class PushObject:
             # Send a message to the device corresponding to the provided
             # registration token.
             result = messaging.send(message)
-            LOGGER.info('fcm推送结果:{}'.format(result))
+            LOGGER.info('uid:{}fcm推送结果:{}'.format(uid, result))
             return True
         except Exception as e:
-            LOGGER.info('fcm推送异常:{}'.format(repr(e)))
+            LOGGER.info('uid:{}fcm推送异常:{}'.format(uid, repr(e)))
             return False
 
     @staticmethod