fix: 修复刷新问题；修复不能修改品种合约问题

app/api/config.py

@@ -7,7 +7,7 @@ import shutil
 from pathlib import Path
 from typing import Optional
 
-from fastapi import APIRouter, Depends, HTTPException, UploadFile, File, Body
+from fastapi import APIRouter, Depends, HTTPException, UploadFile, File, Body, Request
 from fastapi.responses import JSONResponse
 from sqlalchemy.orm import Session
 from pydantic import BaseModel
@@ -48,12 +48,12 @@ def get_config():
 
 
 @router.post("/upload")
-def upload_config(
+async def upload_config(
     file: Optional[UploadFile] = File(None),
-    json_config: Optional[dict] = Body(None, embed=False),
+    request: Request = None,
 ):
     """
-    上传品种配置文件（JSON格式）。
+    上传品种配置文件(JSON格式)。
     格式示例:
     {
         "futures": {"沪银": "AG2606", "沪金": "AU2606"},
@@ -64,12 +64,14 @@ def upload_config(
     
     try:
         if file:
-            content = file.file.read()
+            content = await file.read()
             data = json.loads(content)
-        elif json_config:
-            data = json_config
         else:
-            raise HTTPException(status_code=400, detail="请提供配置文件或JSON数据")
+            # 直接从请求体读取 JSON
+            body = await request.body()
+            if not body:
+                raise HTTPException(status_code=400, detail="请提供配置文件或JSON数据")
+            data = json.loads(body)
             
         if not isinstance(data, dict):
             raise HTTPException(status_code=400, detail="配置文件必须是 JSON 对象")

app/api/futures_analysis.py

@@ -44,6 +44,9 @@ def get_futures_list(db: Session = Depends(get_db)):
     for name, symbol_code in futures_config.items():
         cached = get_cached_data(db, symbol_code, "futures")
         if cached and cached.get("timeframes"):
+            # 优先使用缓存中的 current_price 字段
+            current_price = cached.get("current_price")
+            
             all_candles = []
             for period, candles in cached.get("timeframes", {}).items():
                 all_candles.extend(candles)
@@ -55,22 +58,26 @@ def get_futures_list(db: Session = Depends(get_db)):
                 high_price = float(latest_candle.get("high", 0))
                 low_price = float(latest_candle.get("low", 0))
                 
-                change = close_price - open_price
+                # 如果 current_price 为空,则使用收盘价
+                if not current_price:
+                    current_price = close_price
+                
+                change = current_price - open_price
                 change_pct = (change / open_price * 100) if open_price > 0 else 0
                 
                 futures_data.append({
                     "symbol": symbol_code,
                     "name": name,
-                    "price": close_price,
+                    "price": current_price,
                     "change": round(change, 2),
                     "changePct": round(change_pct, 2),
-                    "suggestion": _get_suggestion(close_price, open_price, change_pct),
+                    "suggestion": _get_suggestion(current_price, open_price, change_pct),
                     "suggestionType": "up" if change >= 0 else "down",
                     "periods": _get_period_trends(all_candles),
                     "successRate": _calc_success_rate(all_candles),
                     "trendScore": _calc_trend_score(all_candles),
-                    "resistance": round(2 * ((high_price + low_price + close_price) / 3) - low_price, 2),
-                    "support": round(2 * ((high_price + low_price + close_price) / 3) - high_price, 2),
+                    "resistance": round(2 * ((high_price + low_price + current_price) / 3) - low_price, 2),
+                    "support": round(2 * ((high_price + low_price + current_price) / 3) - high_price, 2),
                     "open": open_price,
                     "high": high_price,
                     "low": low_price,
@@ -106,37 +113,46 @@ def get_futures_detail(symbol: str, db: Session = Depends(get_db)):
     if not cached:
         raise HTTPException(status_code=404, detail=f"未找到 {symbol} 的缓存数据")
 
+    # 优先使用缓存中的 current_price 字段
+    current_price = cached.get("current_price")
+    
+    # 从所有K线数据中获取最新的K线用于计算指标
     all_candles = []
     for period, candles in cached.get("timeframes", {}).items():
         all_candles.extend(candles)
 
     if not all_candles:
         raise HTTPException(status_code=404, detail=f"未找到 {symbol} 的K线数据")
-
+    
+    # 如果 current_price 为空,则从K线数据中获取最新收盘价
+    if not current_price:
+        current_price = float(all_candles[-1].get("close", 0))
+    
+    # 使用最新一条K线数据计算指标
     latest_candle = all_candles[-1]
     open_price = float(latest_candle.get("open", 0))
-    close_price = float(latest_candle.get("close", 0))
+    close_price = float(latest_candle.get("close", current_price))
     high_price = float(latest_candle.get("high", 0))
     low_price = float(latest_candle.get("low", 0))
     
-    change = close_price - open_price
+    change = current_price - open_price
     change_pct = (change / open_price * 100) if open_price > 0 else 0
     
     # Pivot Point 公式计算关键点位
-    pp = (high_price + low_price + close_price) / 3
+    pp = (high_price + low_price + current_price) / 3
     r1 = round(2 * pp - low_price, 2)
     r2 = round(pp + (high_price - low_price), 2)
     s1 = round(2 * pp - high_price, 2)
     s2 = round(pp - (high_price - low_price), 2)
     
-    suggestion = _get_suggestion(close_price, open_price, change_pct)
+    suggestion = _get_suggestion(current_price, open_price, change_pct)
     suggestion_type = "up" if change >= 0 else "down"
     trend_score = _calc_trend_score(all_candles)
     
     data = {
         "symbol": symbol,
         "name": _get_futures_name(symbol),
-        "price": close_price,
+        "price": current_price,
         "change": round(change, 2),
         "changePct": round(change_pct, 2),
         "suggestion": suggestion,
@@ -146,7 +162,7 @@ def get_futures_detail(symbol: str, db: Session = Depends(get_db)):
         "high": high_price,
         "low": low_price,
         "volume": sum(float(c.get("volume", 0)) for c in all_candles),
-        "entryPrice": round(close_price * 0.995, 2) if change >= 0 else round(close_price * 1.005, 2),
+        "entryPrice": round(current_price * 0.995, 2) if change >= 0 else round(current_price * 1.005, 2),
         "targetPrice": r1 if change >= 0 else s1,
         "stopLoss": s1 if change >= 0 else r1,
         "riskLevel": "低" if trend_score >= 80 else "中" if trend_score >= 60 else "高",

app/static/index.html

@@ -1176,6 +1176,42 @@
         </div>
     </div>
 
+    <!-- Edit Symbol Modal -->
+    <div class="modal-overlay" id="editSymbolModal">
+        <div class="modal">
+            <div class="modal-header">
+                <div class="modal-title">修改变种</div>
+                <button class="modal-close" onclick="closeEditSymbolModal()">
+                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" style="width: 24px; height: 24px;">
+                        <line x1="18" y1="6" x2="6" y2="18"/><line x1="6" y1="6" x2="18" y2="18"/>
+                    </svg>
+                </button>
+            </div>
+            <div class="modal-body">
+                <input type="hidden" id="editSymbolType">
+                <input type="hidden" id="editSymbolOldName">
+                <input type="hidden" id="editSymbolOldCode">
+                
+                <div class="form-group">
+                    <label class="form-label">品种名称</label>
+                    <input class="form-input" id="editSymbolName" placeholder="如: 原油">
+                </div>
+                
+                <div class="form-group">
+                    <label class="form-label">合约代码</label>
+                    <input class="form-input" id="editSymbolCode" placeholder="如: SC2609">
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-outline" onclick="closeEditSymbolModal()">取消</button>
+                <button class="btn btn-primary" onclick="saveEditSymbol()">
+                    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" style="width: 16px; height: 16px;"><path d="M19 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11l5 5v11a2 2 0 0 1-2 2z"/><polyline points="17 21 17 13 7 13 7 21"/><polyline points="7 3 7 8 15 8"/></svg>
+                    保存
+                </button>
+            </div>
+        </div>
+    </div>
+
     <!-- Edit Task Modal -->
     <div class="modal-overlay" id="editTaskModal">
         <div class="modal">
@@ -1453,22 +1489,46 @@
             }
         }
 
-        async function editSymbol(type, oldCode, oldName) {
-            const newName = prompt('请输入新的品种名称:', oldName);
-            if (!newName || newName === oldName) return;
+        function openEditSymbolModal(type, code, name) {
+            document.getElementById('editSymbolType').value = type;
+            document.getElementById('editSymbolOldName').value = name;
+            document.getElementById('editSymbolOldCode').value = code;
+            document.getElementById('editSymbolName').value = name;
+            document.getElementById('editSymbolCode').value = code;
+            document.getElementById('editSymbolModal').classList.add('active');
+        }
 
-            const newCode = prompt('请输入新的品种代码:', oldCode);
-            if (!newCode) return;
+        function closeEditSymbolModal() {
+            document.getElementById('editSymbolModal').classList.remove('active');
+        }
 
-            const symbols = type === 'futures' ? (currentConfig.futures || {}) : (currentConfig.stock || {});
-            delete symbols[oldName];
-            symbols[newName] = newCode;
+        async function saveEditSymbol() {
+            const type = document.getElementById('editSymbolType').value;
+            const oldName = document.getElementById('editSymbolOldName').value;
+            const oldCode = document.getElementById('editSymbolOldCode').value;
+            const newName = document.getElementById('editSymbolName').value.trim();
+            const newCode = document.getElementById('editSymbolCode').value.trim();
 
+            if (!newName || !newCode) {
+                return showToast('请填写品种名称和合约代码', 'error');
+            }
+
+            // 深拷贝配置,避免直接修改 currentConfig
             const fullConfig = {
-                futures: currentConfig.futures || {},
-                stock: currentConfig.stock || {}
+                futures: JSON.parse(JSON.stringify(currentConfig.futures || {})),
+                stock: JSON.parse(JSON.stringify(currentConfig.stock || {}))
             };
-            fullConfig[type] = symbols;
+            
+            const symbols = fullConfig[type];
+            
+            if (newName !== oldName && symbols[newName]) {
+                return showToast('品种名称已存在', 'error');
+            }
+
+            delete symbols[oldName];
+            symbols[newName] = newCode;
+
+            console.log('保存配置:', JSON.stringify(fullConfig, null, 2));
 
             try {
                 const res = await fetch(`${API}/config/upload`, {
@@ -1477,18 +1537,25 @@
                     body: JSON.stringify(fullConfig),
                 });
 
+                const data = await res.json();
                 if (res.ok) {
                     showToast('品种修改成功', 'success');
+                    closeEditSymbolModal();
                     loadConfig();
                 } else {
-                    const data = await res.json();
+                    console.error('修改失败响应:', data);
                     showToast(data.detail || '修改失败', 'error');
                 }
             } catch (e) {
+                console.error('修改异常:', e);
                 showToast(`修改失败: ${e.message}`, 'error');
             }
         }
 
+        async function editSymbol(type, code, name) {
+            openEditSymbolModal(type, code, name);
+        }
+
         async function deleteSymbol(type, code) {
             if (!confirm('确定删除此品种？')) return;
 

config/symbols_config.json

@@ -22,8 +22,6 @@
         "20号胶": "NR2607",
         "螺纹钢": "RB2610",
         "铁矿石": "I2609",
-        "焦煤": "JM2606",
-        "焦炭": "J2606",
         "PTA": "TA2609",
         "棕榈油": "P2609",
         "豆粕": "M2609",
@@ -31,6 +29,9 @@
         "棉花": "CF2609",
         "甲醇": "MA2609",
         "尿素": "UR2609",
-        "中证1000": "IM2606"
-    }
+        "中证1000": "IM2606",
+        "焦煤": "JM2609",
+        "焦炭": "J2609"
+    },
+    "stock": {}
 }