mns-scheduler 1.0.3.3__py3-none-any.whl → 1.0.3.6__py3-none-any.whl

mns_scheduler/backup/__init__.py

@@ -0,0 +1,7 @@
+import sys
+import os
+
+file_path = os.path.abspath(__file__)
+end = file_path.index('mns') + 16
+project_path = file_path[0:end]
+sys.path.append(project_path)

mns_scheduler/{concept → backup}/em/em_new_concept_his_sync.py

@@ -11,7 +11,7 @@ from loguru import logger
 from datetime import datetime
 import mns_common.utils.date_handle_util as date_handle_util
 import mns_common.db.MongodbUtil as MongodbUtil
-import mns_scheduler.concept.em.em_new_concept_sync_common_api as em_new_concept_sync_common_api
+import mns_scheduler.backup.em.em_new_concept_sync_common_api as em_new_concept_sync_common_api
 import mns_common.api.em.em_concept_index_api as em_concept_index_api
 
 mongodb_util = MongodbUtil('27017')

mns_scheduler/{concept → backup}/em/em_new_concept_sync_web.py

@@ -9,7 +9,7 @@ sys.path.append(project_path)
 import datetime
 import time
 from loguru import logger
-import mns_scheduler.concept.em.em_new_concept_sync_common_api as em_new_concept_sync_common_api
+import mns_scheduler.backup.em.em_new_concept_sync_common_api as em_new_concept_sync_common_api
 
 
 # 同步东财新概念

mns_scheduler/concept/clean/{ths_effective_concept_clean_api.py → ths_concept_clean_api.py}

@@ -25,6 +25,7 @@ def update_concept_num():
         mongodb_util.save_mongo(ths_concept_list_one_df, 'ths_concept_list')
 
 
+# 更新空名字
 def update_null_name():
     query = {"_id": {'$gte': 886025}}
     ths_concept_list = mongodb_util.find_query_data('ths_concept_list', query)

mns_scheduler/concept/ths/common/ths_concept_sync_common_api.py

@@ -2,9 +2,7 @@ import sys
 import os
 
 import pandas as pd
-import time
 import mns_common.api.ths.ths_stock_api as ths_stock_api
-import datetime
 from mns_common.db.MongodbUtil import MongodbUtil
 import mns_common.component.company.company_common_service_api as company_common_service_api
 
@@ -15,7 +13,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 = [
@@ -31,6 +29,7 @@ order_fields = [
 ]
 
 
+# 推送到手机
 def push_msg_to_we_chat_web(concept_code, concept_name, url):
     msg = "概念代码:" + str(concept_code) + "," + "概念名称:" + concept_name + "," + "url:   " + url
     title = "新增同花顺概念:" + str(concept_code) + "-" + concept_name
@@ -100,7 +99,8 @@ def save_ths_concept_detail(new_concept_symbol_df,
 
     if bool(1 - ('way' in new_concept_symbol_df.columns)):
         new_concept_symbol_df['way'] = 'symbol_sync'
-
+    if "long" not in new_concept_symbol_df.columns:
+        new_concept_symbol_df['long'] = ''
     new_concept_symbol_df = new_concept_symbol_df[[
         "_id",
         "index",
@@ -120,7 +120,8 @@ def save_ths_concept_detail(new_concept_symbol_df,
         "total_mv_sp",
         "company_type",
         "concept_create_day",
-        "way"
+        "way",
+        "long"
     ]]
 
     exist_concept_detail = mongodb_util.find_query_data('ths_stock_concept_detail', query)
@@ -150,92 +151,9 @@ def update_company_info(new_concept_symbol_df):
         company_common_service_api.company_info_industry_cache_clear()
 
 
-def update_null_name():
-    query = {"_id": {'$gte': 886025}}
-    ths_concept_list = mongodb_util.find_query_data('ths_concept_list', query)
-    ths_concept_list = ths_concept_list.sort_values(by=['_id'], ascending=False)
-
-    for concept_one in ths_concept_list.itertuples():
-        concept_code = concept_one.symbol
-        name = concept_one.name
-        exist_url = concept_one.url
-
-        if name == '':
-            concept_name = ths_stock_api.get_concept_name(concept_code)
-            query_concept = {"symbol": concept_code}
-            new_values = {'$set': {"name": concept_name}}
-            mongodb_util.update_one_query(query_concept, new_values, 'ths_concept_list')
-
-            new_values_detail = {'$set': {"concept_name": concept_name}}
-
-            query_concept_detail = {"concept_code": concept_code}
-
-            mongodb_util.update_many(query_concept_detail, new_values_detail, 'ths_stock_concept_detail')
-            time.sleep(10)
-
-        if exist_url == '' or pd.isna(exist_url):
-            url = 'http://q.10jqka.com.cn/thshy/detail/code/' + str(concept_code)
-            str_now_time = concept_one.str_day + " " + "00:00:00"
-            query_concept = {"symbol": concept_code}
-            new_values = {'$set': {"url": url, "str_now_time": str_now_time}}
-            mongodb_util.update_one_query(query_concept, new_values, 'ths_concept_list')
-
-
-# 更新概念数量
-def update_concept_number():
-    query = {}
-    ths_concept_list = mongodb_util.find_query_data('ths_concept_list', query)
-    ths_concept_list = ths_concept_list.sort_values(by=['_id'], ascending=False)
-    for concept_one in ths_concept_list.itertuples():
-        try:
-            query_detail = {'concept_code': concept_one.symbol}
-            concept_number = mongodb_util.count(query_detail, 'ths_stock_concept_detail')
-            query_update = {"symbol": concept_one.symbol}
-            new_values = {'$set': {"concept_number": concept_number}}
-            mongodb_util.update_one_query(query_update, new_values, 'ths_concept_list')
-        except BaseException as e:
-            print(e)
-
-
 def get_concept_detail_info_web(concept_code):
     new_concept_symbol_list = ths_stock_api.ths_stock_concept(concept_code)
     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']
     return new_concept_symbol_list
-
-
-def update_nan_data():
-    query = {"concept_code": float('NaN')}
-    ths_stock_concept_detail = mongodb_util.find_query_data('ths_stock_concept_detail', query)
-
-    ths_stock_concept_detail['concept_code'] = ths_stock_concept_detail['_id']
-    for stock_one in ths_stock_concept_detail.itertuples():
-        query = {"symbol": stock_one.symbol}
-        company_info = mongodb_util.find_query_data('company_info', query)
-
-        concept_code = stock_one.concept_code
-        concept_code = int(concept_code[0:6])
-
-        new_values = {'$set': {"concept_code": concept_code,
-                               "flow_mv_sp": list(company_info['flow_mv_sp'])[0],
-                               "total_mv_sp": list(company_info['total_mv_sp'])[0],
-                               "company_type": list(company_info['company_type'])[0]
-
-                               }}
-        query_update = {"_id": stock_one.concept_code}
-        mongodb_util.update_many(query_update, new_values, 'ths_stock_concept_detail')
-
-
-def update_concept_create_day():
-    query = {"symbol": {'$exists': True}}
-    new_concept_list = mongodb_util.descend_query(query, "ths_concept_list", "_id", 500)
-
-    if new_concept_list.shape[0] > 0:
-        for one_concept in new_concept_list.itertuples():
-            concept_create_day = one_concept.str_day
-            query_update = {"concept_code": one_concept.symbol}
-
-            new_values = {'$set': {"concept_create_day": concept_create_day}}
-
-            mongodb_util.update_many(query_update, new_values, 'ths_stock_concept_detail')

mns_scheduler/concept/ths/common/ths_concept_update_common_api.py

@@ -11,11 +11,16 @@ 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
+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 pandas as pd
 
 mongodb_util = MongodbUtil('27017')
 
 
-def update_ths_concept_detail(ths_symbol_all_concepts, symbol):
+# 更新概念入选理由
+def update_ths_concept_choose_reason(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:
@@ -32,3 +37,53 @@ def update_ths_concept_detail(ths_symbol_all_concepts, symbol):
                     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)
+
+
+# 更新空的入选概念
+def update_ths_concept_choose_null_reason():
+    now_date = datetime.now()
+    str_day = now_date.strftime('%Y-%m-%d')
+    last_trade_day = trade_date_common_service_api.get_last_trade_day(str_day)
+    query = {"$and": [{"str_day": {"$gte": last_trade_day}},
+                      {"str_day": {"$lte": str_day}}],
+             "$or": [{"long": ""},
+                     {"long": {"$exists": False}}]}
+    nan_reason_df = mongodb_util.find_query_data(db_name_constant.TODAY_NEW_CONCEPT_LIST, query)
+    update_null_reason(nan_reason_df)
+
+
+# 更新空入选理由
+def update_null_reason(nan_reason_df):
+    # 所有概念
+    all_ths_concept = ths_concept_common_service_api.get_all_ths_concept()
+    for nan_one in nan_reason_df.itertuples():
+        try:
+            concept_code = nan_one.concept_code
+            ths_concept_one_df = all_ths_concept.loc[
+                (all_ths_concept['symbol'] == concept_code)
+                | (all_ths_concept['web_concept_code'] == concept_code)]
+            if data_frame_util.is_empty(ths_concept_one_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_one_df = symbol_ths_concept_all_df[
+                symbol_ths_concept_all_df['cid'] == web_concept_code]
+            if data_frame_util.is_empty(symbol_ths_concept_one_df):
+                continue
+
+            query = {"$or": [{'symbol': nan_one.symbol, "concept_code": int(concept_code)},
+                             {'symbol': nan_one.symbol, "concept_code": int(web_concept_code)}]}
+            short = list(symbol_ths_concept_one_df['short'])[0]
+            long = list(symbol_ths_concept_one_df['long'])[0]
+            new_values = {"$set": {"short": short, "long": long}}
+            mongodb_util.update_many(query, new_values, db_name_constant.THS_STOCK_CONCEPT_DETAIL)
+            mongodb_util.update_many(query, new_values, db_name_constant.TODAY_NEW_CONCEPT_LIST)
+        except BaseException as e:
+            logger.error("更新概念入选理由异常:{},{}", nan_one.symbol, e)
+
+
+if __name__ == '__main__':
+    update_ths_concept_choose_null_reason()

mns_scheduler/concept/ths/{symbol/sync_symbol_all_concepts_api.py → update_concept_info/sync_one_symbol_all_concepts_api.py}

@@ -95,7 +95,7 @@ def update_symbol_new_concept(symbol_df, page_number):
             now_date = datetime.now()
             # 开盘交易前不同步 资源开销过大
             if date_handle_util.is_close_time(now_date):
-                ths_concept_update_common_api.update_ths_concept_detail(symbol_ths_concept_all_df, stock_one.symbol)
+                ths_concept_update_common_api.update_ths_concept_choose_reason(symbol_ths_concept_all_df, stock_one.symbol)
 
             str_day = now_date.strftime('%Y-%m-%d')
             str_now_date = now_date.strftime('%Y-%m-%d %H:%M:%S')

mns_scheduler/kpl/selection/index/sync_best_choose_his_index.py

@@ -51,7 +51,7 @@ def sync_best_choose_his_index(str_day):
     for end_time in KPL_MINUTE_LIST:
         while page_number <= page_max_number:
             index = page_number * kpl_common_api.HIS_PAGE_MAX_COUNT
-            kpl_plate_best_index_df = kpl_common_api.get_plate_index_his(index, int(kpl_common_api.BEST_CHOOSE),
+            kpl_plate_best_index_df = kpl_common_api.get_plate_index_his(index, kpl_common_api.BEST_CHOOSE,
                                                                          str_day, KPL_MINUTE_BEGIN,
                                                                          end_time)
 
@@ -59,11 +59,6 @@ def sync_best_choose_his_index(str_day):
                 continue
             kpl_plate_best_index_df['number'] = number
             kpl_plate_best_index_df['str_day'] = str_day
-            hour = end_time[0:2]
-            minute = end_time[2:4]
-            kpl_plate_best_index_df['str_day'] = str_day
-
-            kpl_plate_best_index_df['str_now_date'] = str_day + " " + hour + ":" + minute + ":00"
             kpl_plate_best_index_df = kpl_plate_best_index_df[[
                 "plate_code",
                 "plate_name",
@@ -83,7 +78,7 @@ def sync_best_choose_his_index(str_day):
                 "ava_pe_next",
                 "number",
                 "str_day",
-                "str_now_date"
+
             ]]
             save_kpl_his_index(kpl_plate_best_index_df, str_day, end_time)
             if end_time == KPL_MINUTE_END:
@@ -96,7 +91,7 @@ def sync_best_choose_his_index(str_day):
 
 def save_kpl_his_index(kpl_plate_best_index_df, str_day, end_time):
     kpl_plate_best_index_df['_id'] = str_day + '-' + end_time + '-' + kpl_plate_best_index_df['plate_code']
-    mongodb_util.save_mongo(kpl_plate_best_index_df, db_name_constant.KPL_BEST_CHOOSE_HIS)
+    mongodb_util.insert_mongo(kpl_plate_best_index_df, db_name_constant.KPL_BEST_CHOOSE_HIS)
 
 
 def save_kpl_his_daily(kpl_plate_best_index_df, str_day, end_time):
@@ -105,7 +100,7 @@ def save_kpl_his_daily(kpl_plate_best_index_df, str_day, end_time):
 
 
 def sync_all_days():
-    query = {"_id": {"$gte": '2022-07-19'}, 'trade_date': {"$lte": "2024-04-23"}}
+    query = {"_id": {"$gte": '2022-07-22'}, 'trade_date': {"$lte": "2024-04-21"}}
     trade_date_list = mongodb_util.find_query_data('trade_date_list', query)
     trade_date_list = trade_date_list.sort_values(by=['trade_date'], ascending=False)
     for trade_one in trade_date_list.itertuples():

mns_scheduler/real_time/realtime_quotes_now_sync.py

@@ -18,7 +18,7 @@ import mns_scheduler.real_time.realtime_quotes_now_create_db_index as realtime_q
 import pandas as pd
 from mns_common.db.MongodbUtil import MongodbUtil
 from mns_common.utils.async_fun import async_fun
-
+import mns_scheduler.trade.auto_sell_service_api as auto_sell_service_api
 import mns_common.constant.db_name_constant as db_name_constant
 
 mongodb_util = MongodbUtil('27017')
@@ -174,13 +174,17 @@ def sync_realtime_quotes():
         now_date = datetime.datetime.now()
 
         str_now_date = now_date.strftime('%Y-%m-%d %H:%M:%S')
-        if bool(date_util.is_trade_time(now_date)):
+        if True or bool(date_util.is_trade_time(now_date)):
             try:
                 real_time_quotes_now = east_money_stock_api.get_real_time_quotes_all_stocks()
                 real_time_quotes_now = handle_init_real_time_quotes_data(real_time_quotes_now.copy(),
                                                                          str_now_date, number)
                 save_real_time_quotes(real_time_quotes_now.copy(), now_date, db_name_constant.REAL_TIME_QUOTES_NOW,
                                       number)
+                try:
+                    auto_sell_service_api.auto_sell_stock(real_time_quotes_now.copy())
+                except Exception as e:
+                    logger.error("自动卖出执行异常:{}", e)
 
                 if date_util.is_call_auction(str_now_date) or date_util.is_afternoon_time(now_date):
                     if number % 3 == 0:

mns_scheduler/{ipo → trade}/auto_ipo_buy_api.py

@@ -6,15 +6,12 @@ end = file_path.index('mns') + 17
 project_path = file_path[0:end]
 sys.path.append(project_path)
 
-import easytrader
-
-user = easytrader.use('ths')
-user.connect(r'D:\Program Files\ths\xiadan.exe')
+import mns_common.component.trade.trade_service_api as trade_service_api
 
 
 ## 自动一键打新
 def auto_ipo_buy():
-    user.auto_ipo()
+    trade_service_api.auto_ipo_buy()
 
 
 if __name__ == '__main__':

mns_scheduler/trade/auto_sell_service_api.py

@@ -0,0 +1,116 @@
+import os
+import sys
+
+file_path = os.path.abspath(__file__)
+end = file_path.index('mns') + 16
+project_path = file_path[0:end]
+sys.path.append(project_path)
+
+import mns_common.utils.data_frame_util as data_frame_util
+import mns_common.constant.db_name_constant as db_name_constant
+import datetime
+import mns_common.component.cache.cache_service as cache_service
+from mns_common.db.MongodbUtil import MongodbUtil
+import mns_common.component.trade.trade_service_api as trade_service_api
+from loguru import logger
+from mns_common.utils.async_fun import async_fun
+
+mongodb_util = MongodbUtil('27017')
+
+AUTO_SELL_KEY = "AUTO_SELL_KEY"
+
+# 当前跌幅卖出阈值
+AUTO_SELL_CHG = -8
+# 收益率阈值
+AUTO_SELL_PROFIT_LOSS_CHG = -11.0
+
+
+# 自动卖出
+@async_fun
+def auto_sell_stock(realtime_quotes_now):
+    sell_flag = cache_service.get_cache(AUTO_SELL_KEY)
+    if sell_flag is not None and bool(1 - sell_flag):
+        return
+    now_date = datetime.datetime.now()
+    str_day = now_date.strftime('%Y-%m-%d')
+    query_exist = {'str_day': str_day, "valid": True}
+    position_stock_df = mongodb_util.find_query_data(db_name_constant.POSITION_STOCK, query_exist)
+    if data_frame_util.is_empty(position_stock_df):
+        cache_service.set_cache(AUTO_SELL_KEY, False)
+        return None
+    else:
+        cache_service.set_cache(AUTO_SELL_KEY, True)
+        position_stock_symbol_list = list(position_stock_df['symbol'])
+        realtime_quotes_now_position = realtime_quotes_now.loc[
+            realtime_quotes_now['symbol'].isin(position_stock_symbol_list)]
+        sell_stock_detail(realtime_quotes_now_position, position_stock_df, str_day, now_date)
+
+
+def sell_stock_detail(realtime_quotes_now_position, position_stock_df, str_day, now_date):
+    for stock_one in realtime_quotes_now_position.itertuples():
+        try:
+
+            symbol = stock_one.symbol
+            sell_price = trade_service_api.get_last_sell_price(symbol)
+            position_stock_df_one = position_stock_df.loc[position_stock_df['symbol'] == symbol]
+            available_position = list(position_stock_df_one['available_position'])[0]
+            if sell_signal(stock_one, now_date, position_stock_df_one):
+                sell_result = trade_service_api.order_sell(symbol, sell_price, available_position)
+                if "message" in sell_result:
+                    result_msg = sell_result['message']
+                    if result_msg == 'success':
+                        update_position_status(symbol, None, str_day)
+                elif "entrust_no" in sell_result:
+                    sell_entrust_no = sell_result['entrust_no']
+                    if sell_entrust_no is not None:
+                        update_position_status(symbol, sell_entrust_no, str_day)
+
+        except BaseException as e:
+            logger.error("自动卖出异常:{},{}", stock_one.symbol, e)
+
+
+# 卖出信号 TODO 待优化
+def sell_signal(stock_one, now_date, position_stock_df_one):
+    chg = stock_one.chg
+    wei_bi = stock_one.wei_bi
+
+    hour = now_date.hour
+    minute = now_date.minute
+    # 跌停直接卖出
+    if wei_bi == -100:
+        return True
+    # 开盘五分钟先看看
+    if hour == 9 and minute <= 35:
+        return False
+    # 尾盘卖不出了
+    if hour == 14 and minute >= 57:
+        return False
+
+    # 自动卖出涨幅
+    if chg < AUTO_SELL_CHG:
+        return True
+
+    cost_price = list(position_stock_df_one['cost_price'])[0]
+    now_price = stock_one.now_price
+    # 收益率
+    profit_loss_chg = round((now_price - cost_price) * 100 / cost_price, 2)
+    # 收益卖出阈值
+    if profit_loss_chg < AUTO_SELL_PROFIT_LOSS_CHG:
+        return True
+    return False
+
+
+# 更新持仓状态
+def update_position_status(symbol, sell_entrust_no, str_day):
+    update_query = {'symbol': symbol, 'str_day': str_day}
+    new_values = {"$set": {"valid": False, "sell_entrust_no": sell_entrust_no}}
+    mongodb_util.update_many(update_query, new_values, db_name_constant.POSITION_STOCK)
+
+
+import mns_common.api.em.east_money_stock_api as east_money_stock_api
+
+if __name__ == '__main__':
+    sell_price_01 = trade_service_api.get_last_sell_price('002336')
+    while True:
+        real_time_quotes_now = east_money_stock_api.get_real_time_quotes_all_stocks()
+        auto_sell_stock(real_time_quotes_now)

mns_scheduler/trade/sync_position_api.py

@@ -0,0 +1,56 @@
+import sys
+import os
+
+file_path = os.path.abspath(__file__)
+end = file_path.index('mns') + 16
+project_path = file_path[0:end]
+sys.path.append(project_path)
+import mns_common.component.trade.trade_service_api as trade_service_api
+import pandas as pd
+import mns_common.utils.data_frame_util as data_frame_util
+import mns_common.constant.db_name_constant as db_name_constant
+import datetime
+
+from mns_common.db.MongodbUtil import MongodbUtil
+
+mongodb_util = MongodbUtil('27017')
+
+
+# 同步持仓
+def sync_position():
+    now_date = datetime.datetime.now()
+    str_day = now_date.strftime('%Y-%m-%d')
+    query_exist = {'str_day': str_day}
+    if mongodb_util.exist_data_query(db_name_constant.POSITION_STOCK, query_exist):
+        return None
+    position_list = trade_service_api.get_position()
+    position_df = pd.DataFrame(position_list)
+    position_df = position_df.rename(columns={"明细": "detail",
+                                              "序号": "index",
+                                              "证券代码": "symbol",
+                                              "证券名称": "name",
+                                              "持仓数量": "open_position",
+                                              "可用数量": "available_position",
+                                              "冻结数量": "frozen_position",
+                                              "参考成本价": "cost_price",
+                                              "当前价": "now_price",
+                                              "浮动盈亏": "floating_profit_loss",
+                                              "盈亏比例(%)": "profit_loss_percent",
+                                              "最新市值": "flow_mv",
+                                              "当日盈亏": "today_profit_loss",
+                                              "当日盈亏比(%)": "today_profit_loss_percent",
+                                              "仓位占比(%)": "position_ratio",
+                                              "持股天数": "holding_days",
+                                              "当日买入": "day_buy",
+                                              "当日卖出": "day_sell",
+                                              "交易市场": "market"
+                                              })
+    if data_frame_util.is_not_empty(position_df):
+        position_df["_id"] = position_df['symbol'] + '-' + str_day
+        position_df["str_day"] = str_day
+        position_df["valid"] = True
+        mongodb_util.save_mongo(position_df, db_name_constant.POSITION_STOCK)
+
+
+if __name__ == '__main__':
+    sync_position()

mns_scheduler/zz_task/data_sync_task.py

@@ -24,17 +24,20 @@ import mns_scheduler.zt.zt_five_boards_sync_api as zt_five_boards_sync_api
 import mns_scheduler.zt.zt_pool_sync_api as zt_pool_sync_api
 import mns_scheduler.zt.today_high_chg_pool_sync_api as today_high_chg_pool_sync_api
 import mns_scheduler.k_line.clean.k_line_info_clean_service as k_line_info_clean_service
-import mns_scheduler.concept.clean.ths_effective_concept_clean_api as ths_effective_concept_choose_api
+import mns_scheduler.concept.clean.ths_concept_clean_api as ths_concept_choose_api
 import mns_common.api.em.east_money_stock_gdfx_free_top_10_api as east_money_stock_gdfx_free_top_10_api
-import mns_scheduler.concept.ths.symbol.sync_concept_all_symbols_api as sync_concept_all_symbols_api
-import mns_scheduler.concept.ths.symbol.sync_symbol_all_concepts_api as sync_symbol_all_concepts_api
-import mns_scheduler.concept.ths.web.sync_ths_new_concept_by_web_api as sync_ths_new_concept_by_web_api
-import mns_scheduler.concept.ths.web.sync_ths_concept_by_ak_api as sync_ths_concept_by_ak_api
-import mns_scheduler.concept.clean.ths_effective_concept_clean_api as ths_effective_concept_clean_api
+import \
+    mns_scheduler.concept.ths.update_concept_info.sync_one_concept_all_symbols_api as sync_one_concept_all_symbols_api
+import \
+    mns_scheduler.concept.ths.update_concept_info.sync_one_symbol_all_concepts_api as sync_one_symbol_all_concepts_api
+import mns_scheduler.concept.ths.sync_new_index.sync_ths_new_concept_by_web_api as sync_ths_new_concept_by_web_api
+import mns_scheduler.concept.ths.sync_new_index.sync_ths_concept_by_ak_api as sync_ths_concept_by_ak_api
 import mns_scheduler.kpl.selection.total.sync_kpl_best_total_sync_api as sync_kpl_best_total_sync_api
 import mns_scheduler.company_info.company_info_sync_api as company_info_sync_api
-import mns_scheduler.ipo.auto_ipo_buy_api as auto_ipo_buy_api
+import mns_scheduler.trade.auto_ipo_buy_api as auto_ipo_buy_api
 import mns_scheduler.kpl.selection.index.sync_best_choose_his_index as sync_best_choose_his_index
+import mns_scheduler.concept.ths.common.ths_concept_update_common_api as ths_concept_update_common_api
+import mns_scheduler.trade.sync_position_api as sync_position_api
 
 
 # 同步交易日期任务完成
@@ -200,11 +203,6 @@ def sync_today_trade_k_line_info():
         logger.info('计算当日k线信息完成:{}', str_day)
 
 
-#  更新空概念名称
-def update_null_name():
-    ths_effective_concept_choose_api.update_null_name()
-
-
 # 同步所有股票前十大流通股本
 def sync_stock_gdfx_free_top_10_one_day():
     logger.info('同步所有股票前十大流通股本')
@@ -213,16 +211,26 @@ def sync_stock_gdfx_free_top_10_one_day():
     east_money_stock_gdfx_free_top_10_api.sync_stock_gdfx_free_top_10_one_day(str_day)
 
 
+# 更新同花顺概念信息
+def ths_concept_info_clean():
+    #  更新空概念名称
+    ths_concept_choose_api.update_null_name()
+    #  更新概念包含个数
+    ths_concept_choose_api.update_concept_num()
+
+
 # 同步概念下所有股票组成 by 概念指数
-def update_concept_all_symbol_detail():
+def update_one_concept_all_symbol_detail():
     logger.info('同步概念下所有股票组成')
-    sync_concept_all_symbols_api.update_concept_all_symbol_detail()
+    sync_one_concept_all_symbols_api.update_concept_all_symbol_detail()
+    update_ths_concept_choose_null_reason()
 
 
 # 同步单只股票下所有概念 by 股票代码
-def sync_symbol_all_concept():
-    sync_symbol_all_concepts_api.sync_symbol_all_concept(None)
+def update_one_symbol_all_concepts():
     logger.info('同步单只股票所有概念组成')
+    sync_one_symbol_all_concepts_api.sync_symbol_all_concept(None)
+    update_ths_concept_choose_null_reason()
 
 
 # 同步同花顺新增概念指数通过web端接口爬取 8开头
@@ -255,7 +263,14 @@ def sync_new_concept_data_web():
     sync_new_concept_data_by_web()
     # 同步同花顺新增概念指数通过ak_share接口爬取
     sync_new_ths_concept_by_ak_api()
-    logger.info("同步新概念web端数据任务完成", )
+    update_ths_concept_choose_null_reason()
+    logger.info("同步新概念web端数据任务完成")
+
+
+# 更新空的入选概念
+def update_ths_concept_choose_null_reason():
+    logger.info("更新空的入选概念")
+    ths_concept_update_common_api.update_ths_concept_choose_null_reason()
 
 
 # 清洗公司基本信息
@@ -273,15 +288,22 @@ def auto_ipo_buy():
         auto_ipo_buy_api.auto_ipo_buy()
 
 
+# 同步持仓
+def sync_position():
+    now_date = datetime.now()
+    str_day = now_date.strftime('%Y-%m-%d')
+    # 同步持仓
+    if trade_date_common_service_api.is_trade_day(str_day):
+        sync_position_api.sync_position()
+
+
 # 同步开盘啦当日精选指数行情数据
 
 def sync_kpl_best_his_quotes():
     now_date = datetime.now()
     str_day = now_date.strftime('%Y-%m-%d')
     if trade_date_common_service_api.is_trade_day(str_day):
-        last_trade_day = trade_date_common_service_api.get_last_trade_day(str_day)
-        # 当天不能获取历史数据
-        sync_best_choose_his_index.sync_best_choose_his_index(last_trade_day)
+        sync_best_choose_his_index.sync_best_choose_his_index(str_day)
         logger.info('同步开盘啦当日精选指数行情数据任务完成')
 
 
@@ -307,8 +329,7 @@ blockingScheduler.add_job(col_data_move, 'cron', hour='15', minute='33')
 
 # 数据库健康检查
 blockingScheduler.add_job(db_status_check, 'interval', seconds=30, max_instances=4)
-# 更新空概念名称
-blockingScheduler.add_job(update_null_name, 'cron', hour='9,18', minute='01')
+
 # 同步大单数据
 blockingScheduler.add_job(sync_ths_big_deal, 'cron', hour='09', minute='30', max_instances=4)
 
@@ -323,11 +344,14 @@ blockingScheduler.add_job(sync_today_trade_k_line_info, 'cron', hour='08', minut
 # 同步十大流通股东信息
 blockingScheduler.add_job(sync_stock_gdfx_free_top_10_one_day, 'cron', hour='08,22', minute='23')
 
+# 更新同花顺概念信息
+blockingScheduler.add_job(ths_concept_info_clean, 'cron', hour='9,18', minute='01')
+
 # 更新概念指数下所有股票组成 by 概念代码
-blockingScheduler.add_job(update_concept_all_symbol_detail, 'cron', hour='08,18,12', minute='30')
+blockingScheduler.add_job(update_one_concept_all_symbol_detail, 'cron', hour='08,18,12', minute='30')
 
 # 同步单只股票下所有概念 by 股票代码
-blockingScheduler.add_job(sync_symbol_all_concept, 'cron', hour='09,18,12', minute='15')
+blockingScheduler.add_job(update_one_symbol_all_concepts, 'cron', hour='09,18,12', minute='15')
 
 # 开盘前同步同花顺新概念指数
 blockingScheduler.add_job(sync_new_concept_data_web, 'cron', hour='09', minute='05,10,15,20,25')
@@ -350,7 +374,10 @@ blockingScheduler.add_job(auto_ipo_buy, 'cron', hour='10', minute='40,50')
 blockingScheduler.add_job(update_best_choose_plate_relation, 'cron', hour='09,18', minute='25')
 
 # 更新开盘啦指数关系
-blockingScheduler.add_job(sync_kpl_best_his_quotes, 'cron', hour='16,22', minute='48')
+blockingScheduler.add_job(sync_kpl_best_his_quotes, 'cron', hour='18,22', minute='25')
+
+# 更新开盘啦指数关系
+blockingScheduler.add_job(sync_position, 'cron', hour='00,08', minute='10')
 
 print('定时任务启动成功')
 blockingScheduler.start()

{mns_scheduler-1.0.3.3.dist-info → mns_scheduler-1.0.3.6.dist-info}/METADATA

@@ -1,4 +1,4 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.0.3.3
+Version: 1.0.3.6
 

{mns_scheduler-1.0.3.3.dist-info → mns_scheduler-1.0.3.6.dist-info}/RECORD

@@ -1,4 +1,13 @@
 mns_scheduler/__init__.py,sha256=ffZXFCLFdIwOsbxnw__u1MbQYh9yz7Bs8UMP6VF0X2M,161
+mns_scheduler/backup/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
+mns_scheduler/backup/app/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
+mns_scheduler/backup/app/ths_new_concept_sync_app.py,sha256=yBr3RN24zCWgmRVCKgY6fwm0tdJA5XKliK3CSB-75tY,5148
+mns_scheduler/backup/em/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
+mns_scheduler/backup/em/em_new_concept_his_sync.py,sha256=Yqbuz9VE9433o0Z6BvDo5adhj3lK4vmN66XNQBIdC1k,4992
+mns_scheduler/backup/em/em_new_concept_sync_common_api.py,sha256=KnNCf0KXy31GFwF1-wbbkfDM-H7-cEtcVoCwl4QmoVs,7083
+mns_scheduler/backup/em/em_new_concept_sync_web.py,sha256=wVS0yLyPYzpcxfWAuUqmqbYkjw9wjpo48CvLSZFckzw,2334
+mns_scheduler/backup/wen_cai/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
+mns_scheduler/backup/wen_cai/wen_cai_concept_sync.py,sha256=boKtgOIXIsRny5n1keZm4luDFCiooudbPDsEFIGImIw,1747
 mns_scheduler/big_deal/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/big_deal/ths_big_deal_sync.py,sha256=wezGJWFRnKYBaPP9PVXLqMbHENOXgvJtw3HSGCSlX5c,4555
 mns_scheduler/company_info/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
@@ -6,32 +15,22 @@ mns_scheduler/company_info/company_constant_data.py,sha256=LwyBWLoErAUPXss68ebVj
 mns_scheduler/company_info/company_info_sync_api.py,sha256=2sQk197p5qjq2DQlRpVbotSSIN87x43T-RGAtMiXQI4,20332
 mns_scheduler/concept/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/concept/clean/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/concept/clean/ths_effective_concept_clean_api.py,sha256=2CzG7zvA2mydjIvnckMWz8eR_tmdfOl8k-I0eov9fy4,2440
-mns_scheduler/concept/em/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/concept/em/em_new_concept_his_sync.py,sha256=4Z0q4aTB6NMPpgtXu8wBThS3UJQvIFt5a50Icnlzdrc,4993
-mns_scheduler/concept/em/em_new_concept_sync_common_api.py,sha256=KnNCf0KXy31GFwF1-wbbkfDM-H7-cEtcVoCwl4QmoVs,7083
-mns_scheduler/concept/em/em_new_concept_sync_web.py,sha256=q2g2KEFvLFgaSu2G9UJOLR4M-f34tlTgBLNa4xuRB0g,2335
+mns_scheduler/concept/clean/ths_concept_clean_api.py,sha256=SR5NRzh4N2r0ouXX3SRAONJyH44eorJdpaayekbNWCE,2459
 mns_scheduler/concept/ths/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/concept/ths/app/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/concept/ths/app/ths_new_concept_sync_app.py,sha256=yBr3RN24zCWgmRVCKgY6fwm0tdJA5XKliK3CSB-75tY,5148
 mns_scheduler/concept/ths/common/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/concept/ths/common/ths_concept_sync_common_api.py,sha256=hRN9bXdpWQRfqN4z7IkYrO3L5p6iQBdPm8NsmJt98PQ,10238
-mns_scheduler/concept/ths/common/ths_concept_update_common_api.py,sha256=ps8fuK3Xdm5ZwjpcYzfX5O4OxZH65qWFZnTSBBBcn6M,1662
-mns_scheduler/concept/ths/symbol/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/concept/ths/symbol/sync_concept_all_symbols_api.py,sha256=ipRtiihpHlbxuces7YpHfvBtCDxgzrVXjcCKZiFBPaw,1928
-mns_scheduler/concept/ths/symbol/sync_symbol_all_concepts_api.py,sha256=HOho65wwoIlzn3COp9FkTalmfjXJD99KFAva6bhovv8,8757
-mns_scheduler/concept/ths/web/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/concept/ths/web/sync_ths_concept_by_ak_api.py,sha256=asZLrVxv2acbheJaI1VMguk4Vu6dqdcHPiJgWbq3b74,5001
-mns_scheduler/concept/ths/web/sync_ths_new_concept_by_web_api.py,sha256=Yv3Gp6qwAnpg3qM_MguWNSH7NDpxQkvH_SLWcsJfYo8,3605
-mns_scheduler/concept/ths/wen_cai/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/concept/ths/wen_cai/wen_cai_concept_sync.py,sha256=boKtgOIXIsRny5n1keZm4luDFCiooudbPDsEFIGImIw,1747
+mns_scheduler/concept/ths/common/ths_concept_sync_common_api.py,sha256=x3f6DHMyDCAVYtfmSlTPbeL_Z40ybf3sJHbmyIFTGXA,6542
+mns_scheduler/concept/ths/common/ths_concept_update_common_api.py,sha256=2Sv5lPzTWuma-mtKkgvO0cHJj150U0SDWQGyCJIvCpg,4305
+mns_scheduler/concept/ths/sync_new_index/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
+mns_scheduler/concept/ths/sync_new_index/sync_ths_concept_by_ak_api.py,sha256=asZLrVxv2acbheJaI1VMguk4Vu6dqdcHPiJgWbq3b74,5001
+mns_scheduler/concept/ths/sync_new_index/sync_ths_new_concept_by_web_api.py,sha256=Yv3Gp6qwAnpg3qM_MguWNSH7NDpxQkvH_SLWcsJfYo8,3605
+mns_scheduler/concept/ths/update_concept_info/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
+mns_scheduler/concept/ths/update_concept_info/sync_one_concept_all_symbols_api.py,sha256=ipRtiihpHlbxuces7YpHfvBtCDxgzrVXjcCKZiFBPaw,1928
+mns_scheduler/concept/ths/update_concept_info/sync_one_symbol_all_concepts_api.py,sha256=Hl5fJ9bVmy8hSawRM1xnBl5u-xbOI6LEa5ALCnQAJM8,8764
 mns_scheduler/db/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/db/col_move_service.py,sha256=OyuHGXXWB8VPHkiA2JwXR4y961PLdZeNfgk_5R0f3pA,3952
 mns_scheduler/db/db_status.py,sha256=K1jtYIGZzDV6knpoJLLnXEhN3tyziJp_zY2gSfguHCA,747
 mns_scheduler/dt/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/dt/stock_dt_pool_sync.py,sha256=5ivRUOnFtOapZniwTbujf1lVq3y4btm2Cmd5R6JJAVo,3466
-mns_scheduler/ipo/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/ipo/auto_ipo_buy_api.py,sha256=7d0xCo5sWgzBKZYrpzLSHsk2Kb3Gg2GHKqUPLD7Jbu0,387
 mns_scheduler/k_line/__init__.py,sha256=ffZXFCLFdIwOsbxnw__u1MbQYh9yz7Bs8UMP6VF0X2M,161
 mns_scheduler/k_line/clean/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/k_line/clean/k_line_info_clean_impl.py,sha256=3NPu-bkBw5ARW2yoMAmf_-au6vxQdSjzGlT-l4dqV4w,21833
@@ -41,7 +40,7 @@ mns_scheduler/k_line/sync/daily_week_month_line_sync.py,sha256=SNKkwGoyE1qzds1o-
 mns_scheduler/kpl/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/kpl/selection/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/kpl/selection/index/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/kpl/selection/index/sync_best_choose_his_index.py,sha256=ySu2wdVeyb_gqK0WZOJhJD2ot_iciv8tPk8gv8wUG4o,4765
+mns_scheduler/kpl/selection/index/sync_best_choose_his_index.py,sha256=7z9UPwh6_EnZMOQnpQQksdF_IwV1t7uRRYg1ZrpL3OA,4503
 mns_scheduler/kpl/selection/index/sync_best_choose_index.py,sha256=-34drqAMsx792DxR8P1A8DrGCM5yIVGsop3UzDNzsPw,8016
 mns_scheduler/kpl/selection/symbol/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/kpl/selection/symbol/sync_best_choose_symbol.py,sha256=kUKs0SWCqekhvV0o5A1pDv0Nw4x6VTS-ij0AryzKe8w,4679
@@ -49,7 +48,11 @@ mns_scheduler/kpl/selection/total/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3Zi
 mns_scheduler/kpl/selection/total/sync_kpl_best_total_sync_api.py,sha256=WRK-Pu0-7ub9q1n5TK406_sAGQwOEUl2CZLu9suo70k,10461
 mns_scheduler/real_time/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
 mns_scheduler/real_time/realtime_quotes_now_create_db_index.py,sha256=qQCjcsG3WYgn3zemS45Ms0AHtbkCwlSVPPCntxVvK8Q,1066
-mns_scheduler/real_time/realtime_quotes_now_sync.py,sha256=YldmBI19eKNEL_yTZvBrWewL33B5G6a8cuEn7YQMV9w,8850
+mns_scheduler/real_time/realtime_quotes_now_sync.py,sha256=nLVt8CCoqjnMgpY0eIwAXUXMSQ7VF9YtKn53JidV-YY,9149
+mns_scheduler/trade/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
+mns_scheduler/trade/auto_ipo_buy_api.py,sha256=QXNzFJGNGveVUcXBh0RRJb_HV7abbLYXRljezPJf9ZM,377
+mns_scheduler/trade/auto_sell_service_api.py,sha256=HaauZeOsuLNBrowXT8IKaSgWLR2Huott6mg_AoLhpUY,4423
+mns_scheduler/trade/sync_position_api.py,sha256=HmREr4H-PqlOdlNx3_SN6vRaRnhlaLCI6keSlYuXJHc,2739
 mns_scheduler/zb/__init__.py,sha256=Tyvi_iQlv3jz59EdH67Mycnt9CSixcWPQoJwu55bOq0,165
 mns_scheduler/zb/stock_zb_pool_sync.py,sha256=ky3CNDzpjB6C_frCf4YGNXdidnUo-uUUKsJpY62P4Bk,1936
 mns_scheduler/zt/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
@@ -59,9 +62,9 @@ mns_scheduler/zt/today_high_chg_pool_sync_api.py,sha256=G6FXMH7HnvhyMFoE-RszggkB
 mns_scheduler/zt/zt_five_boards_sync_api.py,sha256=HfjPHKD99fU9c37kSenEX2_qNvFAjQGgy8ERuacSxwk,10916
 mns_scheduler/zt/zt_pool_sync_api.py,sha256=tzSCnqAelV7MQBZ3KcpOQQHNYnjFnmvoDFcapBpU_NA,7534
 mns_scheduler/zz_task/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
-mns_scheduler/zz_task/data_sync_task.py,sha256=cSCjl8JqEfjmvpLJHshe5r-TURY3AF4bzjTMfJvbBUU,14500
+mns_scheduler/zz_task/data_sync_task.py,sha256=cVwVhzLnr3LXn9qBGtwrnbbkRO0XBDoWB6GmONCwB3M,15337
 mns_scheduler/zz_task/sync_realtime_quotes_task.py,sha256=DN3bq2XCDZC-PHlbD2NTog48bR44EruIEc2QVGKg7Tk,932
-mns_scheduler-1.0.3.3.dist-info/METADATA,sha256=niUDOzjRf7RExX-wIS_QkyHKbsnOXp3VR7bLw7XTgBA,64
-mns_scheduler-1.0.3.3.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-mns_scheduler-1.0.3.3.dist-info/top_level.txt,sha256=PXQDFBGR1pWmsUbH5yiLAh71P5HZODTRED0zJ8CCgOc,14
-mns_scheduler-1.0.3.3.dist-info/RECORD,,
+mns_scheduler-1.0.3.6.dist-info/METADATA,sha256=oQq-vFt1ZmbonN3c75ZOQhtTeJ11kyu5k-T3O1iKotU,64
+mns_scheduler-1.0.3.6.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+mns_scheduler-1.0.3.6.dist-info/top_level.txt,sha256=PXQDFBGR1pWmsUbH5yiLAh71P5HZODTRED0zJ8CCgOc,14
+mns_scheduler-1.0.3.6.dist-info/RECORD,,