设备电池电量上报区分PIR、MQTT唤醒

Controller/SerialNumberController.py

@@ -117,10 +117,12 @@ class SerialNumberView(View):
         is_verify = request_dict.get('is_verify', None)
 
         if not all([serial_number, token, time_stamp]):
+            LOGGER.error(f'{serial_number}请求绑定uid参数缺失')
             return response.json(444)
 
         # 时间戳token校验
         if not CommonService.check_time_stamp_token(token, time_stamp):
+            LOGGER.error(f'{serial_number}时间戳校验失败time:{time_stamp},tk:{token}')
             return response.json(13)
 
         now_time = int(time.time())
@@ -655,6 +657,7 @@ class SerialNumberView(View):
         try:
             # 添加或更新扫码记录
             ip = CommonService.get_ip_address(request)
+            LOGGER.info('请求获取UID{},userId:{},ip:{}'.format(serial_number, user_id, ip))
             # 查询用户国家id
             region_country = 0
             # ios请求头没传token,user_id为None

Model/models.py

@@ -5716,6 +5716,8 @@ class DeviceDailyReport(models.Model):
     human_detection = models.IntegerField(default=0, verbose_name='人形检测次数')
     working_hours = models.IntegerField(default=0, verbose_name='工作时长/秒')
     wake_sleep = models.IntegerField(default=0, verbose_name='唤醒休眠次数')
+    pir_wakeup_count = models.IntegerField(default=0, verbose_name='PIR唤醒次数')
+    mqtt_wakeup_count = models.IntegerField(default=0, verbose_name='mqtt唤醒次数')
     channel = models.IntegerField(default=1, blank=True, verbose_name=u'设备通道')
     created_time = models.IntegerField(default=0, verbose_name='创建时间')
     updated_time = models.IntegerField(default=0, verbose_name='更新时间')