Merge remote-tracking branch 'origin/master'

models/ai_predict_model/ai_predict_model_index.go

@@ -304,15 +304,37 @@ func (m *AiPredictModelIndex) ImportIndexAndData(createIndexes, updateIndexes []
 				err = fmt.Errorf("update index err: %v", e)
 				return
 			}
+			var hasDaily, hasMonthly bool
 			for _, d := range v.Data {
 				d.AiPredictModelIndexId = v.Index.AiPredictModelIndexId
 				d.IndexCode = v.Index.IndexCode
 				d.DataTimestamp = d.DataTime.UnixNano() / 1e6
+				if d.Source == ModelDataSourceDaily {
+					hasDaily = true
+				}
+				if d.Source == ModelDataSourceMonthly {
+					hasMonthly = true
+				}
+			}
+			// 哪个有数据就先清空然后重新写入，没数据就保留旧数据, 都没就忽略
+			if !hasDaily && !hasMonthly {
+				continue
+			}
+			removeCond := ``
+			removePars := make([]interface{}, 0)
+			removePars = append(removePars, v.Index.AiPredictModelIndexId)
+			if hasDaily && !hasMonthly {
+				removeCond += ` AND source = ?`
+				removePars = append(removePars, ModelDataSourceDaily)
+			}
+			if !hasDaily && hasMonthly {
+				removeCond += ` AND source = ?`
+				removePars = append(removePars, ModelDataSourceMonthly)
 			}
 
 			// 清空指标并新增
-			sql := `DELETE FROM ai_predict_model_data WHERE ai_predict_model_index_id = ?`
-			e = tx.Exec(sql, v.Index.AiPredictModelIndexId).Error
+			sql := fmt.Sprintf(`DELETE FROM ai_predict_model_data WHERE ai_predict_model_index_id = ? %s`, removeCond)
+			e = tx.Exec(sql, removePars...).Error
 			if e != nil {
 				err = fmt.Errorf("clear index data err: %v", e)
 				return