Browse Source

更新接口修改

chenjunkai 6 years ago
parent
commit
b4c5e43d19
2 changed files with 29 additions and 8 deletions
  1. 28 7
      Controller/EquipmentOTA.py
  2. 1 1
      Object/TokenObject.py

+ 28 - 7
Controller/EquipmentOTA.py

@@ -176,9 +176,30 @@ class EquipmentVersionView(View):
             return response.json(404)
         if operation == 'query':
             return self.do_query(request_dict, response)
+        if operation == 'update':
+            return self.do_update(request_dict, response)
         else:
             return response.json(444, 'error path')
 
+    def do_update(self,request_dict,response):
+        code = request_dict.get('code', None)
+        status = request_dict.get('status', None)
+        if code is not None:
+            ev = Equipment_Version.objects.filter(code=code)
+            if ev.exists():
+                try:
+                    update_time = timezone.localtime(timezone.now())
+                    ev.update(status=status, update_time=update_time)
+                except Exception as e:
+                    return response.json(404,repr(e))
+                else:
+                    return response.json(0, {'update_time': str(update_time)})
+            else:
+                return response.json(173)
+        else:
+            return response.json(444,'code')
+
+
     def do_check_ver(self, request_dict, response):
         code = request_dict.get('code', None)
         ov = request_dict.get('ov', None)
@@ -199,7 +220,7 @@ class EquipmentVersionView(View):
             path = file_path.replace('static/Upgrade/', '').replace('\\', '/')
             url = SERVER_DOMAIN + 'OTA/downloads/' + path + '?time=' + str(time.time())
         elif file_path.find('static/otapack') != -1:
-            url = SERVER_DOMAIN + 'OTA/downloadsPack/' +file_path+ '?time=' + str(time.time())
+            url = SERVER_DOMAIN + 'OTA/downloadsPack/' + file_path + '?time=' + str(time.time())
             # url = SERVER_DOMAIN + 'dl/otaPack/' + file_path + '?time=' + str(time.time())
         else:
             return response.json(900, '2')
@@ -210,6 +231,7 @@ class EquipmentVersionView(View):
             "softwareVersion": eqs[0].softwareVersion
         }
         return response.json(0, res)
+
     # 修改加密的路径
     def do_check_value(self, request_dict, response):
         code = request_dict.get('code', None)
@@ -232,28 +254,27 @@ class EquipmentVersionView(View):
             path = file_path.replace('static/Upgrade/', '').replace('\\', '/')
             # 创建url的token
             tko = UrlTokenObject()
-            path = tko.generate(data={'Url': "ansjer/"+CommonService.RandomStr(6) +"/"+ file_path})
+            path = tko.generate(data={'Url': "ansjer/" + CommonService.RandomStr(6) + "/" + file_path})
 
             url = SERVER_DOMAIN + 'OTA/downloads/' + path
         elif file_path.find('static/otapack') != -1:
             file_path = file_path
             # 创建url的token
             tko = UrlTokenObject()
-            file_path = tko.generate(data={'Url': "ansjer/"+CommonService.RandomStr(6) +"/"+ file_path})
+            file_path = tko.generate(data={'Url': "ansjer/" + CommonService.RandomStr(6) + "/" + file_path})
 
-            url = SERVER_DOMAIN + 'dlotapack/' +file_path
+            url = SERVER_DOMAIN + 'dlotapack/' + file_path
         else:
             return response.json(900, '2')
         # http: // 192.168.136.39:8000 / EquipmentVersion / checkVer?code = 20D20410010
 
-
         res = {
             "url": url,
             "fileSize": eqs[0].fileSize,
             "Description": eqs[0].Description,
             "softwareVersion": eqs[0].softwareVersion
         }
-        print (url)
+        print(url)
         return response.json(0, res)
 
     def do_query(self, request_dict, response):
@@ -272,7 +293,7 @@ class EquipmentVersionView(View):
         if code is not None:
             cv_qs = cv_qs.filter(code__contains=code)
         cv_qs = cv_qs.order_by('code').values_list('code', flat=True).distinct()
-        print (cv_qs)
+        print(cv_qs)
         count = cv_qs.count()
         cv_qs = list(cv_qs[(page - 1) * line:page * line])
         # return response.json(0, cv_qs)

+ 1 - 1
Object/TokenObject.py

@@ -23,7 +23,7 @@ class TokenObject:
         if token == 'local':
             token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySUQiOiIxNTQzOTA5MDUwNDEzMTM4MDAxMzgwMDAiLCJsYW5nIjoiZW4iLCJ1c2VyIjoiMTM4MDAxMzgwMDEiLCJtX2NvZGUiOiIxMjM0MTMyNDMyMTQiLCJleHAiOjE1NjcyMzE5MzZ9.tCRQzNTSUH-4gdI26iQW13rSvsevOXEwLVs44Yx4LrE'
         if token == 'test':
-            token = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyIjoiMTM4MDAxMzgwMDEiLCJ1c2VySUQiOiIxNTE1NjQyNjIzMzc5Mzk1MTM4MDAxMzgwMDEiLCJsYW5nIjoiZW4iLCJleHAiOjE1NTI2MTIxOTF9.sO8BtSclN6B-qwqNmYWbICatHYEtyMdoqzZ0hcOSsmg'
+            token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyIjoiMTM4MDAxMzgwMDEiLCJleHAiOjE1Njk5OTg4OTYsInVzZXJJRCI6IjE1MTU2NDI2MjMzNzkzOTUxMzgwMDEzODAwMSIsImxhbmciOiJlbiIsIm1fY29kZSI6IjEyMzQxMzI0MzIxNCJ9.VAQtT9AbCCfXcrNj9DL5cvVasMDoI7AP8ptgU1GoMu8'
         self.token = token
         self.lang = None
         self.userID = None