chenjunkai пре 6 година
родитељ
комит
c9363f5168
2 измењених фајлова са 11 додато и 3 уклоњено
  1. 0 1
      Controller/CloudVod.py
  2. 11 2
      Controller/OTAEquipment.py

+ 0 - 1
Controller/CloudVod.py

@@ -263,7 +263,6 @@ class CloudVodView(View):
         '''
         return response
 
-    # next
     def do_create_order(self, request_dict, userID, response):
         did = request_dict.get('did', None)
         rank = request_dict.get('rank', None)

+ 11 - 2
Controller/OTAEquipment.py

@@ -187,12 +187,15 @@ def getEquipmentVersionInterface(request):
     response = ResponseObject()
     if request.method == "POST":
         request.encoding = 'utf-8'
-        code = request.POST.get('code', None)
+        request_dict = request.POST
     elif request.method == "GET":
         request.encoding = 'gb2312'
-        code = request.GET.get('code', None)
+        request_dict = request.GET
     else:
         return response.json(801)
+    code = request_dict.get('code', None)
+    ov = request_dict.get('ov', None)
+
     if code is not None:
         try:
             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)
             return response.json(500, {'details': repr(e)})
         else:
+
             if equipmentValid:
+                # 判断大小
+                if ov is not None:
+                    nv = equipmentValid[0].softwareVersion
+                    if ov > nv:
+                        return response.json(900)
                 equipment = equipmentValid[0]
                 return response.json(0, {'softwareVersion': equipment.softwareVersion})
             else: