From f5d99b39f4dfafa305015a97a84ef64402697ac5 Mon Sep 17 00:00:00 2001
From: wcq <wuchunquan@fecr.com.cn>
Date: Wed, 29 Mar 2023 10:56:53 +0800
Subject: [PATCH] =?UTF-8?q?mongodb=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=90=8D=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Context/common.py                                      |  9 ++++++---
 .../Mods/AreaIndustrialStructure/Models.py             |  5 +++--
 .../Mods/AreaIndustrialStructure/Schemas.py            | 10 ++++++----
 Utils/MongoUtils.py                                    | 10 ++++++++--
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/Context/common.py b/Context/common.py
index 56a3244..e11d49a 100644
--- a/Context/common.py
+++ b/Context/common.py
@@ -30,7 +30,10 @@ common_db = SqlalchemyConnect(common_db_base, host=conf['mysql']['host'],
                               db=conf['mysql']['db'])
 
 # mongo db
-mg_db = MongoConnect(conf["mongo"]["host"], int(conf["mongo"]["port"]), conf["mongo"]["db"])
+mg_db = MongoConnect(conf["mongo"]["host"], int(conf["mongo"]["port"]),
+                     conf["mongo"]["db"],
+                     conf["mongo"].get('user'),
+                     conf["mongo"].get("password"))
 
 # 邮箱验证码工具类
 email_code_verify = EmailCodeVerify(redis_pool, conf['email']['api'], conf['email']['sender'])
@@ -52,6 +55,6 @@ phone_msg_send = PhoneMsgSend(conf['hw_msg']['url'],
 phone_verify_code = PhoneVerifyCode(redis_pool, phone_msg_send)
 
 # 天眼查接口
-tianyancha_api = TianyanchaApi(conf['tianyancha']['token'])
+tianyancha_api = TianyanchaApi(conf['tianyancha']['token'], mg_db)
 # 预警通接口
-yujingtong_api = YujingtongApi(conf['yujingtong']['token'])
+yujingtong_api = YujingtongApi(conf['yujingtong']['token'], mg_db)
diff --git a/Mods/RegionalEconomies/Mods/AreaIndustrialStructure/Models.py b/Mods/RegionalEconomies/Mods/AreaIndustrialStructure/Models.py
index d07c0a7..df13502 100644
--- a/Mods/RegionalEconomies/Mods/AreaIndustrialStructure/Models.py
+++ b/Mods/RegionalEconomies/Mods/AreaIndustrialStructure/Models.py
@@ -10,8 +10,9 @@ class AreaIndustrialStructure(common_db.Base):
     __tablename__ = "area_industrial_structure"
     id = Column(Integer, primary_key=True)
     area_id = Column(Integer, comment="区域ID")
-    count_type = Column(String(128), comment="统计类型")
-    count_value = Column(String(128), comment="统计时间")
+    # count_type = Column(String(128), comment="统计类型")
+    # count_value = Column(String(128), comment="统计时间")
+    year = Column(Integer, comment="统计时间")
     first_Industry_development = Column(Text, comment="第一产业发展情况")
     second_Industry_development = Column(Text, comment="第二产业发展情况")
     tertiary_Industry_development = Column(Text, comment="第三产业发展情况")
diff --git a/Mods/RegionalEconomies/Mods/AreaIndustrialStructure/Schemas.py b/Mods/RegionalEconomies/Mods/AreaIndustrialStructure/Schemas.py
index 603d326..2dba4a6 100644
--- a/Mods/RegionalEconomies/Mods/AreaIndustrialStructure/Schemas.py
+++ b/Mods/RegionalEconomies/Mods/AreaIndustrialStructure/Schemas.py
@@ -6,8 +6,9 @@ from typing import Optional, List
 class AreaIndustrialStructureInfo(BaseModel):
     id: Optional[int]
     area_id: Optional[int]
-    count_type: Optional[str]
-    count_value: Optional[str]
+    year: Optional[int]
+    # count_type: Optional[str]
+    # count_value: Optional[str]
     first_Industry_development: Optional[str]
     second_Industry_development: Optional[str]
     tertiary_Industry_development: Optional[str]
@@ -15,8 +16,9 @@ class AreaIndustrialStructureInfo(BaseModel):
 
 class AreaIndustrialStructureAddInfo(BaseModel):
     area_id: int
-    count_type: Optional[str]
-    count_value: Optional[str]
+    # count_type: Optional[str]
+    # count_value: Optional[str]
+    year: Optional[int]
     first_Industry_development: Optional[str]
     second_Industry_development: Optional[str]
     tertiary_Industry_development: Optional[str]
diff --git a/Utils/MongoUtils.py b/Utils/MongoUtils.py
index 639b495..7da1c2e 100644
--- a/Utils/MongoUtils.py
+++ b/Utils/MongoUtils.py
@@ -14,11 +14,17 @@ def pydantic_to_mg_dict(data: BaseModel):
 
 
 class MongoConnect:
-    def __init__(self, host="localhost", port: int = 27017, db: str = None):
+    def __init__(self, host="localhost", port: int = 27017, db: str = None, user: str = None, password: str = None):
         self.host = host
         self.port = port
         self.db = db
-        self.client = MongoClient(host=self.host, port=self.port)
+        self.user = user
+        self.password = password
+        if self.user:
+            self.client = MongoClient(host=self.host, port=self.port,
+                                      username=self.user, password=self.password)
+        else:
+            self.client = MongoClient(host=self.host, port=self.port)
         self.db = self.client[self.db]
 
     def get_db(self):