diff --git a/APPData/Crud/BalanceCrud.py b/APPData/Crud/BalanceCrud.py index 3ea784d..d9f4fd6 100644 --- a/APPData/Crud/BalanceCrud.py +++ b/APPData/Crud/BalanceCrud.py @@ -7,7 +7,7 @@ def create_balance_by_id(db: Session, mongodb, _id, reportdate, condition, conte item = Model.Balance() item._id = _id item.reportdate = reportdate - obj_id = mongodb.upsert_data(dbname="WR_DataBase_v2_test", sheet="C6.1_资产负债表", condition=condition, data=content) + obj_id = mongodb.upsert_data(dbname="WR_DataBase", sheet="C6.1_资产负债表", condition=condition, data=content) item.obj_id = obj_id db.add(item) db.commit() @@ -18,6 +18,6 @@ def find_balance_by_id(db: Session, mongodb, _id): db_item = db.query(Model.Balance).filter_by(_id=_id).all() data = list() for item in db_item: - insert = mongodb.find_data_by_id(dbname="WR_DataBase_v2_test", sheet="C6.1_资产负债表", _id=item.obj_id) + insert = mongodb.find_data_by_id(dbname="WR_DataBase", sheet="C6.1_资产负债表", _id=item.obj_id) data.append(insert) return data diff --git a/APPData/Crud/BusinessCrud.py b/APPData/Crud/BusinessCrud.py index d0bc1d7..4251066 100644 --- a/APPData/Crud/BusinessCrud.py +++ b/APPData/Crud/BusinessCrud.py @@ -6,7 +6,7 @@ from APPData.Model import CompanyModel as Model def create_business_by_id(db: Session, mongodb, _id, content): item = Model.Business() item._id = _id - obj_id = mongodb.insert_data(dbname="WR_DataBase_v2_test", sheet="C3.1_工商信息", data=content) + obj_id = mongodb.insert_data(dbname="WR_DataBase", sheet="C3.1_工商信息", data=content) item.obj_id = obj_id db.add(item) db.commit() @@ -15,11 +15,11 @@ def create_business_by_id(db: Session, mongodb, _id, content): def update_business_by_id(db: Session, mongodb, _id, content): item = db.query(Model.Business).filter_by(_id=_id).first() - mongodb.update_data_by_id(dbname="WR_DataBase_v2_test", sheet="C3.1_工商信息", _id=item.obj_id, data=content) + mongodb.update_data_by_id(dbname="WR_DataBase", sheet="C3.1_工商信息", _id=item.obj_id, data=content) return True def find_business_by_id(db: Session, mongodb, _id): item = db.query(Model.Business).filter_by(_id=_id).first() - data = mongodb.find_data_by_id(dbname="WR_DataBase_v2_test", sheet="C3.1_工商信息", _id=item.obj_id) + data = mongodb.find_data_by_id(dbname="WR_DataBase", sheet="C3.1_工商信息", _id=item.obj_id) return data \ No newline at end of file diff --git a/APPData/Crud/CashFlowCrud.py b/APPData/Crud/CashFlowCrud.py index 88ade3e..5fd4517 100644 --- a/APPData/Crud/CashFlowCrud.py +++ b/APPData/Crud/CashFlowCrud.py @@ -7,7 +7,7 @@ def create_cashflow_by_id(db: Session, mongodb, _id, reportdate, condition, cont item = Model.CashFlow() item._id = _id item.reportdate = reportdate - obj_id = mongodb.upsert_data(dbname="WR_DataBase_v2_test", sheet="C6.3_现金流量表", condition=condition, data=content) + obj_id = mongodb.upsert_data(dbname="WR_DataBase", sheet="C6.3_现金流量表", condition=condition, data=content) item.obj_id = obj_id db.add(item) db.commit() @@ -18,6 +18,6 @@ def find_cashflow_by_id(db: Session, mongodb, _id): db_item = db.query(Model.CashFlow).filter_by(_id=_id).all() data = list() for item in db_item: - insert = mongodb.find_data_by_id(dbname="WR_DataBase_v2_test", sheet="C6.3_现金流量表", _id=item.obj_id) + insert = mongodb.find_data_by_id(dbname="WR_DataBase", sheet="C6.3_现金流量表", _id=item.obj_id) data.append(insert) return data diff --git a/APPData/Crud/DishonestCrud.py b/APPData/Crud/DishonestCrud.py index 82714fa..1549220 100644 --- a/APPData/Crud/DishonestCrud.py +++ b/APPData/Crud/DishonestCrud.py @@ -6,7 +6,7 @@ from APPData.Model import CompanyModel as Model def create_dishonest_by_id(db: Session, mongodb, _id, content): item = Model.Dishonest() item._id = _id - obj_id = mongodb.insert_data(dbname="WR_DataBase_v2_test", sheet="C9.5_失信人", data=content) + obj_id = mongodb.insert_data(dbname="WR_DataBase", sheet="C9.5_失信人", data=content) item.obj_id = obj_id db.add(item) db.commit() @@ -14,7 +14,7 @@ def create_dishonest_by_id(db: Session, mongodb, _id, content): def update_dishonest(mongodb, serach, content): - mongodb.update_data(dbname="WR_DataBase_v2_test", sheet="C9.5_失信人", search=serach, field=content) + mongodb.update_data(dbname="WR_DataBase", sheet="C9.5_失信人", search=serach, field=content) return True @@ -22,6 +22,6 @@ def find_dishonest_by_id(db: Session, mongodb, _id): db_item = db.query(Model.Dishonest).filter_by(_id=_id).all() data = list() for item in db_item: - insert = mongodb.find_data_by_id(dbname="WR_DataBase_v2_test", sheet="C9.5_失信人", _id=item.obj_id) + insert = mongodb.find_data_by_id(dbname="WR_DataBase", sheet="C9.5_失信人", _id=item.obj_id) data.append(insert) return data \ No newline at end of file diff --git a/APPData/Crud/IncomeCrud.py b/APPData/Crud/IncomeCrud.py index 2d9e440..eaa47fb 100644 --- a/APPData/Crud/IncomeCrud.py +++ b/APPData/Crud/IncomeCrud.py @@ -7,7 +7,7 @@ def create_income_by_id(db: Session, mongodb, _id, reportdate, condition, conten item = Model.Income() item._id = _id item.reportdate = reportdate - obj_id = mongodb.upsert_data(dbname="WR_DataBase_v2_test", sheet="C6.2_利润表", condition=condition, data=content) + obj_id = mongodb.upsert_data(dbname="WR_DataBase", sheet="C6.2_利润表", condition=condition, data=content) item.obj_id = obj_id db.add(item) db.commit() @@ -18,6 +18,6 @@ def find_income_by_id(db: Session, mongodb, _id): db_item = db.query(Model.Income).filter_by(_id=_id).all() data = list() for item in db_item: - insert = mongodb.find_data_by_id(dbname="WR_DataBase_v2_test", sheet="C6.2_利润表", _id=item.obj_id) + insert = mongodb.find_data_by_id(dbname="WR_DataBase", sheet="C6.2_利润表", _id=item.obj_id) data.append(insert) return data diff --git a/APPData/Crud/LawsuitCrud.py b/APPData/Crud/LawsuitCrud.py index db0cf5f..cfc8204 100644 --- a/APPData/Crud/LawsuitCrud.py +++ b/APPData/Crud/LawsuitCrud.py @@ -6,7 +6,7 @@ from APPData.Model import CompanyModel as Model def create_lawsuit_by_id(db: Session, mongodb, _id, content): item = Model.Lawsuit() item._id = _id - obj_id = mongodb.insert_data(dbname="WR_DataBase_v2_test", sheet="C9.6_法律诉讼", data=content) + obj_id = mongodb.insert_data(dbname="WR_DataBase", sheet="C9.6_法律诉讼", data=content) item.obj_id = obj_id db.add(item) db.commit() @@ -14,7 +14,7 @@ def create_lawsuit_by_id(db: Session, mongodb, _id, content): def update_lawsuit_by_id(mongodb, _id, content): - mongodb.update_data(dbname="WR_DataBase_v2_test", sheet="C9.6_法律诉讼", search={"id": _id}, field=content) + mongodb.update_data(dbname="WR_DataBase", sheet="C9.6_法律诉讼", search={"id": _id}, field=content) return True @@ -22,7 +22,7 @@ def find_lawsuit_by_id(db: Session, mongodb, _id): db_item = db.query(Model.Lawsuit).filter_by(_id=_id).all() data = list() for item in db_item: - insert = mongodb.find_data_by_id(dbname="WR_DataBase_v2_test", sheet="C9.6_法律诉讼", _id=item.obj_id) + insert = mongodb.find_data_by_id(dbname="WR_DataBase", sheet="C9.6_法律诉讼", _id=item.obj_id) data.append(insert) return data diff --git a/APPData/Crud/MacroDataCrud.py b/APPData/Crud/MacroDataCrud.py index 1d6e0f5..1c250e8 100644 --- a/APPData/Crud/MacroDataCrud.py +++ b/APPData/Crud/MacroDataCrud.py @@ -1,10 +1,10 @@ def upsert_data(mongodb, data): - mongodb.upsert_data("WR_DataBase_v2_test", 'C12.2_区域经济', + mongodb.upsert_data("WR_DataBase", 'C12.2_区域经济', {"省/直辖市": data['省/直辖市'], "地区": data['地区'], "年份": data["年份"]}, data) return True def find_data(mongodb, condition): - data = mongodb.find_all_data("WR_DataBase_v2_test", 'C12.2_区域经济', + data = mongodb.find_all_data("WR_DataBase", 'C12.2_区域经济', {"省/直辖市": condition.provinces, "地区": condition.region, "年份": condition.year}, []) return data diff --git a/APPData/Crud/ShareholderCrud.py b/APPData/Crud/ShareholderCrud.py index 038b506..3a45690 100644 --- a/APPData/Crud/ShareholderCrud.py +++ b/APPData/Crud/ShareholderCrud.py @@ -6,7 +6,7 @@ from APPData.Model import CompanyModel as Model def create_shareholder_by_id(db: Session, mongodb, _id, content): item = Model.Shareholder() item._id = _id - obj_id = mongodb.insert_data(dbname="WR_DataBase_v2_test", sheet="C3.2_股东信息", data=content) + obj_id = mongodb.insert_data(dbname="WR_DataBase", sheet="C3.2_股东信息", data=content) item.obj_id = obj_id db.add(item) db.commit() @@ -15,11 +15,11 @@ def create_shareholder_by_id(db: Session, mongodb, _id, content): def update_shareholder_by_id(db: Session, mongodb, _id, content): item = db.query(Model.Shareholder).filter_by(_id=_id).first() - mongodb.update_data_by_id(dbname="WR_DataBase_v2_test", sheet="C3.2_股东信息", _id=item.obj_id, data=content) + mongodb.update_data_by_id(dbname="WR_DataBase", sheet="C3.2_股东信息", _id=item.obj_id, data=content) return True def find_shareholder_by_id(db: Session, mongodb, _id): item = db.query(Model.Shareholder).filter_by(_id=_id).first() - data = mongodb.find_data_by_id(dbname="WR_DataBase_v2_test", sheet="C3.2_股东信息", _id=item.obj_id) + data = mongodb.find_data_by_id(dbname="WR_DataBase", sheet="C3.2_股东信息", _id=item.obj_id) return data \ No newline at end of file diff --git a/Utils/DataBase/DBConfig.json b/Utils/DataBase/DBConfig.json index 7a08ea8..57aeb3a 100644 --- a/Utils/DataBase/DBConfig.json +++ b/Utils/DataBase/DBConfig.json @@ -3,7 +3,7 @@ "wr_model_store": "mysql+pymysql://root:123456@localhost/wr_model_store?charset=utf8mb4" }, "MongoDB": { - "test": "root:sromitdTW569kC#M@116.63.130.34:27018", + "test": "root:123456@localhost:27017", "tyc": "root:gP@DwMSVd5Sh6EiH@116.63.130.34:27019" } } \ No newline at end of file