diff --git a/CompanyObject/CompanyImpl.py b/CompanyObject/CompanyImpl.py index 40bb5f0..b52c4c7 100644 --- a/CompanyObject/CompanyImpl.py +++ b/CompanyObject/CompanyImpl.py @@ -1,5 +1,4 @@ -from CompanyObject.CompanyObj import Company, HeadInfo, BasicInfo, CompanyIndexBasicBusinessInfo, ShareHolder, \ - MainMember +from CompanyObject.CompanyObj import Company, HeadInfo from DBHelper.MongoHelper import MongoHelper @@ -56,7 +55,6 @@ class CompanyImpl(Company): return head_info.dict_to_show() - @property def get_basic_info(self): """企业主要 基本信息""" @@ -76,3 +74,22 @@ class CompanyImpl(Company): } return result + + def get_industry_analysis(self): + """企业主页 行业分析""" + + industry = self.db.find_single_column( + "企业数据", + "企业数据_更新汇总", + {"企业ID": self.cid}, + "一级行业" + ) + + result = self.db.find_single_data( + "行业数据", + "行业分析", + {"行业": industry}, + ["行业", "行业简介", "更新时间", "正面因素", "负面因素", "增长趋势", "规模分布"] + ) + + return result if result else {} diff --git a/CompanyObject/CompanyObj.py b/CompanyObject/CompanyObj.py index b537e1e..6306ff4 100644 --- a/CompanyObject/CompanyObj.py +++ b/CompanyObject/CompanyObj.py @@ -239,7 +239,6 @@ class Company(SpecObject): def get_basic_info(self): """获取基本工商信息""" + def get_industry_analysis(self): + """企业主页 行业分析""" -class CompanyIndexBasicBusinessInfo(Company): - """企业主页 基本工商信息""" - update_time = ValidateAttr(field='update_time', type=str) diff --git a/CompanyObject/CompanyRoutes.py b/CompanyObject/CompanyRoutes.py index 72cf727..44738a5 100644 --- a/CompanyObject/CompanyRoutes.py +++ b/CompanyObject/CompanyRoutes.py @@ -24,7 +24,22 @@ def head_info_route(**kwargs): @company_route_v021.route('/basic_info', methods=['GET']) @verify_token def basic_info_route(**kwargs): + try: + company = CompanyImpl() + company.cid = kwargs['cid'] + result = company.get_basic_info + return {"info": "查询结果", "result": result}, 200 + except ReturnConditionCheckFailed as e: + return {"info": e.failed_info}, e.status_code + except KeyError: + return {"info": "参数异常"}, 400 + + +@company_route_v021.route('/industry_analysis', methods=['GET']) +@verify_token +def industry_analysis_route(**kwargs): + """行业分析""" company = CompanyImpl() company.cid = kwargs['cid'] - result = company.get_basic_info + result = company.get_industry_analysis() return {"info": "查询结果", "result": result}, 200 diff --git a/company/company_routes.py b/company/company_routes.py index 95c50cb..30b4d69 100644 --- a/company/company_routes.py +++ b/company/company_routes.py @@ -25,6 +25,16 @@ def basic_info_route(**kwargs): return {"info": "查询结果", "result": result}, 200 +@company_route.route('/industry_analysis', methods=['GET']) +@verify_token +def industry_analysis_route(**kwargs): + """行业分析""" + company = CompanyImpl() + company.cid = kwargs['cid'] + result = company.get_industry_analysis() + return {"info": "查询结果", "result": result}, 200 + + @company_route.route('/cc_rating', methods=['GET']) @verify_token def cc_rating_route(**kwargs): @@ -34,18 +44,6 @@ def cc_rating_route(**kwargs): return {"info": "查询结果", "result": result}, 200 -@company_route.route('/industry_analysis', methods=['GET']) -@verify_token -def industry_analysis_route(**kwargs): - """ - 行业分析 - """ - company_index = CompanyIndex() - company_index.cid = kwargs['cid'] - result = company_index.get_industry_analysis() - return {"info": "查询结果", "result": result} - - @company_route.route('/esg_rating', methods=['GET']) @verify_token def esg_rating_route(**kwargs):