From 3f1f46f2f093326042f8841401abb4291e015329 Mon Sep 17 00:00:00 2001 From: P3ngSaM <61768364+P3ngSaM@users.noreply.github.com> Date: Sat, 19 Nov 2022 12:31:11 +0800 Subject: [PATCH] =?UTF-8?q?changes=20=E6=95=B0=E6=8D=AE=E5=BA=93=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APPData/Model/CompanyModel.py | 14 +++++++------- APPData/Router/BusinessRouter.py | 2 +- APPData/Router/DishonestRouter.py | 2 +- APPData/Router/LawsuitRouter.py | 2 +- APPData/Router/ShareholderRouter.py | 18 +++++++++--------- Utils/TycApi/CommonUtil.py | 2 ++ 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/APPData/Model/CompanyModel.py b/APPData/Model/CompanyModel.py index 4365f7c..67dd5f6 100644 --- a/APPData/Model/CompanyModel.py +++ b/APPData/Model/CompanyModel.py @@ -50,7 +50,7 @@ class Business(Base): def dict(self): mongodb = get_mongodb() - item = mongodb.find_data_by_id(dbname="WR_DataBase_v2_test", sheet="C3.1_工商信息", _id=self.obj_id) + item = mongodb.find_data_by_id(dbname="WR_DataBase", sheet="C3.1_工商信息", _id=self.obj_id) return item @@ -64,7 +64,7 @@ class Shareholder(Base): def dict(self): mongodb = get_mongodb() - item = mongodb.find_data_by_id(dbname="WR_DataBase_v2_test", sheet="C3.2_股东信息", _id=self.obj_id) + item = mongodb.find_data_by_id(dbname="WR_DataBase", sheet="C3.2_股东信息", _id=self.obj_id) return item.get("股东列表") @@ -78,7 +78,7 @@ class Lawsuit(Base): def list(self): mongodb = get_mongodb() - item = mongodb.find_data_by_id(dbname="WR_DataBase_v2_test", sheet="C9.6_法律诉讼", _id=self.obj_id) + item = mongodb.find_data_by_id(dbname="WR_DataBase", sheet="C9.6_法律诉讼", _id=self.obj_id) item.pop('企业ID') return item @@ -93,7 +93,7 @@ class Dishonest(Base): def list(self): mongodb = get_mongodb() - item = mongodb.find_data_by_id(dbname="WR_DataBase_v2_test", sheet="C9.5_失信人", _id=self.obj_id) + item = mongodb.find_data_by_id(dbname="WR_DataBase", sheet="C9.5_失信人", _id=self.obj_id) item.pop('企业ID') return item @@ -109,7 +109,7 @@ class Balance(Base): def list(self): mongodb = get_mongodb() - item = mongodb.find_data_by_id(dbname="WR_DataBase_v2_test", sheet="C6.1_资产负债表", _id=self.obj_id) + item = mongodb.find_data_by_id(dbname="WR_DataBase", sheet="C6.1_资产负债表", _id=self.obj_id) item.pop('企业ID') return item @@ -125,7 +125,7 @@ class Income(Base): def list(self): mongodb = get_mongodb() - item = mongodb.find_data_by_id(dbname="WR_DataBase_v2_test", sheet="C6.2_利润表", _id=self.obj_id) + item = mongodb.find_data_by_id(dbname="WR_DataBase", sheet="C6.2_利润表", _id=self.obj_id) item.pop('企业ID') return item @@ -141,7 +141,7 @@ class CashFlow(Base): def list(self): mongodb = get_mongodb() - item = mongodb.find_data_by_id(dbname="WR_DataBase_v2_test", sheet="C6.3_现金流量表", _id=self.obj_id) + item = mongodb.find_data_by_id(dbname="WR_DataBase", sheet="C6.3_现金流量表", _id=self.obj_id) item.pop('企业ID') return item diff --git a/APPData/Router/BusinessRouter.py b/APPData/Router/BusinessRouter.py index 7c225db..d8e4e6d 100644 --- a/APPData/Router/BusinessRouter.py +++ b/APPData/Router/BusinessRouter.py @@ -28,7 +28,7 @@ def func01(name: str, db: Session = Depends(get_db)): data = CompanyCrud.create_company_by_name(db=db, name=name) cid = data.id # 查询数据库是否有此条数据 - search_data = mongodb.find_data("WR_DataBase_v2_test", 'C3.1_工商信息', {"企业ID": cid}, []) + search_data = mongodb.find_data("WR_DataBase", 'C3.1_工商信息', {"企业ID": cid}, []) if search_data: return {"info": "Data already exists", "Datail": search_data} # 拉取天眼查数据到mongodb diff --git a/APPData/Router/DishonestRouter.py b/APPData/Router/DishonestRouter.py index 9b938c9..7e7d543 100644 --- a/APPData/Router/DishonestRouter.py +++ b/APPData/Router/DishonestRouter.py @@ -28,7 +28,7 @@ def func01(name: str, db: Session = Depends(get_db)): data = CompanyCrud.create_company_by_name(db=db, name=name) cid = data.id # 查询数据库是否有此条数据 - search_data = mongodb.find_all_data("WR_DataBase_v2_test", 'C9.5_失信人', {"企业ID": cid}, []) + search_data = mongodb.find_all_data("WR_DataBase", 'C9.5_失信人', {"企业ID": cid}, []) if search_data: return {"info": "Data already exists", "Datail": search_data} # 拉取天眼查数据到mongodb diff --git a/APPData/Router/LawsuitRouter.py b/APPData/Router/LawsuitRouter.py index 91bfee8..d82e692 100644 --- a/APPData/Router/LawsuitRouter.py +++ b/APPData/Router/LawsuitRouter.py @@ -28,7 +28,7 @@ def func01(name: str, db: Session = Depends(get_db)): data = CompanyCrud.create_company_by_name(db=db, name=name) cid = data.id # 查询数据库是否有此条数据 - search_data = mongodb.find_data("WR_DataBase_v2_test", 'C9.6_法律诉讼', {"企业ID": cid}, []) + search_data = mongodb.find_data("WR_DataBase", 'C9.6_法律诉讼', {"企业ID": cid}, []) if search_data: return {"info": "Data already exists", "Datail": search_data} # 拉取天眼查数据到mongodb diff --git a/APPData/Router/ShareholderRouter.py b/APPData/Router/ShareholderRouter.py index b8675b7..6950056 100644 --- a/APPData/Router/ShareholderRouter.py +++ b/APPData/Router/ShareholderRouter.py @@ -6,7 +6,7 @@ from APPData.Crud import CompanyCrud, ShareholderCrud from Utils.AccessControl.AccessUtil import rbac from Utils.DataBase.MongoHelperUtils import get_mongodb, get_tyc_mongodb from Utils.DataBase.SqlAlchemyUtils import get_db -from Utils.TycApi.CommonUtil import CommonUtils +from Utils.TycApi.CommonUtil import CommonUtils, TOKEN from Utils.TycApi.Configure import DB_GSBJ from Utils.TycApi.Shareholder import get_shareholer_data @@ -28,18 +28,18 @@ def func01(name: str, db: Session = Depends(get_db)): data = CompanyCrud.create_company_by_name(db=db, name=name) cid = data.id # 查询数据库是否有此条数据 - search_data = mongodb.find_data("WR_DataBase_v2_test", 'C3.2_股东信息', {"企业ID": cid}, []) + search_data = mongodb.find_data("WR_DataBase", 'C3.2_股东信息', {"企业ID": cid}, []) if search_data: return {"info": "Data already exists", "Datail": search_data} # 获取企业类型，如果不存在则拉取工商信息 - company_type = mongodb.find_data("WR_DataBase_v2_test", 'C3.1_工商信息', {"企业ID": cid}, ["企业类型"]) + company_type = mongodb.find_data("WR_DataBase", 'C3.1_工商信息', {"企业ID": cid}, ["企业类型"]) if not company_type: url = "http://127.0.0.1:8009/api/business/pull?name={}" url = url.format(name) # headers = {"token": token} res = requests.get(url=url) if res.status_code == 200: - company_type = mongodb.find_data("WR_DataBase_v2_test", 'C3.1_工商信息', {"企业ID": cid}, ["企业类型"]) + company_type = mongodb.find_data("WR_DataBase", 'C3.1_工商信息', {"企业ID": cid}, ["企业类型"]) else: raise HTTPException(status_code=202, detail="Failed to get company type") company_type = company_type.get('企业类型', None) @@ -108,14 +108,14 @@ def func02(cid: str, db: Session = Depends(get_db)): raise HTTPException(status_code=204, detail="Company Not Found") name = db_item.name # 获取企业类型，如果不存在则拉取工商信息 - company_type = mongodb.find_data("WR_DataBase_v2_test", 'C3.1_工商信息', {"企业ID": cid}, ["企业类型"]) + company_type = mongodb.find_data("WR_DataBase", 'C3.1_工商信息', {"企业ID": cid}, ["企业类型"]) if not company_type: - url = "http://127.0.0.1:8009/api/business/pull?name={}" + url = "http://test.fecribd.com:5001/api/business/pull?name={}" url = url.format(name) - # headers = {"token": token} - res = requests.get(url=url) + headers = {"token": TOKEN} + res = requests.get(url=url, headers=headers) if res.status_code == 200: - company_type = mongodb.find_data("WR_DataBase_v2_test", 'C3.1_工商信息', {"企业ID": cid}, ["企业类型"]) + company_type = mongodb.find_data("WR_DataBase", 'C3.1_工商信息', {"企业ID": cid}, ["企业类型"]) else: raise HTTPException(status_code=401, detail="Failed to get company type") company_type = company_type.get('企业类型', None) diff --git a/Utils/TycApi/CommonUtil.py b/Utils/TycApi/CommonUtil.py index bbd05a5..0604a59 100644 --- a/Utils/TycApi/CommonUtil.py +++ b/Utils/TycApi/CommonUtil.py @@ -4,6 +4,8 @@ import yaml import random import time +TOKEN = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2luZm8iOnsidWlkIjoiVUlEMDAwMSIsImVtYWlsIjoiZmVjcmliZEBmZWNyLmNvbS5jbiIsIm5hbWUiOiJyb290Iiwicm9sZSI6Ilx1N2JhMVx1NzQwNlx1NTQ1OCIsImRlcGFydG1lbnQiOiJcdTY1NzBcdTViNTdcdTUzMTZcdTkwZTgiLCJyb2xlX2lkIjoiUk9MRTAxIiwiZGVwYXJ0bWVudF9pZCI6IkQwMDEifSwiZXhwIjoxNjgzNDc2OTA4fQ.8girdw3n0WDktRuK0aSgGor10eb11nIFvRJqUtPZum4" + p_map = { "heb": "河北省", "sx": "山西省",