diff --git a/README.MD b/README.MD index 04a680d..6ecc72e 100644 --- a/README.MD +++ b/README.MD @@ -18,7 +18,9 @@ http://192.168.100.20:8888/company?status=0 | 名称 | 类型 | 必填 | | | ------ | ---- | ---- | ---------------------------------- | -| status | int | 是 | 0=未审批,1=审批通过,2=审批未通过 | +| status | int | 否 | 0=未审批,1=审批通过,2=审批未通过 | +| id | int | 否 | 返回该id对应公司信息 | +| | | | 上述参数为空返回所有信息 | ##### 返回参数说明 @@ -160,6 +162,39 @@ http://192.168.100.20:8888/company?id=1006 ##### 返回示例 +{ + "code": 200 +} + +#### 5、添加位置服务信息 + +##### 接口地址 + +http://192.168.100.20:8888/location + +##### 返回格式:json + +##### 请求方式:get + +##### 请求示范 + +http://192.168.100.20:8888/location + +##### 请求参数说明 + +| 名称 | 类型 | 必填 | | +| ---- | ---- | ---- | ---- | +| | | | | + +##### 返回参数说明 + +| 名称 | 类型 | 必填 | 说明 | +| ---- | ---- | ---- | -------- | +| code | int | 是 | 返回状态 | +| | | | | + +##### 返回示例 + { "code": 200 } \ No newline at end of file diff --git a/handler/company.py b/handler/company.py index 4ffaa9f..05841bf 100644 --- a/handler/company.py +++ b/handler/company.py @@ -30,9 +30,15 @@ class Company(Resource): def get(self): status = self.args['status'] + id = self.args['id'] all_data = [] try: - sql = f"select id,name,contact,tel,appid,appkey,status from company where status={status};" + if status: + sql = f"select id,name,contact,tel,appid,appkey,status from company where status={status};" + elif id: + sql = f"select id,name,contact,tel,appid,appkey,status from company where id={id};" + else: + sql = f"select id,name,contact,tel,appid,appkey,status from company where 1" data = mydb.query(sql) log.info(f"get data from db was {data}") @@ -40,7 +46,8 @@ class Company(Resource): for line in data: if line: company = {} - company['id'], company['name'], company['contact'], company['tel'], company['appid'], company['appkey'], company['status'] = line + company['id'], company['name'], company['contact'], company['tel'], company['appid'], company['appkey'], \ + company['status'] = line all_data.append(company) del company else: @@ -83,7 +90,7 @@ class Company(Resource): max = int(data[0][0]) + 1 log.info(f"max id was {max}!") except Exception: - log.error(f"error with get company id ",exc_info=True) + log.error(f"error with get company id ", exc_info=True) max = 1001 return max diff --git a/handler/location.py b/handler/location.py new file mode 100644 index 0000000..47d83aa --- /dev/null +++ b/handler/location.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +from __future__ import absolute_import +from flask import Flask, jsonify +from flask_restful import reqparse, abort, Api, Resource +import logging + +from myredis.myredis import company_redis, expire_time +from mysql.mmysql import MysqlBase +from config import mysql_promotion_config + +import pdb + +log = logging.getLogger(__name__) +mydb = MysqlBase(**mysql_promotion_config) +parser = reqparse.RequestParser() +parser.add_argument('id') +parser.add_argument('name') +parser.add_argument('contact') + + +class Location(): + def get(self): + pass + + def post(self): + pass + + def put(self): + pass + + def delete(self): + pass