Browse Source

预测区间计算

xyxie 7 months ago
parent
commit
29ef41fc85
2 changed files with 14 additions and 4 deletions
  1. 2 0
      models/common.go
  2. 12 4
      models/predict_edb_data_calculate_qjjs.go

+ 2 - 0
models/common.go

@@ -103,6 +103,8 @@ func GetBasePredictEdbInfoModel(source int) (baseEdbInfoModel BasePredictEdbInfo
 		baseEdbInfoModel = PredictPercentile{}
 	case utils.DATA_SOURCE_PREDICT_CALCULATE_ZSXY:
 		baseEdbInfoModel = PredictExponentialSmoothing{}
+	case utils.DATA_SOURCE_PREDICT_CALCULATE_RANGEANLYSIS:
+		baseEdbInfoModel = PredictCalculateRangeAnalysis{}
 	default:
 
 	}

+ 12 - 4
models/predict_edb_data_calculate_qjjs.go

@@ -15,7 +15,7 @@ import (
 type PredictCalculateRangeAnalysis struct {
 }
 
-func (obj PredictCalculateRangeAnalysis) Add(params AddCalculateBatchParams) (edbInfo *EdbInfo, latestDateStr string, latestValue float64, err error, errMsg string) {
+func (obj PredictCalculateRangeAnalysis) Add(params BatchSaveCalculateBatchParams) (edbInfo *EdbInfo, latestDateStr string, latestValue float64, err error, errMsg string) {
 	req := params.Req
 	edbCode := params.EdbCode
 	uniqueCode := params.UniqueCode
@@ -99,7 +99,7 @@ func (obj PredictCalculateRangeAnalysis) Add(params AddCalculateBatchParams) (ed
 	return
 }
 
-func (obj PredictCalculateRangeAnalysis) Edit(params EditCalculateBatchParams) (latestDateStr string, latestValue float64, err error, errMsg string) {
+func (obj PredictCalculateRangeAnalysis) Edit(params BatchSaveCalculateBatchParams) (latestDateStr string, latestValue float64, err error, errMsg string) {
 	edbInfo := params.EdbInfo
 	req := params.Req
 	o := orm.NewOrm()
@@ -123,8 +123,16 @@ func (obj PredictCalculateRangeAnalysis) Edit(params EditCalculateBatchParams) (
 	edbInfo.Unit = req.Unit
 	edbInfo.ClassifyId = req.ClassifyId
 	edbInfo.CalculateFormula = req.CalculateFormula
-	edbInfo.EdbNameEn = req.EdbNameEn
-	edbInfo.UnitEn = req.UnitEn
+	//修改指标信息
+	switch params.Lang {
+	case utils.EnLangVersion:
+		edbInfo.EdbNameEn = req.EdbName
+		edbInfo.UnitEn = req.Unit
+	default:
+		edbInfo.EdbName = req.EdbName
+		edbInfo.Unit = req.Unit
+		edbInfo.EdbNameSource = req.EdbName
+	}
 	edbInfo.ModifyTime = time.Now()
 	_, err = to.Update(edbInfo, "EdbName", "EdbNameSource", "Frequency", "Unit", "ClassifyId", "CalculateFormula", "ModifyTime", "EdbNameEn", "UnitEn")
 	if err != nil {