|
@@ -3,7 +3,7 @@ from django.utils.decorators import method_decorator
|
|
|
from django.views.decorators.csrf import csrf_exempt
|
|
from django.views.decorators.csrf import csrf_exempt
|
|
|
from Service.ModelService import ModelService
|
|
from Service.ModelService import ModelService
|
|
|
from Service.CommonService import CommonService
|
|
from Service.CommonService import CommonService
|
|
|
-from Model.models import Equipment_Info, Device_Info
|
|
|
|
|
|
|
+from Model.models import Equipment_Info, Device_Info, Device_User
|
|
|
import traceback
|
|
import traceback
|
|
|
from Object.ResponseObject import ResponseObject
|
|
from Object.ResponseObject import ResponseObject
|
|
|
from Object.TokenObject import TokenObject
|
|
from Object.TokenObject import TokenObject
|
|
@@ -85,7 +85,7 @@ class EquipmentInfo(View):
|
|
|
if device_info.exists():
|
|
if device_info.exists():
|
|
|
try:
|
|
try:
|
|
|
equipment_info = Equipment_Info(
|
|
equipment_info = Equipment_Info(
|
|
|
- userID=userID,
|
|
|
|
|
|
|
+ userID=Device_User.objects.get(userID=userID),
|
|
|
devUid=devUid,
|
|
devUid=devUid,
|
|
|
Channel=Channel,
|
|
Channel=Channel,
|
|
|
eventType=eventType,
|
|
eventType=eventType,
|
chenjunkai