From aacc6148dd43a9cffbff9a23a273a55b64bf3d8c Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期六, 12 十月 2024 17:21:42 +0800
Subject: [PATCH] bug修复

---
 third_data/kpl_api.py |   53 ++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/third_data/kpl_api.py b/third_data/kpl_api.py
index 405db99..0d15d7e 100644
--- a/third_data/kpl_api.py
+++ b/third_data/kpl_api.py
@@ -19,7 +19,7 @@
 DABAN_TYPE_EVER_LIMIT_DOWN = 5
 
 
-def __base_request(url, data, timeout=60):
+def __base_request(url, data, timeout=10):
     DELEGATE = True
     if not DELEGATE:
         headers = {
@@ -49,7 +49,6 @@
 def __getLimitUpInfo(pidType, page, pageSize):
     data = f"Order=0&a=DailyLimitPerformance&st={pageSize}&apiv=w35&Type=4&c=HomeDingPan&PhoneOSNew=1&DeviceID=a38adabd-99ef-3116-8bb9-6d893c846e24&VerSion=5.13.0.0&Index={(page - 1) * pageSize}&PidType={pidType}&"
     result = __base_request("https://apphq.longhuvip.com/w1/api/index.php", data=data)
-    print(result)
     return result
 
 
@@ -61,12 +60,10 @@
         for i in range(100):
             start_time = time.time()
             result = __getLimitUpInfo(pid_info[0], i + 1, 20)
-            print("璇锋眰鐢ㄦ椂", time.time() - start_time)
             result = json.loads(result)
             datas = result["info"][0]
             results.extend(datas)
             day = result["info"][1]
-            print(datas)
             if len(datas) < 20:
                 break
         for r in results:
@@ -166,12 +163,20 @@
 
 # 鑾峰彇浠g爜鐨勭簿閫夋澘鍧�
 # 杩斿洖鏍煎紡锛歔(鏉垮潡浠g爜,鏉垮潡鍚嶇О,娑ㄥ箙鐧惧垎姣�)]
-def getCodeJingXuanBlocks(code):
+def getCodeJingXuanBlocks(code, jx=True):
     data = f"a=GetStockIDPlate&apiv=w32&Type=2&c=StockL2Data&StockID={code}&PhoneOSNew=1&UserID=0&DeviceID=a38adabd-99ef-3116-8bb9-6d893c846e23&VerSion=5.8.0.2&Token=0&"
     result = __base_request("https://apphq.longhuvip.com/w1/api/index.php", data=data)
     result = json.loads(result)
-    print(result)
-    return result.get("ListJX") if result.get("ListJX") else result.get("List")
+    # print(result)
+    if jx:
+        return result.get("ListJX") if result.get("ListJX") else result.get("List")
+    else:
+        fresults = []
+        if result.get("List"):
+            fresults.extend(result.get("List"))
+        if result.get("ListJX"):
+            fresults.extend(result.get("ListJX"))
+        return fresults
 
 
 # 鑾峰彇鑷敱娴侀�氬競鍊�
@@ -192,7 +197,7 @@
     if result:
         if "List" in result:
             names = [kpl_util.filter_block(x["CName"]) for x in result["List"]]
-            return names
+            return names if len(names) < 3 else names[:2]
     return []
 
 
@@ -212,20 +217,23 @@
 def getCodeBlocks(code):
     blocks = []
     try:
-        _bks = __getConceptJXBK(code)
-        print(_bks)
+        _bks = getCodeJingXuanBlocks(code)
+        # 鍙栧墠2涓�
+        if _bks and len(_bks) > 2:
+            _bks = _bks[:2]
+        _bks = [x[1] for x in _bks]
         if _bks:
             blocks.extend(_bks)
     except:
         pass
-
-    try:
-        _bks = __getConceptBK(code)
-        print(_bks)
-        if _bks:
-            blocks.extend(_bks)
-    except:
-        pass
+    if not blocks:
+        try:
+            _bks = __getConceptBK(code)
+            print(_bks)
+            if _bks:
+                blocks.extend(_bks)
+        except:
+            pass
     return list(set(blocks))
 
 
@@ -261,4 +269,11 @@
 
 
 if __name__ == "__main__":
-    print(getCodeBlocks("002350"))
+    print(getLimitUpInfoNew())
+
+    # __getConceptBK("300564")
+    # data = (getMarketJingXuanRealRankingInfo())
+    # data=json.loads(data)
+    # print(len(data["list"]))
+    # data = json.loads(getCodesByPlate("801235"))
+    # print(data)

--
Gitblit v1.8.0