预测截止日期修改

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.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.EndNum, 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.RuleList, req.MinValue, req.MaxValue, 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)
 	if err != nil {
 		br.Msg = "保存失败"
 		if errMsg != `` {

logic/predict_edb.go

@@ -1,6 +1,7 @@
 package logic
 
 import (
+	"encoding/json"
 	"errors"
 	"eta/eta_index_lib/models"
 	"eta/eta_index_lib/utils"
@@ -11,7 +12,7 @@ import (
 )
 
 // AddPredictEdbInfo 新增预测指标
-func AddPredictEdbInfo(sourceEdbInfoId, classifyId int, edbName, dataDateType string, 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, endNum int, ruleList []models.RuleConfig, minValue, maxValue float64, sysUserId int, sysUserName, lang string) (edbInfo *models.EdbInfo, err error, errMsg string) {
 	var sourceEdbInfo *models.EdbInfo
 	// 来源指标信息校验
 	{
@@ -82,6 +83,11 @@ func AddPredictEdbInfo(sourceEdbInfoId, classifyId int, edbName, dataDateType st
 	if dataDateType == `` {
 		dataDateType = `自然日`
 	}
+	var endDateConfig *models.PredictEdbInfoExtra
+	endDateConfig.EndDateType = endDateType
+	endDateConfig.EndNum = endNum
+	// 转成endDateConfig字符串
+	endDateConfigStr, _ := json.Marshal(endDateConfig)
 	edbInfo = &models.EdbInfo{
 		//EdbInfoId:   0,
 		EdbInfoType:      1,
@@ -114,6 +120,7 @@ func AddPredictEdbInfo(sourceEdbInfoId, classifyId int, edbName, dataDateType st
 		UnitEn:        sourceEdbInfo.UnitEn,
 		DataDateType:  dataDateType,
 		Sort:          models.GetAddEdbMaxSortByClassifyId(classifyId, utils.PREDICT_EDB_INFO_TYPE),
+		Extra:         string(endDateConfigStr),
 	}
 
 	// 关联关系表
@@ -145,13 +152,22 @@ func AddPredictEdbInfo(sourceEdbInfoId, classifyId int, edbName, dataDateType st
 
 	// 预测指标配置
 	predictEdbConfList := make([]*models.PredictEdbConf, 0)
+	var ruleEndDate time.Time
 	for ruleIndex, v := range ruleList {
-		// 预测指标配置
-		ruleEndDate, tmpErr := time.ParseInLocation(utils.FormatDate, v.EndDate, time.Local)
-		if tmpErr != nil {
-			errMsg = "规则配置的截止日期异常，请重新填写"
-			err = errors.New(errMsg)
-			return
+		if endDateType == 0 {
+			// 预测指标配置
+			ruleEndDate, err = time.ParseInLocation(utils.FormatDate, v.EndDate, time.Local)
+			if err != nil {
+				errMsg = "规则配置的截止日期异常，请重新填写"
+				err = errors.New(errMsg)
+				return
+			}
+		} else {
+			if endNum <= 0 {
+				errMsg = "截止期数不正确，请输入大于等于1的整数"
+				err = errors.New(errMsg)
+				return
+			}
 		}
 		//1：最新，2：固定值，3：同比，4：同差，5：环比，6：环差，7：N期移动均值，8：N期段线性外推值，9：动态环差，10：根据 给定终值后插值 规则获取预测数据，11：根据 季节性 规则获取预测数据，12：根据 移动平均同比 规则获取预测数据
 		// 环比、环差、动态环差、季节性、移动平均同比不支持年度
@@ -161,6 +177,11 @@ func AddPredictEdbInfo(sourceEdbInfoId, classifyId int, edbName, dataDateType st
 			return
 		}
 
+		if v.RuleType == 16 && endDateType != 1 {
+			errMsg = "年度值倒推不支持截止期数"
+			err = errors.New(errMsg)
+			return
+		}
 		switch v.RuleType {
 		case 8: //N期段线性外推值
 			valInt, tmpErr := strconv.Atoi(v.Value)
@@ -386,12 +407,15 @@ func AddPredictEdbInfo(sourceEdbInfoId, classifyId int, edbName, dataDateType st
 			SourceEdbInfoId:  sourceEdbInfoId,
 			RuleType:         v.RuleType,
 			//FixedValue:       v.Value,
-			Value:      v.Value,
-			EndDate:    ruleEndDate,
+			Value: v.Value,
+			//EndDate:    ruleEndDate,
 			ModifyTime: time.Now(),
 			CreateTime: time.Now(),
 		}
-
+		if endDateType == 0 {
+			tmpPredictEdbConf.EndDate = ruleEndDate
+		}
+		//todo 指标最终的截止日期的更新
 		edbInfo.EndDate = v.EndDate
 
 		predictEdbConfList = append(predictEdbConfList, tmpPredictEdbConf)
@@ -402,7 +426,7 @@ func AddPredictEdbInfo(sourceEdbInfoId, classifyId int, edbName, dataDateType st
 }
 
 // EditPredictEdbInfo 编辑预测指标
-func EditPredictEdbInfo(edbInfoId, classifyId int, edbName, dataDateType string, ruleList []models.RuleConfig, minValue, maxValue float64, lang string) (edbInfo *models.EdbInfo, err error, errMsg string) {
+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) {
 	// 指标信息校验
 	{
 		edbInfo, err = models.GetEdbInfoById(edbInfoId)
@@ -458,6 +482,12 @@ func EditPredictEdbInfo(edbInfoId, classifyId int, edbName, dataDateType string,
 	if dataDateType == `` {
 		dataDateType = `自然日`
 	}
+	var endDateConfig *models.PredictEdbInfoExtra
+	endDateConfig.EndDateType = endDateType
+	endDateConfig.EndNum = endNum
+	// 转成endDateConfig字符串
+	endDateConfigStr, _ := json.Marshal(endDateConfig)
+
 	switch lang {
 	case utils.EnLangVersion:
 		edbInfo.EdbNameEn = edbName
@@ -471,7 +501,8 @@ func EditPredictEdbInfo(edbInfoId, classifyId int, edbName, dataDateType string,
 	edbInfo.MaxValue = maxValue
 	edbInfo.DataDateType = dataDateType
 	edbInfo.ModifyTime = time.Now()
-	updateEdbInfoCol := []string{"EdbName", "EdbNameEn", "EdbNameSource", "ClassifyId", "EndDate", "MinValue", "MaxValue", "DataDateType", "ModifyTime"}
+	edbInfo.Extra = string(endDateConfigStr)
+	updateEdbInfoCol := []string{"EdbName", "EdbNameEn", "EdbNameSource", "ClassifyId", "EndDate", "MinValue", "MaxValue", "DataDateType", "ModifyTime", "Extra"}
 
 	var sourceEdbInfo *models.EdbInfo
 	// 来源指标信息校验
@@ -531,13 +562,23 @@ func EditPredictEdbInfo(edbInfoId, classifyId int, edbName, dataDateType string,
 	// 预测指标配置
 	predictEdbConfList := make([]*models.PredictEdbConf, 0)
 	for ruleIndex, v := range ruleList {
-		// 预测指标配置
-		ruleEndDate, tmpErr := time.ParseInLocation(utils.FormatDate, v.EndDate, time.Local)
-		if tmpErr != nil {
-			errMsg = "规则配置的截止日期异常，请重新填写"
-			err = errors.New(errMsg)
-			return
+		var ruleEndDate time.Time
+		if endDateType == 0 {
+			// 预测指标配置
+			ruleEndDate, err = time.ParseInLocation(utils.FormatDate, v.EndDate, time.Local)
+			if err != nil {
+				errMsg = "规则配置的截止日期异常，请重新填写"
+				err = errors.New(errMsg)
+				return
+			}
+		} else {
+			if endNum <= 0 {
+				errMsg = "截止期数不正确，请输入大于等于1的整数"
+				err = errors.New(errMsg)
+				return
+			}
 		}
+
 		//1：最新，2：固定值，3：同比，4：同差，5：环比，6：环差，7：N期移动均值，8：N期段线性外推值，9：动态环差，10：根据 给定终值后插值 规则获取预测数据，11：根据 季节性 规则获取预测数据，12：根据 移动平均同比 规则获取预测数据
 		// 环比、环差、动态环差、季节性、移动平均同比不支持年度
 		if sourceEdbInfo.Frequency == "年度" && utils.InArrayByInt([]int{5, 6, 11, 12}, v.RuleType) {
@@ -545,6 +586,11 @@ func EditPredictEdbInfo(edbInfoId, classifyId int, edbName, dataDateType string,
 			err = errors.New(errMsg)
 			return
 		}
+		if v.RuleType == 16 && endDateType != 1 {
+			errMsg = "年度值倒推不支持截止期数"
+			err = errors.New(errMsg)
+			return
+		}
 		switch v.RuleType {
 		case 8: //N期段线性外推值
 			valInt, tmpErr := strconv.Atoi(v.Value)

models/edb_info.go

@@ -741,7 +741,7 @@ func UnifiedModifyPredictEdbInfoMaxAndMinInfo(edbInfo *EdbInfo, latestDateStr st
 }
 
 // GetChartPredictEdbInfoDataListByConfList 获取图表的预测指标的未来数据
-func GetChartPredictEdbInfoDataListByConfList(predictEdbConfList []*PredictEdbConfAndData, filtrateStartDateStr, latestDateStr, endDateStr, frequency, dataDateType string, realPredictEdbInfoData []*EdbInfoSearchData) (predictEdbInfoData []*EdbInfoSearchData, minValue, maxValue float64, err error) {
+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
@@ -751,7 +751,6 @@ func GetChartPredictEdbInfoDataListByConfList(predictEdbConfList []*PredictEdbCo
 	if err != nil {
 		return
 	}
-
 	// 开始预测数据的时间
 	startDate := latestDate
 
@@ -788,7 +787,7 @@ func GetChartPredictEdbInfoDataListByConfList(predictEdbConfList []*PredictEdbCo
 		endDate = predictEdbConf.EndDate
 		var tmpMinValue, tmpMaxValue float64 // 当前预测结果中的最大/最小值
 
-		dayList := getPredictEdbDayList(startDate, endDate, frequency, dataDateType, predictEdbConf.EndDateType, predictEdbConf.EndNum)
+		dayList := getPredictEdbDayList(startDate, endDate, frequency, dataDateType, extra)
 		if len(dayList) <= 0 { // 如果未来没有日期的话，那么就退出当前循环，进入下一个循环
 			continue
 		}
@@ -1019,10 +1018,23 @@ func GetChartPredictEdbInfoDataListByConfList(predictEdbConfList []*PredictEdbCo
 // GetPredictEdbDayList 获取预测指标日期列表
 
 // GetPredictEdbDayList 获取预测指标日期列表
-func getPredictEdbDayList(startDate, endDate time.Time, frequency, dataDateType string, endDateType, endNum int) (dayList []time.Time) {
+func getPredictEdbDayList(startDate, endDate time.Time, frequency, dataDateType, extra string) (dayList []time.Time) {
 	if dataDateType == `` {
 		dataDateType = `交易日`
 	}
+
+	var endDateType, endNum int
+	if extra != "" {
+		//解析配置项
+		var endDateConf *PredictEdbInfoExtra
+		err := json.Unmarshal([]byte(extra), &endDateConf)
+		if err != nil {
+			err = errors.New("解析配置项失败，err:" + err.Error())
+			return
+		}
+		endDateType = endDateConf.EndDateType
+		endNum = endDateConf.EndNum
+	}
 	if endDateType == 0 { // 截止日期
 		switch frequency {
 		case "日度":
@@ -1225,7 +1237,7 @@ func GetPredictDataListByPredictEdbConfList(edbInfo, sourceEdbInfoItem *EdbInfo,
 	var predictMinValue, predictMaxValue float64
 	// 如果有配置的预测规则，那么就进行预测
 	if len(predictEdbConfList) > 0 {
-		predictDataList, predictMinValue, predictMaxValue, err = GetChartPredictEdbInfoDataListByConfList(predictEdbConfList, startDate, sourceEdbInfoItem.LatestDate, endDateStr, edbInfo.Frequency, edbInfo.DataDateType, allDataList)
+		predictDataList, predictMinValue, predictMaxValue, err = GetChartPredictEdbInfoDataListByConfList(predictEdbConfList, startDate, sourceEdbInfoItem.LatestDate, endDateStr, edbInfo.Frequency, edbInfo.DataDateType, edbInfo.Extra, allDataList)
 		if err != nil {
 			return
 		}
@@ -1683,3 +1695,8 @@ func (m SortEdbDataList) Less(i, j int) bool {
 func (m SortEdbDataList) Swap(i, j int) {
 	m[i], m[j] = m[j], m[i]
 }
+
+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, rule.EndDateType, rule.EndNum)
+		dayList := getPredictEdbDayList(startDate, endDate, predictEdbInfo.Frequency, predictEdbInfo.DataDateType, predictEdbInfo.Extra)
 		if len(dayList) <= 0 { // 如果未来没有日期的话，那么就退出当前循环，进入下一个循环
 			return
 		}

models/predict_edb_conf.go

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

models/predict_edb_info_rule.go

@@ -1193,6 +1193,7 @@ type RuleLineNhConf struct {
 	EndDate   string `description:"结束日期"`
 	MoveDay   int    `description:"移动天数"`
 	EdbInfoId int    `description:"指标id"`
+	DateType  int    `description:"时间类型:0:开始日期至截止日期，1开始日期-至今"`
 }
 
 //	GetChartPredictEdbInfoDataListByRuleLineNh 根据 一元线性拟合 的计算规则获取预测数据
@@ -1250,6 +1251,9 @@ func getCalculateNhccData(secondDataList []*EdbInfoSearchData, ruleConf RuleLine
 	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 {
+		endDate = time.Now()
+	}
 
 	//查询当前指标现有的数据
 	edbInfo, err := GetEdbInfoById(firstEdbInfoId)