mns-scheduler 1.0.2.0__tar.gz → 1.0.2.2__tar.gz

{mns-scheduler-1.0.2.0 → mns-scheduler-1.0.2.2}/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.0.2.0
+Version: 1.0.2.2

{mns-scheduler-1.0.2.0 → mns-scheduler-1.0.2.2}/mns_scheduler/company_info/company_info_sync_api.py

@@ -367,6 +367,7 @@ def set_kpl_data(kpl_real_time_quotes_one, company_info_type, company_one):
     return company_info_type
 
 
+# 更新新上市公司信息
 def new_company_info_update():
     east_money_stock_info = get_east_money_stock_info()
     new_stock = common_service_fun_api.get_new_stock(east_money_stock_info)
@@ -380,6 +381,7 @@ def new_company_info_update():
     company_common_service_api.company_info_industry_cache_clear
 
 
+# 保存申万行业分类
 def save_sw_data(company_info_type):
     first_sw_info = company_info_type[[
         'first_sw_industry',

{mns-scheduler-1.0.2.0 → mns-scheduler-1.0.2.2}/mns_scheduler/concept/ths/common/ths_concept_sync_common_api.py

@@ -15,7 +15,7 @@ sys.path.append(project_path)
 mongodb_util = MongodbUtil('27017')
 import mns_common.api.msg.push_msg_api as push_msg_api
 import mns_scheduler.company_info.company_info_sync_api as company_info_sync_api
-
+import mns_common.utils.data_frame_util as data_frame_util
 max_concept_code = 886110
 
 order_fields = [

mns-scheduler-1.0.2.2/mns_scheduler/concept/ths/common/ths_concept_update_common_api.py

@@ -0,0 +1,31 @@
+import sys
+import os
+
+file_path = os.path.abspath(__file__)
+end = file_path.index('mns') + 17
+project_path = file_path[0:end]
+sys.path.append(project_path)
+
+import mns_common.component.concept.ths_concept_common_service_api as ths_concept_common_service_api
+from mns_common.db.MongodbUtil import MongodbUtil
+from loguru import logger
+import mns_common.utils.data_frame_util as data_frame_util
+import mns_common.constant.db_name_constant as db_name_constant
+mongodb_util = MongodbUtil('27017')
+
+
+def update_ths_concept_detail(ths_symbol_all_concepts, symbol):
+    all_ths_concept = ths_concept_common_service_api.get_all_ths_concept()
+    for concept_one in ths_symbol_all_concepts.itertuples():
+        try:
+            ths_concept_one_db = all_ths_concept.loc[all_ths_concept['web_concept_code'] == int(concept_one.cid)]
+            if data_frame_util.is_not_empty(ths_concept_one_db):
+                concept_code = list(ths_concept_one_db['symbol'])[0]
+                query = {"$or": [{'symbol': symbol, "concept_code": int(concept_code)},
+                                 {'symbol': symbol, "concept_code": int(concept_one.cid)}]}
+                short = concept_one.short
+                long = concept_one.long
+                new_values = {"$set": {"short": short, "long": long}}
+                mongodb_util.update_many(query, new_values, db_name_constant.THS_STOCK_CONCEPT_DETAIL)
+        except BaseException as e:
+            logger.error("更新ths概念入选理由异常{},{},{}", symbol, concept_one.title, e)

{mns-scheduler-1.0.2.0 → mns-scheduler-1.0.2.2}/mns_scheduler/concept/ths/symbol/sync_symbol_all_concepts_api.py

@@ -11,6 +11,7 @@ from datetime import datetime
 from mns_common.utils.async_fun import async_fun
 import mns_scheduler.concept.ths.common.ths_concept_sync_common_api as ths_concept_sync_common_api
 import threading
+import mns_scheduler.concept.ths.common.ths_concept_update_common_api as ths_concept_update_common_api
 
 file_path = os.path.abspath(__file__)
 end = file_path.index('mns') + 17
@@ -90,6 +91,8 @@ def update_symbol_new_concept(symbol_df, page_number):
             if data_frame_util.is_empty(symbol_ths_concept_all_df):
                 continue
 
+            ths_concept_update_common_api.update_ths_concept_detail(symbol_ths_concept_all_df, stock_one.symbol)
+
             now_date = datetime.now()
             str_day = now_date.strftime('%Y-%m-%d')
             str_now_date = now_date.strftime('%Y-%m-%d %H:%M:%S')
@@ -158,7 +161,10 @@ def sync_symbol_all_concept(symbol):
     for page in range(page_number):  # 0到100页
         end_count = (page + 1) * MAX_PAGE_NUMBER
         begin_count = page * MAX_PAGE_NUMBER
-        page_df = real_time_quotes_now.loc[begin_count:end_count]
+        if symbol is None:
+            page_df = real_time_quotes_now.loc[begin_count:end_count]
+        else:
+            page_df = real_time_quotes_now
         thread = threading.Thread(target=update_symbol_new_concept, args=(page_df, page_number))
         threads.append(thread)
         thread.start()

{mns-scheduler-1.0.2.0 → mns-scheduler-1.0.2.2}/mns_scheduler/concept/ths/web/sync_ths_concept_by_ak_api.py

@@ -58,7 +58,7 @@ def sync_new_ths_concept_by_ak_api():
                     'str_day': str_day,
                     'success': True,
                     'str_now_time': str_now_time,
-                    'web_concept_code': concept_one.concept_code,
+                    'web_concept_code': int(concept_one.concept_code),
                     'web_concept_url': concept_one.url,
                     'valid': True
                 }

{mns-scheduler-1.0.2.0 → mns-scheduler-1.0.2.2}/mns_scheduler/zt/zt_pool_sync_api.py

@@ -126,24 +126,23 @@ def save_zt_info(str_day):
     mongodb_util.save_mongo(stock_em_zt_pool_df_data, 'stock_zt_pool')
     return stock_em_zt_pool_df_data
 
-
-from datetime import datetime
-
-if __name__ == '__main__':
-
-    sync_date = date_handle_util.add_date_day('20240110', 0)
-
-    now_date = datetime.now()
-
-    str_now_day = sync_date.strftime('%Y-%m-%d')
-
-    while now_date > sync_date:
-        try:
-            save_zt_info(str_now_day)
-            sync_date = date_handle_util.add_date_day(date_handle_util.no_slash_date(str_now_day), 1)
-            print(str_now_day)
-            str_now_day = sync_date.strftime('%Y-%m-%d')
-
-        except BaseException as e:
-            sync_date = date_handle_util.add_date_day(date_handle_util.no_slash_date(str_now_day), 1)
-            str_now_day = sync_date.strftime('%Y-%m-%d')
+# from datetime import datetime
+#
+# if __name__ == '__main__':
+#
+#     sync_date = date_handle_util.add_date_day('20240110', 0)
+#
+#     now_date = datetime.now()
+#
+#     str_now_day = sync_date.strftime('%Y-%m-%d')
+#
+#     while now_date > sync_date:
+#         try:
+#             save_zt_info(str_now_day)
+#             sync_date = date_handle_util.add_date_day(date_handle_util.no_slash_date(str_now_day), 1)
+#             print(str_now_day)
+#             str_now_day = sync_date.strftime('%Y-%m-%d')
+#
+#         except BaseException as e:
+#             sync_date = date_handle_util.add_date_day(date_handle_util.no_slash_date(str_now_day), 1)
+#             str_now_day = sync_date.strftime('%Y-%m-%d')

{mns-scheduler-1.0.2.0 → mns-scheduler-1.0.2.2}/mns_scheduler.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.0.2.0
+Version: 1.0.2.2

{mns-scheduler-1.0.2.0 → mns-scheduler-1.0.2.2}/mns_scheduler.egg-info/SOURCES.txt

@@ -22,6 +22,7 @@ mns_scheduler/concept/ths/app/__init__.py
 mns_scheduler/concept/ths/app/ths_new_concept_sync_app.py
 mns_scheduler/concept/ths/common/__init__.py
 mns_scheduler/concept/ths/common/ths_concept_sync_common_api.py
+mns_scheduler/concept/ths/common/ths_concept_update_common_api.py
 mns_scheduler/concept/ths/symbol/__init__.py
 mns_scheduler/concept/ths/symbol/sync_concept_all_symbols_api.py
 mns_scheduler/concept/ths/symbol/sync_symbol_all_concepts_api.py

{mns-scheduler-1.0.2.0 → mns-scheduler-1.0.2.2}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='mns-scheduler',
-    version='1.0.2.0',
+    version='1.0.2.2',
     packages=find_packages(),
     install_requires=[],  # 如果有依赖项，可以在这里列出
 )