Merge branch 'eta/2.6.4' into debug

controllers/data_manage/ai_predict_model/index_config.go

@@ -227,9 +227,14 @@ func (c *AiPredictModelIndexConfigController) SetCurr() {
 		return
 	}
 
-	indexItem.AiPredictModelIndexConfigId = configItem.AiPredictModelIndexConfigId
-	indexItem.ModifyTime = time.Now()
-	err = indexItem.Update([]string{indexOb.Cols().ModifyTime, indexOb.Cols().AiPredictModelIndexConfigId})
+	if indexItem.AiPredictModelIndexConfigId == configItem.AiPredictModelIndexConfigId {
+		br.Msg = `已经是当前版本`
+		br.IsSendEmail = false
+		return
+	}
+
+	//  设置为当前版本
+	err = services.SetCurrIndexConfig(indexItem, configItem)
 	if err != nil {
 		br.Msg = "操作失败"
 		br.ErrMsg = fmt.Sprintf("配置失败,Err:%v", e)

services/ai_predict_model_index.go

@@ -665,6 +665,11 @@ func GetCurrentRunningAiPredictModelIndexCount() (total int, err error) {
 	return
 }
 
+// SetCurrIndexConfig
+// @Description: 设置当前为当前版本
+// @param indexItem
+// @param indexConfigItem
+// @return err
 func SetCurrIndexConfig(indexItem *aiPredictModel.AiPredictModelIndex, indexConfigItem *aiPredictModel.AiPredictModelIndexConfig) (err error) {
 	indexOb := aiPredictModel.AiPredictModelIndex{}