完善低电量推送接口

Controller/DetectControllerV2.py

@@ -779,7 +779,7 @@ class PWnotificationView(View):
                 userID_id = up["userID_id"]
                 if userID_id not in userID_ids:
                     sys_msg_text = self.get_msg_text(channel=channel, n_time=now_time, lang=lang, tz=tz,
-                                                     event_type=event_type, is_sys=1, electricity= electricity)
+                                                     event_type=event_type, is_sys=1, electricity=electricity)
                     sys_msg_list.append(SysMsgModel(
                         userID_id=userID_id,
                         msg=sys_msg_text,
@@ -787,7 +787,6 @@ class PWnotificationView(View):
                         updTime=now_time,
                         uid=uid,
                         eventType=event_type,
-                        electricity=electricity,
                     ))
                     userID_ids.append(userID_id)
             SysMsgModel.objects.bulk_create(sys_msg_list)
@@ -826,7 +825,7 @@ class PWnotificationView(View):
         etype = int(event_type)
         if lang == 'cn':
             if etype == 704:
-                msg_type = '电量已剩：'+electricity+'%'
+                msg_type = '电量已剩：'+electricity
             elif etype == 702:
                 msg_type = '摄像头休眠'
             elif etype == 703:
@@ -840,7 +839,7 @@ class PWnotificationView(View):
                 # send_text = '{msg_type} 通道:{channel} 日期:{date}'.format(msg_type=msg_type, channel=channel, date=n_date)
         else:
             if etype == 704:
-                msg_type = 'Battery is left: '+electricity+'%'
+                msg_type = 'Battery is left: '+electricity
             elif etype == 702:
                 msg_type = 'Camera sleep'
             elif etype == 703:

Model/models.py

@@ -292,14 +292,13 @@ class Equipment_Info(models.Model):
 class SysMsgModel(models.Model):
     #更新
     id = models.AutoField(primary_key=True, verbose_name='自增id')
-    userID_id =  models.CharField(default='', blank=True, max_length=32, verbose_name=u'用户ID')
+    userID_id = models.CharField(default='', blank=True, max_length=32, verbose_name=u'用户ID')
     msg = models.TextField(blank=True, default='', verbose_name=u'消息发送内容')
     status = models.SmallIntegerField(verbose_name='是否已读', default=0)  # 0:否,1:是
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
     updTime = models.IntegerField(verbose_name='更新时间', default=0)
     eventType = models.IntegerField(verbose_name='消息类型', default=0) # 默认系统消息类型,0系统消息，1 ipcamera消息
     uid = models.CharField(default='', max_length=20, db_index=True, verbose_name='设备UID')
-    electricity = models.CharField(default='', max_length=10, verbose_name='电量')
 
     class Meta:
         db_table = 'sys_msg'