deving

internal/logic/restful/starter.go

@@ -45,13 +45,11 @@ func Starter(ctx *gin.Context) {
 
 			// 满足以上规则在让Deepseek分析
 			if model.UpDateDay > 360 && model.StScore > 0 && model.IndustryScore > 1 && model.GtPrice > 0 && model.GtAmount > 0 && model.RoeScore > 0 {
-				model.AiScore = 0 // 待分析
-				model.Status = 1
+				model.Status = 1 // 待Indicator分析
 				model.TotalScore = float64(model.IndustryScore + model.StScore + model.GtPrice + model.GtAmount + model.RoeScore)
-				model.RecommendDesc = "Rule规则"
+				model.AddDesc("Rule规则满足，加入标的")
 			} else {
 				model.Status = -1
-				model.AiScore = -2
 				model.AddDesc("Rule规则不满足，不加入标的")
 			}
 
@@ -64,16 +62,12 @@ func Starter(ctx *gin.Context) {
 	impl.DBService.Model(&models.StratModel{}).Where("status=1 and ymd=?", ymd).Find(&allowStocks)
 	for _, m := range allowStocks {
 		// CTA：RSI指标贴近下轨并成上涨趋势
-		indicator.New(m).RunRsi()
-
-		// 满足以上规则在让Deepseek分析
-		if m.ScoreRsi < 0 {
-			impl.DBService.Model(m).Where("id=?", m.ID).Updates(map[string]any{"ai_score": -2, "recommend_desc": m.RecommendDesc + "||" + "无需AI分析,RsiScore:" + utils.Int2String(m.ScoreRsi)})
-		}
+		rsiResult := indicator.RunRsi(m.Code)
+		impl.DBService.Model(m).Where("id=?", m.ID).Updates(map[string]any{"rsi_score": rsiResult.Score, "rsi_val_oversold": rsiResult.Oversold, "rsi_val_prve": rsiResult.Prve, "rsi_val_last": rsiResult.Last, "recommend_desc": m.RecommendDesc + "||Rsi:" + rsiResult.Desc})
 
 		// CTA：MACD指标红绿柱及价量关系
-		score, desc := indicator.New(m).RunMacd()
-		impl.DBService.Model(m).Where("id=?", m.ID).Updates(map[string]any{"macd_score": score, "recommend_desc": m.RecommendDesc + "||" + desc})
+		macdResult := indicator.RunMacd(m.Code)
+		impl.DBService.Model(m).Where("id=?", m.ID).Updates(map[string]any{"macd_score": macdResult.Score, "macd_val": macdResult.Val, "recommend_desc": m.RecommendDesc + "||Macd:" + macdResult.Desc})
 	}
 
 	// 加入资金流向特大的标的