一元拟合

controllers/base_from_predict.go

@@ -59,7 +59,7 @@ func addPredict(br *models.BaseResponse, req models.AddPredictEdbInfoReq, lang s
 	}
 
 	// 添加指标
-	edbInfo, err, errMsg := logic.AddPredictEdbInfo(req.SourceEdbInfoId, req.ClassifyId, req.EdbName, req.DataDateType, req.EndDateType, req.EndNum, req.RuleList, req.MinValue, req.MaxValue, req.AdminId, req.AdminName, lang)
+	edbInfo, err, errMsg := logic.AddPredictEdbInfo(req.SourceEdbInfoId, req.ClassifyId, req.EdbName, req.DataDateType, req.EndDateType, req.RuleList, req.MinValue, req.MaxValue, req.AdminId, req.AdminName, lang)
 	if err != nil {
 		br.Msg = "保存失败"
 		if errMsg != `` {
@@ -97,7 +97,7 @@ func editPredict(br *models.BaseResponse, req models.AddPredictEdbInfoReq, lang
 	}
 
 	// 编辑指标
-	edbInfo, err, errMsg := logic.EditPredictEdbInfo(req.EdbInfoId, req.ClassifyId, req.EdbName, req.DataDateType, req.EndDateType, req.EndNum, req.RuleList, req.MinValue, req.MaxValue, lang)
+	edbInfo, err, errMsg := logic.EditPredictEdbInfo(req.EdbInfoId, req.ClassifyId, req.EdbName, req.DataDateType, req.EndDateType, req.RuleList, req.MinValue, req.MaxValue, lang)
 	if err != nil {
 		br.Msg = "保存失败"
 		if errMsg != `` {

logic/predict_edb.go

@@ -12,7 +12,7 @@ import (
 )
 
 // AddPredictEdbInfo 新增预测指标
-func AddPredictEdbInfo(sourceEdbInfoId, classifyId int, edbName, dataDateType string, endDateType, endNum int, ruleList []models.RuleConfig, minValue, maxValue float64, sysUserId int, sysUserName, lang string) (edbInfo *models.EdbInfo, err error, errMsg string) {
+func AddPredictEdbInfo(sourceEdbInfoId, classifyId int, edbName, dataDateType string, endDateType int, ruleList []models.RuleConfig, minValue, maxValue float64, sysUserId int, sysUserName, lang string) (edbInfo *models.EdbInfo, err error, errMsg string) {
 	var sourceEdbInfo *models.EdbInfo
 	// 来源指标信息校验
 	{
@@ -83,9 +83,9 @@ func AddPredictEdbInfo(sourceEdbInfoId, classifyId int, edbName, dataDateType st
 	if dataDateType == `` {
 		dataDateType = `自然日`
 	}
-	var endDateConfig *models.PredictEdbInfoExtra
+
+	endDateConfig := new(models.PredictEdbInfoExtra)
 	endDateConfig.EndDateType = endDateType
-	endDateConfig.EndNum = endNum
 	// 转成endDateConfig字符串
 	endDateConfigStr, _ := json.Marshal(endDateConfig)
 	edbInfo = &models.EdbInfo{
@@ -163,7 +163,7 @@ func AddPredictEdbInfo(sourceEdbInfoId, classifyId int, edbName, dataDateType st
 				return
 			}
 		} else {
-			if endNum <= 0 {
+			if v.EndNum <= 0 {
 				errMsg = "截止期数不正确，请输入大于等于1的整数"
 				err = errors.New(errMsg)
 				return
@@ -411,6 +411,7 @@ func AddPredictEdbInfo(sourceEdbInfoId, classifyId int, edbName, dataDateType st
 			//EndDate:    ruleEndDate,
 			ModifyTime: time.Now(),
 			CreateTime: time.Now(),
+			EndNum:     v.EndNum,
 		}
 		if endDateType == 0 {
 			tmpPredictEdbConf.EndDate = ruleEndDate
@@ -426,7 +427,7 @@ func AddPredictEdbInfo(sourceEdbInfoId, classifyId int, edbName, dataDateType st
 }
 
 // EditPredictEdbInfo 编辑预测指标
-func EditPredictEdbInfo(edbInfoId, classifyId int, edbName, dataDateType string, endDateType, endNum int, ruleList []models.RuleConfig, minValue, maxValue float64, lang string) (edbInfo *models.EdbInfo, err error, errMsg string) {
+func EditPredictEdbInfo(edbInfoId, classifyId int, edbName, dataDateType string, endDateType int, ruleList []models.RuleConfig, minValue, maxValue float64, lang string) (edbInfo *models.EdbInfo, err error, errMsg string) {
 	// 指标信息校验
 	{
 		edbInfo, err = models.GetEdbInfoById(edbInfoId)
@@ -484,7 +485,6 @@ func EditPredictEdbInfo(edbInfoId, classifyId int, edbName, dataDateType string,
 	}
 	var endDateConfig *models.PredictEdbInfoExtra
 	endDateConfig.EndDateType = endDateType
-	endDateConfig.EndNum = endNum
 	// 转成endDateConfig字符串
 	endDateConfigStr, _ := json.Marshal(endDateConfig)
 
@@ -572,7 +572,7 @@ func EditPredictEdbInfo(edbInfoId, classifyId int, edbName, dataDateType string,
 				return
 			}
 		} else {
-			if endNum <= 0 {
+			if v.EndNum <= 0 {
 				errMsg = "截止期数不正确，请输入大于等于1的整数"
 				err = errors.New(errMsg)
 				return
@@ -800,7 +800,7 @@ func EditPredictEdbInfo(edbInfoId, classifyId int, edbName, dataDateType string,
 				}
 				trendsMappingList = append(trendsMappingList, tmpPredictEdbConfCalculateMapping)
 			}
-
+			// todo
 			calculateRuleMap[ruleIndex] = models.CalculateRule{
 				TrendsCalculateMappingList: trendsMappingList,
 				EdbInfoList:                edbInfoList,
@@ -810,6 +810,7 @@ func EditPredictEdbInfo(edbInfoId, classifyId int, edbName, dataDateType string,
 				EndDate:      v.EndDate,
 				EdbInfoIdArr: v.EdbInfoIdArr,
 			}
+
 		}
 
 		tmpPredictEdbConf := &models.PredictEdbConf{
@@ -819,10 +820,14 @@ func EditPredictEdbInfo(edbInfoId, classifyId int, edbName, dataDateType string,
 			//FixedValue:       v.Value,
 			Value:      v.Value,
 			EndDate:    ruleEndDate,
+			EndNum:     v.EndNum,
 			ModifyTime: time.Now(),
 			CreateTime: time.Now(),
 		}
-
+		if endDateType == 0 {
+			tmpPredictEdbConf.EndDate = ruleEndDate
+		}
+		// todo
 		edbInfo.EndDate = v.EndDate
 
 		predictEdbConfList = append(predictEdbConfList, tmpPredictEdbConf)

models/edb_info.go

@@ -742,9 +742,12 @@ func UnifiedModifyPredictEdbInfoMaxAndMinInfo(edbInfo *EdbInfo, latestDateStr st
 
 // GetChartPredictEdbInfoDataListByConfList 获取图表的预测指标的未来数据
 func GetChartPredictEdbInfoDataListByConfList(predictEdbConfList []*PredictEdbConfAndData, filtrateStartDateStr, latestDateStr, endDateStr, frequency, dataDateType string, extra string, realPredictEdbInfoData []*EdbInfoSearchData) (predictEdbInfoData []*EdbInfoSearchData, minValue, maxValue float64, err error) {
-	endDate, err := time.ParseInLocation(utils.FormatDate, endDateStr, time.Local)
-	if err != nil {
-		return
+	var endDate time.Time
+	if endDateStr != `` {
+		endDate, err = time.ParseInLocation(utils.FormatDate, endDateStr, time.Local)
+		if err != nil {
+			return
+		}
 	}
 
 	latestDate, err := time.ParseInLocation(utils.FormatDate, latestDateStr, time.Local)
@@ -784,13 +787,14 @@ func GetChartPredictEdbInfoDataListByConfList(predictEdbConfList []*PredictEdbCo
 		//if predictEdbConf.EndDate.Before(dataEndTime) {
 		//	dataEndTime = predictEdbConf.EndDate
 		//}
-		endDate = predictEdbConf.EndDate
+		//endDate = predictEdbConf.EndDate
 		var tmpMinValue, tmpMaxValue float64 // 当前预测结果中的最大/最小值
 
-		dayList := getPredictEdbDayList(startDate, endDate, frequency, dataDateType, extra)
+		dayList := getPredictEdbDayList(startDate, predictEdbConf.EndDate, frequency, dataDateType, extra, predictEdbConf.EndNum)
 		if len(dayList) <= 0 { // 如果未来没有日期的话，那么就退出当前循环，进入下一个循环
 			continue
 		}
+		endDate = dayList[len(dayList)-1]
 
 		switch predictEdbConf.RuleType {
 		case 1: //1：最新
@@ -867,7 +871,6 @@ func GetChartPredictEdbInfoDataListByConfList(predictEdbConfList []*PredictEdbCo
 			}
 		case 9: //9：动态环差”预测规则；
 			hcDataMap := make(map[string]float64) //规则计算的环差值map
-
 			if predictEdbConf.PredictEdbInfoId > 0 {
 				tmpPredictEdbRuleDataList, tmpErr := GetPredictEdbRuleDataItemList(predictEdbConf.PredictEdbInfoId, predictEdbConf.ConfigId, startDate.Format(utils.FormatDate), endDate.Format(utils.FormatDate))
 				if tmpErr != nil {
@@ -1018,12 +1021,12 @@ func GetChartPredictEdbInfoDataListByConfList(predictEdbConfList []*PredictEdbCo
 // GetPredictEdbDayList 获取预测指标日期列表
 
 // GetPredictEdbDayList 获取预测指标日期列表
-func getPredictEdbDayList(startDate, endDate time.Time, frequency, dataDateType, extra string) (dayList []time.Time) {
+func getPredictEdbDayList(startDate, endDate time.Time, frequency, dataDateType, extra string, endNum int) (dayList []time.Time) {
 	if dataDateType == `` {
 		dataDateType = `交易日`
 	}
 
-	var endDateType, endNum int
+	var endDateType int
 	if extra != "" {
 		//解析配置项
 		var endDateConf *PredictEdbInfoExtra
@@ -1033,7 +1036,6 @@ func getPredictEdbDayList(startDate, endDate time.Time, frequency, dataDateType,
 			return
 		}
 		endDateType = endDateConf.EndDateType
-		endNum = endDateConf.EndNum
 	}
 	if endDateType == 0 { // 截止日期
 		switch frequency {
@@ -1698,5 +1700,4 @@ func (m SortEdbDataList) Swap(i, j int) {
 
 type PredictEdbInfoExtra struct {
 	EndDateType int `description:"截止日期类型：0：未来日期，1未来期数"`
-	EndNum      int `description:"截止期数"`
 }

models/predict_edb.go

@@ -369,7 +369,7 @@ func CalculateByRuleByRuleLineNh(to orm.TxOrmer, predictEdbInfo EdbInfo, predict
 		//endDate, _ := time.ParseInLocation(utils.FormatDate, ruleConf.EndDate, time.Local)
 		endDate := rule.EndDate
 		// todo 拟合时间配置
-		dayList := getPredictEdbDayList(startDate, endDate, predictEdbInfo.Frequency, predictEdbInfo.DataDateType, predictEdbInfo.Extra)
+		dayList := getPredictEdbDayList(startDate, endDate, predictEdbInfo.Frequency, predictEdbInfo.DataDateType, predictEdbInfo.Extra, rule.EndNum)
 		if len(dayList) <= 0 { // 如果未来没有日期的话，那么就退出当前循环，进入下一个循环
 			return
 		}

models/predict_edb_conf.go

@@ -19,7 +19,6 @@ type AddPredictEdbInfoReq struct {
 	MinValue        float64      `description:"最小值"`
 	DataDateType    string       `description:"日期类型，枚举值：交易日、自然日"`
 	EndDateType     int          `description:"截止日期类型：0：未来日期，1未来期数"`
-	EndNum          int          `description:"截止期数"`
 }
 
 // RuleConfig 预测规则配置
@@ -29,6 +28,7 @@ type RuleConfig struct {
 	EmptyType    int              `description:"空值处理类型（0查找前后35天，1不计算，2前值填充，3后值填充，4等于0）"`
 	MaxEmptyType int              `description:"MAX、MIN公式空值处理类型（1、等于0；2、跳过空值）"`
 	EndDate      string           `description:"截止日期"`
+	EndNum       int              `description:"截止期数"`
 	EdbInfoIdArr []EdbInfoFromTag `description:"指标信息"`
 }
 
@@ -50,6 +50,7 @@ type PredictEdbConf struct {
 	EmptyType        int       `description:"空值处理类型（0查找前后35天，1不计算，2前值填充，3后值填充，4等于0）"`
 	MaxEmptyType     int       `description:"MAX、MIN公式空值处理类型（1、等于0；2、跳过空值）"`
 	EndDate          time.Time `description:"截止日期"`
+	EndNum           int       `description:"截止期数"`
 	ModifyTime       time.Time `description:"修改时间"`
 	CreateTime       time.Time `description:"添加时间"`
 }
@@ -65,6 +66,7 @@ type PredictEdbConfAndData struct {
 	EmptyType        int                  `description:"空值处理类型（0查找前后35天，1不计算，2前值填充，3后值填充，4等于0）"`
 	MaxEmptyType     int                  `description:"MAX、MIN公式空值处理类型（1、等于0；2、跳过空值）"`
 	EndDate          time.Time            `description:"截止日期"`
+	EndNum           int                  `description:"截止期数"`
 	ModifyTime       time.Time            `description:"修改时间"`
 	CreateTime       time.Time            `description:"添加时间"`
 	DataList         []*EdbInfoSearchData `description:"动态数据"`

models/predict_edb_data_base.go

@@ -129,6 +129,7 @@ func AddPredictEdb(item *EdbInfo, calculateMappingList []*EdbInfoCalculateMappin
 			FixedValue:       v.FixedValue,
 			Value:            v.Value,
 			EndDate:          v.EndDate,
+			EndNum:           v.EndNum,
 			ModifyTime:       v.ModifyTime,
 			CreateTime:       v.CreateTime,
 			DataList:         resultDataList,

models/predict_edb_info_rule.go

@@ -1250,8 +1250,10 @@ func getCalculateNhccData(secondDataList []*EdbInfoSearchData, ruleConf RuleLine
 	firstEdbInfoId := ruleConf.EdbInfoId
 	moveDay := ruleConf.MoveDay
 	startDate, _ := time.ParseInLocation(utils.FormatDate, ruleConf.StartDate, time.Local)
-	endDate, _ := time.ParseInLocation(utils.FormatDate, ruleConf.EndDate, time.Local)
-	if ruleConf.DateType == 1 {
+	var endDate time.Time
+	if ruleConf.DateType == 0 {
+		endDate, _ = time.ParseInLocation(utils.FormatDate, ruleConf.EndDate, time.Local)
+	} else {
 		endDate = time.Now()
 	}