Browse Source

修改了app版本更新记录的查询接口

pzb 6 năm trước cách đây
mục cha
commit
616ef28a25
1 tập tin đã thay đổi với 40 bổ sung8 xóa
  1. 40 8
      Controller/AppColophon.py

+ 40 - 8
Controller/AppColophon.py

@@ -88,14 +88,35 @@ class AppColView(View):
             line = request_dict.get('line', None)
             page = int(page)
             line = int(line)
-            omqs = App_Colophon.objects.filter()
+            omqs = App_Colophon.objects.order_by('app_id').values_list('app_id__appBundleId', flat=True).distinct()
             if not omqs.exists():
                 return response.json(0, [])
             count = omqs.count()
-            order_ql = omqs[(page - 1) * line:page * line]. \
-                values("id", "lang", "newApp_version", "content", "app_id__appBundleId")
-            order_list = list(order_ql)
-            return response.json(0, {'data': order_list, 'count': count})
+            omqs = list(omqs[(page - 1) * line:page * line])
+            # 查询时候用记得用in,查询是多个
+            ev_qs = App_Colophon.objects.filter(app_id__appBundleId__in=list(omqs)).values("id", "lang",
+                     "newApp_version", "content", "app_id__appBundleId", "app_id__app_type")
+
+            order_list = list(ev_qs)
+            datas = {}
+            # 组装数据
+            for ev in order_list:
+                for id in omqs:
+                    if id not in datas.keys():
+                        datas[id] = []
+                    if id == ev['app_id__appBundleId']:
+
+                        datas[id].append(ev)
+
+            for k, v in enumerate(datas):
+                new = sorted(datas[v], key=lambda x: x['id'],reverse=True)
+                datas[v]=new
+
+            res = {
+                'datas': datas,
+                'count': count
+            }
+            return response.json(0, res)
 
         else:
             return response.json(404)
@@ -106,20 +127,31 @@ class AppColView(View):
         if own_perm is not True:
             return response.json(404)
         app_id = request_dict.get('app_id', None)
-        lang = request_dict.get('lang', None)
         newApp_version = request_dict.get('newApp_version', None)
+        en_content = request_dict.get('en_content', None)
         content = request_dict.get('content', None)
         param_flag = CommonService.get_param_flag(
-            data=[lang, newApp_version, content])
+            data=[en_content, newApp_version, content])
         if param_flag is not True:
             return response.json(444)
+        app_info = App_Info.objects.filter(appBundleId=app_id)
+        if app_info.exists():
+            print ("ok")
+        else :
+            return response.json(701)
         try:
             AppColophon = App_Colophon(
                 app_id=App_Info.objects.get(appBundleId=app_id),
-                lang=lang,
+                lang='cn',
                 newApp_version=newApp_version,
                 content=content)
             AppColophon.save()
+            AppColophon2 = App_Colophon(
+                app_id=App_Info.objects.get(appBundleId=app_id),
+                lang='en',
+                newApp_version=newApp_version,
+                content=en_content)
+            AppColophon2.save()
             return response.json(0)
         except Exception:
             errorInfo = traceback.format_exc()