Merge branch 'eta/2.6.4' into debug

logic/ai_predict_model/index.go

@@ -353,9 +353,16 @@ func handleTaskRecordSuccessByTrain(aiPredictModelImportData request.AiPredictMo
 	indexItem.TrainStatus = aiPredictModel.TrainStatusSuccess
 	indexItem.ModifyTime = time.Now()
 
-	updateIndexConfigCols := []string{"train_status", `remark`, "modify_time", `train_mse`, `train_r2`, `test_mse`, `test_r2`}
+	updateIndexConfigCols := []string{"train_status", `remark`, "modify_time", `train_mse`, `train_r2`, `test_mse`, `test_r2`, `model_framework`, `predict_value`, `predict_frequency`, `direction_accuracy`, `absolute_deviation`, `extra_config`}
 	// 配置状态修改
 	{
+		predictDate, e := time.ParseInLocation(utils.FormatDate, aiPredictModelImportData.Index.PredictDate, time.Local)
+		if e != nil {
+			err = fmt.Errorf("预测日期解析失败, %v", e)
+			return
+		}
+		indexItem.PredictDate = predictDate
+
 		// 训练参数
 		trainData := aiPredictModelImportData.TrainData
 		indexConfigItem.TrainStatus = aiPredictModel.TrainStatusSuccess
@@ -364,6 +371,15 @@ func handleTaskRecordSuccessByTrain(aiPredictModelImportData request.AiPredictMo
 		indexConfigItem.TrainR2 = fmt.Sprint(trainData.TrainR2)
 		indexConfigItem.TestMse = fmt.Sprint(trainData.TestMse)
 		indexConfigItem.TestR2 = fmt.Sprint(trainData.TestR2)
+
+		indexConfigItem.ModelFramework = aiPredictModelImportData.Index.ModelFramework
+		indexConfigItem.PredictDate = predictDate
+		indexConfigItem.PredictValue = aiPredictModelImportData.Index.PredictValue
+		indexConfigItem.PredictFrequency = aiPredictModelImportData.Index.PredictFrequency
+		indexConfigItem.DirectionAccuracy = aiPredictModelImportData.Index.DirectionAccuracy
+		indexConfigItem.AbsoluteDeviation = aiPredictModelImportData.Index.AbsoluteDeviation
+		indexConfigItem.ExtraConfig = aiPredictModelImportData.Index.ExtraConfig
+
 		indexConfigItem.ModifyTime = time.Now()
 	}
 

models/ai_predict_model/ai_predict_model_index_config.go

@@ -22,6 +22,13 @@ type AiPredictModelIndexConfig struct {
 	AiPredictModelIndexId       int       `gorm:"column:ai_predict_model_index_id" description:"ai预测模型id"`
 	TrainStatus                 string    `gorm:"column:train_status" description:"训练状态，枚举值：待训练，训练中，训练成功，训练失败"`
 	Params                      string    `gorm:"column:params" description:"训练参数，json字符串存储，便于以后参数扩展"`
+	ModelFramework              string    `description:"模型框架"`
+	PredictDate                 time.Time `description:"预测日期"`
+	PredictValue                float64   `description:"预测值"`
+	PredictFrequency            string    `description:"预测频度"`
+	DirectionAccuracy           string    `description:"方向准确度"`
+	AbsoluteDeviation           string    `description:"绝对偏差"`
+	ExtraConfig                 string    `description:"模型参数"`
 	TrainMse                    string    `gorm:"column:train_mse" description:"训练集mse"`
 	TrainR2                     string    `gorm:"column:train_r2" description:"训练集r2"`
 	TestMse                     string    `gorm:"column:test_mse" description:"测试集mse"`