Browse Source

Merge branch 'dev' into test

Ansjer 3 years ago
parent
commit
1e5fb3c630
1 changed files with 3 additions and 4 deletions
  1. 3 4
      Controller/AiController.py

+ 3 - 4
Controller/AiController.py

@@ -46,7 +46,7 @@ from Controller.CheckUserData import DataValid
 from Model.models import Device_Info, Order_Model, Store_Meal, VodHlsModel, OssCrdModel, UID_Bucket, StsCrdModel, \
     ExperienceContextModel, Pay_Type, CDKcontextModel, Device_User, SysMassModel, SysMsgModel, UidPushModel, \
     Unused_Uid_Meal, UIDMainUser, UserModel, PromotionRuleModel, VideoPlaybackTimeModel, CloudLogModel, CouponModel, \
-    AiStoreMeal, AiService, UidSetModel, Ai_Push_Info, iotdeviceInfoModel, AiProcessTime
+    AiStoreMeal, AiService, UidSetModel, Ai_Push_Info, iotdeviceInfoModel, AiProcessTime, Equipment_Info
 from Object.AWS.S3Email import S3Email
 from Object.AliPayObject import AliPayObject
 from Object.AliSmsObject import AliSmsObject
@@ -807,7 +807,7 @@ class AiView(View):
                 userID_id = up["userID_id"]
                 if userID_id not in userID_ids:
                     now_time = int(time.time())
-                    eq_list.append(Ai_Push_Info(
+                    eq_list.append(Equipment_Info(
                         userID_id=userID_id,
                         eventTime=n_time,
                         eventType=event_type,
@@ -853,8 +853,7 @@ class AiView(View):
                 except Exception as e:
                     logger.info("errLine={errLine}, errMsg={errMsg}".format(errLine=e.__traceback__.tb_lineno,errMsg=repr(e)))
                     continue
-
-            Ai_Push_Info.objects.bulk_create(eq_list)
+            Equipment_Info.objects.bulk_create(eq_list)
             return JsonResponse(status=200, data='success', safe=False)
 
         except Exception as e: