From 1be8fb3aed3f8a55c0dcb6d021685cbb2c79e6ec Mon Sep 17 00:00:00 2001
From: Administrator <admin@example.com>
Date: 星期三, 20 三月 2024 18:47:54 +0800
Subject: [PATCH] 接口调整

---
 third_data/data_server.py |   44 ++++++++++++++++++++------------------------
 1 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/third_data/data_server.py b/third_data/data_server.py
index 49dd481..b0c36c8 100644
--- a/third_data/data_server.py
+++ b/third_data/data_server.py
@@ -306,7 +306,7 @@
             name = ps_dict.get('name')
             date = ps_dict.get('date')
             try:
-                data = code_info_output.get_output_params(code, self.__jingxuan_cache_dict, self.__industry_cache_dict, trade_record_date = date)
+                data = code_info_output.get_output_params(code, self.__jingxuan_cache_dict, self.__industry_cache_dict)
                 if data["code_name"].find("None") > -1 and name:
                     data["code_name"] = f"{name} {code}"
 
@@ -320,7 +320,16 @@
                 logger_debug.exception(e)
                 logging.exception(e)
 
-            # 鑾峰彇璇勫垎淇℃伅
+        elif url.path == "/get_trade_records":
+            # 鑾峰彇鎸傛挙淇℃伅
+            ps_dict = dict([(k, v[0]) for k, v in parse_qs(url.query).items()])
+            code = ps_dict['code']
+            date = ps_dict.get('date')
+            local_today_datas = log_export.load_l2_from_log(date)
+            total_datas = local_today_datas.get(code)
+            trade_info = code_info_output.load_trade_record(code, total_datas, date)
+            response_data = json.dumps({"code": 0, "data": {"open_limit_up": trade_info[0], "records": trade_info[2]}})
+
         elif url.path == "/get_l2_cant_buy_reasons":
             # 鑾峰彇L2娌′拱鐨勫師鍥�
             ps_dict = dict([(k, v[0]) for k, v in parse_qs(url.query).items()])
@@ -350,6 +359,8 @@
                 total_datas = l2_data_util.local_today_datas.get(code)
                 if date:
                     total_datas = None
+                else:
+                    date = tool.get_now_date_str()
                 datas = data_export_util.get_l2_datas(code, total_datas, date=date)
                 code_name = gpcode_manager.get_code_name(code)
                 response_data = json.dumps({"code": 0, "data": {"code": code, "code_name": code_name, "data": datas}})
@@ -367,10 +378,12 @@
             ps_dict = dict([(k, v[0]) for k, v in parse_qs(url.query).items()])
             code = ps_dict['code']
             date = ps_dict.get('date')
+            if not date:
+                date = tool.get_now_date_str()
             buy_single_index = ps_dict.get('buy_single_index')
             if buy_single_index is not None:
                 buy_single_index = int(buy_single_index)
-            records = code_info_output.load_trade_record_cancel_watch_indexes(code, date)
+            records = code_info_output.load_trade_record_cancel_watch_indexes(code, date=date)
             # 鑾峰彇鏈�鏂扮殑L涓婁笌L涓�
             records.reverse()
             up_indexes = []
@@ -833,25 +846,8 @@
 
 
 if __name__ == "__main__":
-    code = "002676"
-    buy_single_index = 716
-    records = code_info_output.load_trade_record_cancel_watch_indexes(code)
-    # 鑾峰彇鏈�鏂扮殑L涓婁笌L涓�
-    records.reverse()
-    up_indexes = []
-    down_indexes = []
-    for r in records:
-        if buy_single_index and buy_single_index != r[1]:
-            continue
-        if r[0] == trade_record_log_util.CancelWatchIndexesInfo.CANCEL_TYPE_L_UP:
-            up_indexes = r[2]
-            break
-    for r in records:
-        if buy_single_index and buy_single_index != r[1]:
-            continue
-        if r[0] == trade_record_log_util.CancelWatchIndexesInfo.CANCEL_TYPE_L_DOWN:
-            down_indexes = r[2]
-            break
+    code = "600822"
+    records = code_info_output.load_trade_record_cancel_watch_indexes(code, date="2024-03-12")
 
-    response_data = json.dumps(
-        {"code": 0, "data": {"up": up_indexes, "down": down_indexes}})
+    # data = code_info_output.get_output_params(code, self.__jingxuan_cache_dict, self.__industry_cache_dict,
+    #                                           trade_record_date=date)

--
Gitblit v1.8.0