修改定时计算bug

services/data/data_calculate.go

@@ -60,10 +60,13 @@ func RefreshCalculate(edbInfoIdArr []*data_manage.EdbInfo, edbInfoId int, edbCod
 	nowStr := time.Now().Format(utils.FormatDateTime)
 	var isAdd bool
 
+	fmt.Println("start")
+
+	fmt.Println("end")
+
 	for sk, sv := range saveDataMap {
 		formulaStr = strings.ToUpper(formulaStr)
 		formulaFormStr := ReplaceFormula(edbInfoIdArr, sv, formulaMap, formulaStr, edbInfoIdBytes)
-
 		if formulaFormStr != "" && !strings.Contains(formulaFormStr, "/0") {
 			expression := formula.NewExpression(formulaFormStr)
 			calResult, err := expression.Evaluate()

services/data/edb_info.go

@@ -277,7 +277,7 @@ func RefreshDataFromCalculateAll() (err error) {
 			for _, v := range calculateMap {
 				formulaStr += v.FromTag + ","
 				edbInfoIdBytes = append(edbInfoIdBytes, v.FromTag)
-				edbInfo, _ := data_manage.GetEdbInfoById(v.EdbInfoId)
+				edbInfo, _ := data_manage.GetEdbInfoById(v.FromEdbInfoId)
 				edbInfoList = append(edbInfoList, edbInfo)
 			}
 			err = RefreshCalculate(edbInfoList, edbInfoId, edbCode, v.CalculateFormula, startDate, endDate, edbInfoIdBytes)

services/data/edb_info_calculate.go

@@ -11,7 +11,6 @@ type CalculateItems struct {
 	DataMap   map[string]float64
 }
 
-
 func CheckFormula(formula string) map[string]string {
 	mathFormula := []string{"MAX", "MIN", "ABS", "ACOS", "ASIN", "CEIL", "MOD", "POW", "ROUND", "SIGN", "SIN", "TAN", "LOG10", "LOG2", "LOG"}
 
@@ -56,7 +55,9 @@ func ReplaceFormula(edbInfoIdArr []*data_manage.EdbInfo, valArr map[int]float64,
 		if dk == 1 {
 			dKey := edbInfoIdBytes[dk]
 			if _, ok := formulaMap[dKey]; ok { //公式中存在
+
 				if val, valOk := valArr[dv.EdbInfoId]; valOk { //值存在
+
 					dvStr := fmt.Sprintf("%v", val)
 					formulaStr = strings.Replace(formulaStr, dKey, dvStr, -1)
 					replaceCount++
@@ -156,4 +157,4 @@ func GetFormulaMap() map[string]string {
 	funMap["POW"] = "[@*]"
 	funMap["ROUND"] = "[@(]"
 	return funMap
-}
+}

services/task.go

@@ -155,8 +155,7 @@ func RefreshCalculateData(cont context.Context) (err error) {
 
 //func Task() {
 //	fmt.Println("start")
-//	cont := new(context.Context)
-//	GetLzSurveyProductData(*cont)
+//	data.RefreshDataFromCalculateAll()
 //	//startDate := time.Now().AddDate(-30, 0, 0).UnixNano() / 1e6
 //
 //	//fmt.Println(startDate)