|
|
@@ -314,256 +314,8 @@ func SavePredictCalculateTcz(reqEdbInfoId, classifyId int, edbName, frequency, u
|
|
|
return
|
|
|
}
|
|
|
|
|
|
-// EditPredictCalculateTcz 同差值
|
|
|
-func EditPredictCalculateTcz(req *EdbInfoCalculateBatchEditReq, fromEdbInfo *EdbInfo, edbCode string) (edbInfoId int, err error) {
|
|
|
- edbInfoId = req.EdbInfoId
|
|
|
- o := orm.NewOrm()
|
|
|
- to, err := o.Begin()
|
|
|
- if err != nil {
|
|
|
- return
|
|
|
- }
|
|
|
- defer func() {
|
|
|
- if err != nil {
|
|
|
- fmt.Println("EditCalculateTcz,Err:" + err.Error())
|
|
|
- _ = to.Rollback()
|
|
|
- } else {
|
|
|
- _ = to.Commit()
|
|
|
- }
|
|
|
- }()
|
|
|
-
|
|
|
- //修改指标信息
|
|
|
- sql := ` UPDATE edb_info
|
|
|
- SET
|
|
|
- edb_name =?,
|
|
|
- edb_name_source=?,
|
|
|
- frequency = ?,
|
|
|
- unit = ?,
|
|
|
- classify_id = ?,
|
|
|
- modify_time = NOW()
|
|
|
- WHERE edb_info_id = ? `
|
|
|
- _, err = o.Raw(sql, req.EdbName, req.EdbName, req.Frequency, req.Unit, req.ClassifyId, edbInfoId).Exec()
|
|
|
- if err != nil {
|
|
|
- return
|
|
|
- }
|
|
|
-
|
|
|
- var existCondition string
|
|
|
- var existPars []interface{}
|
|
|
- existCondition += " AND edb_info_id=? "
|
|
|
- existPars = append(existPars, edbInfoId)
|
|
|
-
|
|
|
- existCondition += " AND from_edb_info_id=? "
|
|
|
- existPars = append(existPars, req.FromEdbInfoId)
|
|
|
-
|
|
|
- //判断计算指标是否被更换
|
|
|
- count, err := GetEdbInfoCalculateCountByCondition(existCondition, existPars)
|
|
|
- if err != nil {
|
|
|
- err = errors.New("判断指标是否改变失败,Err:" + err.Error())
|
|
|
- return
|
|
|
- }
|
|
|
- if count <= 0 {
|
|
|
- //删除指标关联计算指标
|
|
|
- //sql := ` DELETE FROM edb_info_calculate_tcz WHERE edb_info_id = ? `
|
|
|
- //_, err = o.Raw(sql, edbInfoId).Exec()
|
|
|
- //if err != nil {
|
|
|
- // return
|
|
|
- //}
|
|
|
- //
|
|
|
- //calculateItem := new(EdbInfoCalculateTcz)
|
|
|
- //calculateItem.CreateTime = time.Now()
|
|
|
- //calculateItem.ModifyTime = time.Now()
|
|
|
- //calculateItem.Sort = 1
|
|
|
- //calculateItem.EdbCode = edbCode
|
|
|
- //calculateItem.EdbInfoId = edbInfoId
|
|
|
- //calculateItem.FromEdbInfoId = fromEdbInfo.EdbInfoId
|
|
|
- //calculateItem.FromEdbCode = fromEdbInfo.EdbCode
|
|
|
- //calculateItem.FromEdbName = fromEdbInfo.EdbName
|
|
|
- //calculateItem.FromSource = fromEdbInfo.Source
|
|
|
- //calculateItem.FromSourceName = fromEdbInfo.SourceName
|
|
|
- //
|
|
|
- //_, err = o.Insert(calculateItem)
|
|
|
- //if err != nil {
|
|
|
- // return
|
|
|
- //}
|
|
|
-
|
|
|
- //删除，计算指标关联的，基础指标的关联关系
|
|
|
- sql = ` DELETE FROM edb_info_calculate_mapping WHERE edb_info_id = ? `
|
|
|
- _, err = o.Raw(sql, edbInfoId).Exec()
|
|
|
- if err != nil {
|
|
|
- return
|
|
|
- }
|
|
|
-
|
|
|
- //清空原有数据
|
|
|
- sql = ` DELETE FROM edb_data_predict_calculate_tcz WHERE edb_info_id = ? `
|
|
|
- _, err = o.Raw(sql, edbInfoId).Exec()
|
|
|
- if err != nil {
|
|
|
- return edbInfoId, err
|
|
|
- }
|
|
|
-
|
|
|
- //关联关系
|
|
|
- {
|
|
|
- calculateMappingItem := new(EdbInfoCalculateMapping)
|
|
|
- calculateMappingItem.CreateTime = time.Now()
|
|
|
- calculateMappingItem.ModifyTime = time.Now()
|
|
|
- calculateMappingItem.Sort = 1
|
|
|
- calculateMappingItem.EdbCode = edbCode
|
|
|
- calculateMappingItem.EdbInfoId = 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 = utils.DATA_SOURCE_CALCULATE_TCZ
|
|
|
- calculateMappingItem.SourceName = "同差值"
|
|
|
- _, err = o.Insert(calculateMappingItem)
|
|
|
- if err != nil {
|
|
|
- return
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- edbInfoIdStr := strconv.Itoa(edbInfoId)
|
|
|
-
|
|
|
- //计算数据
|
|
|
- var condition string
|
|
|
- var pars []interface{}
|
|
|
- condition += " AND edb_info_id=? "
|
|
|
- pars = append(pars, req.FromEdbInfoId)
|
|
|
- fmt.Println("EdbInfoId:", req.FromEdbInfoId)
|
|
|
- dataList, err := GetEdbDataListAll(condition, pars, fromEdbInfo.Source, 0)
|
|
|
- if err != nil {
|
|
|
- return edbInfoId, err
|
|
|
- }
|
|
|
- var dateArr []string
|
|
|
- dataMap := make(map[string]*EdbInfoSearchData)
|
|
|
- for _, v := range dataList {
|
|
|
- dateArr = append(dateArr, v.DataTime)
|
|
|
- dataMap[v.DataTime] = v
|
|
|
- }
|
|
|
-
|
|
|
- addSql := ` INSERT INTO edb_data_predict_calculate_tcz(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
|
|
|
- var isAdd bool
|
|
|
- for ak, av := range dateArr {
|
|
|
- fmt.Println(ak, av)
|
|
|
- currentItem := dataMap[av]
|
|
|
- if currentItem != nil {
|
|
|
- //当前日期
|
|
|
- currentDate, err := time.Parse(utils.FormatDate, av)
|
|
|
- if err != nil {
|
|
|
- return edbInfoId, err
|
|
|
- }
|
|
|
- //上一年的日期
|
|
|
- preDate := currentDate.AddDate(-1, 0, 0)
|
|
|
- preDateStr := preDate.Format(utils.FormatDate)
|
|
|
- if findItem, ok := dataMap[preDateStr]; ok { //上一年同期找到
|
|
|
- //dataTime, _ := time.Parse(utils.FormatDate, date)
|
|
|
- timestamp := currentDate.UnixNano() / 1e6
|
|
|
- timestampStr := fmt.Sprintf("%d", timestamp)
|
|
|
-
|
|
|
- val := TczSub(currentItem.Value, findItem.Value)
|
|
|
- addSql += GetAddSql(edbInfoIdStr, edbCode, av, timestampStr, val)
|
|
|
- isAdd = true
|
|
|
- utils.FileLog.Info("同期找到:" + av + ";" + preDateStr)
|
|
|
- continue
|
|
|
- } else {
|
|
|
- if fromEdbInfo.Frequency == "月度" { //向上和向下，各找一个月
|
|
|
- nextDateDay := preDate.AddDate(0, 1, 0)
|
|
|
- nextDateDayStr := nextDateDay.Format(utils.FormatDate)
|
|
|
-
|
|
|
- preDateDay := preDate.AddDate(0, -1, 0)
|
|
|
- preDateDayStr := preDateDay.Format(utils.FormatDate)
|
|
|
-
|
|
|
- for i := 0; i <= 6; i++ {
|
|
|
- if i >= 1 {
|
|
|
- nextDateDay = nextDateDay.AddDate(0, 0, i)
|
|
|
- nextDateDayStr = nextDateDay.Format(utils.FormatDate)
|
|
|
- }
|
|
|
- if findItem, ok := dataMap[nextDateDayStr]; ok { //上一年同期->下一个月找到
|
|
|
- timestamp := currentDate.UnixNano() / 1e6
|
|
|
- timestampStr := fmt.Sprintf("%d", timestamp)
|
|
|
- val := TczSub(currentItem.Value, findItem.Value)
|
|
|
-
|
|
|
- addSql += GetAddSql(edbInfoIdStr, edbCode, av, timestampStr, val)
|
|
|
- isAdd = true
|
|
|
- break
|
|
|
- } else {
|
|
|
- if i >= 1 {
|
|
|
- preDateDay = preDate.AddDate(0, 0, -i)
|
|
|
- preDateDayStr = nextDateDay.Format(utils.FormatDate)
|
|
|
- }
|
|
|
- if findItem, ok := dataMap[preDateDayStr]; ok { //上一年同期->上一个月找到
|
|
|
- timestamp := currentDate.UnixNano() / 1e6
|
|
|
- timestampStr := fmt.Sprintf("%d", timestamp)
|
|
|
- val := TczSub(currentItem.Value, findItem.Value)
|
|
|
-
|
|
|
- addSql += GetAddSql(edbInfoIdStr, edbCode, av, timestampStr, val)
|
|
|
- isAdd = true
|
|
|
- break
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- } else if fromEdbInfo.Frequency == "季度" || fromEdbInfo.Frequency == "年度" {
|
|
|
- if findItem, ok := dataMap[preDateStr]; ok { //上一年同期->下一个月找到
|
|
|
- timestamp := currentDate.UnixNano() / 1e6
|
|
|
- timestampStr := fmt.Sprintf("%d", timestamp)
|
|
|
- val := TczSub(currentItem.Value, findItem.Value)
|
|
|
-
|
|
|
- addSql += GetAddSql(edbInfoIdStr, edbCode, av, timestampStr, val)
|
|
|
- isAdd = true
|
|
|
- break
|
|
|
- }
|
|
|
- } else {
|
|
|
- nextDateDay := preDate.AddDate(0, 0, 1)
|
|
|
- nextDateDayStr := nextDateDay.Format(utils.FormatDate)
|
|
|
-
|
|
|
- preDateDay := preDate.AddDate(0, 0, -1)
|
|
|
- preDateDayStr := preDateDay.Format(utils.FormatDate)
|
|
|
-
|
|
|
- for i := 0; i < 35; i++ {
|
|
|
- if i >= 1 {
|
|
|
- nextDateDay = nextDateDay.AddDate(0, 0, i)
|
|
|
- nextDateDayStr = nextDateDay.Format(utils.FormatDate)
|
|
|
- }
|
|
|
- if findItem, ok := dataMap[nextDateDayStr]; ok { //上一年同期->下一个月找到
|
|
|
- timestamp := currentDate.UnixNano() / 1e6
|
|
|
- timestampStr := fmt.Sprintf("%d", timestamp)
|
|
|
- val := TczSub(currentItem.Value, findItem.Value)
|
|
|
-
|
|
|
- addSql += GetAddSql(edbInfoIdStr, edbCode, av, timestampStr, val)
|
|
|
- isAdd = true
|
|
|
- break
|
|
|
- } else {
|
|
|
- if i >= 1 {
|
|
|
- preDateDay = preDate.AddDate(0, 0, -i)
|
|
|
- preDateDayStr = nextDateDay.Format(utils.FormatDate)
|
|
|
- }
|
|
|
- if findItem, ok := dataMap[preDateDayStr]; ok { //上一年同期->上一个月找到
|
|
|
- timestamp := currentDate.UnixNano() / 1e6
|
|
|
- timestampStr := fmt.Sprintf("%d", timestamp)
|
|
|
- val := TczSub(currentItem.Value, findItem.Value)
|
|
|
-
|
|
|
- addSql += GetAddSql(edbInfoIdStr, edbCode, av, timestampStr, val)
|
|
|
- isAdd = true
|
|
|
- break
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- if isAdd {
|
|
|
- addSql = strings.TrimRight(addSql, ",")
|
|
|
- _, err = o.Raw(addSql).Exec()
|
|
|
- if err != nil {
|
|
|
- return edbInfoId, err
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- return
|
|
|
-}
|
|
|
-
|
|
|
// RefreshAllPredictCalculateTcz 刷新全部同差值数据
|
|
|
-func RefreshAllPredictCalculateTcz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string) (err error) {
|
|
|
+func RefreshAllPredictCalculateTcz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode, startDate string) (latestDateStr string, latestValue float64, err error) {
|
|
|
o := orm.NewOrm()
|
|
|
to, err := o.Begin()
|
|
|
if err != nil {
|
|
|
@@ -582,27 +334,15 @@ func RefreshAllPredictCalculateTcz(edbInfoId, source int, fromEdbInfo *EdbInfo,
|
|
|
return
|
|
|
}
|
|
|
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)
|
|
|
- }
|
|
|
- //if endDate != "" {
|
|
|
- // condition += " AND data_time<=? "
|
|
|
- // pars = append(pars, endDate)
|
|
|
- //}
|
|
|
-
|
|
|
- dataList, err := GetEdbDataListAll(condition, pars, fromEdbInfo.Source, 0)
|
|
|
+ // 获取关联指标数据
|
|
|
+ dataList, err := GetPredictEdbDataListAllByStartDate(fromEdbInfo, 0, startDate)
|
|
|
if err != nil {
|
|
|
- return err
|
|
|
+ return
|
|
|
}
|
|
|
+
|
|
|
+ latestDateStr = fromEdbInfo.LatestDate
|
|
|
+ //计算数据
|
|
|
var dateArr []string
|
|
|
dataMap := make(map[string]*EdbInfoSearchData)
|
|
|
for _, v := range dataList {
|
|
|
@@ -616,7 +356,7 @@ func RefreshAllPredictCalculateTcz(edbInfoId, source int, fromEdbInfo *EdbInfo,
|
|
|
sql = fmt.Sprintf(sql, dataTableName)
|
|
|
_, err = o.Raw(sql, edbInfoId).QueryRows(&existDataList)
|
|
|
if err != nil {
|
|
|
- return err
|
|
|
+ return
|
|
|
}
|
|
|
existDataMap := make(map[string]string)
|
|
|
for _, v := range existDataList {
|
|
|
@@ -630,9 +370,10 @@ func RefreshAllPredictCalculateTcz(edbInfoId, source int, fromEdbInfo *EdbInfo,
|
|
|
currentItem := dataMap[av]
|
|
|
if currentItem != nil {
|
|
|
//当前日期
|
|
|
- currentDate, err := time.Parse(utils.FormatDate, av)
|
|
|
- if err != nil {
|
|
|
- return err
|
|
|
+ currentDate, tmpErr := time.Parse(utils.FormatDate, av)
|
|
|
+ if tmpErr != nil {
|
|
|
+ err = tmpErr
|
|
|
+ return
|
|
|
}
|
|
|
//上一年的日期
|
|
|
preDate := currentDate.AddDate(-1, 0, 0)
|
|
|
@@ -647,17 +388,30 @@ func RefreshAllPredictCalculateTcz(edbInfoId, source int, fromEdbInfo *EdbInfo,
|
|
|
if _, existOk := existAddDataMap[av]; !existOk {
|
|
|
addSql += GetAddSql(edbInfoIdStr, edbCode, av, timestampStr, val)
|
|
|
isAdd = true
|
|
|
+
|
|
|
+ // 实际数据的值
|
|
|
+ if fromEdbInfo.LatestDate == av {
|
|
|
+ latestValueDecimal, tmpErr := decimal.NewFromString(val)
|
|
|
+ if tmpErr != nil {
|
|
|
+ return
|
|
|
+ }
|
|
|
+ latestValue, _ = latestValueDecimal.Truncate(4).Float64() //保留4位小数
|
|
|
+ }
|
|
|
}
|
|
|
existAddDataMap[av] = av
|
|
|
} else {
|
|
|
- existValDecimal, err := decimal.NewFromString(existVal)
|
|
|
+ existValDecimal, tmpErr := decimal.NewFromString(existVal)
|
|
|
+ if tmpErr != nil {
|
|
|
+ err = tmpErr
|
|
|
+ return
|
|
|
+ }
|
|
|
existStr := existValDecimal.String()
|
|
|
if existStr != val {
|
|
|
sql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
|
|
|
sql = fmt.Sprintf(sql, dataTableName)
|
|
|
_, err = o.Raw(sql, val, edbInfoId, av).Exec()
|
|
|
if err != nil {
|
|
|
- return err
|
|
|
+ return
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -677,17 +431,30 @@ func RefreshAllPredictCalculateTcz(edbInfoId, source int, fromEdbInfo *EdbInfo,
|
|
|
if _, existOk := existAddDataMap[av]; !existOk {
|
|
|
addSql += GetAddSql(edbInfoIdStr, edbCode, av, timestampStr, val)
|
|
|
isAdd = true
|
|
|
+
|
|
|
+ // 实际数据的值
|
|
|
+ if fromEdbInfo.LatestDate == av {
|
|
|
+ latestValueDecimal, tmpErr := decimal.NewFromString(val)
|
|
|
+ if tmpErr != nil {
|
|
|
+ return
|
|
|
+ }
|
|
|
+ latestValue, _ = latestValueDecimal.Truncate(4).Float64() //保留4位小数
|
|
|
+ }
|
|
|
}
|
|
|
existAddDataMap[av] = av
|
|
|
} else {
|
|
|
- existValDecimal, err := decimal.NewFromString(existVal)
|
|
|
+ existValDecimal, tmpErr := decimal.NewFromString(existVal)
|
|
|
+ if tmpErr != nil {
|
|
|
+ err = tmpErr
|
|
|
+ return
|
|
|
+ }
|
|
|
existStr := existValDecimal.String()
|
|
|
if existStr != val {
|
|
|
sql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
|
|
|
sql = fmt.Sprintf(sql, dataTableName)
|
|
|
_, err = o.Raw(sql, val, edbInfoId, av).Exec()
|
|
|
if err != nil {
|
|
|
- return err
|
|
|
+ return
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -704,17 +471,30 @@ func RefreshAllPredictCalculateTcz(edbInfoId, source int, fromEdbInfo *EdbInfo,
|
|
|
if _, existOk := existAddDataMap[av]; !existOk {
|
|
|
addSql += GetAddSql(edbInfoIdStr, edbCode, av, timestampStr, val)
|
|
|
isAdd = true
|
|
|
+
|
|
|
+ // 实际数据的值
|
|
|
+ if fromEdbInfo.LatestDate == av {
|
|
|
+ latestValueDecimal, tmpErr := decimal.NewFromString(val)
|
|
|
+ if tmpErr != nil {
|
|
|
+ return
|
|
|
+ }
|
|
|
+ latestValue, _ = latestValueDecimal.Truncate(4).Float64() //保留4位小数
|
|
|
+ }
|
|
|
}
|
|
|
existAddDataMap[av] = av
|
|
|
} else {
|
|
|
- existValDecimal, err := decimal.NewFromString(existVal)
|
|
|
+ existValDecimal, tmpErr := decimal.NewFromString(existVal)
|
|
|
+ if tmpErr != nil {
|
|
|
+ err = tmpErr
|
|
|
+ return
|
|
|
+ }
|
|
|
existStr := existValDecimal.String()
|
|
|
if existStr != val {
|
|
|
sql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
|
|
|
sql = fmt.Sprintf(sql, dataTableName)
|
|
|
_, err = o.Raw(sql, val, edbInfoId, av).Exec()
|
|
|
if err != nil {
|
|
|
- return err
|
|
|
+ return
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -732,17 +512,30 @@ func RefreshAllPredictCalculateTcz(edbInfoId, source int, fromEdbInfo *EdbInfo,
|
|
|
if _, existOk := existAddDataMap[av]; !existOk {
|
|
|
addSql += GetAddSql(edbInfoIdStr, edbCode, av, timestampStr, val)
|
|
|
isAdd = true
|
|
|
+
|
|
|
+ // 实际数据的值
|
|
|
+ if fromEdbInfo.LatestDate == av {
|
|
|
+ latestValueDecimal, tmpErr := decimal.NewFromString(val)
|
|
|
+ if tmpErr != nil {
|
|
|
+ return
|
|
|
+ }
|
|
|
+ latestValue, _ = latestValueDecimal.Truncate(4).Float64() //保留4位小数
|
|
|
+ }
|
|
|
}
|
|
|
existAddDataMap[av] = av
|
|
|
} else {
|
|
|
- existValDecimal, err := decimal.NewFromString(existVal)
|
|
|
+ existValDecimal, tmpErr := decimal.NewFromString(existVal)
|
|
|
+ if tmpErr != nil {
|
|
|
+ err = tmpErr
|
|
|
+ return
|
|
|
+ }
|
|
|
existStr := existValDecimal.String()
|
|
|
if existStr != val {
|
|
|
sql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
|
|
|
sql = fmt.Sprintf(sql, dataTableName)
|
|
|
_, err = o.Raw(sql, val, edbInfoId, av).Exec()
|
|
|
if err != nil {
|
|
|
- return err
|
|
|
+ return
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -761,17 +554,30 @@ func RefreshAllPredictCalculateTcz(edbInfoId, source int, fromEdbInfo *EdbInfo,
|
|
|
if _, existOk := existAddDataMap[av]; !existOk {
|
|
|
addSql += GetAddSql(edbInfoIdStr, edbCode, av, timestampStr, val)
|
|
|
isAdd = true
|
|
|
+
|
|
|
+ // 实际数据的值
|
|
|
+ if fromEdbInfo.LatestDate == av {
|
|
|
+ latestValueDecimal, tmpErr := decimal.NewFromString(val)
|
|
|
+ if tmpErr != nil {
|
|
|
+ return
|
|
|
+ }
|
|
|
+ latestValue, _ = latestValueDecimal.Truncate(4).Float64() //保留4位小数
|
|
|
+ }
|
|
|
}
|
|
|
existAddDataMap[av] = av
|
|
|
} else {
|
|
|
- existValDecimal, err := decimal.NewFromString(existVal)
|
|
|
+ existValDecimal, tmpErr := decimal.NewFromString(existVal)
|
|
|
+ if tmpErr != nil {
|
|
|
+ err = tmpErr
|
|
|
+ return
|
|
|
+ }
|
|
|
existStr := existValDecimal.String()
|
|
|
if existStr != val {
|
|
|
sql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
|
|
|
sql = fmt.Sprintf(sql, dataTableName)
|
|
|
_, err = o.Raw(sql, val, edbInfoId, av).Exec()
|
|
|
if err != nil {
|
|
|
- return err
|
|
|
+ return
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -788,17 +594,30 @@ func RefreshAllPredictCalculateTcz(edbInfoId, source int, fromEdbInfo *EdbInfo,
|
|
|
if _, existOk := existAddDataMap[av]; !existOk {
|
|
|
addSql += GetAddSql(edbInfoIdStr, edbCode, av, timestampStr, val)
|
|
|
isAdd = true
|
|
|
+
|
|
|
+ // 实际数据的值
|
|
|
+ if fromEdbInfo.LatestDate == av {
|
|
|
+ latestValueDecimal, tmpErr := decimal.NewFromString(val)
|
|
|
+ if tmpErr != nil {
|
|
|
+ return
|
|
|
+ }
|
|
|
+ latestValue, _ = latestValueDecimal.Truncate(4).Float64() //保留4位小数
|
|
|
+ }
|
|
|
}
|
|
|
existAddDataMap[av] = av
|
|
|
} else {
|
|
|
- existValDecimal, err := decimal.NewFromString(existVal)
|
|
|
+ existValDecimal, tmpErr := decimal.NewFromString(existVal)
|
|
|
+ if tmpErr != nil {
|
|
|
+ err = tmpErr
|
|
|
+ return
|
|
|
+ }
|
|
|
existStr := existValDecimal.String()
|
|
|
if existStr != val {
|
|
|
sql := ` UPDATE %s SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
|
|
|
sql = fmt.Sprintf(sql, dataTableName)
|
|
|
_, err = o.Raw(sql, val, edbInfoId, av).Exec()
|
|
|
if err != nil {
|
|
|
- return err
|
|
|
+ return
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -814,7 +633,7 @@ func RefreshAllPredictCalculateTcz(edbInfoId, source int, fromEdbInfo *EdbInfo,
|
|
|
addSql = strings.TrimRight(addSql, ",")
|
|
|
_, err = o.Raw(addSql).Exec()
|
|
|
if err != nil {
|
|
|
- return err
|
|
|
+ return
|
|
|
}
|
|
|
}
|
|
|
return
|
