diff --git a/company/CompanyIndex.py b/company/CompanyIndex.py index 975f073..e626b6f 100644 --- a/company/CompanyIndex.py +++ b/company/CompanyIndex.py @@ -1,21 +1,16 @@ -from company.scripts import basic_info_script, general_rating_script +from company.scripts import find_company_data_scripts class CompanyIndex: def __init__(self): self.cid = None + self.table = None - def basic_info_obj(self): - result = basic_info_script(self.cid) - if result: - return "查询成功", result[0] - else: - return "无数据", {} - - def general_rating_obj(self): - result = general_rating_script(self.cid) + def get_company_data_obj(self): + result = find_company_data_scripts(self.table, self.cid) if result: + result[0].pop('企业ID') return "查询成功", result[0] else: return "无数据", {} diff --git a/company/db.py b/company/db.py index 1862e8a..8e4ec18 100644 --- a/company/db.py +++ b/company/db.py @@ -3,29 +3,16 @@ import pymongo client = pymongo.MongoClient('mongodb://{}:{}@{}:{}'.format('root', 'sromitdTW569kC#M', '116.63.130.34', 27018)) -def find_basic_info(param): +def find_data_in_company(param1, param2): """ - Notes + 从企业数据库中查询数据 Parameters: - param: desc + param1 str 数据表 + param2 dict 查询条件 Returns: res: desc """ - collection = client['企业']['公司基本信息'] - data = collection.find(param, {'_id': False}) - record = list(data) - return record - - -def find_general_rating_info(param): - """ - Notes - Parameters: - param: desc - Returns: - res: desc - """ - collection = client['企业']['综合评价分析'] - data = collection.find(param, {'_id': False}) + collection = client['企业'][param1] + data = collection.find(param2, {'_id': False}) record = list(data) return record diff --git a/company/routes.py b/company/routes.py index b24ebde..233fa42 100644 --- a/company/routes.py +++ b/company/routes.py @@ -1,4 +1,4 @@ -from flask import Blueprint, request, Response +from flask import Blueprint, request from common.auth import verify_token from company.CompanyIndex import CompanyIndex @@ -6,25 +6,9 @@ from company.CompanyIndex import CompanyIndex company_route = Blueprint('company', __name__) -@company_route.route('/basic_info', methods=['GET']) +@company_route.route('/company_index', methods=['POST']) @verify_token -def basic_info_route(**kwargs): - """ - 企业基本信息 - Parameters: - param desc - Returns: - res: desc - """ - company_index = CompanyIndex() - company_index.cid = kwargs['cid'] - info, result = company_index.basic_info_obj() - return {"info": info, "result": result} - - -@company_route.route('/general_rating', methods=['GET']) -@verify_token -def general_rating_route(**kwargs): +def company_page(**kwargs): """ Parameters: @@ -34,5 +18,6 @@ def general_rating_route(**kwargs): """ company_index = CompanyIndex() company_index.cid = kwargs['cid'] - info, result = company_index.general_rating_obj() + company_index.table = request.json['table'] + info, result = company_index.get_company_data_obj() return {"info": info, "result": result} diff --git a/company/scripts.py b/company/scripts.py index 1bbebf5..b8c4aa7 100644 --- a/company/scripts.py +++ b/company/scripts.py @@ -1,11 +1,5 @@ -from company.db import find_basic_info, find_general_rating_info +from company.db import find_data_in_company -def basic_info_script(cid): - data = find_basic_info({"企业ID": cid}) - return data - - -def general_rating_script(cid): - data = find_general_rating_info({"企业ID": cid}) - return data +def find_company_data_scripts(table, cid): + return find_data_in_company(table, {"企业ID": cid})