tttt

Controller/EquipmentOTA.py

@@ -204,7 +204,7 @@ class EquipmentVersionView(View):
         }
         return response.json(0, res)
 
-    def do_query1(self, request_dict, response):
+    def do_query(self, request_dict, response):
         mci = request_dict.get('mci', None)
         page = request_dict.get('page', None)
         line = request_dict.get('line', None)
@@ -238,52 +238,52 @@ class EquipmentVersionView(View):
         }
         return response.json(0, res)
 
-    def do_query(self, request_dict, response):
-        mci = request_dict.get('mci', None)
-        page = request_dict.get('page', None)
-        line = request_dict.get('line', None)
-        if not page or not line:
-            return response.json(444, 'page,line')
-        else:
-            page = int(page)
-            line = int(line)
-        datas = {}
-        if mci is not None:
-            cv_qs = Equipment_Version.objects.order_by('code').filter(mci=mci).values('code', 'lang').distinct()
-            count = cv_qs.count()
-            cv_qs = cv_qs[(page - 1) * line:page * line]
-            code_list = []
-            for cv in cv_qs:
-                code_list.append(cv['code'])
-            ev_qs = Equipment_Version.objects.filter(code__in=code_list).values()
-            datas = {}
-            # 组装数据
-            for ev in ev_list:
-                for code in cv_qs:
-                    if code not in datas.keys():
-                        datas[code] = []
-                    if code == ev['code']:
-                        datas[code].append(ev)
-            for cv in cv_qs:
-                ev_qs = Equipment_Version.objects.filter(code=cv['code'], lang=cv['lang'])
-                if cv['code'] not in datas.keys():
-                    datas[cv['code']] = []
-                else:
-                    ev_qs
-                    if code not in datas.keys():
-                        datas[code] = []
-                    if code == ev['code']:
-                        datas[code].append(ev)
-        else:
-            pass
-        # return response.json(0, cv_qs)
-        ev_qs = Equipment_Version.objects.filter(code__in=list(cv_qs)).values()
-        ev_list = CommonService.qs_to_list(ev_qs)
-        datas = {}
-        # 组装数据
-
-        res = {
-            'datas': datas,
-            'count': count
-        }
-        return response.json(0, res)
+    # def do_query(self, request_dict, response):
+    #     mci = request_dict.get('mci', None)
+    #     page = request_dict.get('page', None)
+    #     line = request_dict.get('line', None)
+    #     if not page or not line:
+    #         return response.json(444, 'page,line')
+    #     else:
+    #         page = int(page)
+    #         line = int(line)
+    #     datas = {}
+    #     if mci is not None:
+    #         cv_qs = Equipment_Version.objects.order_by('code').filter(mci=mci).values('code', 'lang').distinct()
+    #         count = cv_qs.count()
+    #         cv_qs = cv_qs[(page - 1) * line:page * line]
+    #         code_list = []
+    #         for cv in cv_qs:
+    #             code_list.append(cv['code'])
+    #         ev_qs = Equipment_Version.objects.filter(code__in=code_list).values()
+    #         datas = {}
+    #         # 组装数据
+    #         for ev in ev_qs:
+    #             for code in cv_qs:
+    #                 if code not in datas.keys():
+    #                     datas[code] = []
+    #                 if code == ev['code']:
+    #                     datas[code].append(ev)
+    #         for cv in cv_qs:
+    #             ev_qs = Equipment_Version.objects.filter(code=cv['code'], lang=cv['lang'])
+    #             if cv['code'] not in datas.keys():
+    #                 datas[cv['code']] = []
+    #             else:
+    #                 ev_qs
+    #                 if code not in datas.keys():
+    #                     datas[code] = []
+    #                 if code == ev['code']:
+    #                     datas[code].append(ev)
+    #     else:
+    #         pass
+    #     # return response.json(0, cv_qs)
+    #     ev_qs = Equipment_Version.objects.filter(code__in=list(cv_qs)).values()
+    #     ev_list = CommonService.qs_to_list(ev_qs)
+    #     datas = {}
+    #     # 组装数据
+    #
+    #     res = {
+    #         'datas': datas,
+    #         'count': count
+    #     }
+    #     return response.json(0, res)