From cbe19ea6066a600cbd0b5110db5d43f8252d14a8 Mon Sep 17 00:00:00 2001 From: Administrator <admin@example.com> Date: 星期四, 13 六月 2024 11:23:53 +0800 Subject: [PATCH] L撤成交进度相关改进 --- third_data/kpl_api.py | 40 ++++++++++++++++++++++------------------ 1 files changed, 22 insertions(+), 18 deletions(-) diff --git a/third_data/kpl_api.py b/third_data/kpl_api.py index cef299e..83b1ddb 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 = { @@ -34,7 +34,7 @@ raise Exception("璇锋眰鍑洪敊") return response.text else: - fdata = middle_api_protocol.load_kpl(url, data) + fdata = middle_api_protocol.load_kpl(url, data, timeout) return middle_api_protocol.request(fdata) @@ -47,7 +47,7 @@ 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-6d893c846e23&VerSion=5.13.0.0&Index={(page - 1) * pageSize}&PidType={pidType}&" + 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) return result @@ -57,18 +57,22 @@ fresults = [] for pid_info in pids: results = [] - for i in range(10): + for i in range(100): + start_time = time.time() result = __getLimitUpInfo(pid_info[0], i + 1, 20) 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: if not r[18] and pid_info[1]: r[18] = pid_info[1] + # 鏇挎崲鎺夋澘鍧楀悕绉� + for i in range(len(r)): + if type(r[i]) == str: + r[i] = kpl_util.filter_block(r[i]) fresults.extend(results) return json.dumps({"errcode": 0, "list": fresults}) @@ -93,7 +97,7 @@ def getHistoryLimitUpInfo(day): fresults = [] - for i in range(0, 5): + for i in range(0, 100): data = f"Order=1&a=HisDaBanList&st=20&c=HisHomeDingPan&PhoneOSNew=1&DeviceID=a38adabd-99ef-3116-8bb9-6d893c846e23&VerSion=5.8.0.2&Index={i * 20}&Is_st=1&PidType=1&apiv=w32&Type=6&FilterMotherboard=0&Filter=0&FilterTIB=0&Day={day}&FilterGem=0&" result = __base_request("https://apphis.longhuvip.com/w1/api/index.php", data=data) result = json.loads(result) @@ -184,7 +188,7 @@ result = json.loads(result) if result: if "List" in result: - names = [x["CName"].replace("姒傚康", "") for x in result["List"]] + names = [kpl_util.filter_block(x["CName"]) for x in result["List"]] return names return [] @@ -196,7 +200,7 @@ result = json.loads(result) if result: if "List" in result: - names = [x["CName"].replace("姒傚康", "") for x in result["List"]] + names = [kpl_util.filter_block(x["CName"]) for x in result["List"]] return names return [] @@ -206,17 +210,19 @@ blocks = [] try: _bks = __getConceptJXBK(code) + print(_bks) if _bks: blocks.extend(_bks) except: pass - - try: - _bks = __getConceptBK(code) - 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)) @@ -252,6 +258,4 @@ if __name__ == "__main__": - results = kpl_util.parseLimitUpData(getLimitUpInfoNew()) - print(results) - + print(getZYLTAmount("300198")) -- Gitblit v1.8.0