|
@@ -187,12 +187,15 @@ def getEquipmentVersionInterface(request):
|
|
response = ResponseObject()
|
|
response = ResponseObject()
|
|
if request.method == "POST":
|
|
if request.method == "POST":
|
|
request.encoding = 'utf-8'
|
|
request.encoding = 'utf-8'
|
|
- code = request.POST.get('code', None)
|
|
|
|
|
|
+ request_dict = request.POST
|
|
elif request.method == "GET":
|
|
elif request.method == "GET":
|
|
request.encoding = 'gb2312'
|
|
request.encoding = 'gb2312'
|
|
- code = request.GET.get('code', None)
|
|
|
|
|
|
+ request_dict = request.GET
|
|
else:
|
|
else:
|
|
return response.json(801)
|
|
return response.json(801)
|
|
|
|
+ code = request_dict.get('code', None)
|
|
|
|
+ ov = request_dict.get('ov', None)
|
|
|
|
+
|
|
if code is not None:
|
|
if code is not None:
|
|
try:
|
|
try:
|
|
equipmentValid = Equipment_Version.objects.filter(code=code, status=1, lang='en').order_by('-data_joined')
|
|
equipmentValid = Equipment_Version.objects.filter(code=code, status=1, lang='en').order_by('-data_joined')
|
|
@@ -201,7 +204,13 @@ def getEquipmentVersionInterface(request):
|
|
print('查询数据库错误: %s' % errorInfo)
|
|
print('查询数据库错误: %s' % errorInfo)
|
|
return response.json(500, {'details': repr(e)})
|
|
return response.json(500, {'details': repr(e)})
|
|
else:
|
|
else:
|
|
|
|
+
|
|
if equipmentValid:
|
|
if equipmentValid:
|
|
|
|
+ # 判断大小
|
|
|
|
+ if ov is not None:
|
|
|
|
+ nv = equipmentValid[0].softwareVersion
|
|
|
|
+ if ov > nv:
|
|
|
|
+ return response.json(900)
|
|
equipment = equipmentValid[0]
|
|
equipment = equipmentValid[0]
|
|
return response.json(0, {'softwareVersion': equipment.softwareVersion})
|
|
return response.json(0, {'softwareVersion': equipment.softwareVersion})
|
|
else:
|
|
else:
|