ai推送使用新表存数据

Controller/AiController.py

@@ -17,6 +17,7 @@ from Object.ResponseObject import ResponseObject
 from Object.enums.MessageTypeEnum import MessageTypeEnum
 from Object.utils import LocalDateTimeUtil
 from Service.CommonService import CommonService
+from Service.DevicePushService import DevicePushService
 from Service.EquipmentInfoService import EquipmentInfoService
 from Service.HuaweiPushService.HuaweiPushService import HuaweiPushObject
 from Service.PushService import PushObject
@@ -81,11 +82,11 @@ class AiView(View):
         eto = ETkObject(etk)
         uid = eto.uid
         LOGGING.info('---进入ai识别推送接口--- etk:{}, uid:{}'.format(etk, uid))
-        receive_time = int(time.time())
+        now_time = int(time.time())
         file_list = [file_one, file_two, file_three]
 
         # 查询设备是否有使用中的ai服务
-        ai_service_qs = AiService.objects.filter(uid=uid, detect_status=1, use_status=1, endTime__gt=receive_time). \
+        ai_service_qs = AiService.objects.filter(uid=uid, detect_status=1, use_status=1, endTime__gt=now_time). \
             values('detect_group')
         if not ai_service_qs.exists():
             return response.json(173)
@@ -99,7 +100,6 @@ class AiView(View):
         # 查询设备数据
         device_info_qs = Device_Info.objects.filter(UID=uid).first()
         nickname = uid if device_info_qs is None else device_info_qs.NickName
-        now_time = int(time.time())
         try:
             dir_path = os.path.join(BASE_DIR, 'static/ai/' + uid + '/' + str(n_time))
             if not os.path.exists(dir_path):
@@ -134,7 +134,6 @@ class AiView(View):
 
             # 存储消息以及推送
             uid_push_list = [uid_push for uid_push in uid_push_qs]
-            eq_list = []
             user_id_list = []
             local_date_time = ''
             lang = uid_push_list[0]['lang']
@@ -144,11 +143,9 @@ class AiView(View):
                 tz = up['tz']
                 if tz is None or tz == '':
                     tz = 0
-                local_date_time = CommonService.get_now_time_str(n_time=n_time, tz=tz, lang='cn')[:10]
                 user_id = up['userID_id']
                 if user_id not in user_id_list:
-                    eq_list.append(EquipmentInfoService.get_equipment_info_obj(
-                        local_date_time,
+                    EquipmentInfoService.randoms_insert_equipment_info(
                         device_user_id=user_id,
                         event_time=n_time,
                         event_type=event_type,
@@ -157,11 +154,10 @@ class AiView(View):
                         channel=channel,
                         alarm=label_str,
                         is_st=3,
-                        receive_time=receive_time,
                         add_time=now_time,
                         storage_location=2,
                         border_coords=new_bounding_box_dict
-                    ))
+                    )
                     user_id_list.append(user_id)
 
                 # 推送
@@ -208,8 +204,6 @@ class AiView(View):
                     LOGGING.info('ai推送消息异常,errLine:{}, errMsg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
                     continue
             AiView.save_cloud_ai_tag(uid, int(n_time), event_type)
-            week = LocalDateTimeUtil.date_to_week(local_date_time)
-            EquipmentInfoService.equipment_info_bulk_create(week, eq_list)
             return response.json(0)
 
         except Exception as e: