add more files

web/app.py

@@ -128,6 +128,7 @@ def get_kl_data(symbol, timeframe, limit=1000, start_time=None, end_time=None):
         
         # 按时间排序
         df = df.sort_values('timestamp')
+        """
         chan = ChanLun()
         klc_list = chan.get_klc_list(df)
         klc_index = 0
@@ -140,13 +141,14 @@ def get_kl_data(symbol, timeframe, limit=1000, start_time=None, end_time=None):
             if index == klc.start_klu.index:
                 ret_df.loc[klc_index] = df_copy.loc[index]
                 klc_index += 1
+        """
         # 如果过滤后没有数据，返回None
-        if len(ret_df) == 0:
+        if len(df) == 0:
             print("过滤后无数据")
             return None
         
-        print(f"获取到总共 {len(ret_df)} 条数据")
-        return ret_df
+        print(f"获取到总共 {len(df)} 条数据")
+        return df
         
     except Exception as e:
         print(f"获取数据错误: {e}")
@@ -471,6 +473,9 @@ def analyze():
                 'direction': convert_direction(bi.dir)
             } for bi in element_analysis['bi_list'] if bi.end_klc]
             
+            # 添加小周期K线数据
+            result['element_kline_data'] = element_df.to_dict('records')
+            
             result['element_seg_list'] = [{
                 'start_time': seg.start_bi.start_klc.end_time if isinstance(seg.start_bi.start_klc.end_time, str) else seg.start_bi.start_klc.end_time.astimezone(client_tz).isoformat(),
                 'end_time': (seg.end_bi.end_klc.end_time if isinstance(seg.end_bi.end_klc.end_time, str) else seg.end_bi.end_klc.end_time.astimezone(client_tz).isoformat()) if seg.end_bi else None,
@@ -503,6 +508,14 @@ def analyze():
                 'desc': point['desc']
             } for point in element_analysis['trade_points']]
             
+            # 添加小周期分型信息
+            result['element_klc_fx_info'] = [{
+                'time': format_time_safely(point['time'], client_tz),
+                'price': point['price'],
+                'fx_type': point['fx_type'],
+                'is_bottom': point['is_bottom']
+            } for point in element_analysis['klc_fx_info']]
+            
             print(f"小周期分析完成: {element_timeframe}, 笔数量: {len(result['element_bi_list'])}, {'仅元素数据' if elements_only else '包含主周期数据'}")
         else:
             print(f"无法获取小周期数据: {element_timeframe}")