mns-scheduler 1.2.1.2__py3-none-any.whl → 1.2.1.4__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of mns-scheduler might be problematic. Click here for more details.

Files changed (7) hide show
  1. mns_scheduler/company_info/base/sync_company_base_info_api.py +6 -3
  2. mns_scheduler/company_info/constant/company_constant_data.py +17 -11
  3. mns_scheduler/self_choose/ths_self_choose_service.py +2 -2
  4. {mns_scheduler-1.2.1.2.dist-info → mns_scheduler-1.2.1.4.dist-info}/METADATA +1 -1
  5. {mns_scheduler-1.2.1.2.dist-info → mns_scheduler-1.2.1.4.dist-info}/RECORD +7 -7
  6. {mns_scheduler-1.2.1.2.dist-info → mns_scheduler-1.2.1.4.dist-info}/WHEEL +0 -0
  7. {mns_scheduler-1.2.1.2.dist-info → mns_scheduler-1.2.1.4.dist-info}/top_level.txt +0 -0
mns_scheduler/company_info/base/sync_company_base_info_api.py CHANGED
@@ -11,7 +11,6 @@ import pandas as pd
11
11
  from loguru import logger
12
12
  import mns_common.api.ths.concept.web.ths_company_info_web as ths_company_info_web
13
13
  import mns_common.api.em.east_money_stock_v2_api as east_money_stock_v2_api
14
- import mns_scheduler.company_info.constant.company_constant_data as company_constant_data
15
14
  import mns_common.component.common_service_fun_api as common_service_fun_api
16
15
  import mns_common.component.concept.ths_concept_common_service_api as ths_concept_common_service_api
17
16
  from mns_common.db.MongodbUtil import MongodbUtil
@@ -164,6 +163,11 @@ def single_thread_sync_company_info(east_money_stock_info,
164
163
  company_info_type['third_industry_code'] = company_info_type['hy3code'].apply(
165
164
  lambda x: x[1:7])
166
165
 
166
+ company_info_type['main_business_list'] = company_info_type['main_business_list']
167
+ company_info_type['most_profitable_business'] = company_info_type['most_profitable_business']
168
+ company_info_type['most_profitable_business_rate'] = company_info_type['most_profitable_business_rate']
169
+ company_info_type['most_profitable_business_profit'] = company_info_type['most_profitable_business_profit']
170
+
167
171
  company_info_type['first_sw_industry'] = company_info_type['hy']
168
172
  company_info_type['second_sw_industry'] = company_info_type['hy2']
169
173
  company_info_type['third_sw_industry'] = company_info_type['hy3']
@@ -434,6 +438,5 @@ if __name__ == '__main__':
434
438
  # query = {"total_operate_income": 0}
435
439
  # un_report_company_info = mongodb_util.find_query_data(db_name_constant.COMPANY_INFO, query)
436
440
  # symbol_list = list(un_report_company_info['symbol'])
437
- fix_symbol_industry_df = company_constant_data.get_fix_symbol_industry()
438
- sync_company_base_info(list(fix_symbol_industry_df['symbol']))
441
+ sync_company_base_info(None)
439
442
  # group_by_industry()
mns_scheduler/company_info/constant/company_constant_data.py CHANGED
@@ -47,7 +47,6 @@ def get_fix_symbol_industry():
47
47
  ['300033', '同花顺', '490101', '证券'],
48
48
  ['300399', '天利科技', '490201', '保险'],
49
49
 
50
-
51
50
  ],
52
51
  columns=['symbol', 'name', 'new_industry_code', 'new_industry'])
53
52
 
@@ -199,12 +198,15 @@ def get_industry_final_fix_df():
199
198
  ['贸易Ⅱ', '贸易'], #
200
199
 
201
200
  # 农林牧渔
202
- ['养殖业', '农林牧渔'], # merge 农林牧渔
203
- ['农产品加工', '农林牧渔'], # merge 农林牧渔
204
- ['饲料', '农林牧渔'], # merge to 饲料
205
- ['渔业', '农林牧渔'], # merge to 渔业
206
- ['种植业', '种植业'], # merge 种植业
207
- ['动物保健Ⅱ', '动物保健'], # todo exclude
201
+ ['养殖业', '养殖业'], # merge 农林牧渔
202
+ ['农产品加工', '农产品加工'], # merge 农林牧渔
203
+ ['饲料', '饲料'], # merge to 农林牧渔
204
+ ['渔业', '渔业'], # merge to 农林牧渔
205
+ # merge 农林牧渔
206
+ ['动物保健Ⅱ', '动物保健'],
207
+ ['种植业', '种植业'],
208
+ ['林业Ⅱ', '林业'], # merge 农林牧渔
209
+ ['农业综合Ⅱ', '农业综合'], # merge 农林牧渔
208
210
 
209
211
  # 公用事业
210
212
  ['燃气Ⅱ', '燃气'],
@@ -244,9 +246,9 @@ def get_industry_final_fix_df():
244
246
  ['通用设备', '通用设备'], # todo exclude
245
247
  ['专业服务', '专业服务'], # todo exclude 无法具体分类
246
248
  ['摩托车及其他', '摩托车及其他'], # todo exclude
247
- ['专业连锁Ⅱ', '综合'], # merge 综合Ⅱ
248
- ['林业Ⅱ', '综合'], # merge 综合Ⅱ
249
- ['农业综合Ⅱ', '综合'], # merge 综合Ⅱ
249
+
250
+ ['专业连锁Ⅱ', '专业连锁'], # 专业连锁 综合Ⅱ
251
+
250
252
  ['体育Ⅱ', '综合'], # merge 综合Ⅱ
251
253
  ['综合Ⅱ', '综合'] # todo exclude
252
254
 
@@ -386,7 +388,11 @@ def filed_sort(company_info):
386
388
  'total_operate_income',
387
389
  'kzz_debt_list',
388
390
  'hk_stock_code',
389
- 'hk_stock_name'
391
+ 'hk_stock_name',
392
+ 'main_business_list',
393
+ 'most_profitable_business',
394
+ 'most_profitable_business_rate',
395
+ 'most_profitable_business_profit',
390
396
  ]]
391
397
 
392
398
 
mns_scheduler/self_choose/ths_self_choose_service.py CHANGED
@@ -116,14 +116,14 @@ def add_continue_boards_zt_stocks():
116
116
  # 自选股操作 删除当天自选股 增加新的连板股票 添加固定选择自选
117
117
  def self_choose_stock_handle():
118
118
  delete_all_self_choose_stocks()
119
+ # 固定自选
120
+ add_fixed_optional()
119
121
  # 自己买入的股票
120
122
  add_trade_stocks()
121
123
  # 本地自选
122
124
  add_self_choose_local()
123
125
  # 连板股票
124
126
  # add_continue_boards_zt_stocks()
125
- # 固定自选
126
- add_fixed_optional()
127
127
 
128
128
 
129
129
  if __name__ == '__main__':
{mns_scheduler-1.2.1.2.dist-info → mns_scheduler-1.2.1.4.dist-info}/METADATA RENAMED
@@ -1,4 +1,4 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: mns-scheduler
3
- Version: 1.2.1.2
3
+ Version: 1.2.1.4
4
4
 
{mns_scheduler-1.2.1.2.dist-info → mns_scheduler-1.2.1.4.dist-info}/RECORD RENAMED
@@ -7,12 +7,12 @@ mns_scheduler/company_info/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlI
7
7
  mns_scheduler/company_info/announce/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
8
8
  mns_scheduler/company_info/announce/company_announce_sync_service.py,sha256=sqD2L7axULCGGYnIN_IIFYTSiMV1lb8oWqDefJkAg10,2802
9
9
  mns_scheduler/company_info/base/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
10
- mns_scheduler/company_info/base/sync_company_base_info_api.py,sha256=xH4awVhaXBvkGV79Hpxa8AWQonTIUnO1qgfEKBU2wNo,20290
10
+ mns_scheduler/company_info/base/sync_company_base_info_api.py,sha256=pZOlCkT-KKyHajmr-6J9191AiDqqWCRh9vKPm5S6JiI,20529
11
11
  mns_scheduler/company_info/base/sync_company_hold_info_api.py,sha256=W3Nj9st45efx8cy_42PRTcOXijWKnkO1-ZFRyyfR3S0,1587
12
12
  mns_scheduler/company_info/clean/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
13
13
  mns_scheduler/company_info/clean/company_info_clean_api.py,sha256=n3kxsqihPjKJvGDkAjMYqB_U2EPemOi1Yjez5yOYJeo,4858
14
14
  mns_scheduler/company_info/constant/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
15
- mns_scheduler/company_info/constant/company_constant_data.py,sha256=MHhVQfMa1NZpEw5GqBUHbGDszjA0ijvPPopWj6F58-g,17051
15
+ mns_scheduler/company_info/constant/company_constant_data.py,sha256=b9xrlEDJvQzPi3dLClgdeLwouKcmBQLhGFqH1ALQJ9o,17228
16
16
  mns_scheduler/company_info/de_list_stock/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
17
17
  mns_scheduler/company_info/de_list_stock/de_list_stock_service.py,sha256=GCp6hlvO-SuH1oIpEsYZwEnGUOa6fXb2D7CqAUYXKQA,1993
18
18
  mns_scheduler/company_info/remark/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
@@ -107,7 +107,7 @@ mns_scheduler/risk/test/fix_blask_list.py,sha256=jjLhhIWH1L4CgNp2jQ_HAHbC3wVgeX1
107
107
  mns_scheduler/risk/transactions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
108
108
  mns_scheduler/risk/transactions/transactions_check_api.py,sha256=4NzdWgLmGPlzE7EgnicYmK115ThFN8O5_APlb2ZF2Do,6890
109
109
  mns_scheduler/self_choose/__init__.py,sha256=wEg73KlZo-dU0yKGwpA1C2y6LZm4IBb94tNda1tqLeg,163
110
- mns_scheduler/self_choose/ths_self_choose_service.py,sha256=X0eiw5oAMQGBcyQVjUeBGBZi0WI-gI6ORRBUDnuUxAk,5526
110
+ mns_scheduler/self_choose/ths_self_choose_service.py,sha256=Us8AH0EcgalQlyvJHlUNVzlxSRQPqYCdsYJgEr4y09E,5526
111
111
  mns_scheduler/trade/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
112
112
  mns_scheduler/trade/auto_ipo_buy_api.py,sha256=jVe5ZiXwzkDy_j_4X4rUamSzJpmzhV16lNKwbeWgpQw,386
113
113
  mns_scheduler/trade/auto_sell_service_api.py,sha256=b-4xmW6W6cd6dMuLPD7ZJu3tUtchMcUG-p7wOMm_RRY,4640
@@ -142,7 +142,7 @@ mns_scheduler/zt/zt_pool/ths_zt_pool_sync_api.py,sha256=Sy39T-yFwLSIIoSZqQzS-6-W
142
142
  mns_scheduler/zt/zt_pool/update_null_zt_reason_api.py,sha256=OuklSKUhZMj1aKcwDLpZilKIqFbHY3hvvIuA_UFnPqA,2135
143
143
  mns_scheduler/zz_task/__init__.py,sha256=QWBdZwBCvQw8aS4hnL9_pg3U3ZiNLUXzlImyy9WhUcI,163
144
144
  mns_scheduler/zz_task/data_sync_task.py,sha256=b-hv4OBJr9qsmhtCA3k88Odj2WGThuLrn0NkvKIgx0o,21195
145
- mns_scheduler-1.2.1.2.dist-info/METADATA,sha256=_WvVl4z7ImblajsCPmY5M_38hR9iwamMsKVWr57MVR0,64
146
- mns_scheduler-1.2.1.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
147
- mns_scheduler-1.2.1.2.dist-info/top_level.txt,sha256=PXQDFBGR1pWmsUbH5yiLAh71P5HZODTRED0zJ8CCgOc,14
148
- mns_scheduler-1.2.1.2.dist-info/RECORD,,
145
+ mns_scheduler-1.2.1.4.dist-info/METADATA,sha256=5l1qSXqibUe8_1TBLUN0rtYpHnLmwg0Nb2HrCCwxyro,64
146
+ mns_scheduler-1.2.1.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
147
+ mns_scheduler-1.2.1.4.dist-info/top_level.txt,sha256=PXQDFBGR1pWmsUbH5yiLAh71P5HZODTRED0zJ8CCgOc,14
148
+ mns_scheduler-1.2.1.4.dist-info/RECORD,,