1，feature

增加添加时间，
自动批量删除推送信息

Controller/DetectController.py

@@ -413,6 +413,7 @@ class NotificationView(View):
     def do_bulk_create_info(self, uaqs, n_time, channel, event_type, is_st):
         #
         qs_list = []
+        nowTime = int(time.time())
         for dv in uaqs:
             add_data = {
                 'userID_id': dv["userID_id"],
@@ -423,7 +424,8 @@ class NotificationView(View):
                 'Channel': channel,
                 'alarm': 'Motion \tChannel:{channel}'.format(channel=channel),
                 'is_st': int(is_st),
-                'receiveTime': n_time
+                'receiveTime': n_time,
+                'addTime':nowTime
             }
             qs_list.append(Equipment_Info(**add_data))
         if qs_list:

Controller/EquipmentInfo.py

@@ -11,7 +11,9 @@ from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Object.UidTokenObject import UidTokenObject
 from Service.CommonService import CommonService
+
 from Service.ModelService import ModelService
+import time
 
 '''
 http://192.168.136.45:8077/equipment/info?token=test&operation=add&devUid=2N1K3LE78TYJ38CE111A&Channel=0&eventType=1&eventTime=1234567890&operation=add&alarm=21342134&receiveTime=1234567891234567
@@ -80,6 +82,7 @@ class EquipmentInfo(View):
         if not device_info.exists():
             return response.json(14)
         try:
+            nowTime = int(time.time())
             equipment_info = Equipment_Info(
                 userID=Device_User.objects.get(userID=userID),
                 devUid=devUid,
@@ -88,6 +91,7 @@ class EquipmentInfo(View):
                 receiveTime=receiveTime,
                 eventTime=eventTime,
                 devNickName=device_info[0].NickName,
+                addTime=nowTime,
                 alarm=alarm)
             equipment_info.save()
         except Exception:
@@ -191,6 +195,7 @@ class EquipmentInfo(View):
             send_json = CommonService.qs_to_dict(res)
             send_json['count'] = count
             return response.json(0, send_json)
+
     # 管理员查询指定用户的推送信息接口
     def query_all_info(self, request_dict, userID, response):
         page = int(request_dict.get('page', None))
@@ -221,7 +226,7 @@ class EquipmentInfo(View):
             qs = Equipment_Info.objects.filter(userID_id=user_id).order_by('-id')
         elif uid:
             qs = Equipment_Info.objects.filter(devUid=uid).order_by('-id')
-        elif devNickName :
+        elif devNickName:
             qs = Equipment_Info.objects.filter(devNickName=devNickName).order_by('-id')
         elif Channel:
             qs = Equipment_Info.objects.filter(Channel=Channel).order_by('-id')
@@ -348,12 +353,12 @@ class DetectStatusView(View):
 # 按季度删除访问日志
 def deleteExpireEquipmentInfo(request):
     response = ResponseObject()
-    i = int(request.GET.get('i',10))
+    i = int(request.GET.get('i', 10))
 
     import time
     nowTime = int(time.time())
-    for i in range(i):
-        ei = Equipment_Info.objects.filter(eventTime__lte=str(nowTime - 3600 * 24 * 90))[0:3000]
+    for i in range(5):
+        ei = Equipment_Info.objects.filter(addTime__lte=str(nowTime - 3600 * 24 * 30))[0:10000]
         id_list = ei.values_list("id", flat=True)
         print(id_list)
         Equipment_Info.objects.filter(id__in=list(id_list)).delete()

Model/models.py

@@ -334,6 +334,7 @@ class Equipment_Info(models.Model):
     receiveTime = models.CharField(blank=True, default='', max_length=16, verbose_name=u'接收到报警时间')
     userID = models.ForeignKey(Device_User, null=True, blank=True, to_field='userID', on_delete=models.CASCADE)
     is_st = models.SmallIntegerField(default=0, verbose_name='是否截图')  # 0 否,1 是图，2,视频
+    addTime = models.IntegerField(verbose_name='添加时间', default=0)
 
     def __str__(self):
         return self.id