mns-scheduler 1.2.1.2__tar.gz → 1.2.1.4__tar.gz

{mns_scheduler-1.2.1.2 → mns_scheduler-1.2.1.4}/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.2.1.2
+Version: 1.2.1.4

{mns_scheduler-1.2.1.2 → mns_scheduler-1.2.1.4}/mns_scheduler/company_info/base/sync_company_base_info_api.py

@@ -11,7 +11,6 @@ import pandas as pd
 from loguru import logger
 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.constant.company_constant_data as company_constant_data
 import mns_common.component.common_service_fun_api as common_service_fun_api
 import mns_common.component.concept.ths_concept_common_service_api as ths_concept_common_service_api
 from mns_common.db.MongodbUtil import MongodbUtil
@@ -164,6 +163,11 @@ def single_thread_sync_company_info(east_money_stock_info,
             company_info_type['third_industry_code'] = company_info_type['hy3code'].apply(
                 lambda x: x[1:7])
 
+            company_info_type['main_business_list'] = company_info_type['main_business_list']
+            company_info_type['most_profitable_business'] = company_info_type['most_profitable_business']
+            company_info_type['most_profitable_business_rate'] = company_info_type['most_profitable_business_rate']
+            company_info_type['most_profitable_business_profit'] = company_info_type['most_profitable_business_profit']
+
             company_info_type['first_sw_industry'] = company_info_type['hy']
             company_info_type['second_sw_industry'] = company_info_type['hy2']
             company_info_type['third_sw_industry'] = company_info_type['hy3']
@@ -434,6 +438,5 @@ if __name__ == '__main__':
     # query = {"total_operate_income": 0}
     # un_report_company_info = mongodb_util.find_query_data(db_name_constant.COMPANY_INFO, query)
     # symbol_list = list(un_report_company_info['symbol'])
-    fix_symbol_industry_df = company_constant_data.get_fix_symbol_industry()
-    sync_company_base_info(list(fix_symbol_industry_df['symbol']))
+    sync_company_base_info(None)
     # group_by_industry()

{mns_scheduler-1.2.1.2 → mns_scheduler-1.2.1.4}/mns_scheduler/company_info/constant/company_constant_data.py

@@ -47,7 +47,6 @@ def get_fix_symbol_industry():
                          ['300033', '同花顺', '490101', '证券'],
                          ['300399', '天利科技', '490201', '保险'],
 
-
                          ],
                         columns=['symbol', 'name', 'new_industry_code', 'new_industry'])
 
@@ -199,12 +198,15 @@ def get_industry_final_fix_df():
         ['贸易Ⅱ', '贸易'],  #
 
         # 农林牧渔
-        ['养殖业', '农林牧渔'],  # merge 农林牧渔
-        ['农产品加工', '农林牧渔'],  # merge 农林牧渔
-        ['饲料', '农林牧渔'],  # merge  to 饲料
-        ['渔业', '农林牧渔'],  # merge  to 渔业
-        ['种植业', '种植业'],  # merge 种植业
-        ['动物保健Ⅱ', '动物保健'],  # todo exclude
+        ['养殖业', '养殖业'],  # merge 农林牧渔
+        ['农产品加工', '农产品加工'],  # merge 农林牧渔
+        ['饲料', '饲料'],  # merge  to 农林牧渔
+        ['渔业', '渔业'],  # merge  to 农林牧渔
+        # merge 农林牧渔
+        ['动物保健Ⅱ', '动物保健'],
+        ['种植业', '种植业'],
+        ['林业Ⅱ', '林业'],  # merge  农林牧渔
+        ['农业综合Ⅱ', '农业综合'],  # merge  农林牧渔
 
         # 公用事业
         ['燃气Ⅱ', '燃气'],
@@ -244,9 +246,9 @@ def get_industry_final_fix_df():
         ['通用设备', '通用设备'],  # todo exclude
         ['专业服务', '专业服务'],  # todo exclude 无法具体分类
         ['摩托车及其他', '摩托车及其他'],  # todo exclude
-        ['专业连锁Ⅱ', '综合'],  # merge 综合Ⅱ
-        ['林业Ⅱ', '综合'],  # merge  综合Ⅱ
-        ['农业综合Ⅱ', '综合'],  # merge  综合Ⅱ
+
+        ['专业连锁Ⅱ', '专业连锁'],  # 专业连锁 综合Ⅱ
+
         ['体育Ⅱ', '综合'],  # merge  综合Ⅱ
         ['综合Ⅱ', '综合']  # todo exclude
 
@@ -386,7 +388,11 @@ def filed_sort(company_info):
         'total_operate_income',
         'kzz_debt_list',
         'hk_stock_code',
-        'hk_stock_name'
+        'hk_stock_name',
+        'main_business_list',
+        'most_profitable_business',
+        'most_profitable_business_rate',
+        'most_profitable_business_profit',
     ]]
 
 

{mns_scheduler-1.2.1.2 → mns_scheduler-1.2.1.4}/mns_scheduler/self_choose/ths_self_choose_service.py

@@ -116,14 +116,14 @@ def add_continue_boards_zt_stocks():
 # 自选股操作 删除当天自选股 增加新的连板股票  添加固定选择自选
 def self_choose_stock_handle():
     delete_all_self_choose_stocks()
+    # 固定自选
+    add_fixed_optional()
     # 自己买入的股票
     add_trade_stocks()
     # 本地自选
     add_self_choose_local()
     # 连板股票
     # add_continue_boards_zt_stocks()
-    # 固定自选
-    add_fixed_optional()
 
 
 if __name__ == '__main__':

{mns_scheduler-1.2.1.2 → mns_scheduler-1.2.1.4}/mns_scheduler.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: mns-scheduler
-Version: 1.2.1.2
+Version: 1.2.1.4

{mns_scheduler-1.2.1.2 → mns_scheduler-1.2.1.4}/setup.py

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