From 71df5f75ee2680934a9b0a662b49fa286f61fc2f Mon Sep 17 00:00:00 2001 From: pengtao Date: Thu, 11 Jul 2019 10:55:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8C=89companyid=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=B9=BF=E5=91=8A=E5=88=97=E8=A1=A8=E7=9A=84=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.MD | 9 +++++---- handler/ad.py | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/README.MD b/README.MD index 9868810..274043b 100644 --- a/README.MD +++ b/README.MD @@ -426,10 +426,11 @@ http://192.168.100.20:8888/ad?status=0 ##### 请求参数说明 -| 名称 | 类型 | 必填 | 说明 | -| ------ | ---- | ---- | --------------------------- | -| | int | 否 | 广告ID，其优先级高于status | -| status | int | 否 | 审批状态，默认为1（已审批） | +| 名称 | 类型 | 必填 | 说明 | +| --------- | ---- | ---- | ---------------------------------- | +| id | int | 否 | 广告ID，其优先级高于其他参数 | +| companyid | int | 否 | 公司ID，优先级高于status | +| status | int | 否 | 审批状态，都不填写返回所有广告信息 | ##### 返回参数说明 diff --git a/handler/ad.py b/handler/ad.py index e831710..304c0b8 100644 --- a/handler/ad.py +++ b/handler/ad.py @@ -56,8 +56,8 @@ class Ad(Resource): sel_sql = f"select id,name,begin_time,end_time,ad_num,ad_title,ad_body,ad_image,ad_url,ad_sort," \ f"status,companyid from ad where companyid={companyid};" elif status: - sel_sql = f"select id,name,begin_time,end_time,ad_num,ad_title,ad_body,ad_image,ad_url,ad_sort," \ - f"status，companyid from ad where status={status};" + sel_sql = f"select id,name,begin_time,end_time,ad_num,ad_title,ad_body,ad_image,ad_url,ad_sort," \ + f"status，companyid from ad where status={status};" else: sel_sql = f"select id,name,begin_time,end_time,ad_num,ad_title,ad_body,ad_image,ad_url,ad_sort," \ f"status,companyid from ad ;" @@ -73,7 +73,7 @@ class Ad(Resource): for line in data: ad_info['id'], ad_info['name'], ad_info['begin_time'], ad_info['end_time'], ad_info['ad_num'], \ ad_info['ad_title'], ad_info['ad_body'], ad_info['ad_image'], ad_info['ad_url'], ad_info[ - 'ad_sort'], ad_info['status'] = line + 'ad_sort'], ad_info['status'], ad_info['companyid'] = line all.append(ad_info) return jsonify({'code': 200, 'message': all}) except Exception: