|
@@ -341,14 +341,22 @@ class IotCoreView(View):
|
|
def getIotInfo(self, request_dict, response):
|
|
def getIotInfo(self, request_dict, response):
|
|
# 获取IoT数据
|
|
# 获取IoT数据
|
|
serial_number = request_dict.get('serial_number', None)
|
|
serial_number = request_dict.get('serial_number', None)
|
|
- if not serial_number:
|
|
|
|
|
|
+ uid = request_dict.get('uid', None)
|
|
|
|
+ if not uid and not serial_number:
|
|
return response.json(444)
|
|
return response.json(444)
|
|
|
|
|
|
try:
|
|
try:
|
|
- serial_number = serial_number[0:6]
|
|
|
|
- iot_info_qs = iotdeviceInfoModel.objects.filter(serial_number=serial_number).values('endpoint', 'token_iot_number')
|
|
|
|
|
|
+ if serial_number:
|
|
|
|
+ serial_number = serial_number[0:6]
|
|
|
|
+ iot_info_qs = iotdeviceInfoModel.objects.filter(serial_number=serial_number).\
|
|
|
|
+ values('endpoint', 'token_iot_number')
|
|
|
|
+ else:
|
|
|
|
+ iot_info_qs = iotdeviceInfoModel.objects.filter(uid=uid).\
|
|
|
|
+ values('endpoint', 'token_iot_number')
|
|
|
|
+
|
|
if not iot_info_qs.exists():
|
|
if not iot_info_qs.exists():
|
|
return response.json(173)
|
|
return response.json(173)
|
|
|
|
+
|
|
endpoint = iot_info_qs[0]['endpoint']
|
|
endpoint = iot_info_qs[0]['endpoint']
|
|
token_iot_number = iot_info_qs[0]['token_iot_number']
|
|
token_iot_number = iot_info_qs[0]['token_iot_number']
|
|
res = {'endpoint': endpoint, 'token_iot_number': token_iot_number}
|
|
res = {'endpoint': endpoint, 'token_iot_number': token_iot_number}
|