mns-scheduler 1.0.9.6__tar.gz → 1.1.0.1__tar.gz

{mns-scheduler-1.0.9.6 → mns-scheduler-1.1.0.1}/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.0.9.6
+Version: 1.1.0.1

{mns-scheduler-1.0.9.6 → mns-scheduler-1.1.0.1}/mns_scheduler/big_deal/ths_big_deal_sync.py

@@ -10,7 +10,7 @@ from datetime import datetime, time, timedelta
 from loguru import logger
 import mns_common.utils.data_frame_util as data_frame_util
 from mns_common.db.MongodbUtil import MongodbUtil
-import mns_common.api.ths.ths_big_deal_api as ths_big_deal_api
+import mns_common.api.ths.big_deal.ths_big_deal_api as ths_big_deal_api
 import time as sleep_time
 import mns_common.constant.db_name_constant as db_name_constant
 

{mns-scheduler-1.0.9.6 → mns-scheduler-1.1.0.1}/mns_scheduler/company_info/company_info_sync_api.py

@@ -9,7 +9,7 @@ sys.path.append(project_path)
 from datetime import datetime
 import pandas as pd
 from loguru import logger
-import mns_common.api.ths.ths_stock_api as ths_stock_api
+import mns_common.api.ths.concept.web.ths_company_info_web as ths_company_info_web
 import mns_common.api.em.east_money_stock_v2_api as east_money_stock_v2_api
 import mns_scheduler.company_info.company_constant_data as company_constant_data_api
 import mns_common.component.common_service_fun_api as common_service_fun_api
@@ -21,6 +21,7 @@ import mns_common.api.kpl.constant.kpl_constant as kpl_constant
 import mns_common.component.company.company_common_service_api as company_common_service_api
 import mns_common.component.k_line.common.k_line_common_service_api as k_line_common_service_api
 import mns_common.constant.db_name_constant as db_name_constant
+import mns_scheduler.concept.common.detaill.ths_concept_detail_api as ths_concept_detail_api
 
 mongodb_util = MongodbUtil('27017')
 # 分页大小
@@ -187,7 +188,7 @@ def fix_company_industry(symbol):
 
     try:
         # 次新股
-        sub_stock = ths_stock_api.ths_stock_concept('885598')
+        sub_stock = ths_concept_detail_api.get_ths_concept_detail('885598', None)
         sub_stock_symbol_list = list(sub_stock['symbol'])
     except BaseException as e:
         logger.error("出现异常:{},{}", symbol, e)
@@ -272,7 +273,7 @@ def single_thread_sync_company_info(east_money_stock_info,
     fail_list = []
     for company_one in east_money_stock_info.itertuples():
         try:
-            company_info_type = ths_stock_api.get_company_info_detail(company_one.symbol)
+            company_info_type = ths_company_info_web.get_company_info_detail(company_one.symbol)
             company_info_type['first_industry_code'] = company_info_type['hycode'].apply(
                 lambda x: x[1:3] + '0000')
             company_info_type['second_industry_code'] = company_info_type['hy2code'].apply(
@@ -502,11 +503,6 @@ def get_recent_year_income(symbol, company_info_type):
 
 
 if __name__ == '__main__':
-    # while True:
-    #     df = ths_stock_api.get_company_info_detail('000001')
-    #     print(df)
-    # company_info_update()
-    # company_info_type = ths_stock_api.get_company_info_detail('836699')
     # sync_company_base_info()
     # fix_company_industry()
     # calculate_circu_ratio("601069")
@@ -514,6 +510,6 @@ if __name__ == '__main__':
     # 300293
     # sync_company_base_info(None)
     # new_company_info_update()
-    sync_company_base_info(['920002'])
+    sync_company_base_info(None)
     fix_company_industry(None)
     # group_by_industry()

{mns-scheduler-1.0.9.6 → mns-scheduler-1.1.0.1}/mns_scheduler/concept/clean/ths_concept_clean_api.py

@@ -7,7 +7,7 @@ project_path = file_path[0:end]
 sys.path.append(project_path)
 from mns_common.db.MongodbUtil import MongodbUtil
 import pandas as pd
-import mns_common.api.ths.ths_stock_api as ths_stock_api
+import mns_scheduler.concept.common.detaill.ths_concept_detail_api as ths_concept_detail_api
 import time
 from loguru import logger
 import mns_common.component.company.company_common_service_api as company_common_service_api
@@ -86,7 +86,7 @@ def update_null_name():
         exist_url = concept_one.url
 
         if name == '':
-            concept_name = ths_stock_api.get_concept_name(concept_code)
+            concept_name = ths_concept_detail_api.get_ths_concept_detail(concept_code, None)
             query_concept = {"symbol": concept_code}
             new_values = {'$set': {"name": concept_name}}
             mongodb_util.update_one_query(query_concept, new_values, 'ths_concept_list')

mns-scheduler-1.1.0.1/mns_scheduler/concept/common/detaill/ths_concept_detail_api.py

@@ -0,0 +1,196 @@
+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
+import mns_common.component.common_service_fun_api as common_service_fun_api
+import mns_common.api.ths.concept.app.ths_concept_detail_app as ths_concept_detail_app
+import mns_common.api.ths.wen_cai.ths_wen_cai_api as ths_wen_cai_api
+import mns_common.api.em.east_money_stock_api as east_money_stock_api
+import mns_common.component.company.company_common_service_new_api as company_common_service_new_api
+import mns_common.api.ths.concept.web.ths_concept_detail_web as ths_concept_detail_web
+import math
+from loguru import logger
+import pandas as pd
+import mns_common.utils.data_frame_util as data_frame_util
+
+
+def get_ths_concept_detail(concept_code, concept_name):
+    real_time_quotes_all_stocks = east_money_stock_api.get_real_time_quotes_all_stocks()
+    # 1  通过入选理获取概念组成股票详情
+    ths_concept_detail_by_explain = get_ths_concept_detail_by_explain(concept_code, real_time_quotes_all_stocks)
+    # 2 app 分享链接获取概念组成详情
+    ths_concept_detail_from_app = get_ths_concept_detail_from_app(concept_code, real_time_quotes_all_stocks)
+    # 3 通过问财
+    if concept_name is None or data_frame_util.is_string_empty(concept_name):
+        ths_concept_list = ths_concept_common_service_api.get_all_ths_concept()
+        ths_concept_one_df = ths_concept_list.loc[
+            (ths_concept_list['symbol'] == int(concept_code))
+            | (ths_concept_list['web_concept_code'] == int(concept_code))]
+        if data_frame_util.is_not_empty(ths_concept_one_df):
+            concept_name = list(ths_concept_one_df['name'])[0]
+    if data_frame_util.is_string_not_empty(concept_name) and concept_name is not None:
+        concept_detail_by_wen_cai_df = get_ths_concept_detail_by_wen_cai(concept_name, real_time_quotes_all_stocks)
+    else:
+        concept_detail_by_wen_cai_df = None
+    # 4 通过web端
+    ths_concept_detail_from_web_df = get_ths_concept_detail_from_web(concept_code, real_time_quotes_all_stocks)
+    # 判断是否都为空
+    all_are_none = all(
+        df is None for df in [ths_concept_detail_by_explain, ths_concept_detail_from_app,
+                              concept_detail_by_wen_cai_df, ths_concept_detail_from_web_df])
+    if all_are_none:
+        return None
+    result_df = pd.concat([ths_concept_detail_by_explain, ths_concept_detail_from_app,
+                           concept_detail_by_wen_cai_df, ths_concept_detail_from_web_df])
+
+    result_df.drop_duplicates('symbol', keep='last', inplace=True)
+    if data_frame_util.is_not_empty(ths_concept_detail_by_explain):
+        ths_concept_detail_by_explain_new = ths_concept_detail_by_explain.loc[
+            ths_concept_detail_by_explain['symbol'].isin(result_df['symbol'])]
+
+        not_in_ths_concept_detail_by_explain = result_df.loc[~(
+            result_df['symbol'].isin(ths_concept_detail_by_explain['symbol']))]
+        result_df = pd.concat([ths_concept_detail_by_explain_new, not_in_ths_concept_detail_by_explain])
+    return result_df
+
+
+# 通过入选理获取概念组成股票详情
+def get_ths_concept_detail_by_explain(concept_code, real_time_quotes_all_stocks):
+    page_size = 800
+
+    de_list_symbols = company_common_service_new_api.get_de_list_company()
+    real_time_quotes_all_stocks = real_time_quotes_all_stocks.loc[
+        ~(real_time_quotes_all_stocks['symbol'].isin(de_list_symbols))]
+
+    max_page_number = math.ceil(real_time_quotes_all_stocks.shape[0] / page_size)
+    page = 0
+
+    result_df = None
+
+    while page < max_page_number:
+        try:
+
+            begin_index = page * page_size
+            end_index = (page + 1) * page_size
+            page_df = real_time_quotes_all_stocks.iloc[begin_index: end_index]
+            code_list = ','.join(page_df['symbol'].astype(str))
+            all_ths_concept_detail = ths_concept_detail_app.get_concept_explain(concept_code, code_list)
+            if data_frame_util.is_empty(result_df) and data_frame_util.is_not_empty(all_ths_concept_detail):
+                result_df = all_ths_concept_detail
+            elif data_frame_util.is_not_empty(result_df) and data_frame_util.is_not_empty(all_ths_concept_detail):
+                result_df = pd.concat([all_ths_concept_detail, result_df])
+        except BaseException as e:
+            logger.error("通过ths概念入选理由列表获取详情异常:{},{}", concept_code, e)
+        page = page + 1
+    if data_frame_util.is_not_empty(result_df):
+        result_df = result_df[result_df['explain'].astype(str).str.len() > 0]
+    if data_frame_util.is_not_empty(result_df):
+        result_df = result_df.rename(columns={
+            "stockCode": "symbol",
+            "explain": "long"})
+        result_df = merge_data_common_fun(result_df, real_time_quotes_all_stocks)
+        return result_df
+    else:
+        return None
+
+
+# 通过分享链接获取
+def get_ths_concept_detail_from_app(concept_code, real_time_quotes_all_stocks):
+    ths_concept_detail_from_app = ths_concept_detail_app.get_ths_concept_detail_by_app(concept_code)
+    if data_frame_util.is_not_empty(ths_concept_detail_from_app):
+        ths_concept_detail_from_app['long'] = ''
+        ths_concept_detail_from_app = ths_concept_detail_from_app[[
+            'symbol',
+            'long'
+        ]]
+        ths_concept_detail_from_app = merge_data_common_fun(ths_concept_detail_from_app,
+                                                            real_time_quotes_all_stocks)
+        return ths_concept_detail_from_app
+
+    else:
+        return None
+
+
+# 3 通过问财
+def get_ths_concept_detail_by_wen_cai(concept_name, real_time_quotes_all_stocks):
+    concept_detail_by_wen_cai_df = ths_wen_cai_api.get_concept_detail_by_wen_cai(concept_name)
+    if data_frame_util.is_not_empty(concept_detail_by_wen_cai_df):
+        concept_detail_by_wen_cai_df = concept_detail_by_wen_cai_df[[
+            'symbol',
+            'explain'
+        ]]
+
+        concept_detail_by_wen_cai_df = concept_detail_by_wen_cai_df.rename(columns={
+            "explain": "long"})
+        concept_detail_by_wen_cai_df = merge_data_common_fun(concept_detail_by_wen_cai_df,
+                                                             real_time_quotes_all_stocks)
+
+    return concept_detail_by_wen_cai_df
+
+
+# 通过web端 最近不可用
+def get_ths_concept_detail_from_web(concept_code, real_time_quotes_all_stocks):
+    ths_concept_detail_from_web_df = ths_concept_detail_web.stock_board_cons_ths(concept_code)
+    if data_frame_util.is_not_empty(ths_concept_detail_from_web_df):
+        ths_concept_detail_from_web_df = ths_concept_detail_from_web_df[[
+            'symbol'
+        ]]
+        ths_concept_detail_from_web_df['long'] = ''
+
+        ths_concept_detail_from_web_df = merge_data_common_fun(ths_concept_detail_from_web_df,
+                                                               real_time_quotes_all_stocks)
+
+    return ths_concept_detail_from_web_df
+
+
+def merge_data_common_fun(result_df, real_time_quotes_all_stocks):
+    real_time_quotes_ths_detail = real_time_quotes_all_stocks.loc[
+        real_time_quotes_all_stocks['symbol'].isin(result_df['symbol'])]
+    real_time_quotes_ths_detail = common_service_fun_api.total_mv_classification(real_time_quotes_ths_detail)
+    real_time_quotes_ths_detail = real_time_quotes_ths_detail[[
+        "symbol",
+        "name",
+        "now_price",
+        "chg",
+        "exchange",
+        "amount",
+        "flow_mv_sp",
+        "total_mv_sp"]]
+
+    query_field = {
+        "concept_name": 1,
+        "concept_code": 1,
+        "company_type": 1,
+        "concept_create_day": 1,
+        "first_relevance_industry": 1,
+        "second_relevance_industry": 1,
+        "industry": 1
+    }
+    query_field_key = str(query_field)
+    query_key = str({})
+    company_df = company_common_service_new_api.get_company_info_by_field(query_key, query_field_key)
+    company_ths_df = company_df.loc[company_df['_id'].isin(result_df['symbol'])]
+
+    result_df['short'] = result_df['long']
+    result_df = result_df.set_index(['symbol'], drop=True)
+    company_ths_df = company_ths_df.set_index(['_id'], drop=True)
+    real_time_quotes_ths_detail = real_time_quotes_ths_detail.set_index(['symbol'], drop=False)
+    result_df = pd.merge(real_time_quotes_ths_detail, result_df,
+                         how='outer',
+                         left_index=True, right_index=True)
+    result_df = pd.merge(result_df, company_ths_df,
+                         how='outer',
+                         left_index=True, right_index=True)
+    return result_df
+
+
+if __name__ == '__main__':
+    get_ths_concept_detail('886073', '铜缆高速连接')
+    real_time_quotes_all_stocks_df = east_money_stock_api.get_real_time_quotes_all_stocks()
+    get_ths_concept_detail_from_web('886072', real_time_quotes_all_stocks_df)
+    get_ths_concept_detail_by_explain('886078', real_time_quotes_all_stocks_df)
+    get_ths_concept_detail_by_wen_cai('PCB概念', real_time_quotes_all_stocks_df)

{mns-scheduler-1.0.9.6 → mns-scheduler-1.1.0.1}/mns_scheduler/concept/ths/common/ths_concept_sync_common_api.py

@@ -2,7 +2,6 @@ import sys
 import os
 
 import pandas as pd
-import mns_common.api.ths.ths_stock_api as ths_stock_api
 from mns_common.db.MongodbUtil import MongodbUtil
 import mns_common.component.company.company_common_service_api as company_common_service_api
 
@@ -13,6 +12,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_scheduler.concept.common.detaill.ths_concept_detail_api as ths_concept_detail_api
 
 max_concept_code = 886110
 
@@ -155,7 +155,7 @@ def update_company_info(new_concept_symbol_df):
 
 
 def get_concept_detail_info_web(concept_code):
-    new_concept_symbol_list = ths_stock_api.ths_stock_concept(concept_code)
+    new_concept_symbol_list = ths_concept_detail_api.get_ths_concept_detail(concept_code, None)
     if new_concept_symbol_list is None or new_concept_symbol_list.shape[0] == 0:
         return None
     new_concept_symbol_list['_id'] = str(concept_code) + '-' + new_concept_symbol_list['symbol']

{mns-scheduler-1.0.9.6 → mns-scheduler-1.1.0.1}/mns_scheduler/concept/ths/common/ths_concept_update_common_api.py

@@ -13,7 +13,7 @@ import mns_common.utils.data_frame_util as data_frame_util
 import mns_common.constant.db_name_constant as db_name_constant
 import mns_common.component.trade_date.trade_date_common_service_api as trade_date_common_service_api
 from datetime import datetime
-import mns_common.api.ths.ths_stock_api as ths_stock_api
+import mns_common.api.ths.concept.web.ths_concept_detail_web as ths_concept_detail_web
 import pandas as pd
 
 mongodb_util = MongodbUtil('27017')
@@ -69,8 +69,7 @@ def update_null_reason(nan_reason_df):
                 continue
             web_concept_code = list(ths_concept_one_df['web_concept_code'])[0]
 
-            ths_concept_json = ths_stock_api.get_symbol_add_new_concept(nan_one.symbol)
-            symbol_ths_concept_all_df = pd.DataFrame(ths_concept_json)
+            symbol_ths_concept_all_df = ths_concept_detail_web.get_one_symbol_all_ths_concepts(nan_one.symbol)
 
             symbol_ths_concept_one_df = symbol_ths_concept_all_df[
                 symbol_ths_concept_all_df['cid'] == web_concept_code]

{mns-scheduler-1.0.9.6 → mns-scheduler-1.1.0.1}/mns_scheduler/concept/ths/sync_new_index/sync_ths_concept_by_ak_api.py

@@ -13,9 +13,9 @@ import pandas as pd
 from datetime import datetime
 import akshare as ak
 import mns_scheduler.concept.ths.common.ths_concept_sync_common_api as ths_concept_sync_common_api
-import mns_common.api.ths.ths_stock_api as ths_stock_api
-import mns_scheduler.concept.clean.ths_concept_clean_api as ths_concept_clean_api
 
+import mns_scheduler.concept.clean.ths_concept_clean_api as ths_concept_clean_api
+import mns_scheduler.concept.common.detaill.ths_concept_detail_api as ths_concept_detail_api
 mongodb_util = MongodbUtil('27017')
 
 
@@ -90,7 +90,7 @@ def handle_new_concept_msg(concept_code, concept_name, url):
 
 # 获取web端 新增概念详情
 def get_concept_detail_info_web(concept_code):
-    new_concept_symbol_list = ths_stock_api.ths_stock_concept(concept_code)
+    new_concept_symbol_list = ths_concept_detail_api.get_ths_concept_detail(concept_code, None)
     if new_concept_symbol_list is None or new_concept_symbol_list.shape[0] == 0:
         return None
     new_concept_symbol_list = new_concept_symbol_list[ths_concept_sync_common_api.order_fields]

{mns-scheduler-1.0.9.6 → mns-scheduler-1.1.0.1}/mns_scheduler/concept/ths/sync_new_index/sync_ths_new_concept_by_web_api.py

@@ -5,8 +5,8 @@ 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.api.ths.ths_stock_api as ths_stock_api
-
+import mns_scheduler.concept.common.detaill.ths_concept_detail_api as ths_concept_detail_api
+import mns_common.api.ths.concept.web.ths_concept_index_web as ths_concept_index_web
 import datetime
 import time
 import mns_common.api.msg.push_msg_api as push_msg_api
@@ -20,7 +20,7 @@ mongodb_util = MongodbUtil('27017')
 
 # 获取web端 新增概念详情
 def get_concept_detail_info_web(concept_code):
-    new_concept_symbol_list = ths_stock_api.ths_stock_concept(concept_code)
+    new_concept_symbol_list = ths_concept_detail_api.get_ths_concept_detail(concept_code, None)
     if new_concept_symbol_list is None or new_concept_symbol_list.shape[0] == 0:
         return None
     new_concept_symbol_list = new_concept_symbol_list[ths_concept_sync_common_api.order_fields]
@@ -52,7 +52,7 @@ def sync_new_concept_data_by_web():
                 time.sleep(1)
                 continue
             time.sleep(2)
-            concept_name = ths_stock_api.get_concept_name(concept_code)
+            concept_name = ths_concept_index_web.get_concept_name(concept_code)
             concept_name = concept_name.replace('（', '(')
             concept_name = concept_name.replace('）', ')')
 
@@ -82,7 +82,6 @@ def handle_new_concept_msg(concept_code, concept_name, url):
 
 if __name__ == '__main__':
     # code = 886025
-    # name = ths_stock_api.get_concept_name(code)
     # push_msg_to_we_chat_web(code, name)
     # get_concept_detail_info_web(886026)
     # get_concept_detail_info_web(886035)

{mns-scheduler-1.0.9.6 → mns-scheduler-1.1.0.1}/mns_scheduler/concept/ths/update_concept_info/sync_one_symbol_all_concepts_api.py

@@ -1,7 +1,7 @@
 import os
 import sys
 import pandas as pd
-import mns_common.api.ths.ths_stock_api as ths_stock_api
+import mns_common.api.ths.concept.web.ths_concept_detail_web as ths_concept_detail_web
 import mns_common.api.em.east_money_stock_api as east_money_stock_api
 import mns_common.component.common_service_fun_api as common_service_fun_api
 from mns_common.db.MongodbUtil import MongodbUtil
@@ -86,9 +86,8 @@ def choose_type_new_concept(ths_concept_df):
 def update_symbol_new_concept(symbol_df, page_number):
     for stock_one in symbol_df.itertuples():
         try:
-            ths_concept_json = ths_stock_api.get_symbol_add_new_concept(stock_one.symbol)
+            symbol_ths_concept_all_df = ths_concept_detail_web.get_symbol_add_new_concept(stock_one.symbol)
             logger.info("同步symbol概念信息:{}", stock_one.symbol)
-            symbol_ths_concept_all_df = pd.DataFrame(ths_concept_json)
             if data_frame_util.is_empty(symbol_ths_concept_all_df):
                 continue
 
@@ -179,4 +178,4 @@ def sync_symbol_all_concept(symbol):
 
 
 if __name__ == '__main__':
-    sync_symbol_all_concept(None)
+    sync_symbol_all_concept('300085')

{mns-scheduler-1.0.9.6 → mns-scheduler-1.1.0.1}/mns_scheduler/risk/major_violations/register_and_investigate_stock_sync_api.py

@@ -63,7 +63,7 @@ def sync_all_investigate_stocks(page_size, search_key, begin_day, end_day):
 
 
 # 立案调查的股票
-def sync_new_high_risk_stocks():
+def sync_register_and_investigate_stocks():
     before_days = 60
     const_num = 30
     init_date = datetime.now()
@@ -124,7 +124,7 @@ def sync_new_high_risk_stocks():
 
 
 if __name__ == '__main__':
-    sync_new_high_risk_stocks()
+    sync_register_and_investigate_stocks()
     # result_df = sync_all_investigate_stocks(30, '立案', '2023-01-01', '2024-06-15')
     # result_df = result_df.sort_values(by=['announcementTime'], ascending=False)
     # print(result_df)

{mns-scheduler-1.0.9.6 → mns-scheduler-1.1.0.1}/mns_scheduler/risk/self/wei_pan_stock_api.py

@@ -6,7 +6,7 @@ end = file_path.index('mns') + 16
 project_path = file_path[0:end]
 sys.path.append(project_path)
 
-import mns_common.api.ths.ths_stock_api as ths_stock_api
+import mns_scheduler.concept.common.detaill.ths_concept_detail_api as ths_concept_detail_api
 import mns_common.component.self_choose.black_list_service_api as black_list_service_api
 from datetime import datetime
 from loguru import logger
@@ -15,7 +15,7 @@ from mns_common.constant.black_list_classify_enum import BlackClassify
 
 
 def add_concept_to_lack_list(concept_code, reason):
-    new_concept_symbol_list = ths_stock_api.ths_stock_concept(concept_code)
+    new_concept_symbol_list = ths_concept_detail_api.get_ths_concept_detail(concept_code, None)
     if data_frame_util.is_empty(new_concept_symbol_list):
         return None
 

{mns-scheduler-1.0.9.6 → mns-scheduler-1.1.0.1}/mns_scheduler/zt/zt_pool/zt_pool_sync_api.py

@@ -7,7 +7,7 @@ project_path = file_path[0:end]
 sys.path.append(project_path)
 import pandas as pd
 import mns_common.api.akshare.stock_zt_pool_api as stock_zt_pool_api
-import mns_common.api.ths.ths_stock_zt_pool_api as ths_stock_zt_pool_api
+import mns_common.api.ths.zt.ths_stock_zt_pool_api as ths_stock_zt_pool_api
 import mns_common.utils.date_handle_util as date_handle_util
 import mns_common.component.concept.ths_concept_common_service_api as ths_concept_common_service_api
 from mns_common.db.MongodbUtil import MongodbUtil

{mns-scheduler-1.0.9.6 → mns-scheduler-1.1.0.1}/mns_scheduler/zz_task/data_sync_task.py

@@ -262,8 +262,6 @@ def sync_new_ths_concept_by_ak_api():
 def sync_all_kpl_plate_info():
     logger.info('同步开盘啦精选指数开始')
     sync_kpl_best_total_sync_api.sync_all_plate_info()
-    logger.info('同步新概念通过web端')
-    sync_new_concept_data_by_web()
 
 
 # 更新一二级关系
@@ -327,9 +325,9 @@ def sync_kpl_best_his_quotes():
 
 
 # 同步高风险的股票
-def sync_new_high_risk_stocks():
+def sync_high_risk_stocks():
     logger.info('同步被立案调查的股票')
-    register_and_investigate_stock_sync_api.sync_new_high_risk_stocks()
+    register_and_investigate_stock_sync_api.sync_register_and_investigate_stocks()
     reason_detail = '微盘股拉黑'
     concept_code_wei_pan = '883418'
     wei_pan_stock_api.add_concept_to_lack_list(concept_code_wei_pan, reason_detail)
@@ -377,7 +375,7 @@ blockingScheduler.add_job(db_status_check, 'interval', seconds=30, max_instances
 # todo 需要前后顺序执行
 # todo 当日k线信息
 # 同步一天k线 涨停 数据
-blockingScheduler.add_job(sync_daily_data_info, 'cron', hour='15,20', minute='21')
+blockingScheduler.add_job(sync_daily_data_info, 'cron', hour='15,20', minute='26')
 
 # 开盘前同步当天交易需要的k线数据
 blockingScheduler.add_job(sync_today_trade_k_line_info, 'cron', hour='08', minute='30')
@@ -420,8 +418,8 @@ blockingScheduler.add_job(sync_kpl_best_his_quotes, 'cron', hour='18,22', minute
 # 更新开盘啦指数关系
 blockingScheduler.add_job(sync_position, 'cron', hour='0,08', minute='10')
 
-# 同步被立案调查的股票
-blockingScheduler.add_job(sync_new_high_risk_stocks, 'cron', hour='0,09,12,16', minute='20')
+# 同步高风险股票
+blockingScheduler.add_job(sync_high_risk_stocks, 'cron', hour='0,09,12,16', minute='20')
 
 # 同步互动回答
 blockingScheduler.add_job(sync_all_interactive_questions, 'cron', hour='08,12,17', minute='05')

{mns-scheduler-1.0.9.6 → mns-scheduler-1.1.0.1}/mns_scheduler.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.0.9.6
+Version: 1.1.0.1

{mns-scheduler-1.0.9.6 → mns-scheduler-1.1.0.1}/mns_scheduler.egg-info/SOURCES.txt

@@ -6,14 +6,10 @@ mns_scheduler.egg-info/SOURCES.txt
 mns_scheduler.egg-info/dependency_links.txt
 mns_scheduler.egg-info/top_level.txt
 mns_scheduler/backup/__init__.py
-mns_scheduler/backup/app/__init__.py
-mns_scheduler/backup/app/ths_new_concept_sync_app.py
 mns_scheduler/backup/em/__init__.py
 mns_scheduler/backup/em/em_new_concept_his_sync.py
 mns_scheduler/backup/em/em_new_concept_sync_common_api.py
 mns_scheduler/backup/em/em_new_concept_sync_web.py
-mns_scheduler/backup/wen_cai/__init__.py
-mns_scheduler/backup/wen_cai/wen_cai_concept_sync.py
 mns_scheduler/big_deal/__init__.py
 mns_scheduler/big_deal/ths_big_deal_sync.py
 mns_scheduler/company_info/__init__.py
@@ -24,6 +20,9 @@ mns_scheduler/concept/__init__.py
 mns_scheduler/concept/clean/__init__.py
 mns_scheduler/concept/clean/kpl_concept_clean_api.py
 mns_scheduler/concept/clean/ths_concept_clean_api.py
+mns_scheduler/concept/common/__init__.py
+mns_scheduler/concept/common/detaill/__init__.py
+mns_scheduler/concept/common/detaill/ths_concept_detail_api.py
 mns_scheduler/concept/ths/__init__.py
 mns_scheduler/concept/ths/common/__init__.py
 mns_scheduler/concept/ths/common/ths_concept_sync_common_api.py

{mns-scheduler-1.0.9.6 → mns-scheduler-1.1.0.1}/setup.py

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

mns-scheduler-1.0.9.6/mns_scheduler/backup/app/ths_new_concept_sync_app.py

@@ -1,122 +0,0 @@
-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.api.ths.ths_stock_api as ths_stock_api
-import datetime
-import time
-import mns_common.api.msg.push_msg_api as push_msg_api
-from loguru import logger
-import mns_scheduler.concept.ths.common.ths_concept_sync_common_api as ths_concept_sync_common_api
-import pandas as pd
-from mns_common.db.MongodbUtil import MongodbUtil
-
-mongodb_util = MongodbUtil('27017')
-
-
-# app 端获取新增概念信息 接口不稳定
-
-# 获取最大概念代码
-def get_max_concept_name():
-    query = {"symbol": {'$ne': 'null'}, "success": True}
-    return mongodb_util.descend_query(query, 'ths_concept_list', 'symbol', 1)
-
-
-# 获取app端新概念名称
-def get_concept_detail_info_app(concept_code):
-    return ths_stock_api.get_new_concept_code_app(concept_code)
-
-
-# 获取app端新概念详细列表
-def get_new_concept_detail_list_app(concept_code):
-    new_concept_symbol_list = ths_stock_api.get_new_concept_list_app(concept_code)
-    if new_concept_symbol_list is None or new_concept_symbol_list.shape == 0:
-        return None
-    new_concept_symbol_list = new_concept_symbol_list[ths_concept_sync_common_api.order_fields]
-    new_concept_symbol_list['_id'] = str(concept_code) + '-' + new_concept_symbol_list['symbol']
-    return new_concept_symbol_list
-
-
-# 推送新概念信息到微信
-def push_msg_to_we_chat_app(concept_code, concept_name):
-    url = f'https://m.10jqka.com.cn/hq/industry.html#code={concept_code}&refCountId=R_55ba2964_186'
-    msg = "概念代码:" + str(concept_code) + "," + "概念名称:" + concept_name + "," + "url:   " + url
-    title = "新增概念:" + str(concept_code) + "-" + concept_name
-    push_msg_api.push_msg_to_wechat(title, msg)
-
-
-# 保存新概念信息到数据库
-def save_ths_concept_list_app(concept_code, concept_name, str_day, str_now_time, success):
-    concept_code = int(concept_code)
-    url = 'https://m.10jqka.com.cn/hq/industry.html#code=' + str(concept_code) + '&refCountId=R_55ba2964_186'
-    ths_concept_list = pd.DataFrame([
-        [concept_code, concept_code, concept_name, str_day, url, str_now_time, success],
-    ], columns=['_id', 'symbol', 'name', 'str_day', 'url', 'str_now_time', 'success'])
-
-    mongodb_util.save_mongo(ths_concept_list, 'ths_concept_list')
-
-
-# 同步新概念信息 从app爬取
-def sync_new_concept_data():
-    max_concept_name = get_max_concept_name()
-    try:
-        now_date = datetime.datetime.now()
-        str_day = now_date.strftime('%Y-%m-%d')
-        str_now_time = now_date.strftime('%Y-%m-%d %H:%M:%S')
-        concept_code = list(max_concept_name['symbol'])[0]
-        success = list(max_concept_name['success'])[0]
-        if success:
-            concept_code = concept_code + 1
-
-        new_concept_df = get_concept_detail_info_app(concept_code)
-        if new_concept_df is None or new_concept_df.shape[0] == 0:
-            time.sleep(1)
-            return None
-
-        concept_name = list(new_concept_df['concept_name'])[0]
-        concept_code = list(new_concept_df['concept_code'])[0]
-        if success:
-            # 推送新概念信息到微信
-            push_msg_to_we_chat_app(concept_code, concept_name)
-        # 获取新概念详细信息
-        new_concept_symbol_list = get_new_concept_detail_list_app(concept_code)
-
-        if new_concept_symbol_list is None or new_concept_symbol_list.shape[0] == 0:
-            # 保存新概念信息到数据库
-            query = {"symbol": int(concept_code), "success": True}
-            exist_success = mongodb_util.exist_data_query('ths_concept_list', query)
-            if bool(1 - exist_success):
-                save_ths_concept_list_app(concept_code, concept_name, str_day, str_now_time, False)
-                time.sleep(1)
-
-        else:
-            # 保存新概念信息到数据库
-            save_ths_concept_list_app(concept_code, concept_name, str_day, str_now_time, True)
-            new_concept_symbol_list.loc[:, 'way'] = 'index_sync'
-            # 保存新概念详细信息到数据库
-            ths_concept_sync_common_api.save_ths_concept_detail(new_concept_symbol_list, concept_name, str_day,
-                                                                str_now_time, concept_code)
-            time.sleep(1)
-
-    except BaseException as e:
-        logger.error("同步新概念异常:{},concept_code:{}", e, concept_code)
-
-
-if __name__ == '__main__':
-    # myquery1 = {"symbol": {"$ne": 'null'}}
-    # newvalues1 = {"$set": {"success": True}}
-    #
-    # mongodb_util_remote.update_many(myquery1, newvalues1, 'ths_concept_list')
-    # concept_df = get_concept_detail_info_app('886033')
-    df = get_new_concept_detail_list_app('883418')
-    print(df)
-    # sync_new_concept_data()
-    # code = 886026
-    # while True:
-    #     symbol_new_concept = get_concept_detail_info_app(code)
-    #     logger.info(symbol_new_concept)
-    #     new_concept_symbols = ths_stock_api.get_new_concept_list_app(code)
-    #     logger.info(new_concept_symbols)

mns-scheduler-1.0.9.6/mns_scheduler/backup/wen_cai/wen_cai_concept_sync.py

@@ -1,51 +0,0 @@
-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)
-from datetime import datetime
-import mns_common.api.ths.ths_stock_api as ths_stock_api
-import mns_common.utils.date_handle_util as date_handle_util
-import mns_common.utils.data_frame_util as data_frame_util
-
-
-def sync_wei_concept_data():
-    now_date = datetime.now()
-    str_day = now_date.strftime('%Y-%m-%d')
-    number = 1
-    result = None
-    while True:
-        wen_cai_concept_df = ths_stock_api.ths_concept_wen_cai(date_handle_util.no_slash_date(str_day),
-                                                               str(number))
-        result = data_frame_util.merge_choose_data_no_drop(result, wen_cai_concept_df)
-        if wen_cai_concept_df.shape[0] < 50:
-            break
-        number = number + 1
-    result = result.rename(columns={"股票代码": "symbol",
-                                    "股票简称": "name",
-                                    "最新价": "price",
-                                    "最新涨跌幅": "chg",
-                                    "所属概念": "concepts",
-                                    "所属概念数量": "concept_num"
-                                    })
-    result = result[[
-        'symbol',
-        'name',
-        'price',
-        'chg',
-        'concepts',
-        'concept_num',
-        'market_code',
-        'code',
-    ]]
-    result['chg'].fillna(0, inplace=True)
-    result['price'].fillna(0, inplace=True)
-    result['concepts'].fillna(0, inplace=True)
-    return result
-
-
-if __name__ == '__main__':
-    df = sync_wei_concept_data()
-    print(df)

mns-scheduler-1.0.9.6/mns_scheduler/zt/high_chg/__init__.py

@@ -1,7 +0,0 @@
-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)

mns-scheduler-1.0.9.6/mns_scheduler/zz_task/__init__.py

@@ -1,7 +0,0 @@
-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)