修复综合选股错误

instock/core/crawling/stock_selection.py

@@ -1,6 +1,7 @@
 # -*- coding:utf-8 -*-
 # !/usr/bin/env python
 
+import math
 import pandas as pd
 import requests
 import instock.core.tablestructure as tbs
@@ -17,15 +18,17 @@ def stock_selection() -> pd.DataFrame:
     :rtype: pandas.DataFrame
     """
     cols = tbs.TABLE_CN_STOCK_SELECTION['columns']
+    page_size = 1000
+    page_current = 1
     sty = ""  # 初始值 "SECUCODE,SECURITY_CODE,SECURITY_NAME_ABBR,CHANGE_RATE"
     for k in cols:
         sty = f"{sty},{cols[k]['map']}"
     url = "https://data.eastmoney.com/dataapi/xuangu/list"
     params = {
         "sty": sty[1:],
         "filter": "(MARKET+in+(\"上交所主板\",\"深交所主板\",\"深交所创业板\"))(NEW_PRICE>0)",
-        "p": 1,
-        "ps": 10000,
+        "p": page_current,
+        "ps": page_size,
         "source": "SELECT_SECURITIES",
         "client": "WEB"
     }
@@ -34,6 +37,18 @@ def stock_selection() -> pd.DataFrame:
     data = data_json["result"]["data"]
     if not data:
         return pd.DataFrame()
+
+    data_count = data_json["result"]["count"]
+    page_count = math.ceil(data_count/page_size)
+    while page_count > 1:
+        page_current = page_current + 1
+        params["p"] = page_current
+        r = requests.get(url, params=params)
+        data_json = r.json()
+        _data = data_json["result"]["data"]
+        data.extend(_data)
+        page_count =page_count - 1
+
     temp_df = pd.DataFrame(data)
 
     mask = ~temp_df['CONCEPT'].isna()

instock/job/init_job.py

@@ -36,7 +36,7 @@ def create_new_base_table():
         with conn.cursor() as db:
             create_table_sql = """CREATE TABLE IF NOT EXISTS `cn_stock_attention` (
                                   `datetime` datetime(0) NULL DEFAULT NULL, 
-                                  `code` varchar(6) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+                                  `code` varchar(6) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
                                   PRIMARY KEY (`code`) USING BTREE,
                                   INDEX `INIX_DATETIME`(`datetime`) USING BTREE
                                   ) CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;"""

instock/web/static/css/gc.spread.sheets.excel2013white.css

@@ -1296,13 +1296,13 @@ div.gc-search-outer-div input::-ms-clear {
   padding: 3px;
   margin: 1px;
   overflow: hidden;
+  display: flex;
 }
 
 .gc-ui-contextmenu-icon {
   width: 16px;
   height: 16px;
   margin-left: 0;
-  float: left;
   display: inline-block;
   margin-right: 12px;
 }
@@ -1359,11 +1359,11 @@ div.gc-search-outer-div input::-ms-clear {
 .gc-ui-contextmenu-menuitem-content .gc-ui-contextmenu-sup-indicator {
   width: 16px;
   height: 16px;
-  float: right;
   display: inline-block;
   background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAgCAYAAABU1PscAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTM4IDc5LjE1OTgyNCwgMjAxNi8wOS8xNC0wMTowOTowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkFEODY1RjVGQzhGMjExRTdBMDNDRDU1NEFCMEVGRTIxIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkFEODY1RjYwQzhGMjExRTdBMDNDRDU1NEFCMEVGRTIxIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QUQ4NjVGNURDOEYyMTFFN0EwM0NENTU0QUIwRUZFMjEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6QUQ4NjVGNUVDOEYyMTFFN0EwM0NENTU0QUIwRUZFMjEiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz6xjVcxAAAAg0lEQVR42uzYMQ6AIAyF4RaFwXgT738PV+PMBVxRqx4A3RTM/yYGhn60hAQ1M6k5TioPAAAAAAAAAAAAAAAAAAAA8EdA33emqjLOccjt0ZJ/Jc7izftWUlqzdRYPeKq1mjtwdsLowBdpGnd70EUDQvCybbte6ykuvroR4iED8EIOAQYApagr3uYsgU4AAAAASUVORK5CYII=);
   background-position: -32px -16px;
   background-repeat: no-repeat;
+  margin-left: auto;
 }
 
 .gc-ui-contextmenu-splitMenu-container {
@@ -1885,6 +1885,7 @@ div.gc-search-outer-div input::-ms-clear {
   width: 12px;
   height: 12px;
   display: inline-block;
+  padding-top: 1px;
 }
 
 .gc-statusbar-contextmenu-content {
@@ -1897,6 +1898,7 @@ div.gc-search-outer-div input::-ms-clear {
   float: right;
   color: #444444;
   vertical-align: middle;
+  margin-left: auto;
 }
 
 input.gc-checkbox-cell-type-input[type=checkbox]:before {

instock/web/templates/stock_indicators.html

@@ -1,7 +1,7 @@
 {% extends "layout/indicators.html" %}
 {% block main_content %}
-<script type="text/javascript" src="/static/js/bokeh-3.6.0.min.js"></script>
-<script type="text/javascript" src="/static/js/bokeh-widgets-3.6.0.min.js"></script>
+<script type="text/javascript" src="/static/js/bokeh-3.6.2.min.js"></script>
+<script type="text/javascript" src="/static/js/bokeh-widgets-3.6.2.min.js"></script>
 <script type="text/javascript">
     Bokeh.set_log_level("error");
     function attention(code,obj){

requirements.txt

@@ -1,15 +1,15 @@
 numpy==2.1.3
 pandas==2.2.3
 py_mini_racer==0.6.0
-TA_Lib==0.5.0
+TA_Lib==0.5.1
 arrow==1.3.0
-bokeh==3.6.0
+bokeh==3.6.2
 PyMySQL==1.1.1
 requests==2.32.3
 Logbook==1.8.0
 SQLAlchemy==2.0.36
-tornado==6.4.1
-tqdm==4.67.0
+tornado==6.4.2
+tqdm==4.67.1
 easytrader==0.23.0
 beautifulsoup4==4.12.3
 pycryptodome==3.21.0