网关推送使用新表存数据

Controller/AiController.py

@@ -138,6 +138,21 @@ class AiView(View):
             local_date_time = ''
             lang = uid_push_list[0]['lang']
             label_str = ai_view.get_tag_message(lang, event_type)
+
+            # 推送表存储数据
+            equipment_info_kwargs = {
+                'device_uid': uid,
+                'device_nick_name': nickname,
+                'channel': channel,
+                'is_st': 3,
+                'storage_location': 2,
+                'event_type': event_type,
+                'event_time': n_time,
+                'add_time': now_time,
+                'alarm': label_str,
+                'border_coords': new_bounding_box_dict
+            }
+
             for up in uid_push_list:
                 # 保存推送数据
                 tz = up['tz']
@@ -145,19 +160,8 @@ class AiView(View):
                     tz = 0
                 user_id = up['userID_id']
                 if user_id not in user_id_list:
-                    EquipmentInfoService.randoms_insert_equipment_info(
-                        device_user_id=user_id,
-                        event_time=n_time,
-                        event_type=event_type,
-                        device_uid=uid,
-                        device_nick_name=nickname,
-                        channel=channel,
-                        alarm=label_str,
-                        is_st=3,
-                        add_time=now_time,
-                        storage_location=2,
-                        border_coords=new_bounding_box_dict
-                    )
+                    equipment_info_kwargs['device_user_id'] = user_id
+                    EquipmentInfoService.randoms_insert_equipment_info(**equipment_info_kwargs)
                     user_id_list.append(user_id)
 
                 # 推送

Controller/gatewayController.py

@@ -11,10 +11,7 @@ from django.views.generic.base import View
 from AnsjerPush.Config.gatewaySensorConfig import SENSOR_TYPE, EVENT_TYPE
 from AnsjerPush.config import LOGGER
 from Model.models import SensorRecord, GatewaySubDevice, GatewayPush, Device_Info, SceneLog, SmartScene, CountryModel
-from Object.RedisObject import RedisObject
 from Object.ResponseObject import ResponseObject
-from Object.utils import LocalDateTimeUtil
-from Service.CommonService import CommonService
 from Service.EquipmentInfoService import EquipmentInfoService
 from Service.HuaweiPushService.HuaweiPushService import HuaweiPushObject
 from Service.PushService import PushObject
@@ -112,28 +109,19 @@ class GatewayView(View):
             if not device_info_qs.exists():
                 return response.json(173)
 
-            equipment_info_list = []
-
+            # 推送表存储数据
+            equipment_info_kwargs = {
+                'device_uid': serial_number,
+                'device_nick_name': nickname,
+                'event_type': event_type,
+                'event_time': n_time,
+                'add_time': n_time,
+                'alarm': alarm
+            }
             for device_info in device_info_qs:
                 user_id = device_info['userID_id']
-
-                # 组织存储数据
-                local_date_time = CommonService.get_now_time_str(n_time=n_time, tz=0, lang='cn')[:10]
-                equipment_info_list.append(EquipmentInfoService.get_equipment_info_obj(
-                    local_date_time,
-                    add_time=n_time,
-                    event_time=n_time,
-                    receive_time=n_time,
-                    device_uid=serial_number,
-                    device_nick_name=nickname,
-                    alarm=alarm,
-                    event_type=event_type,
-                    device_user_id=user_id,
-                ))
-                if equipment_info_list:
-                    # 根据日期获得星期几
-                    week = LocalDateTimeUtil.date_to_week(local_date_time)
-                    EquipmentInfoService.equipment_info_bulk_create(week, equipment_info_list)
+                equipment_info_kwargs['device_user_id'] = user_id
+                EquipmentInfoService.randoms_insert_equipment_info(**equipment_info_kwargs)
 
                 # 查询推送配置数据
                 gateway_push_qs = GatewayPush.objects.filter(user_id=user_id, logout=False). \