mns-common 1.2.9.2__py3-none-any.whl → 1.2.9.5__py3-none-any.whl

mns_common/api/ths/concept/web/ths_company_info_web.py

@@ -128,11 +128,32 @@ def get_company_info_detail(symbol: str = "688272") -> pd.DataFrame:
         data_df['address'] = address
         market_id = data_json['data']['market_id']
         data_df['market_id'] = market_id
+        # 初始化数据
+        data_df['main_business_list'] = [[]]
+        data_df['most_profitable_business'] = ''
+        data_df['most_profitable_business_rate'] = ''
+        data_df['most_profitable_business_profit'] = ''
 
+        # 业务构成
+        main_business_list = data_json['data']['main_business']
+        # 最盈利业务
+        profitable_business = data_json['data']['profitable_business']
+
+        data_df['main_business_list'] = [main_business_list]
+
+        most_profitable_business = profitable_business['name']
+
+        most_profitable_business_rate = profitable_business['profit_rate']
+
+        most_profitable_business_profit = profitable_business['profit']
+
+        data_df['most_profitable_business'] = most_profitable_business
+        data_df['most_profitable_business_rate'] = most_profitable_business_rate
+        data_df['most_profitable_business_profit'] = most_profitable_business_profit
         return data_df
     except BaseException as e:
         logger.error("获取symbol公司详细信息异常:{},{}", symbol, e)
 
 
 if __name__ == '__main__':
-    get_company_info('688272')
+    get_company_info_detail('688272')

mns_common/db/MongodbUtil.py

@@ -21,8 +21,18 @@ class MongodbUtil:
 
     def get_db(self):
         port = self.port
-
-        client = pymongo.MongoClient("mongodb://192.168.200.2:" + port + "/patience")
+        mac_address = ip_util.get_mac_address()
+        if port == "remote":
+            client = pymongo.MongoClient("mongodb://100.87.2.149:" + '27017' + "/patience")
+        elif port == "remote1":
+            client = pymongo.MongoClient("mongodb://100.87.2.149:" + '27019' + "/patience")
+        # 家里
+        elif mac_address is not None and mac_address == ip_util.WINDOWS_MAC_ADDRESS_CD:
+            client = pymongo.MongoClient("mongodb://127.0.0.1:" + port + "/patience")
+        elif '192.168.1' in ip_util.get_host_ip() and mac_address is not None and mac_address == ip_util.APPLE_AIR_MAC_ADDRESS:
+            client = pymongo.MongoClient("mongodb://127.0.0.1:" + port + "/patience")
+        else:
+            client = pymongo.MongoClient("mongodb://127.0.0.1:" + port + "/patience")
         return client.patience
 
     def group(self, query, coll_name):

{mns_common-1.2.9.2.dist-info → mns_common-1.2.9.5.dist-info}/METADATA

@@ -1,4 +1,4 @@
 Metadata-Version: 2.1
 Name: mns_common
-Version: 1.2.9.2
+Version: 1.2.9.5
 

{mns_common-1.2.9.2.dist-info → mns_common-1.2.9.5.dist-info}/RECORD

@@ -48,7 +48,7 @@ mns_common/api/ths/concept/app/ths_concept_detail_app.py,sha256=pPrpntV1tQlgdsSe
 mns_common/api/ths/concept/app/ths_concept_index_app.py,sha256=_7QuYoMKOnMqDE85mfWtBGZ1NDvRUDRpC0b0rMdrku0,8171
 mns_common/api/ths/concept/web/__init__.py,sha256=2U9DiKslxsWwLLEcZKjS8UiQPN1QgALvnK3HiJNIZE0,163
 mns_common/api/ths/concept/web/ths_common_js_api.py,sha256=ekU9BtSX0xFkeFDVn9QQG_qgQXhpSmZKGKpgkDbeYk4,381
-mns_common/api/ths/concept/web/ths_company_info_web.py,sha256=Q_yofooG5ruwWQRDIieTqDiKWcfr8cGSLghLLsmoyVg,6670
+mns_common/api/ths/concept/web/ths_company_info_web.py,sha256=m9nSdeX_vouMZ88VY1B-X79jHtsySKZQv7h2kqxDnq0,7625
 mns_common/api/ths/concept/web/ths_concept_detail_web.py,sha256=F7PIXPd1dbAR0VbqukeZYRWXEjZT-8Dxjj05lgdCSAc,8540
 mns_common/api/ths/concept/web/ths_concept_index_web.py,sha256=zULAWpnmpnwc2MOZt7fiMHuAFoJZoln50dunWCGCvHY,7300
 mns_common/api/ths/self_choose/__init__.py,sha256=2U9DiKslxsWwLLEcZKjS8UiQPN1QgALvnK3HiJNIZE0,163
@@ -114,7 +114,7 @@ mns_common/constant/db_name_constant.py,sha256=3o0HsZHomPXqw5UwRYWDhgvSBRj2lUoXZ
 mns_common/constant/price_enum.py,sha256=nhcPxk0AFdQAp8IsNr5EP9xURLqqJuSl6ljIzTp7Wyo,1093
 mns_common/constant/redis_msg_constant.py,sha256=fMtI_WbJ2IkMX4qGwvR5MkMO0NqU8XgUUZqQzHIRscU,501
 mns_common/constant/self_choose_constant.py,sha256=QJVSwUpnXvMYA62V3_8ptDqBdI2J8S5FqI5rYSJTwT0,496
-mns_common/db/MongodbUtil.py,sha256=KN7StZYcyng9ga9ywNxvwI4wq4UjOOo3CNY4Kmp5E3k,11024
+mns_common/db/MongodbUtil.py,sha256=oO6t_kKiC13uS4M3OyyQkc_ktfOKhBgWLu49LVy4QQo,11745
 mns_common/db/MongodbUtilLocal.py,sha256=xLUTeeZ83BbqPtUEwy7QmPtkSfwPyNB_5ggkn-eMpBQ,7560
 mns_common/db/__init__.py,sha256=2U9DiKslxsWwLLEcZKjS8UiQPN1QgALvnK3HiJNIZE0,163
 mns_common/utils/__init__.py,sha256=xu36nA6MJTauswUWPfKIKH0E-lpOAHTw2TL5QI_6TeY,165
@@ -125,7 +125,7 @@ mns_common/utils/date_handle_util.py,sha256=-WJF_0DRkPkKlfQ5lVqJu8mH3EhpIZ-EBrz0
 mns_common/utils/db_util.py,sha256=hSmfNAN4vEeEaUva6_cicZEhb2jSnib-Gvk2reke1vc,2590
 mns_common/utils/file_util.py,sha256=egWu6PenGPRp_ixrNTHKarT4dAnOT6FETR82EHUZJnQ,1042
 mns_common/utils/ip_util.py,sha256=UTcYfz_uytB__6nlBf7T-izuI7hi4XdB6ET0sJgEel4,969
-mns_common-1.2.9.2.dist-info/METADATA,sha256=8MO0MDtrsAxtMEEFi0Vuwj9Rg6sjI6pL7S5ojKaLQWw,61
-mns_common-1.2.9.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mns_common-1.2.9.2.dist-info/top_level.txt,sha256=ZC58kAR-8Hvc6U2xhYNBNLAh3mb6sZazbdj5nZpvEkQ,11
-mns_common-1.2.9.2.dist-info/RECORD,,
+mns_common-1.2.9.5.dist-info/METADATA,sha256=V-ZNYe1LxqePHvuZkyWlcxhV4xp2Dxjpoz6E4Y--Y9A,61
+mns_common-1.2.9.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mns_common-1.2.9.5.dist-info/top_level.txt,sha256=ZC58kAR-8Hvc6U2xhYNBNLAh3mb6sZazbdj5nZpvEkQ,11
+mns_common-1.2.9.5.dist-info/RECORD,,