update

Controller/EquipmentOTA.py

@@ -152,12 +152,12 @@ class EquipmentVersionView(View):
     def get(self, request, *args, **kwargs):
         request.encoding = 'utf-8'
         operation = kwargs.get('operation')
-        return self.validation(request.GET, operation,request)
+        return self.validation(request.GET, operation, request)
 
     def post(self, request, *args, **kwargs):
         request.encoding = 'utf-8'
         operation = kwargs.get('operation')
-        return self.validation(request.POST, operation,request)
+        return self.validation(request.POST, operation, request)
 
     def validation(self, request_dict, operation, request):
         response = ResponseObject()
@@ -180,28 +180,28 @@ class EquipmentVersionView(View):
         if operation == 'query':
             return self.do_query(request_dict, response)
         if operation == 'update':
-            return self.do_update(request_dict, response,request)
+            return self.do_update(request_dict, response, request)
         if operation == 'filter':
             return self.do_filter(request_dict, response)
         else:
             return response.json(444, 'error path')
 
-    def do_update(self, request_dict, response,request):
+    def do_update(self, request_dict, response, request):
         code = request_dict.get('code', None)
         status = request_dict.get('status', None)
         lang = request_dict.get('lang', None)
-
+        min_ver = request_dict.get('min_ver', None)
         file_s = request.FILES.get('file', None)
         paths = 'static/versions/image'
         if not os.path.exists(paths):
             os.makedirs(paths)  # makedirs 创建文件时如果路径不存在会创建这个路径
             # print ('该文件不存在')
         else:
-            print ('该文件存在')
+            print('该文件存在')
         ev = Equipment_Version.objects.filter(code=code, lang=lang)
         if file_s is None:
-             rv_path = 'static/versions/image/' + code + '.png'
-             img = SERVER_DOMAIN + 'sysfile/' + rv_path
+            rv_path = 'static/versions/image/' + code + '.png'
+            img = SERVER_DOMAIN + 'sysfile/' + rv_path
         else:
             rv_path = 'static/versions/image/' + code + '.png'
             try:
@@ -214,17 +214,24 @@ class EquipmentVersionView(View):
             except Exception as e:
                 pass
             else:
-                img= SERVER_DOMAIN + 'sysfile/' + rv_path
+                img = SERVER_DOMAIN + 'sysfile/' + rv_path
         if code is not None:
 
             if ev.exists():
                 try:
                     update_time = timezone.localtime(timezone.now())
-                    ev.update(status=status,img=img, update_time=update_time)
+                    update_dict = {
+                        'status': status,
+                        'img': img,
+                        'update_time': update_time
+                    }
+                    if min_ver:
+                        update_dict['min_ver'] = min_ver
+                    ev.update(**update_dict)
                 except Exception as e:
                     return response.json(404, repr(e))
                 else:
-                    return response.json(0, {'update_time': str(update_time),'img':img})
+                    return response.json(0, {'update_time': str(update_time), 'img': img})
             else:
                 return response.json(173)
         else: