otaequipment

Controller/EquipmentOTA.py

@@ -14,6 +14,7 @@ from Object.TokenObject import TokenObject
 from Object.UrlTokenObject import UrlTokenObject
 from Service.CommonService import CommonService
 from Service.ModelService import ModelService
+from var_dump import var_dump
 
 '''
 http://192.168.136.45:8077/equipment/OTA?token=test&operation=query&page=1&line=10
@@ -178,6 +179,8 @@ class EquipmentVersionView(View):
             return self.do_query(request_dict, response)
         if operation == 'update':
             return self.do_update(request_dict, response)
+        if operation == 'filter':
+            return self.do_filter(request_dict, response)
         else:
             return response.json(444, 'error path')
 
@@ -312,3 +315,30 @@ class EquipmentVersionView(View):
             'count': count
         }
         return response.json(0, res)
+
+    def do_filter(self, request_dict, response):
+        mci = request_dict.get('mci', None)
+        page = request_dict.get('page', None)
+        line = request_dict.get('line', None)
+        code = request_dict.get('code', None)
+        lang = request_dict.get('lang', None)
+        if not page or not line:
+            return response.json(444, 'page,line')
+        else:
+            page = int(page)
+            line = int(line)
+        ev_qs = Equipment_Version.objects
+        if mci:
+            ev_qs = ev_qs.filter(mci=mci)
+        if code:
+            ev_qs = ev_qs.filter(code__contains=code)
+        if lang:
+            ev_qs = ev_qs.filter(lang=lang)
+        count = ev_qs.count()
+        ev_qs = ev_qs[(page - 1) * line:page * line].values()
+        ev_ls = CommonService.qs_to_list(ev_qs)
+        res = {
+            'datas': ev_ls,
+            'count': count
+        }
+        return response.json(0, res)

Controller/OTAEquipment.py

@@ -401,6 +401,12 @@ def addNewEquipmentVersionInterface(request):
         deviceData = json.loads(deviceContent)
         version = deviceData.get('version', None)
         filePath = deviceData.get('filePath', None)
+        code = deviceContent.get('code', None)
+        if code:
+            try:
+                Equipment_Version.objects.filter(code=code).delete()
+            except Exception as e:
+                pass
         if version is None or filePath is None:
             return response.json(444, 'content')
         deviceData['filePath'] = ','.join(filePath)

Object/TokenObject.py

@@ -21,7 +21,7 @@ class TokenObject:
 
     def __init__(self, token=None):
         if token == 'local':
-            token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySUQiOiIxNTQzOTA5MDUwNDEzMTM4MDAxMzgwMDAiLCJsYW5nIjoiZW4iLCJ1c2VyIjoiMTM4MDAxMzgwMDEiLCJtX2NvZGUiOiIxMjM0MTMyNDMyMTQiLCJleHAiOjE1NjcyMzE5MzZ9.tCRQzNTSUH-4gdI26iQW13rSvsevOXEwLVs44Yx4LrE'
+            token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySUQiOiIxNTQzOTA5MDUwNDEzMTM4MDAxMzgwMDAiLCJsYW5nIjoiZW4iLCJ1c2VyIjoiMTM4MDAxMzgwMDEiLCJtX2NvZGUiOiIxMjM0MTMyNDMyMTQiLCJleHAiOjE1NzA2ODY5NDl9.ivlkQ3d9ADaIsC76DR7q0K1irhTnm8RwaLnn_AVyO9g'
         if token == 'test':
             token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VyIjoiMTM4MDAxMzgwMDEiLCJleHAiOjE1Njk5OTg4OTYsInVzZXJJRCI6IjE1MTU2NDI2MjMzNzkzOTUxMzgwMDEzODAwMSIsImxhbmciOiJlbiIsIm1fY29kZSI6IjEyMzQxMzI0MzIxNCJ9.VAQtT9AbCCfXcrNj9DL5cvVasMDoI7AP8ptgU1GoMu8'
         self.token = token