Merge remote-tracking branch 'origin/chart/14.8'

controllers/base_from_calculate.go

@@ -606,6 +606,17 @@ func (this *CalculateController) BatchSave() {
 	var edbInfoId int
 	var edbInfo *models.EdbInfo
 	var errMsg string
+
+	var baseEdbInfoModel models.BaseEdbInfoInterface
+	addParam := models.AddCalculateBatchParams{
+		Req:             &req,
+		FromEdbInfo:     fromEdbInfo,
+		EdbCode:         edbCode,
+		UniqueCode:      uniqueCode,
+		SysUserId:       sysUserId,
+		SysUserRealName: sysUserName,
+	}
+
 	switch req.Source {
 	case utils.DATA_SOURCE_CALCULATE_LJZZY:
 		sourName = "累计值转月值"
@@ -779,10 +790,18 @@ func (this *CalculateController) BatchSave() {
 		sourName = utils.DATA_SOURCE_NAME_CALCULATE_CORRELATION
 		edbInfo, err, errMsg = models.AddCalculateCorrelation(&req, edbCode, uniqueCode, sysUserId, sysUserName)
 	default:
-		br.Msg = "无效计算方式"
-		br.ErrMsg = "无效计算方式,source:" + strconv.Itoa(req.Source)
-		return
+		// 获取通用的数据源处理服务
+		baseEdbInfoModel = models.GetBaseEdbInfoModel(req.Source)
+		// 没有找到的话，那么就直接返回报错吧
+		if baseEdbInfoModel == nil {
+			br.Msg = "无效计算方式"
+			br.ErrMsg = "无效计算方式,source:" + strconv.Itoa(req.Source)
+			return
+		}
+		sourName = baseEdbInfoModel.GetSourceName()
+		edbInfo, err, errMsg = baseEdbInfoModel.Add(addParam)
 	}
+
 	if err != nil {
 		br.Msg = "生成" + sourName + "失败"
 		if errMsg != `` {
@@ -1005,6 +1024,12 @@ func (this *CalculateController) BatchEdit() {
 
 	var sourName, errMsg string
 	var edbInfoId int
+	var baseEdbInfoModel models.BaseEdbInfoInterface
+	editParams := models.EditCalculateBatchParams{
+		Req:         &req,
+		EdbInfo:     edbInfo,
+		FromEdbInfo: fromEdbInfo,
+	}
 
 	switch req.Source {
 	case utils.DATA_SOURCE_CALCULATE_LJZZY:
@@ -1168,10 +1193,16 @@ func (this *CalculateController) BatchEdit() {
 		sourName = utils.DATA_SOURCE_NAME_CALCULATE_CORRELATION
 		err, errMsg = models.EditCalculateCorrelation(edbInfo, &req)
 	default:
-		br.Msg = "无效计算方式"
-		br.ErrMsg = "无效计算方式,source:" + strconv.Itoa(req.Source)
-		return
-
+		// 获取通用的数据源处理服务
+		baseEdbInfoModel = models.GetBaseEdbInfoModel(req.Source)
+		// 没有找到的话，那么就直接返回报错吧
+		if baseEdbInfoModel == nil {
+			br.Msg = "无效计算方式"
+			br.ErrMsg = "无效计算方式,source:" + strconv.Itoa(req.Source)
+			return
+		}
+		sourName = baseEdbInfoModel.GetSourceName()
+		err, errMsg = baseEdbInfoModel.Edit(editParams)
 	}
 	if err != nil {
 		br.Msg = "生成" + sourName + "失败"
@@ -1285,6 +1316,13 @@ func (this *CalculateController) Refresh() {
 	edbInfoId := edbInfo.EdbInfoId
 	source := edbInfo.Source
 
+	var baseEdbInfoModel models.BaseEdbInfoInterface
+	refreshParams := models.RefreshParams{
+		EdbInfo:   edbInfo,
+		StartDate: "", // 更新所有
+		EndDate:   "", // 更新所有数据
+	}
+
 	switch source {
 	case utils.DATA_SOURCE_CALCULATE:
 		//startDate = edbInfo.StartDate
@@ -1596,9 +1634,16 @@ func (this *CalculateController) Refresh() {
 	case utils.DATA_SOURCE_CALCULATE_CORRELATION:
 		err, errMsg = models.RefreshAllCalculateCorrelation(edbInfo)
 	default:
-		br.Msg = "来源异常，请联系相关开发！"
-		br.ErrMsg = "来源异常，请联系相关开发"
-		return
+		// 获取通用的数据源处理服务
+		baseEdbInfoModel = models.GetBaseEdbInfoModel(source)
+		// 没有找到的话，那么就直接返回报错吧
+		if baseEdbInfoModel == nil {
+			br.Msg = "来源异常，请联系相关开发！"
+			br.ErrMsg = "来源异常，请联系相关开发"
+			return
+		}
+		err, errMsg = baseEdbInfoModel.Refresh(refreshParams)
+
 	}
 	if errMsg != `` {
 		br.Msg = "刷新指标失败！"

controllers/base_from_predict_calculate.go

@@ -653,6 +653,16 @@ func (this *PredictCalculateController) CalculateBatchSave() {
 		}
 	}
 
+	var baseEdbInfoModel models.BasePredictEdbInfoInterface
+	saveParams := models.BatchSaveCalculateBatchParams{
+		Req:             req,
+		FromEdbInfo:     fromEdbInfo,
+		EdbCode:         edbCode,
+		UniqueCode:      uniqueCode,
+		SysUserId:       req.AdminId,
+		SysUserRealName: req.AdminName,
+	}
+
 	if req.Source == utils.DATA_SOURCE_PREDICT_CALCULATE_TBZ {
 		if req.EdbInfoId <= 0 {
 			if req.Frequency != fromEdbInfo.Frequency {
@@ -743,9 +753,33 @@ func (this *PredictCalculateController) CalculateBatchSave() {
 		sourName = utils.DATA_SOURCE_NAME_PREDICT_CALCULATE_KSZS
 		edbInfo, latestDateStr, latestValue, err, errMsg = models.SavePredictCalculateKszs(req.EdbInfoId, req.ClassifyId, req.EdbName, req.Frequency, req.Unit, req.Formula, req.EdbInfoIdArr, edbCode, uniqueCode, adminId, adminName)
 	} else {
-		br.Msg = "无效计算方式"
-		br.ErrMsg = "无效计算方式,source:" + strconv.Itoa(req.Source)
-		return
+		// 获取通用的数据源处理服务
+		baseEdbInfoModel = models.GetBasePredictEdbInfoModel(req.Source)
+		// 没有找到的话，那么就直接返回报错吧
+		if baseEdbInfoModel == nil {
+			br.Msg = "无效计算方式"
+			br.ErrMsg = "无效计算方式,source:" + strconv.Itoa(req.Source)
+			return
+		}
+
+		sourName = baseEdbInfoModel.GetSourceName()
+		if req.EdbInfoId <= 0 {
+			edbInfo, latestDateStr, latestValue, err, errMsg = baseEdbInfoModel.Add(saveParams)
+		} else {
+			edbInfo, err = models.GetEdbInfoById(req.EdbInfoId)
+			if err != nil {
+				if err.Error() == utils.ErrNoRow() {
+					br.Msg = "指标已被删除，请刷新页面"
+					br.ErrMsg = "指标已被删除，请刷新页面:Err:" + err.Error()
+					return
+				}
+				br.Msg = "获取指标信息失败"
+				br.ErrMsg = "获取指标信息失败:Err:" + err.Error()
+				return
+			}
+			saveParams.EdbInfo = edbInfo
+			latestDateStr, latestValue, err, errMsg = baseEdbInfoModel.Edit(saveParams)
+		}
 	}
 
 	if err != nil {
@@ -859,6 +893,12 @@ func (this *PredictCalculateController) Refresh() {
 
 	var latestDateStr string // 最近实际数据的日期
 	var latestValue float64  // 最近实际数据的值
+
+	var baseEdbInfoModel models.BasePredictEdbInfoInterface
+	refreshParams := models.RefreshParams{
+		EdbInfo: edbInfo,
+	}
+
 	switch source {
 	case utils.DATA_SOURCE_PREDICT_CALCULATE:
 		//startDate = edbInfo.StartDate
@@ -1112,9 +1152,16 @@ func (this *PredictCalculateController) Refresh() {
 			break
 		}
 	default:
-		br.Msg = "来源异常，请联系相关开发！"
-		br.ErrMsg = "来源异常，请联系相关开发"
-		return
+		// 获取通用的数据源处理服务
+		baseEdbInfoModel = models.GetBasePredictEdbInfoModel(source)
+		// 没有找到的话，那么就直接返回报错吧
+		if baseEdbInfoModel == nil {
+			br.Msg = "来源异常，请联系相关开发！"
+			br.ErrMsg = "来源异常，请联系相关开发"
+			return
+		}
+		latestDateStr, latestValue, err, errMsg = baseEdbInfoModel.Refresh(refreshParams)
+
 	}
 	if errMsg != `` {
 		br.Msg = "刷新指标失败！"

logic/predict_edb.go

@@ -32,11 +32,11 @@ func AddPredictEdbInfo(sourceEdbInfoId, classifyId int, edbName string, ruleList
 			err = errors.New(errMsg)
 			return
 		}
-		if !utils.InArrayByStr([]string{"日度", "周度", "月度", "年度"}, sourceEdbInfo.Frequency) {
-			errMsg = "预测指标只支持选择日度、周度、月度、年度的指标"
-			err = errors.New(errMsg)
-			return
-		}
+		//if !utils.InArrayByStr([]string{"日度", "周度", "月度", "年度"}, sourceEdbInfo.Frequency) {
+		//	errMsg = "预测指标只支持选择日度、周度、月度、年度的指标"
+		//	err = errors.New(errMsg)
+		//	return
+		//}
 	}
 
 	var classifyInfo *models.EdbClassify
@@ -476,11 +476,11 @@ func EditPredictEdbInfo(edbInfoId, classifyId int, edbName string, ruleList []mo
 			err = errors.New(errMsg)
 			return
 		}
-		if !utils.InArrayByStr([]string{"日度", "周度", "月度", "年度"}, sourceEdbInfo.Frequency) {
-			errMsg = "预测指标只支持选择日度、周度、月度、年度的指标"
-			err = errors.New(errMsg)
-			return
-		}
+		//if !utils.InArrayByStr([]string{"日度", "周度", "月度", "年度"}, sourceEdbInfo.Frequency) {
+		//	errMsg = "预测指标只支持选择日度、周度、月度、年度的指标"
+		//	err = errors.New(errMsg)
+		//	return
+		//}
 	}
 
 	// 预测指标配置

models/common.go

@@ -0,0 +1,85 @@
+package models
+
+import "hongze/hongze_edb_lib/utils"
+
+// BaseEdbInfoInterface 基础指标接口
+type BaseEdbInfoInterface interface {
+	Add(params AddCalculateBatchParams) (edbInfo *EdbInfo, err error, errMsg string)
+	Edit(params EditCalculateBatchParams) (err error, errMsg string)
+	Refresh(params RefreshParams) (err error, errMsg string)
+	GetSourceName() string
+}
+
+// AddCalculateBatchParams 添加的请求参
+type AddCalculateBatchParams struct {
+	Req             *EdbInfoCalculateBatchSaveReq
+	FromEdbInfo     *EdbInfo
+	EdbCode         string
+	UniqueCode      string
+	SysUserId       int
+	SysUserRealName string
+}
+
+// EditCalculateBatchParams 编辑的请求参
+type EditCalculateBatchParams struct {
+	Req         *EdbInfoCalculateBatchEditReq
+	EdbInfo     *EdbInfo
+	FromEdbInfo *EdbInfo
+}
+
+// RefreshParams 编辑的请求参
+type RefreshParams struct {
+	EdbInfo     *EdbInfo
+	FromEdbInfo *EdbInfo
+	StartDate   string
+	EndDate     string
+}
+
+// GetBaseEdbInfoModel 获取普通指标的model
+func GetBaseEdbInfoModel(source int) (baseEdbInfoModel BaseEdbInfoInterface) {
+	switch source {
+	case utils.DATA_SOURCE_CALCULATE_LJZZJ:
+		baseEdbInfoModel = Ljzzj{}
+	case utils.DATA_SOURCE_CALCULATE_LJZ:
+		baseEdbInfoModel = Ljz{}
+	case utils.DATA_SOURCE_CALCULATE_LJZNCZJ:
+		baseEdbInfoModel = LjzNczj{}
+	default:
+
+	}
+	return
+}
+
+// BatchSaveCalculateBatchParams 编辑的请求参
+type BatchSaveCalculateBatchParams struct {
+	Req             EdbInfoCalculateBatchSaveReq
+	EdbInfo         *EdbInfo
+	FromEdbInfo     *EdbInfo
+	EdbCode         string
+	UniqueCode      string
+	SysUserId       int
+	SysUserRealName string
+}
+
+// BasePredictEdbInfoInterface 基础指标接口
+type BasePredictEdbInfoInterface interface {
+	Add(params BatchSaveCalculateBatchParams) (edbInfo *EdbInfo, latestDateStr string, latestValue float64, err error, errMsg string)
+	Edit(params BatchSaveCalculateBatchParams) (latestDateStr string, latestValue float64, err error, errMsg string)
+	Refresh(params RefreshParams) (latestDateStr string, latestValue float64, err error, errMsg string)
+	GetSourceName() string
+}
+
+// GetBasePredictEdbInfoModel 获取预测指标的model
+func GetBasePredictEdbInfoModel(source int) (baseEdbInfoModel BasePredictEdbInfoInterface) {
+	switch source {
+	case utils.DATA_SOURCE_PREDICT_CALCULATE_LJZZJ:
+		baseEdbInfoModel = PredictLjzzj{}
+	case utils.DATA_SOURCE_PREDICT_CALCULATE_LJZ:
+		baseEdbInfoModel = PredictLjz{}
+	case utils.DATA_SOURCE_PREDICT_CALCULATE_LJZNCZJ:
+		baseEdbInfoModel = PredictLjzNczj{}
+	default:
+
+	}
+	return
+}

models/edb_data_calculate_ljz.go

@@ -0,0 +1,614 @@
+package models
+
+import (
+	"errors"
+	"fmt"
+	"github.com/beego/beego/v2/client/orm"
+	"github.com/shopspring/decimal"
+	"hongze/hongze_edb_lib/utils"
+	"reflect"
+	"strconv"
+	"strings"
+	"time"
+)
+
+// Ljz 累计值
+type Ljz struct {
+}
+
+// Add 添加
+func (obj Ljz) Add(params AddCalculateBatchParams) (edbInfo *EdbInfo, err error, errMsg string) {
+	req := params.Req
+	fromEdbInfo := params.FromEdbInfo
+	edbCode := params.EdbCode
+
+	frequencyInt := utils.CheckFrequency(fromEdbInfo.Frequency, req.Frequency)
+	if frequencyInt < 0 {
+		errMsg = "频度异常，不允许低频转为高频"
+		err = errors.New(errMsg)
+		return
+	}
+	if frequencyInt == 0 {
+		errMsg = "频度异常，不允许同频计算累计值"
+		err = errors.New(errMsg)
+		return
+	}
+	o := orm.NewOrm()
+	to, err := o.Begin()
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err != nil {
+			_ = to.Rollback()
+			fmt.Println(reflect.TypeOf(obj).Name(), "；Add,Err:"+err.Error())
+		} else {
+			_ = to.Commit()
+		}
+	}()
+
+	edbInfo = &EdbInfo{
+		//EdbInfoId:        0,
+		SourceName:       obj.GetSourceName(),
+		Source:           obj.GetSource(),
+		EdbCode:          edbCode,
+		EdbName:          req.EdbName,
+		EdbNameSource:    req.EdbName,
+		Frequency:        req.Frequency,
+		Unit:             req.Unit,
+		StartDate:        "",
+		EndDate:          "",
+		ClassifyId:       req.ClassifyId,
+		SysUserId:        params.SysUserId,
+		SysUserRealName:  params.SysUserRealName,
+		UniqueCode:       params.UniqueCode,
+		CreateTime:       time.Now(),
+		ModifyTime:       time.Now(),
+		MinValue:         0,
+		MaxValue:         0,
+		CalculateFormula: req.Formula,
+		EdbType:          2,
+		Sort:             0,
+		MoveType:         0,
+		MoveFrequency:    "",
+		NoUpdate:         0,
+		ServerUrl:        "",
+		EdbInfoType:      0,
+		EdbNameEn:        "",
+		UnitEn:           "",
+		LatestDate:       "",
+		LatestValue:      0,
+		ChartImage:       "",
+		Calendar:         "",
+	}
+
+	newEdbInfoId, tmpErr := to.Insert(edbInfo)
+	if tmpErr != nil {
+		err = tmpErr
+		return
+	}
+	edbInfo.EdbInfoId = int(newEdbInfoId)
+
+	//关联关系
+	{
+		calculateMappingItem := new(EdbInfoCalculateMapping)
+		calculateMappingItem.CreateTime = time.Now()
+		calculateMappingItem.ModifyTime = time.Now()
+		calculateMappingItem.Sort = 1
+		calculateMappingItem.EdbCode = edbCode
+		calculateMappingItem.EdbInfoId = edbInfo.EdbInfoId
+		calculateMappingItem.FromEdbInfoId = fromEdbInfo.EdbInfoId
+		calculateMappingItem.FromEdbCode = fromEdbInfo.EdbCode
+		calculateMappingItem.FromEdbName = fromEdbInfo.EdbName
+		calculateMappingItem.FromSource = fromEdbInfo.Source
+		calculateMappingItem.FromSourceName = fromEdbInfo.SourceName
+		calculateMappingItem.FromTag = ""
+		calculateMappingItem.Source = edbInfo.Source
+		calculateMappingItem.SourceName = edbInfo.SourceName
+		_, err = to.Insert(calculateMappingItem)
+		if err != nil {
+			return
+		}
+	}
+
+	//计算数据
+	err = obj.refresh(to, edbInfo.EdbInfoId, edbInfo.Source, edbInfo, fromEdbInfo, edbInfo.EdbCode, "")
+
+	return
+}
+
+// Edit 编辑
+func (obj Ljz) Edit(params EditCalculateBatchParams) (err error, errMsg string) {
+	req := params.Req
+	edbInfo := params.EdbInfo
+	fromEdbInfo := params.FromEdbInfo
+
+	frequencyInt := utils.CheckFrequency(fromEdbInfo.Frequency, req.Frequency)
+	if frequencyInt < 0 {
+		errMsg = "频度异常，不允许低频转为高频"
+		err = errors.New(errMsg)
+		return
+	}
+	if frequencyInt == 0 {
+		errMsg = "频度异常，不允许同频计算累计值"
+		err = errors.New(errMsg)
+		return
+	}
+
+	o := orm.NewOrm()
+	to, err := o.Begin()
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err != nil {
+			_ = to.Rollback()
+			fmt.Println(reflect.TypeOf(obj).Name(), "；Edit,Err:"+err.Error())
+		} else {
+			_ = to.Commit()
+		}
+	}()
+	tableName := GetEdbDataTableName(edbInfo.Source)
+
+	var isRecalculate bool
+	if edbInfo.Frequency != req.Frequency {
+		isRecalculate = true
+	}
+	//修改指标信息
+	edbInfo.EdbName = req.EdbName
+	edbInfo.EdbNameSource = req.EdbName
+	edbInfo.Frequency = req.Frequency
+	edbInfo.Unit = req.Unit
+	edbInfo.ClassifyId = req.ClassifyId
+	edbInfo.ModifyTime = time.Now()
+	_, err = to.Update(edbInfo, "EdbName", "EdbNameSource", "Frequency", "Unit", "ClassifyId", "ModifyTime")
+	if err != nil {
+		return
+	}
+
+	var existCondition string
+	var existPars []interface{}
+	existCondition += " AND edb_info_id=? AND from_edb_info_id=? "
+	existPars = append(existPars, edbInfo.EdbInfoId, req.FromEdbInfoId)
+
+	//判断计算指标是否被更换
+	count, err := GetEdbInfoCalculateCountByCondition(existCondition, existPars)
+	if err != nil {
+		err = errors.New("判断指标是否改变失败,Err:" + err.Error())
+		return
+	}
+	if count > 0 { // 指标未被替换，无需删除关联数据
+
+		// 频度被换了，需要重新计算
+		if isRecalculate {
+			err = obj.refresh(to, edbInfo.EdbInfoId, edbInfo.Source, edbInfo, fromEdbInfo, edbInfo.EdbCode, "")
+		}
+
+		return
+	}
+
+	//删除，计算指标关联的，基础指标的关联关系
+	sql := ` DELETE FROM edb_info_calculate_mapping WHERE edb_info_id = ? `
+	_, err = to.Raw(sql, edbInfo.EdbInfoId).Exec()
+	if err != nil {
+		return
+	}
+
+	//清空原有数据
+	sql = ` DELETE FROM ` + tableName + ` WHERE edb_info_id = ? `
+	_, err = to.Raw(sql, edbInfo.EdbInfoId).Exec()
+	if err != nil {
+		return
+	}
+
+	//关联关系
+	{
+		calculateMappingItem := &EdbInfoCalculateMapping{
+			EdbInfoCalculateMappingId: 0,
+			EdbInfoId:                 edbInfo.EdbInfoId,
+			Source:                    obj.GetSource(),
+			SourceName:                obj.GetSourceName(),
+			EdbCode:                   edbInfo.EdbCode,
+			FromEdbInfoId:             fromEdbInfo.EdbInfoId,
+			FromEdbCode:               fromEdbInfo.EdbCode,
+			FromEdbName:               fromEdbInfo.EdbName,
+			FromSource:                fromEdbInfo.Source,
+			FromSourceName:            fromEdbInfo.SourceName,
+			FromTag:                   "",
+			Sort:                      1,
+			CreateTime:                time.Now(),
+			ModifyTime:                time.Now(),
+		}
+		_, err = to.Insert(calculateMappingItem)
+		if err != nil {
+			return
+		}
+	}
+
+	//计算数据
+	err = obj.refresh(to, edbInfo.EdbInfoId, edbInfo.Source, edbInfo, fromEdbInfo, edbInfo.EdbCode, "")
+
+	return
+}
+
+// Refresh 刷新
+func (obj Ljz) Refresh(params RefreshParams) (err error, errMsg string) {
+	calculateMapping, err := GetEdbInfoCalculateMappingDetail(params.EdbInfo.EdbInfoId)
+	if err != nil {
+		errMsg = "GetEdbInfoCalculateLjzDetail Err:" + err.Error()
+		return
+	}
+	fromEdbInfo, err := GetEdbInfoById(calculateMapping.FromEdbInfoId)
+	if err != nil {
+		errMsg = "GetEdbInfoById Err:" + err.Error()
+		return
+	}
+
+	o := orm.NewOrm()
+	to, err := o.Begin()
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err != nil {
+			_ = to.Rollback()
+			fmt.Println(reflect.TypeOf(obj).Name(), "；Refresh,Err:"+err.Error())
+		} else {
+			_ = to.Commit()
+		}
+	}()
+
+	// 计算数据
+	err = obj.refresh(to, params.EdbInfo.EdbInfoId, params.EdbInfo.Source, params.EdbInfo, fromEdbInfo, params.EdbInfo.EdbCode, params.StartDate)
+
+	return
+}
+
+// GetSource 获取来源编码id
+func (obj Ljz) GetSource() int {
+	return utils.DATA_SOURCE_CALCULATE_LJZ
+}
+
+// GetSourceName 获取来源名称
+func (obj Ljz) GetSourceName() string {
+	return utils.DATA_SOURCE_NAME_CALCULATE_LJZ
+}
+
+func (obj Ljz) refresh(to orm.TxOrmer, edbInfoId, source int, edbInfo, fromEdbInfo *EdbInfo, edbCode, startDate string) (err error) {
+	dataTableName := GetEdbDataTableName(source)
+	edbInfoIdStr := strconv.Itoa(edbInfoId)
+	//计算数据
+	var condition string
+	var pars []interface{}
+	condition += " AND edb_info_id=? "
+	pars = append(pars, fromEdbInfo.EdbInfoId)
+
+	//if startDate != "" {
+	//	condition += " AND data_time>=? "
+	//	pars = append(pars, startDate)
+	//}
+
+	var isWeekData bool // 是否周度数据，如果是周度数据的话，是需要变频的，最后结果还需要除以7
+	// 周度数据需要先变成日度的
+	if fromEdbInfo.Frequency == `周度` {
+		isWeekData = true
+	}
+
+	dataList, err := GetEdbDataListAllByTo(to, condition, pars, fromEdbInfo.Source, 1)
+	if err != nil {
+		return err
+	}
+
+	fromEdbDataMap := make(map[string]float64)
+	if isWeekData {
+		dataList, err = HandleDataByLinearRegression(dataList, fromEdbDataMap)
+		if err != nil {
+			return
+		}
+	}
+
+	//日度转周度:日期选周五，计算上周六到本周五的日度值的加总，最新日期为最新值对应的周五。
+	//日度转月度:日期选每个月最后一天，计算当月所有日度值的加总，最新日期为最新值对应当月最后一天。
+	//日度转季度、年度:方法类似转月度。
+	//周度转月度/季度/年度:将周度值转成日度，空值用插值法插值，计算当月/当季/当年所有值的加总，然后除以7。
+	//月度转季度/年度: 当季/当年月度值相加。
+
+	dateList := make([]time.Time, 0)
+	valueMap := make(map[time.Time]float64)
+	switch edbInfo.Frequency {
+	case "年度":
+		yearMap := make(map[int]float64)
+		yearList := make([]int, 0)
+		for _, item := range dataList {
+			itemDate, tmpErr := time.ParseInLocation(utils.FormatDate, item.DataTime, time.Local)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			year := itemDate.Year()
+			yearVal, ok := yearMap[year]
+			if ok {
+				yearMap[year] = item.Value + yearVal
+			} else {
+				yearList = append(yearList, year)
+				yearMap[year] = item.Value
+			}
+		}
+		for _, v := range yearList {
+			currTime := time.Date(v, 12, 31, 0, 0, 0, 0, time.Local)
+			dateList = append(dateList, currTime)
+			valueMap[currTime] = yearMap[v]
+		}
+	case "半年度":
+		yearMonthMap := make(map[string]float64)
+		yearMonthList := make([]string, 0)
+		for _, item := range dataList {
+			itemDate, tmpErr := time.ParseInLocation(utils.FormatDate, item.DataTime, time.Local)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			year := itemDate.Year()
+			var tmpK string
+			if itemDate.Month() <= 6 {
+				tmpK = fmt.Sprint(year, "06")
+			} else {
+				tmpK = fmt.Sprint(year, "12")
+			}
+
+			yearVal, ok := yearMonthMap[tmpK]
+			if ok {
+				yearMonthMap[tmpK] = item.Value + yearVal
+			} else {
+				yearMonthList = append(yearMonthList, tmpK)
+				yearMonthMap[tmpK] = item.Value
+			}
+		}
+		for _, v := range yearMonthList {
+			currTime, tmpErr := time.ParseInLocation(utils.FormatYearMonthUnSpace, v, time.Local)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			currTime = currTime.AddDate(0, 1, -1)
+			dateList = append(dateList, currTime)
+			valueMap[currTime] = yearMonthMap[v]
+		}
+	case "季度":
+		yearMonthMap := make(map[string]float64)
+		yearMonthList := make([]string, 0)
+		for _, item := range dataList {
+			itemDate, tmpErr := time.ParseInLocation(utils.FormatDate, item.DataTime, time.Local)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			year := itemDate.Year()
+			var tmpK string
+			if itemDate.Month() <= 3 {
+				tmpK = fmt.Sprint(year, "03")
+			} else if itemDate.Month() <= 6 {
+				tmpK = fmt.Sprint(year, "06")
+			} else if itemDate.Month() <= 9 {
+				tmpK = fmt.Sprint(year, "09")
+			} else {
+				tmpK = fmt.Sprint(year, "12")
+			}
+
+			yearVal, ok := yearMonthMap[tmpK]
+			if ok {
+				yearMonthMap[tmpK] = item.Value + yearVal
+			} else {
+				yearMonthList = append(yearMonthList, tmpK)
+				yearMonthMap[tmpK] = item.Value
+			}
+		}
+		for _, v := range yearMonthList {
+			currTime, tmpErr := time.ParseInLocation(utils.FormatYearMonthUnSpace, v, time.Local)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			currTime = currTime.AddDate(0, 1, -1)
+			dateList = append(dateList, currTime)
+			valueMap[currTime] = yearMonthMap[v]
+		}
+	case "月度":
+		yearMonthMap := make(map[string]float64)
+		yearMonthList := make([]string, 0)
+		for _, item := range dataList {
+			itemDate, tmpErr := time.ParseInLocation(utils.FormatDate, item.DataTime, time.Local)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			year := itemDate.Year()
+			var tmpK string
+			tmpK = fmt.Sprint(year*100 + int(itemDate.Month()))
+
+			yearVal, ok := yearMonthMap[tmpK]
+			if ok {
+				yearMonthMap[tmpK] = item.Value + yearVal
+			} else {
+				yearMonthList = append(yearMonthList, tmpK)
+				yearMonthMap[tmpK] = item.Value
+			}
+		}
+		for _, v := range yearMonthList {
+			currTime, tmpErr := time.ParseInLocation(utils.FormatYearMonthUnSpace, v, time.Local)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			currTime = currTime.AddDate(0, 1, -1)
+			dateList = append(dateList, currTime)
+			valueMap[currTime] = yearMonthMap[v]
+		}
+	case "旬度":
+		tmpDateDataMap := make(map[time.Time]float64)
+		tmpDateList := make([]time.Time, 0)
+		for _, item := range dataList {
+			itemDate, tmpErr := time.ParseInLocation(utils.FormatDate, item.DataTime, time.Local)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			dayInt := itemDate.Year()*100 + int(itemDate.Month())
+			var currTime time.Time
+			if itemDate.Month() <= 10 {
+				tmpK := fmt.Sprint(dayInt*100, "10")
+				currTime, err = time.ParseInLocation(utils.FormatDateUnSpace, tmpK, time.Local)
+				if err != nil {
+					return
+				}
+
+			} else if itemDate.Month() <= 20 {
+				tmpK := fmt.Sprint(dayInt*100, "20")
+				currTime, err = time.ParseInLocation(utils.FormatDateUnSpace, tmpK, time.Local)
+				if err != nil {
+					return
+				}
+			} else {
+				currTime, err = time.ParseInLocation(utils.FormatYearMonthUnSpace, fmt.Sprint(dayInt), time.Local)
+				if err != nil {
+					return
+				}
+				currTime = currTime.AddDate(0, 1, -1)
+			}
+
+			yearVal, ok := tmpDateDataMap[currTime]
+			if ok {
+				tmpDateDataMap[currTime] = item.Value + yearVal
+			} else {
+				tmpDateList = append(tmpDateList, currTime)
+				tmpDateDataMap[currTime] = item.Value
+			}
+		}
+		for _, currTime := range tmpDateList {
+			dateList = append(dateList, currTime)
+			valueMap[currTime] = tmpDateDataMap[currTime]
+		}
+	case "周度":
+		tmpDateDataMap := make(map[time.Time]float64)
+		tmpDateList := make([]time.Time, 0)
+		for _, item := range dataList {
+			itemDate, tmpErr := time.ParseInLocation(utils.FormatDate, item.DataTime, time.Local)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			var currTime time.Time
+			// 周六周日，这是下一个周五的数据
+			if itemDate.Weekday() == 0 {
+				currTime = itemDate.AddDate(0, 0, 5)
+			} else if itemDate.Weekday() == 6 {
+				currTime = itemDate.AddDate(0, 0, 6)
+			} else {
+				currTime = itemDate.AddDate(0, 0, 5-int(itemDate.Weekday()))
+			}
+
+			yearVal, ok := tmpDateDataMap[currTime]
+			if ok {
+				tmpDateDataMap[currTime] = item.Value + yearVal
+			} else {
+				tmpDateList = append(tmpDateList, currTime)
+				tmpDateDataMap[currTime] = item.Value
+			}
+		}
+		for _, currTime := range tmpDateList {
+			dateList = append(dateList, currTime)
+			valueMap[currTime] = tmpDateDataMap[currTime]
+		}
+
+	}
+
+	//获取指标所有数据
+	existDataList := make([]*EdbData, 0)
+	sql := `SELECT * FROM %s WHERE edb_info_id=? `
+	sql = fmt.Sprintf(sql, dataTableName)
+	_, err = to.Raw(sql, edbInfoId).QueryRows(&existDataList)
+	if err != nil {
+		return err
+	}
+	existDataMap := make(map[string]string)
+	removeDataTimeMap := make(map[string]int) //需要移除的日期数据
+	for _, v := range existDataList {
+		existDataMap[v.DataTime] = v.Value
+		removeDataTimeMap[v.DataTime] = 1
+	}
+	needAddDateMap := make(map[time.Time]int)
+
+	addSql := ` INSERT INTO ` + dataTableName + `(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	var isAdd bool
+	for _, currTime := range dateList {
+		currDateStr := currTime.Format(utils.FormatDate)
+		existVal, ok := existDataMap[currDateStr]
+
+		tmpVal, ok2 := valueMap[currTime]
+		if !ok2 {
+			err = errors.New("数据异常,date:" + currDateStr)
+			return
+		}
+		var saveValue string
+		if isWeekData { //周度指标转的话，最后结果要除以7
+			saveValue = decimal.NewFromFloat(tmpVal).Div(decimal.NewFromInt(7)).Round(4).String()
+		} else {
+			saveValue = decimal.NewFromFloat(tmpVal).Round(4).String()
+		}
+
+		// 如果库中已经存在该数据的话，那么就进行值的变更操作
+		if ok {
+			//校验待删除日期数据里面是否存在该元素，如果存在的话，那么移除该日期
+			delete(removeDataTimeMap, currDateStr)
+
+			if existVal != saveValue {
+				sql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
+				sql = fmt.Sprintf(sql, dataTableName)
+				_, err = to.Raw(sql, saveValue, edbInfoId, currDateStr).Exec()
+				if err != nil {
+					return
+				}
+			}
+
+			continue
+		}
+
+		// 库中不存在该日期的数据
+		timestamp := currTime.UnixNano() / 1e6
+		timeStr := fmt.Sprintf("%d", timestamp)
+		if _, existOk := needAddDateMap[currTime]; !existOk {
+			addSql += GetAddSql(edbInfoIdStr, edbCode, currDateStr, timeStr, saveValue)
+			isAdd = true
+		}
+		needAddDateMap[currTime] = 1
+	}
+
+	//删除已经不存在的指标数据（由于该指标当日的数据删除了）
+	{
+		removeDateList := make([]string, 0)
+		for dateTime := range removeDataTimeMap {
+			removeDateList = append(removeDateList, dateTime)
+		}
+		removeNum := len(removeDateList)
+		if removeNum > 0 {
+			sql := fmt.Sprintf(` DELETE FROM %s WHERE edb_info_id = ? and data_time in (`+utils.GetOrmInReplace(removeNum)+`) `, dataTableName)
+			_, err = to.Raw(sql, edbInfo.EdbInfoId, removeDateList).Exec()
+			if err != nil {
+				fmt.Println(reflect.TypeOf(obj).Name(), " add data ;delete Err", err.Error())
+				err = fmt.Errorf("删除不存在的指标数据失败,Err:" + err.Error())
+				return
+			}
+		}
+	}
+
+	if isAdd {
+		addSql = strings.TrimRight(addSql, ",")
+		_, err = to.Raw(addSql).Exec()
+		if err != nil {
+			fmt.Println(reflect.TypeOf(obj).Name(), " add data Err", err.Error())
+			return
+		}
+	}
+
+	return
+}

models/edb_data_calculate_ljznczj.go

@@ -0,0 +1,464 @@
+package models
+
+import (
+	"errors"
+	"fmt"
+	"github.com/beego/beego/v2/client/orm"
+	"github.com/shopspring/decimal"
+	"hongze/hongze_edb_lib/utils"
+	"reflect"
+	"strconv"
+	"strings"
+	"time"
+)
+
+// LjzNczj 累计值年初至今
+type LjzNczj struct {
+}
+
+// Add 添加
+func (obj LjzNczj) Add(params AddCalculateBatchParams) (edbInfo *EdbInfo, err error, errMsg string) {
+	req := params.Req
+	fromEdbInfo := params.FromEdbInfo
+	edbCode := params.EdbCode
+	if fromEdbInfo.Frequency == `年度` {
+		errMsg = "年初至今累计值计算中，可选指标范围为非年度指标"
+		err = errors.New(errMsg)
+		return
+	}
+
+	if fromEdbInfo.Frequency != req.Frequency {
+		errMsg = "生成指标频度与原指标频度不同"
+		err = errors.New(errMsg)
+		return
+	}
+
+	o := orm.NewOrm()
+	to, err := o.Begin()
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err != nil {
+			_ = to.Rollback()
+			fmt.Println(reflect.TypeOf(obj).Name(), "；Add,Err:"+err.Error())
+		} else {
+			_ = to.Commit()
+		}
+	}()
+
+	edbInfo = &EdbInfo{
+		//EdbInfoId:        0,
+		SourceName:       obj.GetSourceName(),
+		Source:           obj.GetSource(),
+		EdbCode:          edbCode,
+		EdbName:          req.EdbName,
+		EdbNameSource:    req.EdbName,
+		Frequency:        req.Frequency,
+		Unit:             req.Unit,
+		StartDate:        "",
+		EndDate:          "",
+		ClassifyId:       req.ClassifyId,
+		SysUserId:        params.SysUserId,
+		SysUserRealName:  params.SysUserRealName,
+		UniqueCode:       params.UniqueCode,
+		CreateTime:       time.Now(),
+		ModifyTime:       time.Now(),
+		MinValue:         0,
+		MaxValue:         0,
+		CalculateFormula: req.Formula,
+		EdbType:          2,
+		Sort:             0,
+		MoveType:         0,
+		MoveFrequency:    "",
+		NoUpdate:         0,
+		ServerUrl:        "",
+		EdbInfoType:      0,
+		EdbNameEn:        "",
+		UnitEn:           "",
+		LatestDate:       "",
+		LatestValue:      0,
+		ChartImage:       "",
+		Calendar:         "",
+	}
+
+	newEdbInfoId, tmpErr := to.Insert(edbInfo)
+	if tmpErr != nil {
+		err = tmpErr
+		return
+	}
+	edbInfo.EdbInfoId = int(newEdbInfoId)
+
+	//关联关系
+	{
+		calculateMappingItem := new(EdbInfoCalculateMapping)
+		calculateMappingItem.CreateTime = time.Now()
+		calculateMappingItem.ModifyTime = time.Now()
+		calculateMappingItem.Sort = 1
+		calculateMappingItem.EdbCode = edbCode
+		calculateMappingItem.EdbInfoId = edbInfo.EdbInfoId
+		calculateMappingItem.FromEdbInfoId = fromEdbInfo.EdbInfoId
+		calculateMappingItem.FromEdbCode = fromEdbInfo.EdbCode
+		calculateMappingItem.FromEdbName = fromEdbInfo.EdbName
+		calculateMappingItem.FromSource = fromEdbInfo.Source
+		calculateMappingItem.FromSourceName = fromEdbInfo.SourceName
+		calculateMappingItem.FromTag = ""
+		calculateMappingItem.Source = edbInfo.Source
+		calculateMappingItem.SourceName = edbInfo.SourceName
+		_, err = to.Insert(calculateMappingItem)
+		if err != nil {
+			return
+		}
+	}
+
+	//计算数据
+	err = obj.refresh(to, edbInfo.EdbInfoId, edbInfo.Source, edbInfo, fromEdbInfo, edbInfo.EdbCode, "")
+
+	return
+}
+
+// Edit 编辑
+func (obj LjzNczj) Edit(params EditCalculateBatchParams) (err error, errMsg string) {
+	req := params.Req
+	edbInfo := params.EdbInfo
+	fromEdbInfo := params.FromEdbInfo
+
+	if fromEdbInfo.Frequency == `年度` {
+		errMsg = "年初至今累计值计算中，可选指标范围为非年度指标"
+		err = errors.New(errMsg)
+		return
+	}
+
+	if fromEdbInfo.Frequency != req.Frequency {
+		errMsg = "生成指标频度与原指标频度不同"
+		err = errors.New(errMsg)
+		return
+	}
+
+	o := orm.NewOrm()
+	to, err := o.Begin()
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err != nil {
+			_ = to.Rollback()
+			fmt.Println(reflect.TypeOf(obj).Name(), "；Edit,Err:"+err.Error())
+		} else {
+			_ = to.Commit()
+		}
+	}()
+	tableName := GetEdbDataTableName(edbInfo.Source)
+
+	var isRecalculate bool
+	if edbInfo.Frequency != req.Frequency {
+		isRecalculate = true
+	}
+	//修改指标信息
+	edbInfo.EdbName = req.EdbName
+	edbInfo.EdbNameSource = req.EdbName
+	edbInfo.Frequency = req.Frequency
+	edbInfo.Unit = req.Unit
+	edbInfo.ClassifyId = req.ClassifyId
+	edbInfo.ModifyTime = time.Now()
+	_, err = to.Update(edbInfo, "EdbName", "EdbNameSource", "Frequency", "Unit", "ClassifyId", "ModifyTime")
+	if err != nil {
+		return
+	}
+
+	var existCondition string
+	var existPars []interface{}
+	existCondition += " AND edb_info_id=? AND from_edb_info_id=? "
+	existPars = append(existPars, edbInfo.EdbInfoId, req.FromEdbInfoId)
+
+	//判断计算指标是否被更换
+	count, err := GetEdbInfoCalculateCountByCondition(existCondition, existPars)
+	if err != nil {
+		err = errors.New("判断指标是否改变失败,Err:" + err.Error())
+		return
+	}
+	if count > 0 { // 指标未被替换，无需删除关联数据
+
+		// 频度被换了，需要重新计算
+		if isRecalculate {
+			err = obj.refresh(to, edbInfo.EdbInfoId, edbInfo.Source, edbInfo, fromEdbInfo, edbInfo.EdbCode, "")
+		}
+
+		return
+	}
+
+	//删除，计算指标关联的，基础指标的关联关系
+	sql := ` DELETE FROM edb_info_calculate_mapping WHERE edb_info_id = ? `
+	_, err = to.Raw(sql, edbInfo.EdbInfoId).Exec()
+	if err != nil {
+		return
+	}
+
+	//清空原有数据
+	sql = ` DELETE FROM ` + tableName + ` WHERE edb_info_id = ? `
+	_, err = to.Raw(sql, edbInfo.EdbInfoId).Exec()
+	if err != nil {
+		return
+	}
+
+	//关联关系
+	{
+		calculateMappingItem := &EdbInfoCalculateMapping{
+			EdbInfoCalculateMappingId: 0,
+			EdbInfoId:                 edbInfo.EdbInfoId,
+			Source:                    obj.GetSource(),
+			SourceName:                obj.GetSourceName(),
+			EdbCode:                   edbInfo.EdbCode,
+			FromEdbInfoId:             fromEdbInfo.EdbInfoId,
+			FromEdbCode:               fromEdbInfo.EdbCode,
+			FromEdbName:               fromEdbInfo.EdbName,
+			FromSource:                fromEdbInfo.Source,
+			FromSourceName:            fromEdbInfo.SourceName,
+			FromTag:                   "",
+			Sort:                      1,
+			CreateTime:                time.Now(),
+			ModifyTime:                time.Now(),
+		}
+		_, err = to.Insert(calculateMappingItem)
+		if err != nil {
+			return
+		}
+	}
+
+	//计算数据
+	err = obj.refresh(to, edbInfo.EdbInfoId, edbInfo.Source, edbInfo, fromEdbInfo, edbInfo.EdbCode, "")
+
+	return
+}
+
+// Refresh 刷新
+func (obj LjzNczj) Refresh(params RefreshParams) (err error, errMsg string) {
+	calculateMapping, err := GetEdbInfoCalculateMappingDetail(params.EdbInfo.EdbInfoId)
+	if err != nil {
+		errMsg = "GetEdbInfoCalculateLjzNczjzyDetail Err:" + err.Error()
+		return
+	}
+	fromEdbInfo, err := GetEdbInfoById(calculateMapping.FromEdbInfoId)
+	if err != nil {
+		errMsg = "GetEdbInfoById Err:" + err.Error()
+		return
+	}
+
+	o := orm.NewOrm()
+	to, err := o.Begin()
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err != nil {
+			_ = to.Rollback()
+			fmt.Println(reflect.TypeOf(obj).Name(), "；Refresh,Err:"+err.Error())
+		} else {
+			_ = to.Commit()
+		}
+	}()
+
+	// 计算数据
+	err = obj.refresh(to, params.EdbInfo.EdbInfoId, params.EdbInfo.Source, params.EdbInfo, fromEdbInfo, params.EdbInfo.EdbCode, params.StartDate)
+
+	return
+}
+
+// GetSource 获取来源编码id
+func (obj LjzNczj) GetSource() int {
+	return utils.DATA_SOURCE_CALCULATE_LJZNCZJ
+}
+
+// GetSourceName 获取来源名称
+func (obj LjzNczj) GetSourceName() string {
+	return utils.DATA_SOURCE_NAME_CALCULATE_LJZNCZJ
+}
+
+func (obj LjzNczj) refresh(to orm.TxOrmer, edbInfoId, source int, edbInfo, fromEdbInfo *EdbInfo, edbCode, startDate string) (err error) {
+	dataTableName := GetEdbDataTableName(source)
+	edbInfoIdStr := strconv.Itoa(edbInfoId)
+	//计算数据
+	var condition string
+	var pars []interface{}
+	condition += " AND edb_info_id=? "
+	pars = append(pars, fromEdbInfo.EdbInfoId)
+
+	//if startDate != "" {
+	//	condition += " AND data_time>=? "
+	//	pars = append(pars, startDate)
+	//}
+
+	var isWeekData bool // 是否周度数据，如果是周度数据的话，是需要变频的，最后结果还需要除以7
+	// 周度数据需要先变成日度的
+	if fromEdbInfo.Frequency == `周度` {
+		isWeekData = true
+	}
+
+	dataList, err := GetEdbDataListAllByTo(to, condition, pars, fromEdbInfo.Source, 1)
+	if err != nil {
+		return err
+	}
+
+	fromEdbDataMap := make(map[string]float64)
+	if isWeekData {
+		dataList, err = HandleDataByLinearRegression(dataList, fromEdbDataMap)
+		if err != nil {
+			return
+		}
+	}
+
+	//日度数据年初至今:日期同原日度数据。将每年1月1日(含)到日度数据所在日期含间的日度值，进行加总。
+	//周度数据年初至今:日期同原周度数据。将周度值转成日度频率，空值用插值法插值，然后算法同日度年度至今，再除以7
+	//月度/季度数据年初至今:日期同原月度/季度数据，将每年1月1日(含)到月度数据所在日期(含)之间的月度/季度值，进行加总
+	//以此类推
+
+	dateList := make([]time.Time, 0)
+	valueMap := make(map[time.Time]float64)
+	yearMap := make(map[int]float64)
+	switch edbInfo.Frequency {
+	case "周度":
+		tmpDateDataMap := make(map[time.Time]float64)
+		tmpDateList := make([]time.Time, 0)
+		for _, item := range dataList {
+			itemDate, tmpErr := time.ParseInLocation(utils.FormatDate, item.DataTime, time.Local)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			var currTime time.Time
+			// 周六周日，这是下一个周五的数据
+			if itemDate.Weekday() == 0 {
+				currTime = itemDate.AddDate(0, 0, 5)
+			} else if itemDate.Weekday() == 6 {
+				currTime = itemDate.AddDate(0, 0, 6)
+			} else {
+				currTime = itemDate.AddDate(0, 0, 5-int(itemDate.Weekday()))
+			}
+
+			year := itemDate.Year()
+			yearVal, ok := yearMap[year]
+			if ok {
+				yearMap[year] = item.Value + yearVal
+			} else {
+				yearMap[year] = item.Value
+			}
+
+			if itemDate.Equal(currTime) {
+				tmpDateDataMap[itemDate] = yearMap[year]
+				tmpDateList = append(tmpDateList, itemDate)
+			}
+		}
+		for _, currTime := range tmpDateList {
+			dateList = append(dateList, currTime)
+			valueMap[currTime] = tmpDateDataMap[currTime]
+		}
+	default:
+		for _, item := range dataList {
+			itemDate, tmpErr := time.ParseInLocation(utils.FormatDate, item.DataTime, time.Local)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			year := itemDate.Year()
+			yearVal, ok := yearMap[year]
+			if ok {
+				yearMap[year] = item.Value + yearVal
+			} else {
+				yearMap[year] = item.Value
+			}
+			valueMap[itemDate] = yearMap[year]
+			dateList = append(dateList, itemDate)
+		}
+
+	}
+
+	//获取指标所有数据
+	existDataList := make([]*EdbData, 0)
+	sql := `SELECT * FROM %s WHERE edb_info_id=? `
+	sql = fmt.Sprintf(sql, dataTableName)
+	_, err = to.Raw(sql, edbInfoId).QueryRows(&existDataList)
+	if err != nil {
+		return err
+	}
+	existDataMap := make(map[string]string)
+	removeDataTimeMap := make(map[string]int) //需要移除的日期数据
+	for _, v := range existDataList {
+		existDataMap[v.DataTime] = v.Value
+		removeDataTimeMap[v.DataTime] = 1
+	}
+	needAddDateMap := make(map[time.Time]int)
+
+	addSql := ` INSERT INTO ` + dataTableName + `(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	var isAdd bool
+	for _, currTime := range dateList {
+		currDateStr := currTime.Format(utils.FormatDate)
+		existVal, ok := existDataMap[currDateStr]
+
+		tmpVal, ok2 := valueMap[currTime]
+		if !ok2 {
+			err = errors.New("数据异常,date:" + currDateStr)
+			return
+		}
+		var saveValue string
+		if isWeekData { //周度指标转的话，最后结果要除以7
+			saveValue = decimal.NewFromFloat(tmpVal).Div(decimal.NewFromInt(7)).Round(4).String()
+		} else {
+			saveValue = decimal.NewFromFloat(tmpVal).Round(4).String()
+		}
+
+		// 如果库中已经存在该数据的话，那么就进行值的变更操作
+		if ok {
+			//校验待删除日期数据里面是否存在该元素，如果存在的话，那么移除该日期
+			delete(removeDataTimeMap, currDateStr)
+
+			if existVal != saveValue {
+				sql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
+				sql = fmt.Sprintf(sql, dataTableName)
+				_, err = to.Raw(sql, saveValue, edbInfoId, currDateStr).Exec()
+				if err != nil {
+					return
+				}
+			}
+
+			continue
+		}
+
+		// 库中不存在该日期的数据
+		timestamp := currTime.UnixNano() / 1e6
+		timeStr := fmt.Sprintf("%d", timestamp)
+		if _, existOk := needAddDateMap[currTime]; !existOk {
+			addSql += GetAddSql(edbInfoIdStr, edbCode, currDateStr, timeStr, saveValue)
+			isAdd = true
+		}
+		needAddDateMap[currTime] = 1
+	}
+
+	//删除已经不存在的指标数据（由于该指标当日的数据删除了）
+	{
+		removeDateList := make([]string, 0)
+		for dateTime := range removeDataTimeMap {
+			removeDateList = append(removeDateList, dateTime)
+		}
+		removeNum := len(removeDateList)
+		if removeNum > 0 {
+			sql := fmt.Sprintf(` DELETE FROM %s WHERE edb_info_id = ? and data_time in (`+utils.GetOrmInReplace(removeNum)+`) `, dataTableName)
+			_, err = to.Raw(sql, edbInfo.EdbInfoId, removeDateList).Exec()
+			if err != nil {
+				fmt.Println(reflect.TypeOf(obj).Name(), " add data ;delete Err", err.Error())
+				err = fmt.Errorf("删除不存在的指标数据失败,Err:" + err.Error())
+				return
+			}
+		}
+	}
+
+	if isAdd {
+		addSql = strings.TrimRight(addSql, ",")
+		_, err = to.Raw(addSql).Exec()
+		if err != nil {
+			fmt.Println(reflect.TypeOf(obj).Name(), " add data Err", err.Error())
+			return
+		}
+	}
+
+	return
+}

models/edb_data_calculate_ljzzj.go

@@ -0,0 +1,397 @@
+package models
+
+import (
+	"errors"
+	"fmt"
+	"github.com/beego/beego/v2/client/orm"
+	"github.com/shopspring/decimal"
+	"hongze/hongze_edb_lib/utils"
+	"reflect"
+	"strconv"
+	"strings"
+	"time"
+)
+
+// Ljzzj 累计值转季度
+type Ljzzj struct {
+}
+
+// Add 添加
+func (obj Ljzzj) Add(params AddCalculateBatchParams) (edbInfo *EdbInfo, err error, errMsg string) {
+	req := params.Req
+	fromEdbInfo := params.FromEdbInfo
+	edbCode := params.EdbCode
+	if fromEdbInfo.Frequency != "季度" {
+		errMsg = "请选择季度指标"
+		err = errors.New(errMsg)
+		return
+	}
+	o := orm.NewOrm()
+	to, err := o.Begin()
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err != nil {
+			_ = to.Rollback()
+			fmt.Println(reflect.TypeOf(obj).Name(), "；Add,Err:"+err.Error())
+		} else {
+			_ = to.Commit()
+		}
+	}()
+
+	edbInfo = new(EdbInfo)
+	edbInfo.Source = obj.GetSource()
+	edbInfo.SourceName = obj.GetSourceName()
+	edbInfo.EdbCode = edbCode
+	edbInfo.EdbName = req.EdbName
+	edbInfo.EdbNameSource = req.EdbName
+	edbInfo.Frequency = req.Frequency
+	edbInfo.Unit = req.Unit
+	edbInfo.ClassifyId = req.ClassifyId
+	edbInfo.SysUserId = params.SysUserId
+	edbInfo.SysUserRealName = params.SysUserRealName
+	edbInfo.CreateTime = time.Now()
+	edbInfo.ModifyTime = time.Now()
+	edbInfo.UniqueCode = params.UniqueCode
+	edbInfo.CalculateFormula = req.Formula
+	edbInfo.EdbType = 2
+	newEdbInfoId, tmpErr := to.Insert(edbInfo)
+	if tmpErr != nil {
+		err = tmpErr
+		return
+	}
+	edbInfo.EdbInfoId = int(newEdbInfoId)
+
+	//关联关系
+	{
+		calculateMappingItem := new(EdbInfoCalculateMapping)
+		calculateMappingItem.CreateTime = time.Now()
+		calculateMappingItem.ModifyTime = time.Now()
+		calculateMappingItem.Sort = 1
+		calculateMappingItem.EdbCode = edbCode
+		calculateMappingItem.EdbInfoId = edbInfo.EdbInfoId
+		calculateMappingItem.FromEdbInfoId = fromEdbInfo.EdbInfoId
+		calculateMappingItem.FromEdbCode = fromEdbInfo.EdbCode
+		calculateMappingItem.FromEdbName = fromEdbInfo.EdbName
+		calculateMappingItem.FromSource = fromEdbInfo.Source
+		calculateMappingItem.FromSourceName = fromEdbInfo.SourceName
+		calculateMappingItem.FromTag = ""
+		calculateMappingItem.Source = edbInfo.Source
+		calculateMappingItem.SourceName = edbInfo.SourceName
+		_, err = to.Insert(calculateMappingItem)
+		if err != nil {
+			return
+		}
+	}
+
+	//计算数据
+	err = obj.refresh(to, edbInfo.EdbInfoId, edbInfo.Source, fromEdbInfo, edbInfo.EdbCode)
+
+	return
+}
+
+// Edit 编辑
+func (obj Ljzzj) Edit(params EditCalculateBatchParams) (err error, errMsg string) {
+	req := params.Req
+	edbInfo := params.EdbInfo
+	fromEdbInfo := params.FromEdbInfo
+	if fromEdbInfo.Frequency != "季度" {
+		errMsg = "请选择季度指标"
+		err = errors.New(errMsg)
+		return
+	}
+
+	o := orm.NewOrm()
+	to, err := o.Begin()
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err != nil {
+			_ = to.Rollback()
+			fmt.Println(reflect.TypeOf(obj).Name(), "；Edit,Err:"+err.Error())
+		} else {
+			_ = to.Commit()
+		}
+	}()
+	tableName := GetEdbDataTableName(edbInfo.Source)
+
+	//修改指标信息
+	edbInfo.EdbName = req.EdbName
+	edbInfo.EdbNameSource = req.EdbName
+	edbInfo.Frequency = req.Frequency
+	edbInfo.Unit = req.Unit
+	edbInfo.ClassifyId = req.ClassifyId
+	edbInfo.ModifyTime = time.Now()
+	_, err = to.Update(edbInfo, "EdbName", "EdbNameSource", "Frequency", "Unit", "ClassifyId", "ModifyTime")
+	if err != nil {
+		return
+	}
+
+	var existCondition string
+	var existPars []interface{}
+	existCondition += " AND edb_info_id=? AND from_edb_info_id=? "
+	existPars = append(existPars, edbInfo.EdbInfoId, req.FromEdbInfoId)
+
+	//判断计算指标是否被更换
+	count, err := GetEdbInfoCalculateCountByCondition(existCondition, existPars)
+	if err != nil {
+		err = errors.New("判断指标是否改变失败,Err:" + err.Error())
+		return
+	}
+	if count > 0 { // 指标未被替换，无需重新计算
+		return
+	}
+
+	//删除，计算指标关联的，基础指标的关联关系
+	sql := ` DELETE FROM edb_info_calculate_mapping WHERE edb_info_id = ? `
+	_, err = to.Raw(sql, edbInfo.EdbInfoId).Exec()
+	if err != nil {
+		return
+	}
+
+	//清空原有数据
+	sql = ` DELETE FROM ` + tableName + ` WHERE edb_info_id = ? `
+	_, err = to.Raw(sql, edbInfo.EdbInfoId).Exec()
+	if err != nil {
+		return
+	}
+
+	//关联关系
+	{
+		calculateMappingItem := &EdbInfoCalculateMapping{
+			EdbInfoCalculateMappingId: 0,
+			EdbInfoId:                 edbInfo.EdbInfoId,
+			Source:                    obj.GetSource(),
+			SourceName:                obj.GetSourceName(),
+			EdbCode:                   edbInfo.EdbCode,
+			FromEdbInfoId:             fromEdbInfo.EdbInfoId,
+			FromEdbCode:               fromEdbInfo.EdbCode,
+			FromEdbName:               fromEdbInfo.EdbName,
+			FromSource:                fromEdbInfo.Source,
+			FromSourceName:            fromEdbInfo.SourceName,
+			FromTag:                   "",
+			Sort:                      1,
+			CreateTime:                time.Now(),
+			ModifyTime:                time.Now(),
+		}
+		_, err = to.Insert(calculateMappingItem)
+		if err != nil {
+			return
+		}
+	}
+
+	//计算数据
+	err = obj.refresh(to, edbInfo.EdbInfoId, edbInfo.Source, fromEdbInfo, edbInfo.EdbCode)
+
+	return
+}
+
+// Refresh 刷新
+func (obj Ljzzj) Refresh(params RefreshParams) (err error, errMsg string) {
+	calculateMapping, err := GetEdbInfoCalculateMappingDetail(params.EdbInfo.EdbInfoId)
+	if err != nil {
+		errMsg = "GetEdbInfoCalculateLjzzyDetail Err:" + err.Error()
+		return
+	}
+	fromEdbInfo, err := GetEdbInfoById(calculateMapping.FromEdbInfoId)
+	if err != nil {
+		errMsg = "GetEdbInfoById Err:" + err.Error()
+		return
+	}
+
+	o := orm.NewOrm()
+	to, err := o.Begin()
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err != nil {
+			_ = to.Rollback()
+			fmt.Println(reflect.TypeOf(obj).Name(), "；Refresh,Err:"+err.Error())
+		} else {
+			_ = to.Commit()
+		}
+	}()
+
+	// 计算数据
+	err = obj.refresh(to, params.EdbInfo.EdbInfoId, params.EdbInfo.Source, fromEdbInfo, params.EdbInfo.EdbCode)
+
+	return
+}
+
+// GetSource 获取来源编码id
+func (obj Ljzzj) GetSource() int {
+	return utils.DATA_SOURCE_CALCULATE_LJZZJ
+}
+
+// GetSourceName 获取来源名称
+func (obj Ljzzj) GetSourceName() string {
+	return utils.DATA_SOURCE_NAME_CALCULATE_LJZZJ
+}
+
+func (obj Ljzzj) refresh(to orm.TxOrmer, edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode string) (err error) {
+	dataTableName := GetEdbDataTableName(source)
+	edbInfoIdStr := strconv.Itoa(edbInfoId)
+
+	// 获取来源指标的数据
+	var condition string
+	var pars []interface{}
+	condition += " AND edb_info_id=? "
+	pars = append(pars, fromEdbInfo.EdbInfoId)
+	dataList, err := GetEdbDataListAllByTo(to, condition, pars, fromEdbInfo.Source, 1)
+	if err != nil {
+		return err
+	}
+
+	yearMap := make(map[int]map[int]*EdbInfoSearchData)
+	dataLen := len(dataList)
+	for i := 0; i < dataLen; i++ {
+		item := dataList[i]
+		//日其中获取年
+		itemDate, err := time.ParseInLocation(utils.FormatDate, item.DataTime, time.Local)
+		if err != nil {
+			return err
+		}
+		year := itemDate.Year()
+		quarter := utils.MonthQuarterMap[int(itemDate.Month())]
+		if quarterMap, yok := yearMap[year]; yok {
+			quarterMap[quarter] = item
+			yearMap[year] = quarterMap
+		} else {
+			quarterMap = make(map[int]*EdbInfoSearchData)
+			quarterMap[quarter] = item
+			yearMap[year] = quarterMap
+		}
+	}
+
+	addSql := ` INSERT INTO ` + dataTableName + `(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	var isAdd bool
+	//获取指标所有数据
+	existDataList := make([]*EdbData, 0)
+	sql := `SELECT * FROM %s WHERE edb_info_id=? `
+	sql = fmt.Sprintf(sql, dataTableName)
+	_, err = to.Raw(sql, edbInfoId).QueryRows(&existDataList)
+	if err != nil {
+		return err
+	}
+	dataMap := make(map[string]string)
+	for _, v := range existDataList {
+		dataMap[v.DataTime] = v.Value
+	}
+	existDataMap := make(map[string]string)
+	for yk, yv := range yearMap {
+		_, oneQuarterOk := yv[1]
+		_, twoQuarterOk := yv[2]
+		if !oneQuarterOk && !twoQuarterOk {
+			continue
+		}
+		for i := 1; i <= 4; i++ {
+			fmt.Println(yk, i, yv[i])
+			dataCurrentItem := yv[i]
+			var date string
+			var val float64
+			if dataCurrentItem != nil {
+				if i == 1 || i == 2 {
+					if _, mok := yv[1]; mok { //第1个季度有值
+						if i == 1 {
+							date = dataCurrentItem.DataTime
+							val, _ = decimal.NewFromFloat(dataCurrentItem.Value).Float64() //a.Div(b).Float64()
+						}
+						if i == 2 {
+							dataOneItem := yv[1]
+							date = dataCurrentItem.DataTime
+							twoQuarter := decimal.NewFromFloat(dataCurrentItem.Value)
+							oneQuarter := decimal.NewFromFloat(dataOneItem.Value)
+							val, _ = twoQuarter.Sub(oneQuarter).Float64()
+						}
+					} else { //第1个季度无值
+						dataTwoItem := yv[2]
+						if i == 1 {
+							date = strconv.Itoa(yk) + "-03-31"
+							a := decimal.NewFromFloat(dataTwoItem.Value)
+							b := decimal.NewFromFloat(2.0)
+							val, _ = a.Div(b).Float64()
+						}
+						if i == 2 {
+							//第1个季度无值：第1个季度=第2个季度/2
+							{
+								date = strconv.Itoa(yk) + "-03-31"
+								a := decimal.NewFromFloat(dataTwoItem.Value)
+								b := decimal.NewFromFloat(2.0)
+								val, _ = a.Div(b).Float64()
+
+								tmpSql, newAdd, tmpErr := obj.calculate(edbInfoId, date, edbInfoIdStr, edbCode, dataTableName, addSql, val, dataMap, existDataMap, to)
+								if !isAdd {
+									isAdd = newAdd
+								}
+								addSql = tmpSql
+								if tmpErr != nil {
+									return tmpErr
+								}
+							}
+							//end 第1个季度无值
+
+							date = dataCurrentItem.DataTime
+							a := decimal.NewFromFloat(dataTwoItem.Value)
+							b := decimal.NewFromFloat(2.0)
+							val, _ = a.Div(b).Float64()
+						}
+					}
+				} else {
+					dataPreItem := yv[i-1]
+					if dataCurrentItem != nil && dataPreItem != nil {
+						date = dataCurrentItem.DataTime
+						//val =  dataCurrentItem.Value - dataPreItem.Value
+						a := decimal.NewFromFloat(dataCurrentItem.Value)
+						b := decimal.NewFromFloat(dataPreItem.Value)
+						val, _ = a.Sub(b).Float64()
+					}
+				}
+			}
+			if date != "" {
+				tmpSql, newAdd, tmpErr := obj.calculate(edbInfoId, date, edbInfoIdStr, edbCode, dataTableName, addSql, val, dataMap, existDataMap, to)
+				if !isAdd {
+					isAdd = newAdd
+				}
+				addSql = tmpSql
+				if tmpErr != nil {
+					return tmpErr
+				}
+			}
+		}
+	}
+	if isAdd {
+		addSql = strings.TrimRight(addSql, ",")
+		_, err = to.Raw(addSql).Exec()
+		if err != nil {
+			fmt.Println(reflect.TypeOf(obj).Name(), " add data Err", err.Error())
+			return
+		}
+	}
+	return
+}
+
+func (obj Ljzzj) calculate(edbInfoId int, date, edbInfoIdStr, edbCode, dataTableName, addSql string, val float64, dataMap, existDataMap map[string]string, to orm.TxOrmer) (newSql string, isAdd bool, err error) {
+	newSql = addSql
+	saveValue := utils.SubFloatToString(val, 4)
+	//判断数据是否存在
+	if existVal, ok := dataMap[date]; !ok {
+		dataTime, _ := time.ParseInLocation(utils.FormatDate, date, time.Local)
+		timestamp := dataTime.UnixNano() / 1e6
+		timeStr := fmt.Sprintf("%d", timestamp)
+		if _, existOk := existDataMap[date]; !existOk {
+			newSql += GetAddSql(edbInfoIdStr, edbCode, date, timeStr, saveValue)
+			isAdd = true
+		}
+		existDataMap[date] = date
+	} else {
+		if existVal != saveValue {
+			sql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
+			sql = fmt.Sprintf(sql, dataTableName)
+			_, err = to.Raw(sql, saveValue, edbInfoId, date).Exec()
+		}
+	}
+	return
+}

models/edb_data_table.go

@@ -123,6 +123,18 @@ func GetEdbDataTableName(source int) (tableName string) {
 		tableName = "edb_data_calculate_correlation"
 	case utils.DATA_SOURCE_NATIONAL_STATISTICS:
 		tableName = "edb_data_national_statistics"
+	case utils.DATA_SOURCE_CALCULATE_LJZZJ: //累计值转季 -> 61
+		tableName = "edb_data_calculate_ljzzj"
+	case utils.DATA_SOURCE_CALCULATE_LJZ: //累计值 -> 62
+		tableName = "edb_data_calculate_ljz"
+	case utils.DATA_SOURCE_CALCULATE_LJZNCZJ: //累计值(年初至今） -> 63
+		tableName = "edb_data_calculate_ljznczj"
+	case utils.DATA_SOURCE_PREDICT_CALCULATE_LJZZJ: // 预测指标 - 累计值 -> 65
+		tableName = "edb_data_predict_calculate_ljzzj"
+	case utils.DATA_SOURCE_PREDICT_CALCULATE_LJZ: //预测指标 - 累计值转季->64
+		tableName = "edb_data_predict_calculate_ljz"
+	case utils.DATA_SOURCE_PREDICT_CALCULATE_LJZNCZJ: //预测指标 - 累计值(年初至今） -> 66
+		tableName = "edb_data_predict_calculate_ljznczj"
 	default:
 		tableName = ""
 	}

models/edb_info.go

@@ -716,6 +716,8 @@ func GetChartPredictEdbInfoDataListByConfList(predictEdbConfList []*PredictEdbCo
 	return
 }
 
+// GetPredictEdbDayList 获取预测指标日期列表
+
 // GetPredictEdbDayList 获取预测指标日期列表
 func getPredictEdbDayList(startDate, endDate time.Time, frequency string) (dayList []time.Time) {
 	//if !utils.InArrayByStr([]string{"日度", "周度", "月度"}, frequency)
@@ -733,6 +735,15 @@ func getPredictEdbDayList(startDate, endDate time.Time, frequency string) (dayLi
 		for currDate := startDate.AddDate(0, 0, 7); currDate.Before(endDate) || currDate.Equal(endDate); currDate = currDate.AddDate(0, 0, 7) {
 			dayList = append(dayList, currDate)
 		}
+	case "旬度":
+		for currDate := startDate.AddDate(0, 0, 1); currDate.Before(endDate) || currDate.Equal(endDate); {
+			nextDate := currDate.AddDate(0, 0, 1)
+			//每个月的10号、20号、最后一天，那么就写入
+			if nextDate.Day() == 11 || nextDate.Day() == 21 || nextDate.Day() == 1 {
+				dayList = append(dayList, currDate)
+			}
+			currDate = nextDate
+		}
 	case "月度":
 		for currDate := startDate; currDate.Before(endDate) || currDate.Equal(endDate); {
 			currDate = time.Date(currDate.Year(), currDate.Month(), 1, 0, 0, 0, 0, time.Now().Location()).AddDate(0, 1, -1)
@@ -741,6 +752,30 @@ func getPredictEdbDayList(startDate, endDate time.Time, frequency string) (dayLi
 			}
 			currDate = currDate.AddDate(0, 0, 1)
 		}
+	case "季度":
+		for currDate := startDate; currDate.Before(endDate) || currDate.Equal(endDate); {
+			// 每月的最后一天
+			currDate = time.Date(currDate.Year(), currDate.Month(), 1, 0, 0, 0, 0, time.Now().Location()).AddDate(0, 1, -1)
+			if !currDate.After(endDate) && !currDate.Equal(startDate) {
+				// 季度日期就写入，否则不写入
+				if currDate.Month() == 3 || currDate.Month() == 6 || currDate.Month() == 9 || currDate.Month() == 12 {
+					dayList = append(dayList, currDate)
+				}
+			}
+			currDate = currDate.AddDate(0, 0, 1)
+		}
+	case "半年度":
+		for currDate := startDate; currDate.Before(endDate) || currDate.Equal(endDate); {
+			// 每月的最后一天
+			currDate = time.Date(currDate.Year(), currDate.Month(), 1, 0, 0, 0, 0, time.Now().Location()).AddDate(0, 1, -1)
+			if !currDate.After(endDate) && !currDate.Equal(startDate) {
+				// 半年度日期就写入，否则不写入
+				if currDate.Month() == 6 || currDate.Month() == 12 {
+					dayList = append(dayList, currDate)
+				}
+			}
+			currDate = currDate.AddDate(0, 0, 1)
+		}
 	case "年度":
 		for currDate := startDate; currDate.Before(endDate) || currDate.Equal(endDate); {
 			currDate = time.Date(currDate.Year()+1, 12, 31, 0, 0, 0, 0, time.Now().Location())

models/handle_data.go

@@ -85,6 +85,13 @@ func HandleDataByLinearRegression(edbInfoDataList []*EdbInfoSearchData, handleDa
 			}
 		}
 
+		// 最后将自己赋值
+		newList = append(newList, &EdbInfoSearchData{
+			EdbDataId: v.EdbDataId,
+			DataTime:  v.DataTime,
+			Value:     v.Value,
+		})
+
 		startEdbInfoData = v
 	}
 

models/predict_edb_data_calculate_jp.go

@@ -106,6 +106,22 @@ func SavePredictCalculateJp(reqEdbInfoId, classifyId int, edbName, frequency, un
 			return
 		}
 
+		latestDateStr = edbInfo.LatestDate
+		latestValue = edbInfo.LatestValue
+		oldCalculateFormula := edbInfo.CalculateFormula
+		//修改指标信息
+		edbInfo.EdbName = edbName
+		edbInfo.EdbNameSource = edbName
+		edbInfo.Frequency = frequency
+		edbInfo.Unit = unit
+		edbInfo.ClassifyId = classifyId
+		edbInfo.CalculateFormula = formula
+		edbInfo.ModifyTime = time.Now()
+		_, err = to.Update(edbInfo, "EdbName", "EdbNameSource", "Frequency", "Unit", "ClassifyId", "CalculateFormula", "ModifyTime")
+		if err != nil {
+			return
+		}
+
 		//判断计算指标是否被更换
 		var existCondition string
 		var existPars []interface{}
@@ -117,7 +133,7 @@ func SavePredictCalculateJp(reqEdbInfoId, classifyId int, edbName, frequency, un
 			err = errors.New("判断指标是否改变失败,Err:" + tmpErr.Error())
 			return
 		}
-		if count > 0 { // 指标未被替换，无需重新计算
+		if count > 0 && formula == oldCalculateFormula { // 指标未被替换，无需重新计算
 			return
 		}
 

models/predict_edb_data_calculate_ljz.go

@@ -0,0 +1,627 @@
+package models
+
+import (
+	"errors"
+	"fmt"
+	"github.com/beego/beego/v2/client/orm"
+	"github.com/shopspring/decimal"
+	"hongze/hongze_edb_lib/utils"
+	"reflect"
+	"strconv"
+	"strings"
+	"time"
+)
+
+// PredictLjz 预测累计值
+type PredictLjz struct {
+}
+
+// Add 添加
+func (obj PredictLjz) Add(params BatchSaveCalculateBatchParams) (edbInfo *EdbInfo, latestDateStr string, latestValue float64, err error, errMsg string) {
+	req := params.Req
+	fromEdbInfo := params.FromEdbInfo
+	edbCode := params.EdbCode
+
+	frequencyInt := utils.CheckFrequency(fromEdbInfo.Frequency, req.Frequency)
+	if frequencyInt < 0 {
+		errMsg = "频度异常，不允许低频转为高频"
+		err = errors.New(errMsg)
+		return
+	}
+	if frequencyInt == 0 {
+		errMsg = "频度异常，不允许同频计算预测累计值"
+		err = errors.New(errMsg)
+		return
+	}
+	o := orm.NewOrm()
+	to, err := o.Begin()
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err != nil {
+			_ = to.Rollback()
+			fmt.Println(reflect.TypeOf(obj).Name(), "；Add,Err:"+err.Error())
+		} else {
+			_ = to.Commit()
+		}
+	}()
+
+	edbInfo = &EdbInfo{
+		//EdbInfoId:        0,
+		SourceName:       obj.GetSourceName(),
+		Source:           obj.GetSource(),
+		EdbCode:          edbCode,
+		EdbName:          req.EdbName,
+		EdbNameSource:    req.EdbName,
+		Frequency:        req.Frequency,
+		Unit:             req.Unit,
+		StartDate:        "",
+		EndDate:          "",
+		ClassifyId:       req.ClassifyId,
+		SysUserId:        params.SysUserId,
+		SysUserRealName:  params.SysUserRealName,
+		UniqueCode:       params.UniqueCode,
+		CreateTime:       time.Now(),
+		ModifyTime:       time.Now(),
+		MinValue:         0,
+		MaxValue:         0,
+		CalculateFormula: req.Formula,
+		EdbType:          2,
+		Sort:             0,
+		MoveType:         0,
+		MoveFrequency:    "",
+		NoUpdate:         0,
+		ServerUrl:        "",
+		EdbInfoType:      1,
+		EdbNameEn:        "",
+		UnitEn:           "",
+		LatestDate:       "",
+		LatestValue:      0,
+		ChartImage:       "",
+		Calendar:         "",
+	}
+
+	newEdbInfoId, tmpErr := to.Insert(edbInfo)
+	if tmpErr != nil {
+		err = tmpErr
+		return
+	}
+	edbInfo.EdbInfoId = int(newEdbInfoId)
+
+	//关联关系
+	{
+		calculateMappingItem := new(EdbInfoCalculateMapping)
+		calculateMappingItem.CreateTime = time.Now()
+		calculateMappingItem.ModifyTime = time.Now()
+		calculateMappingItem.Sort = 1
+		calculateMappingItem.EdbCode = edbCode
+		calculateMappingItem.EdbInfoId = edbInfo.EdbInfoId
+		calculateMappingItem.FromEdbInfoId = fromEdbInfo.EdbInfoId
+		calculateMappingItem.FromEdbCode = fromEdbInfo.EdbCode
+		calculateMappingItem.FromEdbName = fromEdbInfo.EdbName
+		calculateMappingItem.FromSource = fromEdbInfo.Source
+		calculateMappingItem.FromSourceName = fromEdbInfo.SourceName
+		calculateMappingItem.FromTag = ""
+		calculateMappingItem.Source = edbInfo.Source
+		calculateMappingItem.SourceName = edbInfo.SourceName
+		_, err = to.Insert(calculateMappingItem)
+		if err != nil {
+			return
+		}
+	}
+
+	//计算数据
+	latestDateStr, latestValue, err = obj.refresh(to, edbInfo.EdbInfoId, edbInfo.Source, edbInfo, fromEdbInfo, edbInfo.EdbCode, "")
+
+	return
+}
+
+// Edit 编辑
+func (obj PredictLjz) Edit(params BatchSaveCalculateBatchParams) (latestDateStr string, latestValue float64, err error, errMsg string) {
+	req := params.Req
+	edbInfo := params.EdbInfo
+	fromEdbInfo := params.FromEdbInfo
+	latestDateStr = edbInfo.LatestDate
+	latestValue = edbInfo.LatestValue
+
+	frequencyInt := utils.CheckFrequency(fromEdbInfo.Frequency, req.Frequency)
+	if frequencyInt < 0 {
+		errMsg = "频度异常，不允许低频转为高频"
+		err = errors.New(errMsg)
+		return
+	}
+	if frequencyInt == 0 {
+		errMsg = "频度异常，不允许同频计算预测累计值"
+		err = errors.New(errMsg)
+		return
+	}
+	latestDateStr = edbInfo.LatestDate
+	latestValue = edbInfo.LatestValue
+
+	o := orm.NewOrm()
+	to, err := o.Begin()
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err != nil {
+			_ = to.Rollback()
+			fmt.Println(reflect.TypeOf(obj).Name(), "；Edit,Err:"+err.Error())
+		} else {
+			_ = to.Commit()
+		}
+	}()
+	tableName := GetEdbDataTableName(edbInfo.Source)
+
+	var isRecalculate bool
+	if edbInfo.Frequency != req.Frequency {
+		isRecalculate = true
+	}
+	//修改指标信息
+	edbInfo.EdbName = req.EdbName
+	edbInfo.EdbNameSource = req.EdbName
+	edbInfo.Frequency = req.Frequency
+	edbInfo.Unit = req.Unit
+	edbInfo.ClassifyId = req.ClassifyId
+	edbInfo.ModifyTime = time.Now()
+	_, err = to.Update(edbInfo, "EdbName", "EdbNameSource", "Frequency", "Unit", "ClassifyId", "ModifyTime")
+	if err != nil {
+		return
+	}
+
+	var existCondition string
+	var existPars []interface{}
+	existCondition += " AND edb_info_id=? AND from_edb_info_id=? "
+	existPars = append(existPars, edbInfo.EdbInfoId, req.FromEdbInfoId)
+
+	//判断计算指标是否被更换
+	count, err := GetEdbInfoCalculateCountByCondition(existCondition, existPars)
+	if err != nil {
+		err = errors.New("判断指标是否改变失败,Err:" + err.Error())
+		return
+	}
+	if count > 0 { // 指标未被替换，无需删除关联数据
+
+		// 频度被换了，需要重新计算
+		if isRecalculate {
+			latestDateStr, latestValue, err = obj.refresh(to, edbInfo.EdbInfoId, edbInfo.Source, edbInfo, fromEdbInfo, edbInfo.EdbCode, "")
+		}
+
+		return
+	}
+
+	//删除，计算指标关联的，基础指标的关联关系
+	sql := ` DELETE FROM edb_info_calculate_mapping WHERE edb_info_id = ? `
+	_, err = to.Raw(sql, edbInfo.EdbInfoId).Exec()
+	if err != nil {
+		return
+	}
+
+	//清空原有数据
+	sql = ` DELETE FROM ` + tableName + ` WHERE edb_info_id = ? `
+	_, err = to.Raw(sql, edbInfo.EdbInfoId).Exec()
+	if err != nil {
+		return
+	}
+
+	//关联关系
+	{
+		calculateMappingItem := &EdbInfoCalculateMapping{
+			EdbInfoCalculateMappingId: 0,
+			EdbInfoId:                 edbInfo.EdbInfoId,
+			Source:                    obj.GetSource(),
+			SourceName:                obj.GetSourceName(),
+			EdbCode:                   edbInfo.EdbCode,
+			FromEdbInfoId:             fromEdbInfo.EdbInfoId,
+			FromEdbCode:               fromEdbInfo.EdbCode,
+			FromEdbName:               fromEdbInfo.EdbName,
+			FromSource:                fromEdbInfo.Source,
+			FromSourceName:            fromEdbInfo.SourceName,
+			FromTag:                   "",
+			Sort:                      1,
+			CreateTime:                time.Now(),
+			ModifyTime:                time.Now(),
+		}
+		_, err = to.Insert(calculateMappingItem)
+		if err != nil {
+			return
+		}
+	}
+
+	//计算数据
+	latestDateStr, latestValue, err = obj.refresh(to, edbInfo.EdbInfoId, edbInfo.Source, edbInfo, fromEdbInfo, edbInfo.EdbCode, "")
+
+	return
+}
+
+// Refresh 刷新
+func (obj PredictLjz) Refresh(params RefreshParams) (latestDateStr string, latestValue float64, err error, errMsg string) {
+	calculateMapping, err := GetEdbInfoCalculateMappingDetail(params.EdbInfo.EdbInfoId)
+	if err != nil {
+		errMsg = "GetEdbInfoCalculatePredictLjzDetail Err:" + err.Error()
+		return
+	}
+	fromEdbInfo, err := GetEdbInfoById(calculateMapping.FromEdbInfoId)
+	if err != nil {
+		errMsg = "GetEdbInfoById Err:" + err.Error()
+		return
+	}
+
+	o := orm.NewOrm()
+	to, err := o.Begin()
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err != nil {
+			_ = to.Rollback()
+			fmt.Println(reflect.TypeOf(obj).Name(), "；Refresh,Err:"+err.Error())
+		} else {
+			_ = to.Commit()
+		}
+	}()
+
+	// 计算数据
+	latestDateStr, latestValue, err = obj.refresh(to, params.EdbInfo.EdbInfoId, params.EdbInfo.Source, params.EdbInfo, fromEdbInfo, params.EdbInfo.EdbCode, params.StartDate)
+
+	return
+}
+
+// GetSource 获取来源编码id
+func (obj PredictLjz) GetSource() int {
+	return utils.DATA_SOURCE_PREDICT_CALCULATE_LJZ
+}
+
+// GetSourceName 获取来源名称
+func (obj PredictLjz) GetSourceName() string {
+	return utils.DATA_SOURCE_NAME_PREDICT_CALCULATE_LJZ
+}
+
+func (obj PredictLjz) refresh(to orm.TxOrmer, edbInfoId, source int, edbInfo, fromEdbInfo *EdbInfo, edbCode, startDate string) (latestDateStr string, latestValue float64, err error) {
+	dataTableName := GetEdbDataTableName(source)
+	edbInfoIdStr := strconv.Itoa(edbInfoId)
+
+	var isWeekData bool // 是否周度数据，如果是周度数据的话，是需要变频的，最后结果还需要除以7
+	// 周度数据需要先变成日度的
+	if fromEdbInfo.Frequency == `周度` {
+		isWeekData = true
+	}
+
+	// 获取来源指标的数据
+	dataList, err := GetPredictEdbDataListAll(fromEdbInfo, 1)
+	if err != nil {
+		return
+	}
+
+	fromEdbDataMap := make(map[string]float64)
+	if isWeekData {
+		dataList, err = HandleDataByLinearRegression(dataList, fromEdbDataMap)
+		if err != nil {
+			return
+		}
+	}
+
+	//日度转周度:日期选周五，计算上周六到本周五的日度值的加总，最新日期为最新值对应的周五。
+	//日度转月度:日期选每个月最后一天，计算当月所有日度值的加总，最新日期为最新值对应当月最后一天。
+	//日度转季度、年度:方法类似转月度。
+	//周度转月度/季度/年度:将周度值转成日度，空值用插值法插值，计算当月/当季/当年所有值的加总，然后除以7。
+	//月度转季度/年度: 当季/当年月度值相加。
+
+	dateList := make([]time.Time, 0)
+	valueMap := make(map[time.Time]float64)
+	switch edbInfo.Frequency {
+	case "年度":
+		yearMap := make(map[int]float64)
+		yearList := make([]int, 0)
+		for _, item := range dataList {
+			itemDate, tmpErr := time.ParseInLocation(utils.FormatDate, item.DataTime, time.Local)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			year := itemDate.Year()
+			yearVal, ok := yearMap[year]
+			if ok {
+				yearMap[year] = item.Value + yearVal
+			} else {
+				yearList = append(yearList, year)
+				yearMap[year] = item.Value
+			}
+		}
+		for _, v := range yearList {
+			currTime := time.Date(v, 12, 31, 0, 0, 0, 0, time.Local)
+			dateList = append(dateList, currTime)
+			valueMap[currTime] = yearMap[v]
+		}
+	case "半年度":
+		yearMonthMap := make(map[string]float64)
+		yearMonthList := make([]string, 0)
+		for _, item := range dataList {
+			itemDate, tmpErr := time.ParseInLocation(utils.FormatDate, item.DataTime, time.Local)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			year := itemDate.Year()
+			var tmpK string
+			if itemDate.Month() <= 6 {
+				tmpK = fmt.Sprint(year, "06")
+			} else {
+				tmpK = fmt.Sprint(year, "12")
+			}
+
+			yearVal, ok := yearMonthMap[tmpK]
+			if ok {
+				yearMonthMap[tmpK] = item.Value + yearVal
+			} else {
+				yearMonthList = append(yearMonthList, tmpK)
+				yearMonthMap[tmpK] = item.Value
+			}
+		}
+		for _, v := range yearMonthList {
+			currTime, tmpErr := time.ParseInLocation(utils.FormatYearMonthUnSpace, v, time.Local)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			currTime = currTime.AddDate(0, 1, -1)
+			dateList = append(dateList, currTime)
+			valueMap[currTime] = yearMonthMap[v]
+		}
+	case "季度":
+		yearMonthMap := make(map[string]float64)
+		yearMonthList := make([]string, 0)
+		for _, item := range dataList {
+			itemDate, tmpErr := time.ParseInLocation(utils.FormatDate, item.DataTime, time.Local)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			year := itemDate.Year()
+			var tmpK string
+			if itemDate.Month() <= 3 {
+				tmpK = fmt.Sprint(year, "03")
+			} else if itemDate.Month() <= 6 {
+				tmpK = fmt.Sprint(year, "06")
+			} else if itemDate.Month() <= 9 {
+				tmpK = fmt.Sprint(year, "09")
+			} else {
+				tmpK = fmt.Sprint(year, "12")
+			}
+
+			yearVal, ok := yearMonthMap[tmpK]
+			if ok {
+				yearMonthMap[tmpK] = item.Value + yearVal
+			} else {
+				yearMonthList = append(yearMonthList, tmpK)
+				yearMonthMap[tmpK] = item.Value
+			}
+		}
+		for _, v := range yearMonthList {
+			currTime, tmpErr := time.ParseInLocation(utils.FormatYearMonthUnSpace, v, time.Local)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			currTime = currTime.AddDate(0, 1, -1)
+			dateList = append(dateList, currTime)
+			valueMap[currTime] = yearMonthMap[v]
+		}
+	case "月度":
+		yearMonthMap := make(map[string]float64)
+		yearMonthList := make([]string, 0)
+		for _, item := range dataList {
+			itemDate, tmpErr := time.ParseInLocation(utils.FormatDate, item.DataTime, time.Local)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			year := itemDate.Year()
+			var tmpK string
+			tmpK = fmt.Sprint(year*100 + int(itemDate.Month()))
+
+			yearVal, ok := yearMonthMap[tmpK]
+			if ok {
+				yearMonthMap[tmpK] = item.Value + yearVal
+			} else {
+				yearMonthList = append(yearMonthList, tmpK)
+				yearMonthMap[tmpK] = item.Value
+			}
+		}
+		for _, v := range yearMonthList {
+			currTime, tmpErr := time.ParseInLocation(utils.FormatYearMonthUnSpace, v, time.Local)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			currTime = currTime.AddDate(0, 1, -1)
+			dateList = append(dateList, currTime)
+			valueMap[currTime] = yearMonthMap[v]
+		}
+	case "旬度":
+		tmpDateDataMap := make(map[time.Time]float64)
+		tmpDateList := make([]time.Time, 0)
+		for _, item := range dataList {
+			itemDate, tmpErr := time.ParseInLocation(utils.FormatDate, item.DataTime, time.Local)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			dayInt := itemDate.Year()*100 + int(itemDate.Month())
+			var currTime time.Time
+			if itemDate.Month() <= 10 {
+				tmpK := fmt.Sprint(dayInt*100, "10")
+				currTime, err = time.ParseInLocation(utils.FormatDateUnSpace, tmpK, time.Local)
+				if err != nil {
+					return
+				}
+
+			} else if itemDate.Month() <= 20 {
+				tmpK := fmt.Sprint(dayInt*100, "20")
+				currTime, err = time.ParseInLocation(utils.FormatDateUnSpace, tmpK, time.Local)
+				if err != nil {
+					return
+				}
+			} else {
+				currTime, err = time.ParseInLocation(utils.FormatYearMonthUnSpace, fmt.Sprint(dayInt), time.Local)
+				if err != nil {
+					return
+				}
+				currTime = currTime.AddDate(0, 1, -1)
+			}
+
+			yearVal, ok := tmpDateDataMap[currTime]
+			if ok {
+				tmpDateDataMap[currTime] = item.Value + yearVal
+			} else {
+				tmpDateList = append(tmpDateList, currTime)
+				tmpDateDataMap[currTime] = item.Value
+			}
+		}
+		for _, currTime := range tmpDateList {
+			dateList = append(dateList, currTime)
+			valueMap[currTime] = tmpDateDataMap[currTime]
+		}
+	case "周度":
+		tmpDateDataMap := make(map[time.Time]float64)
+		tmpDateList := make([]time.Time, 0)
+		for _, item := range dataList {
+			itemDate, tmpErr := time.ParseInLocation(utils.FormatDate, item.DataTime, time.Local)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			var currTime time.Time
+			// 周六周日，这是下一个周五的数据
+			if itemDate.Weekday() == 0 {
+				currTime = itemDate.AddDate(0, 0, 5)
+			} else if itemDate.Weekday() == 6 {
+				currTime = itemDate.AddDate(0, 0, 6)
+			} else {
+				currTime = itemDate.AddDate(0, 0, 5-int(itemDate.Weekday()))
+			}
+
+			yearVal, ok := tmpDateDataMap[currTime]
+			if ok {
+				tmpDateDataMap[currTime] = item.Value + yearVal
+			} else {
+				tmpDateList = append(tmpDateList, currTime)
+				tmpDateDataMap[currTime] = item.Value
+			}
+		}
+		for _, currTime := range tmpDateList {
+			dateList = append(dateList, currTime)
+			valueMap[currTime] = tmpDateDataMap[currTime]
+		}
+
+	}
+
+	//获取指标所有数据
+	existDataList := make([]*EdbData, 0)
+	sql := `SELECT * FROM %s WHERE edb_info_id=? `
+	sql = fmt.Sprintf(sql, dataTableName)
+	_, err = to.Raw(sql, edbInfoId).QueryRows(&existDataList)
+	if err != nil {
+		return
+	}
+	existDataMap := make(map[string]string)
+	removeDataTimeMap := make(map[string]int) //需要移除的日期数据
+	for _, v := range existDataList {
+		existDataMap[v.DataTime] = v.Value
+		removeDataTimeMap[v.DataTime] = 1
+	}
+	needAddDateMap := make(map[time.Time]int)
+
+	addSql := ` INSERT INTO ` + dataTableName + `(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	var isAdd bool
+	for _, currTime := range dateList {
+		currDateStr := currTime.Format(utils.FormatDate)
+		existVal, ok := existDataMap[currDateStr]
+
+		tmpVal, ok2 := valueMap[currTime]
+		if !ok2 {
+			err = errors.New("数据异常,date:" + currDateStr)
+			return
+		}
+		var saveValue string
+		if isWeekData { //周度指标转的话，最后结果要除以7
+			saveValue = decimal.NewFromFloat(tmpVal).Div(decimal.NewFromInt(7)).Round(4).String()
+		} else {
+			saveValue = decimal.NewFromFloat(tmpVal).Round(4).String()
+		}
+
+		// 如果库中已经存在该数据的话，那么就进行值的变更操作
+		if ok {
+			//校验待删除日期数据里面是否存在该元素，如果存在的话，那么移除该日期
+			delete(removeDataTimeMap, currDateStr)
+
+			if existVal != saveValue {
+				sql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
+				sql = fmt.Sprintf(sql, dataTableName)
+				_, err = to.Raw(sql, saveValue, edbInfoId, currDateStr).Exec()
+				if err != nil {
+					return
+				}
+			}
+
+			continue
+		}
+
+		// 库中不存在该日期的数据
+		timestamp := currTime.UnixNano() / 1e6
+		timeStr := fmt.Sprintf("%d", timestamp)
+		if _, existOk := needAddDateMap[currTime]; !existOk {
+			addSql += GetAddSql(edbInfoIdStr, edbCode, currDateStr, timeStr, saveValue)
+			isAdd = true
+		}
+		needAddDateMap[currTime] = 1
+	}
+
+	//删除已经不存在的指标数据（由于该指标当日的数据删除了）
+	{
+		removeDateList := make([]string, 0)
+		for dateTime := range removeDataTimeMap {
+			removeDateList = append(removeDateList, dateTime)
+		}
+		removeNum := len(removeDateList)
+		if removeNum > 0 {
+			sql := fmt.Sprintf(` DELETE FROM %s WHERE edb_info_id = ? and data_time in (`+utils.GetOrmInReplace(removeNum)+`) `, dataTableName)
+			_, err = to.Raw(sql, edbInfo.EdbInfoId, removeDateList).Exec()
+			if err != nil {
+				fmt.Println(reflect.TypeOf(obj).Name(), " add data ;delete Err", err.Error())
+				err = fmt.Errorf("删除不存在的指标数据失败,Err:" + err.Error())
+				return
+			}
+		}
+	}
+
+	if isAdd {
+		addSql = strings.TrimRight(addSql, ",")
+		_, err = to.Raw(addSql).Exec()
+		if err != nil {
+			fmt.Println(reflect.TypeOf(obj).Name(), " add data Err", err.Error())
+			return
+		}
+	}
+	// 确定实际数据的最终值
+	{
+		var finalLast EdbInfoSearchData
+		sql = fmt.Sprintf(` SELECT data_time , value FROM %s WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `, dataTableName)
+		err = to.Raw(sql, edbInfoId, fromEdbInfo.LatestDate).QueryRow(&finalLast)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			return
+		} else {
+			latestDateStr = finalLast.DataTime
+			latestValue = finalLast.Value
+		}
+		if err != nil {
+			err = nil
+		} else {
+			latestDateStr = finalLast.DataTime
+			latestValue = finalLast.Value
+		}
+	}
+
+	return
+}

models/predict_edb_data_calculate_ljznczj.go

@@ -0,0 +1,475 @@
+package models
+
+import (
+	"errors"
+	"fmt"
+	"github.com/beego/beego/v2/client/orm"
+	"github.com/shopspring/decimal"
+	"hongze/hongze_edb_lib/utils"
+	"reflect"
+	"strconv"
+	"strings"
+	"time"
+)
+
+// PredictLjzNczj 预测累计值年初至今
+type PredictLjzNczj struct {
+}
+
+// Add 添加
+func (obj PredictLjzNczj) Add(params BatchSaveCalculateBatchParams) (edbInfo *EdbInfo, latestDateStr string, latestValue float64, err error, errMsg string) {
+	req := params.Req
+	fromEdbInfo := params.FromEdbInfo
+	edbCode := params.EdbCode
+	if fromEdbInfo.Frequency == `年度` {
+		errMsg = "年初至今累计值计算中，可选指标范围为非年度指标"
+		err = errors.New(errMsg)
+		return
+	}
+	if fromEdbInfo.Frequency != req.Frequency {
+		errMsg = "生成指标频度与原指标频度不同"
+		err = errors.New(errMsg)
+		return
+	}
+
+	o := orm.NewOrm()
+	to, err := o.Begin()
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err != nil {
+			_ = to.Rollback()
+			fmt.Println(reflect.TypeOf(obj).Name(), "；Add,Err:"+err.Error())
+		} else {
+			_ = to.Commit()
+		}
+	}()
+
+	edbInfo = &EdbInfo{
+		//EdbInfoId:        0,
+		SourceName:       obj.GetSourceName(),
+		Source:           obj.GetSource(),
+		EdbCode:          edbCode,
+		EdbName:          req.EdbName,
+		EdbNameSource:    req.EdbName,
+		Frequency:        req.Frequency,
+		Unit:             req.Unit,
+		StartDate:        "",
+		EndDate:          "",
+		ClassifyId:       req.ClassifyId,
+		SysUserId:        params.SysUserId,
+		SysUserRealName:  params.SysUserRealName,
+		UniqueCode:       params.UniqueCode,
+		CreateTime:       time.Now(),
+		ModifyTime:       time.Now(),
+		MinValue:         0,
+		MaxValue:         0,
+		CalculateFormula: req.Formula,
+		EdbType:          2,
+		Sort:             0,
+		MoveType:         0,
+		MoveFrequency:    "",
+		NoUpdate:         0,
+		ServerUrl:        "",
+		EdbInfoType:      1,
+		EdbNameEn:        "",
+		UnitEn:           "",
+		LatestDate:       "",
+		LatestValue:      0,
+		ChartImage:       "",
+		Calendar:         "",
+	}
+
+	newEdbInfoId, tmpErr := to.Insert(edbInfo)
+	if tmpErr != nil {
+		err = tmpErr
+		return
+	}
+	edbInfo.EdbInfoId = int(newEdbInfoId)
+
+	//关联关系
+	{
+		calculateMappingItem := new(EdbInfoCalculateMapping)
+		calculateMappingItem.CreateTime = time.Now()
+		calculateMappingItem.ModifyTime = time.Now()
+		calculateMappingItem.Sort = 1
+		calculateMappingItem.EdbCode = edbCode
+		calculateMappingItem.EdbInfoId = edbInfo.EdbInfoId
+		calculateMappingItem.FromEdbInfoId = fromEdbInfo.EdbInfoId
+		calculateMappingItem.FromEdbCode = fromEdbInfo.EdbCode
+		calculateMappingItem.FromEdbName = fromEdbInfo.EdbName
+		calculateMappingItem.FromSource = fromEdbInfo.Source
+		calculateMappingItem.FromSourceName = fromEdbInfo.SourceName
+		calculateMappingItem.FromTag = ""
+		calculateMappingItem.Source = edbInfo.Source
+		calculateMappingItem.SourceName = edbInfo.SourceName
+		_, err = to.Insert(calculateMappingItem)
+		if err != nil {
+			return
+		}
+	}
+
+	//计算数据
+	latestDateStr, latestValue, err = obj.refresh(to, edbInfo.EdbInfoId, edbInfo.Source, edbInfo, fromEdbInfo, edbInfo.EdbCode, "")
+
+	return
+}
+
+// Edit 编辑
+func (obj PredictLjzNczj) Edit(params BatchSaveCalculateBatchParams) (latestDateStr string, latestValue float64, err error, errMsg string) {
+	req := params.Req
+	edbInfo := params.EdbInfo
+	fromEdbInfo := params.FromEdbInfo
+
+	if fromEdbInfo.Frequency == `年度` {
+		errMsg = "年初至今累计值计算中，可选指标范围为非年度指标"
+		err = errors.New(errMsg)
+		return
+	}
+
+	if fromEdbInfo.Frequency != req.Frequency {
+		errMsg = "生成指标频度与原指标频度不同"
+		err = errors.New(errMsg)
+		return
+	}
+
+	latestDateStr = edbInfo.LatestDate
+	latestValue = edbInfo.LatestValue
+
+	o := orm.NewOrm()
+	to, err := o.Begin()
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err != nil {
+			_ = to.Rollback()
+			fmt.Println(reflect.TypeOf(obj).Name(), "；Edit,Err:"+err.Error())
+		} else {
+			_ = to.Commit()
+		}
+	}()
+	tableName := GetEdbDataTableName(edbInfo.Source)
+
+	var isRecalculate bool
+	if edbInfo.Frequency != req.Frequency {
+		isRecalculate = true
+	}
+	//修改指标信息
+	edbInfo.EdbName = req.EdbName
+	edbInfo.EdbNameSource = req.EdbName
+	edbInfo.Frequency = req.Frequency
+	edbInfo.Unit = req.Unit
+	edbInfo.ClassifyId = req.ClassifyId
+	edbInfo.ModifyTime = time.Now()
+	_, err = to.Update(edbInfo, "EdbName", "EdbNameSource", "Frequency", "Unit", "ClassifyId", "ModifyTime")
+	if err != nil {
+		return
+	}
+
+	var existCondition string
+	var existPars []interface{}
+	existCondition += " AND edb_info_id=? AND from_edb_info_id=? "
+	existPars = append(existPars, edbInfo.EdbInfoId, req.FromEdbInfoId)
+
+	//判断计算指标是否被更换
+	count, err := GetEdbInfoCalculateCountByCondition(existCondition, existPars)
+	if err != nil {
+		err = errors.New("判断指标是否改变失败,Err:" + err.Error())
+		return
+	}
+	if count > 0 { // 指标未被替换，无需删除关联数据
+
+		// 频度被换了，需要重新计算
+		if isRecalculate {
+			latestDateStr, latestValue, err = obj.refresh(to, edbInfo.EdbInfoId, edbInfo.Source, edbInfo, fromEdbInfo, edbInfo.EdbCode, "")
+		}
+
+		return
+	}
+
+	//删除，计算指标关联的，基础指标的关联关系
+	sql := ` DELETE FROM edb_info_calculate_mapping WHERE edb_info_id = ? `
+	_, err = to.Raw(sql, edbInfo.EdbInfoId).Exec()
+	if err != nil {
+		return
+	}
+
+	//清空原有数据
+	sql = ` DELETE FROM ` + tableName + ` WHERE edb_info_id = ? `
+	_, err = to.Raw(sql, edbInfo.EdbInfoId).Exec()
+	if err != nil {
+		return
+	}
+
+	//关联关系
+	{
+		calculateMappingItem := &EdbInfoCalculateMapping{
+			EdbInfoCalculateMappingId: 0,
+			EdbInfoId:                 edbInfo.EdbInfoId,
+			Source:                    obj.GetSource(),
+			SourceName:                obj.GetSourceName(),
+			EdbCode:                   edbInfo.EdbCode,
+			FromEdbInfoId:             fromEdbInfo.EdbInfoId,
+			FromEdbCode:               fromEdbInfo.EdbCode,
+			FromEdbName:               fromEdbInfo.EdbName,
+			FromSource:                fromEdbInfo.Source,
+			FromSourceName:            fromEdbInfo.SourceName,
+			FromTag:                   "",
+			Sort:                      1,
+			CreateTime:                time.Now(),
+			ModifyTime:                time.Now(),
+		}
+		_, err = to.Insert(calculateMappingItem)
+		if err != nil {
+			return
+		}
+	}
+
+	//计算数据
+	latestDateStr, latestValue, err = obj.refresh(to, edbInfo.EdbInfoId, edbInfo.Source, edbInfo, fromEdbInfo, edbInfo.EdbCode, "")
+
+	return
+}
+
+// Refresh 刷新
+func (obj PredictLjzNczj) Refresh(params RefreshParams) (latestDateStr string, latestValue float64, err error, errMsg string) {
+	calculateMapping, err := GetEdbInfoCalculateMappingDetail(params.EdbInfo.EdbInfoId)
+	if err != nil {
+		errMsg = "GetEdbInfoCalculatePredictLjzNczjzyDetail Err:" + err.Error()
+		return
+	}
+	fromEdbInfo, err := GetEdbInfoById(calculateMapping.FromEdbInfoId)
+	if err != nil {
+		errMsg = "GetEdbInfoById Err:" + err.Error()
+		return
+	}
+
+	o := orm.NewOrm()
+	to, err := o.Begin()
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err != nil {
+			_ = to.Rollback()
+			fmt.Println(reflect.TypeOf(obj).Name(), "；Refresh,Err:"+err.Error())
+		} else {
+			_ = to.Commit()
+		}
+	}()
+
+	// 计算数据
+	latestDateStr, latestValue, err = obj.refresh(to, params.EdbInfo.EdbInfoId, params.EdbInfo.Source, params.EdbInfo, fromEdbInfo, params.EdbInfo.EdbCode, params.StartDate)
+
+	return
+}
+
+// GetSource 获取来源编码id
+func (obj PredictLjzNczj) GetSource() int {
+	return utils.DATA_SOURCE_PREDICT_CALCULATE_LJZNCZJ
+}
+
+// GetSourceName 获取来源名称
+func (obj PredictLjzNczj) GetSourceName() string {
+	return utils.DATA_SOURCE_NAME_PREDICT_CALCULATE_LJZNCZJ
+}
+
+func (obj PredictLjzNczj) refresh(to orm.TxOrmer, edbInfoId, source int, edbInfo, fromEdbInfo *EdbInfo, edbCode, startDate string) (latestDateStr string, latestValue float64, err error) {
+	dataTableName := GetEdbDataTableName(source)
+	edbInfoIdStr := strconv.Itoa(edbInfoId)
+
+	var isWeekData bool // 是否周度数据，如果是周度数据的话，是需要变频的，最后结果还需要除以7
+	// 周度数据需要先变成日度的
+	if fromEdbInfo.Frequency == `周度` {
+		isWeekData = true
+	}
+
+	dataList, err := GetPredictEdbDataListAll(fromEdbInfo, 1)
+	if err != nil {
+		return
+	}
+
+	fromEdbDataMap := make(map[string]float64)
+	if isWeekData {
+		dataList, err = HandleDataByLinearRegression(dataList, fromEdbDataMap)
+		if err != nil {
+			return
+		}
+	}
+
+	//日度数据年初至今:日期同原日度数据。将每年1月1日(含)到日度数据所在日期含间的日度值，进行加总。
+	//周度数据年初至今:日期同原周度数据。将周度值转成日度频率，空值用插值法插值，然后算法同日度年度至今，再除以7
+	//月度/季度数据年初至今:日期同原月度/季度数据，将每年1月1日(含)到月度数据所在日期(含)之间的月度/季度值，进行加总
+	//以此类推
+
+	dateList := make([]time.Time, 0)
+	valueMap := make(map[time.Time]float64)
+	yearMap := make(map[int]float64)
+	switch edbInfo.Frequency {
+	case "周度":
+		tmpDateDataMap := make(map[time.Time]float64)
+		tmpDateList := make([]time.Time, 0)
+		for _, item := range dataList {
+			itemDate, tmpErr := time.ParseInLocation(utils.FormatDate, item.DataTime, time.Local)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			var currTime time.Time
+			// 周六周日，这是下一个周五的数据
+			if itemDate.Weekday() == 0 {
+				currTime = itemDate.AddDate(0, 0, 5)
+			} else if itemDate.Weekday() == 6 {
+				currTime = itemDate.AddDate(0, 0, 6)
+			} else {
+				currTime = itemDate.AddDate(0, 0, 5-int(itemDate.Weekday()))
+			}
+
+			year := itemDate.Year()
+			yearVal, ok := yearMap[year]
+			if ok {
+				yearMap[year] = item.Value + yearVal
+			} else {
+				yearMap[year] = item.Value
+			}
+
+			if itemDate.Equal(currTime) {
+				tmpDateDataMap[itemDate] = yearMap[year]
+				tmpDateList = append(tmpDateList, itemDate)
+			}
+		}
+		for _, currTime := range tmpDateList {
+			dateList = append(dateList, currTime)
+			valueMap[currTime] = tmpDateDataMap[currTime]
+		}
+	default:
+		for _, item := range dataList {
+			itemDate, tmpErr := time.ParseInLocation(utils.FormatDate, item.DataTime, time.Local)
+			if tmpErr != nil {
+				err = tmpErr
+				return
+			}
+			year := itemDate.Year()
+			yearVal, ok := yearMap[year]
+			if ok {
+				yearMap[year] = item.Value + yearVal
+			} else {
+				yearMap[year] = item.Value
+			}
+			valueMap[itemDate] = yearMap[year]
+			dateList = append(dateList, itemDate)
+		}
+
+	}
+
+	//获取指标所有数据
+	existDataList := make([]*EdbData, 0)
+	sql := `SELECT * FROM %s WHERE edb_info_id=? `
+	sql = fmt.Sprintf(sql, dataTableName)
+	_, err = to.Raw(sql, edbInfoId).QueryRows(&existDataList)
+	if err != nil {
+		return
+	}
+	existDataMap := make(map[string]string)
+	removeDataTimeMap := make(map[string]int) //需要移除的日期数据
+	for _, v := range existDataList {
+		existDataMap[v.DataTime] = v.Value
+		removeDataTimeMap[v.DataTime] = 1
+	}
+	needAddDateMap := make(map[time.Time]int)
+
+	addSql := ` INSERT INTO ` + dataTableName + `(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	var isAdd bool
+	for _, currTime := range dateList {
+		currDateStr := currTime.Format(utils.FormatDate)
+		existVal, ok := existDataMap[currDateStr]
+
+		tmpVal, ok2 := valueMap[currTime]
+		if !ok2 {
+			err = errors.New("数据异常,date:" + currDateStr)
+			return
+		}
+		var saveValue string
+		if isWeekData { //周度指标转的话，最后结果要除以7
+			saveValue = decimal.NewFromFloat(tmpVal).Div(decimal.NewFromInt(7)).Round(4).String()
+		} else {
+			saveValue = decimal.NewFromFloat(tmpVal).Round(4).String()
+		}
+
+		// 如果库中已经存在该数据的话，那么就进行值的变更操作
+		if ok {
+			//校验待删除日期数据里面是否存在该元素，如果存在的话，那么移除该日期
+			delete(removeDataTimeMap, currDateStr)
+
+			if existVal != saveValue {
+				sql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
+				sql = fmt.Sprintf(sql, dataTableName)
+				_, err = to.Raw(sql, saveValue, edbInfoId, currDateStr).Exec()
+				if err != nil {
+					return
+				}
+			}
+
+			continue
+		}
+
+		// 库中不存在该日期的数据
+		timestamp := currTime.UnixNano() / 1e6
+		timeStr := fmt.Sprintf("%d", timestamp)
+		if _, existOk := needAddDateMap[currTime]; !existOk {
+			addSql += GetAddSql(edbInfoIdStr, edbCode, currDateStr, timeStr, saveValue)
+			isAdd = true
+		}
+		needAddDateMap[currTime] = 1
+	}
+
+	//删除已经不存在的指标数据（由于该指标当日的数据删除了）
+	{
+		removeDateList := make([]string, 0)
+		for dateTime := range removeDataTimeMap {
+			removeDateList = append(removeDateList, dateTime)
+		}
+		removeNum := len(removeDateList)
+		if removeNum > 0 {
+			sql := fmt.Sprintf(` DELETE FROM %s WHERE edb_info_id = ? and data_time in (`+utils.GetOrmInReplace(removeNum)+`) `, dataTableName)
+			_, err = to.Raw(sql, edbInfo.EdbInfoId, removeDateList).Exec()
+			if err != nil {
+				fmt.Println(reflect.TypeOf(obj).Name(), " add data ;delete Err", err.Error())
+				err = fmt.Errorf("删除不存在的指标数据失败,Err:" + err.Error())
+				return
+			}
+		}
+	}
+
+	if isAdd {
+		addSql = strings.TrimRight(addSql, ",")
+		_, err = to.Raw(addSql).Exec()
+		if err != nil {
+			fmt.Println(reflect.TypeOf(obj).Name(), " add data Err", err.Error())
+			return
+		}
+	}
+
+	//确定实际数据的最终值
+	{
+		var finalLast EdbInfoSearchData
+		sql = fmt.Sprintf(` SELECT data_time , value FROM %s WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `, dataTableName)
+		err = to.Raw(sql, edbInfoId, fromEdbInfo.LatestDate).QueryRow(&finalLast)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			return
+		} else {
+			latestDateStr = finalLast.DataTime
+			latestValue = finalLast.Value
+		}
+		if err != nil {
+			err = nil
+		} else {
+			latestDateStr = finalLast.DataTime
+			latestValue = finalLast.Value
+		}
+	}
+
+	return
+}

models/predict_edb_data_calculate_ljzzj.go

@@ -0,0 +1,420 @@
+package models
+
+import (
+	"errors"
+	"fmt"
+	"github.com/beego/beego/v2/client/orm"
+	"github.com/shopspring/decimal"
+	"hongze/hongze_edb_lib/utils"
+	"reflect"
+	"strconv"
+	"strings"
+	"time"
+)
+
+// PredictLjzzj 预测累计值转季度
+type PredictLjzzj struct {
+}
+
+// Add 添加
+func (obj PredictLjzzj) Add(params BatchSaveCalculateBatchParams) (edbInfo *EdbInfo, latestDateStr string, latestValue float64, err error, errMsg string) {
+	req := params.Req
+	fromEdbInfo := params.FromEdbInfo
+	edbCode := params.EdbCode
+	if fromEdbInfo.Frequency != "季度" {
+		errMsg = "请选择季度指标"
+		err = errors.New(errMsg)
+		return
+	}
+	o := orm.NewOrm()
+	to, err := o.Begin()
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err != nil {
+			_ = to.Rollback()
+			fmt.Println(reflect.TypeOf(obj).Name(), "；Add,Err:"+err.Error())
+		} else {
+			_ = to.Commit()
+		}
+	}()
+
+	edbInfo = new(EdbInfo)
+	edbInfo.Source = obj.GetSource()
+	edbInfo.SourceName = obj.GetSourceName()
+	edbInfo.EdbCode = edbCode
+	edbInfo.EdbInfoType = 1
+	edbInfo.EdbName = req.EdbName
+	edbInfo.EdbNameSource = req.EdbName
+	edbInfo.Frequency = req.Frequency
+	edbInfo.Unit = req.Unit
+	edbInfo.ClassifyId = req.ClassifyId
+	edbInfo.SysUserId = params.SysUserId
+	edbInfo.SysUserRealName = params.SysUserRealName
+	edbInfo.CreateTime = time.Now()
+	edbInfo.ModifyTime = time.Now()
+	edbInfo.UniqueCode = params.UniqueCode
+	edbInfo.CalculateFormula = req.Formula
+	edbInfo.EdbType = 2
+	newEdbInfoId, tmpErr := to.Insert(edbInfo)
+	if tmpErr != nil {
+		err = tmpErr
+		return
+	}
+	edbInfo.EdbInfoId = int(newEdbInfoId)
+
+	//关联关系
+	{
+		calculateMappingItem := new(EdbInfoCalculateMapping)
+		calculateMappingItem.CreateTime = time.Now()
+		calculateMappingItem.ModifyTime = time.Now()
+		calculateMappingItem.Sort = 1
+		calculateMappingItem.EdbCode = edbCode
+		calculateMappingItem.EdbInfoId = edbInfo.EdbInfoId
+		calculateMappingItem.FromEdbInfoId = fromEdbInfo.EdbInfoId
+		calculateMappingItem.FromEdbCode = fromEdbInfo.EdbCode
+		calculateMappingItem.FromEdbName = fromEdbInfo.EdbName
+		calculateMappingItem.FromSource = fromEdbInfo.Source
+		calculateMappingItem.FromSourceName = fromEdbInfo.SourceName
+		calculateMappingItem.FromTag = ""
+		calculateMappingItem.Source = edbInfo.Source
+		calculateMappingItem.SourceName = edbInfo.SourceName
+		_, err = to.Insert(calculateMappingItem)
+		if err != nil {
+			return
+		}
+	}
+
+	//计算数据
+	latestDateStr, latestValue, err = obj.refresh(to, edbInfo.EdbInfoId, edbInfo.Source, fromEdbInfo, edbInfo.EdbCode)
+
+	return
+}
+
+// Edit 编辑
+func (obj PredictLjzzj) Edit(params BatchSaveCalculateBatchParams) (latestDateStr string, latestValue float64, err error, errMsg string) {
+	req := params.Req
+	edbInfo := params.EdbInfo
+	fromEdbInfo := params.FromEdbInfo
+	if fromEdbInfo.Frequency != "季度" {
+		errMsg = "请选择季度指标"
+		err = errors.New(errMsg)
+		return
+	}
+
+	latestDateStr = edbInfo.LatestDate
+	latestValue = edbInfo.LatestValue
+
+	o := orm.NewOrm()
+	to, err := o.Begin()
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err != nil {
+			_ = to.Rollback()
+			fmt.Println(reflect.TypeOf(obj).Name(), "；Edit,Err:"+err.Error())
+		} else {
+			_ = to.Commit()
+		}
+	}()
+	tableName := GetEdbDataTableName(edbInfo.Source)
+
+	//修改指标信息
+	edbInfo.EdbName = req.EdbName
+	edbInfo.EdbNameSource = req.EdbName
+	edbInfo.Frequency = req.Frequency
+	edbInfo.Unit = req.Unit
+	edbInfo.ClassifyId = req.ClassifyId
+	edbInfo.ModifyTime = time.Now()
+	_, err = to.Update(edbInfo, "EdbName", "EdbNameSource", "Frequency", "Unit", "ClassifyId", "ModifyTime")
+	if err != nil {
+		return
+	}
+
+	var existCondition string
+	var existPars []interface{}
+	existCondition += " AND edb_info_id=? AND from_edb_info_id=? "
+	existPars = append(existPars, edbInfo.EdbInfoId, req.FromEdbInfoId)
+
+	//判断计算指标是否被更换
+	count, err := GetEdbInfoCalculateCountByCondition(existCondition, existPars)
+	if err != nil {
+		err = errors.New("判断指标是否改变失败,Err:" + err.Error())
+		return
+	}
+	if count > 0 { // 指标未被替换，无需重新计算
+		return
+	}
+
+	//删除，计算指标关联的，基础指标的关联关系
+	sql := ` DELETE FROM edb_info_calculate_mapping WHERE edb_info_id = ? `
+	_, err = to.Raw(sql, edbInfo.EdbInfoId).Exec()
+	if err != nil {
+		return
+	}
+
+	//清空原有数据
+	sql = ` DELETE FROM ` + tableName + ` WHERE edb_info_id = ? `
+	_, err = to.Raw(sql, edbInfo.EdbInfoId).Exec()
+	if err != nil {
+		return
+	}
+
+	//关联关系
+	{
+		calculateMappingItem := &EdbInfoCalculateMapping{
+			EdbInfoCalculateMappingId: 0,
+			EdbInfoId:                 edbInfo.EdbInfoId,
+			Source:                    obj.GetSource(),
+			SourceName:                obj.GetSourceName(),
+			EdbCode:                   edbInfo.EdbCode,
+			FromEdbInfoId:             fromEdbInfo.EdbInfoId,
+			FromEdbCode:               fromEdbInfo.EdbCode,
+			FromEdbName:               fromEdbInfo.EdbName,
+			FromSource:                fromEdbInfo.Source,
+			FromSourceName:            fromEdbInfo.SourceName,
+			FromTag:                   "",
+			Sort:                      1,
+			CreateTime:                time.Now(),
+			ModifyTime:                time.Now(),
+		}
+		_, err = to.Insert(calculateMappingItem)
+		if err != nil {
+			return
+		}
+	}
+
+	//计算数据
+	latestDateStr, latestValue, err = obj.refresh(to, edbInfo.EdbInfoId, edbInfo.Source, fromEdbInfo, edbInfo.EdbCode)
+
+	return
+}
+
+// Refresh 刷新
+func (obj PredictLjzzj) Refresh(params RefreshParams) (latestDateStr string, latestValue float64, err error, errMsg string) {
+	calculateMapping, err := GetEdbInfoCalculateMappingDetail(params.EdbInfo.EdbInfoId)
+	if err != nil {
+		errMsg = "GetEdbInfoCalculateLjzzyDetail Err:" + err.Error()
+		return
+	}
+	fromEdbInfo, err := GetEdbInfoById(calculateMapping.FromEdbInfoId)
+	if err != nil {
+		errMsg = "GetEdbInfoById Err:" + err.Error()
+		return
+	}
+
+	o := orm.NewOrm()
+	to, err := o.Begin()
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err != nil {
+			_ = to.Rollback()
+			fmt.Println(reflect.TypeOf(obj).Name(), "；Refresh,Err:"+err.Error())
+		} else {
+			_ = to.Commit()
+		}
+	}()
+
+	// 计算数据
+	latestDateStr, latestValue, err = obj.refresh(to, params.EdbInfo.EdbInfoId, params.EdbInfo.Source, fromEdbInfo, params.EdbInfo.EdbCode)
+
+	return
+}
+
+// GetSource 获取来源编码id
+func (obj PredictLjzzj) GetSource() int {
+	return utils.DATA_SOURCE_PREDICT_CALCULATE_LJZZJ
+}
+
+// GetSourceName 获取来源名称
+func (obj PredictLjzzj) GetSourceName() string {
+	return utils.DATA_SOURCE_NAME_PREDICT_CALCULATE_LJZZJ
+}
+
+func (obj PredictLjzzj) refresh(to orm.TxOrmer, edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode string) (latestDateStr string, latestValue float64, err error) {
+	dataTableName := GetEdbDataTableName(source)
+	edbInfoIdStr := strconv.Itoa(edbInfoId)
+
+	// 获取来源指标的数据
+	dataList, err := GetPredictEdbDataListAll(fromEdbInfo, 1)
+	if err != nil {
+		return
+	}
+
+	yearMap := make(map[int]map[int]*EdbInfoSearchData)
+	dataLen := len(dataList)
+	for i := 0; i < dataLen; i++ {
+		item := dataList[i]
+		//日其中获取年
+		itemDate, tmpErr := time.ParseInLocation(utils.FormatDate, item.DataTime, time.Local)
+		if tmpErr != nil {
+			err = tmpErr
+			return
+		}
+		year := itemDate.Year()
+		quarter := utils.MonthQuarterMap[int(itemDate.Month())]
+		if quarterMap, yok := yearMap[year]; yok {
+			quarterMap[quarter] = item
+			yearMap[year] = quarterMap
+		} else {
+			quarterMap = make(map[int]*EdbInfoSearchData)
+			quarterMap[quarter] = item
+			yearMap[year] = quarterMap
+		}
+	}
+
+	addSql := ` INSERT INTO ` + dataTableName + `(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	var isAdd bool
+	//获取指标所有数据
+	existDataList := make([]*EdbData, 0)
+	sql := `SELECT * FROM %s WHERE edb_info_id=? `
+	sql = fmt.Sprintf(sql, dataTableName)
+	_, err = to.Raw(sql, edbInfoId).QueryRows(&existDataList)
+	if err != nil {
+		return
+	}
+	dataMap := make(map[string]string)
+	for _, v := range existDataList {
+		dataMap[v.DataTime] = v.Value
+	}
+	existDataMap := make(map[string]string)
+	for yk, yv := range yearMap {
+		_, oneQuarterOk := yv[1]
+		_, twoQuarterOk := yv[2]
+		if !oneQuarterOk && !twoQuarterOk {
+			continue
+		}
+		for i := 1; i <= 4; i++ {
+			fmt.Println(yk, i, yv[i])
+			dataCurrentItem := yv[i]
+			var date string
+			var val float64
+			if dataCurrentItem != nil {
+				if i == 1 || i == 2 {
+					if _, mok := yv[1]; mok { //第1个季度有值
+						if i == 1 {
+							date = dataCurrentItem.DataTime
+							val, _ = decimal.NewFromFloat(dataCurrentItem.Value).Float64() //a.Div(b).Float64()
+						}
+						if i == 2 {
+							dataOneItem := yv[1]
+							date = dataCurrentItem.DataTime
+							twoQuarter := decimal.NewFromFloat(dataCurrentItem.Value)
+							oneQuarter := decimal.NewFromFloat(dataOneItem.Value)
+							val, _ = twoQuarter.Sub(oneQuarter).Float64()
+						}
+					} else { //第1个季度无值
+						dataTwoItem := yv[2]
+						if i == 1 {
+							date = strconv.Itoa(yk) + "-03-31"
+							a := decimal.NewFromFloat(dataTwoItem.Value)
+							b := decimal.NewFromFloat(2.0)
+							val, _ = a.Div(b).Float64()
+						}
+						if i == 2 {
+							//第1个季度无值：第1个季度=第2个季度/2
+							{
+								date = strconv.Itoa(yk) + "-03-31"
+								a := decimal.NewFromFloat(dataTwoItem.Value)
+								b := decimal.NewFromFloat(2.0)
+								val, _ = a.Div(b).Float64()
+
+								tmpSql, newAdd, tmpErr := obj.calculate(edbInfoId, date, edbInfoIdStr, edbCode, dataTableName, addSql, val, dataMap, existDataMap, to)
+								if !isAdd {
+									isAdd = newAdd
+								}
+								addSql = tmpSql
+								if tmpErr != nil {
+									err = tmpErr
+									return
+								}
+							}
+							//end 第1个季度无值
+
+							date = dataCurrentItem.DataTime
+							a := decimal.NewFromFloat(dataTwoItem.Value)
+							b := decimal.NewFromFloat(2.0)
+							val, _ = a.Div(b).Float64()
+						}
+					}
+				} else {
+					dataPreItem := yv[i-1]
+					if dataCurrentItem != nil && dataPreItem != nil {
+						date = dataCurrentItem.DataTime
+						//val =  dataCurrentItem.Value - dataPreItem.Value
+						a := decimal.NewFromFloat(dataCurrentItem.Value)
+						b := decimal.NewFromFloat(dataPreItem.Value)
+						val, _ = a.Sub(b).Float64()
+					}
+				}
+			}
+			if date != "" {
+				tmpSql, newAdd, tmpErr := obj.calculate(edbInfoId, date, edbInfoIdStr, edbCode, dataTableName, addSql, val, dataMap, existDataMap, to)
+				if !isAdd {
+					isAdd = newAdd
+				}
+				addSql = tmpSql
+				if tmpErr != nil {
+					err = tmpErr
+					return
+				}
+			}
+		}
+	}
+	if isAdd {
+		addSql = strings.TrimRight(addSql, ",")
+		_, err = to.Raw(addSql).Exec()
+		if err != nil {
+			fmt.Println(reflect.TypeOf(obj).Name(), " add data Err", err.Error())
+			return
+		}
+	}
+
+	//确定实际数据的最终值
+	{
+		var finalLast EdbInfoSearchData
+		sql = fmt.Sprintf(` SELECT data_time , value FROM %s WHERE edb_info_id=? and data_time<=? ORDER BY data_time DESC `, dataTableName)
+		err = to.Raw(sql, edbInfoId, fromEdbInfo.LatestDate).QueryRow(&finalLast)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			return
+		} else {
+			latestDateStr = finalLast.DataTime
+			latestValue = finalLast.Value
+		}
+		if err != nil {
+			err = nil
+		} else {
+			latestDateStr = finalLast.DataTime
+			latestValue = finalLast.Value
+		}
+	}
+
+	return
+}
+
+func (obj PredictLjzzj) calculate(edbInfoId int, date, edbInfoIdStr, edbCode, dataTableName, addSql string, val float64, dataMap, existDataMap map[string]string, to orm.TxOrmer) (newSql string, isAdd bool, err error) {
+	newSql = addSql
+	saveValue := utils.SubFloatToString(val, 4)
+	//判断数据是否存在
+	if existVal, ok := dataMap[date]; !ok {
+		dataTime, _ := time.ParseInLocation(utils.FormatDate, date, time.Local)
+		timestamp := dataTime.UnixNano() / 1e6
+		timeStr := fmt.Sprintf("%d", timestamp)
+		if _, existOk := existDataMap[date]; !existOk {
+			newSql += GetAddSql(edbInfoIdStr, edbCode, date, timeStr, saveValue)
+			isAdd = true
+		}
+		existDataMap[date] = date
+	} else {
+		if existVal != saveValue {
+			sql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
+			sql = fmt.Sprintf(sql, dataTableName)
+			_, err = to.Raw(sql, saveValue, edbInfoId, date).Exec()
+		}
+	}
+	return
+}

models/predict_edb_data_calculate_nh.go

@@ -106,6 +106,21 @@ func SavePredictCalculateNh(reqEdbInfoId, classifyId int, edbName, frequency, un
 			return
 		}
 
+		latestDateStr = edbInfo.LatestDate
+		latestValue = edbInfo.LatestValue
+		//修改指标信息
+		edbInfo.EdbName = edbName
+		edbInfo.EdbNameSource = edbName
+		edbInfo.Frequency = frequency
+		edbInfo.Unit = unit
+		edbInfo.ClassifyId = classifyId
+		edbInfo.CalculateFormula = formula
+		edbInfo.ModifyTime = time.Now()
+		_, err = to.Update(edbInfo, "EdbName", "EdbNameSource", "Frequency", "Unit", "ClassifyId", "CalculateFormula", "ModifyTime")
+		if err != nil {
+			return
+		}
+
 		//判断计算指标是否被更换
 		var existCondition string
 		var existPars []interface{}

utils/common.go

@@ -1179,3 +1179,21 @@ func GetFrequencyEndDay(currDate time.Time, frequency string) (endDate time.Time
 
 	return
 }
+
+// CheckFrequency 获取两个频度之间是否相对低高频
+// 大于0，代表左侧是高频(例：左侧：日度，右侧：周度）
+// 等于0，代表同频
+// 小于0，代表右侧是高频(例：左侧：周度，右侧：日度）
+func CheckFrequency(leftFrequency, rightFrequency string) int {
+	frequencyMap := map[string]int{
+		"年度":  0,
+		"半年度": 1,
+		"季度":  2,
+		"月度":  3,
+		"旬度":  4,
+		"周度":  5,
+		"日度":  6,
+	}
+
+	return frequencyMap[leftFrequency] - frequencyMap[rightFrequency]
+}

utils/constants.go

@@ -15,6 +15,7 @@ const (
 	FormatDateTimeUnSpace      = "20060102150405"      //完整时间格式
 	FormatShortDateTimeUnSpace = "060102150405"        //省去开头两位年份的时间格式
 	FormatYearMonthDate        = "2006-01"             //日期格式
+	FormatYearMonthUnSpace     = "200601"              //年月的日期格式
 	PageSize15                 = 15                    //列表页每页数据量
 	PageSize5                  = 5
 	PageSize10                 = 10
@@ -90,6 +91,12 @@ const (
 	DATA_SOURCE_STOCK_PLANT                             //存量装置 ->58
 	DATA_SOURCE_CALCULATE_CORRELATION                   //相关性计算->59
 	DATA_SOURCE_NATIONAL_STATISTICS                     //国家统计局->60
+	DATA_SOURCE_CALCULATE_LJZZJ                         //累计值转季 -> 61
+	DATA_SOURCE_CALCULATE_LJZ                           //累计值 -> 62
+	DATA_SOURCE_CALCULATE_LJZNCZJ                       //累计值(年初至今） -> 63
+	DATA_SOURCE_PREDICT_CALCULATE_LJZZJ                 //预测指标 - 累计值转季->64
+	DATA_SOURCE_PREDICT_CALCULATE_LJZ                   //预测指标 - 累计值 -> 65
+	DATA_SOURCE_PREDICT_CALCULATE_LJZNCZJ               //预测指标 - 累计值(年初至今） -> 66
 )
 
 // 指标来源的中文展示
@@ -153,6 +160,13 @@ const (
 	DATA_SOURCE_NAME_BAIINFO                      = `百川盈孚`              //百川盈孚 ->57
 	DATA_SOURCE_NAME_STOCK_PLANT                  = `存量装置`              //存量装置 ->58
 	DATA_SOURCE_NAME_CALCULATE_CORRELATION        = `相关性计算`             //相关性计算->59
+	DATA_SOURCE_NAME_NATIONAL_STATISTICS          = `国家统计局`             //国家统计局->60
+	DATA_SOURCE_NAME_CALCULATE_LJZZJ              = `累计值转季值`            //累计值转季 -> 61
+	DATA_SOURCE_NAME_CALCULATE_LJZ                = `累计值`               //累计值 -> 62
+	DATA_SOURCE_NAME_CALCULATE_LJZNCZJ            = `年初至今累计值`           //累计值(年初至今） -> 63
+	DATA_SOURCE_NAME_PREDICT_CALCULATE_LJZZJ      = `预测累计值转季值`          //预测指标 - 累计值转季->64
+	DATA_SOURCE_NAME_PREDICT_CALCULATE_LJZ        = `预测累计值`             //预测指标 - 累计值 -> 65
+	DATA_SOURCE_NAME_PREDICT_CALCULATE_LJZNCZJ    = `预测年初至今累计值`         //预测指标 - 累计值(年初至今） -> 66
 )
 
 // 基础数据初始化日期
@@ -208,3 +222,19 @@ const (
 	CHART_SOURCE_ROLLING_CORRELATION = 4 // 滚动相关性图表
 	CHART_SOURCE_FUTURE_GOOD_PROFIT  = 5 // 商品利润曲线
 )
+
+// MonthQuarterMap 月份与季度的map
+var MonthQuarterMap = map[int]int{
+	1:  1,
+	2:  1,
+	3:  1,
+	4:  2,
+	5:  2,
+	6:  2,
+	7:  3,
+	8:  3,
+	9:  3,
+	10: 4,
+	11: 4,
+	12: 4,
+}