fix bug

models/data_manage/edb_info.go

@@ -1,11 +1,8 @@
 package data_manage
 
 import (
-	"errors"
 	"fmt"
-	"hongze/hongze_task/utils"
 	"rdluck_tools/orm"
-	"strconv"
 	"time"
 )
 
@@ -82,22 +79,9 @@ func GetEdbInfoMaxAndMinInfo(source int, edbCode string) (item *EdbInfoMaxAndMin
 	o := orm.NewOrm()
 	o.Using("data")
 	sql := ``
-	tableName := ``
-	if source == utils.DATA_SOURCE_THS {
-		tableName = `edb_data_ths`
-	} else if source == utils.DATA_SOURCE_WIND {
-		tableName = `edb_data_wind`
-	} else if source == utils.DATA_SOURCE_PB {
-		tableName = `edb_data_pb`
-	} else if source == utils.DATA_SOURCE_CALCULATE {
-		tableName = "edb_data_calculate"
-	} else {
-		errors.New("无效的渠道:" + strconv.Itoa(source))
-		return
-	}
+	tableName := GetEdbDataTableName(source)
 	sql = ` SELECT MIN(data_time) AS min_date,MAX(data_time) AS max_date,MIN(value) AS min_value,MAX(value) AS max_value FROM %s WHERE edb_code=? `
 	sql = fmt.Sprintf(sql, tableName)
-	fmt.Println("sql:", sql)
 	err = o.Raw(sql, edbCode).QueryRow(&item)
 	return
 }

models/data_manage/edb_info_calculate_ljzzy.go

@@ -177,7 +177,7 @@ func GetEdbInfoCalculateLjzzyDetail(edbInfoId int) (item *EdbInfoCalculateLjzzyD
 func GetEdbDataCalculateLjzzyByCodeAndDate(edbCode string, startDate string) (count int, err error) {
 	o := orm.NewOrm()
 	o.Using("data")
-	sql := ` SELECT COUNT(1) AS count FROM edb_info_calculate_ljzzy WHERE edb_code=? AND data_time=? `
+	sql := ` SELECT COUNT(1) AS count FROM edb_data_calculate_ljzzy WHERE edb_code=? AND data_time=? `
 	err = o.Raw(sql, edbCode, startDate).QueryRow(&count)
 	return
 }
@@ -185,7 +185,7 @@ func GetEdbDataCalculateLjzzyByCodeAndDate(edbCode string, startDate string) (co
 func ModifyEdbDataCalculateLjzzy(edbInfoId int64, dataTime string, value float64) (err error) {
 	o := orm.NewOrm()
 	o.Using("data")
-	sql := ` UPDATE edb_info_calculate_ljzzy SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
+	sql := ` UPDATE edb_data_calculate_ljzzy SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `
 	_, err = o.Raw(sql, value, edbInfoId, dataTime).Exec()
 	return
 }

models/data_manage/edb_info_calculate_tbz.go

@@ -285,7 +285,7 @@ type EdbInfoCalculateTbzDetail struct {
 func GetEdbInfoCalculateTbzDetail(edbInfoId int) (item *EdbInfoCalculateTbzDetail, err error) {
 	o := orm.NewOrm()
 	o.Using("data")
-	sql := ` SELECT a.*,b.start_date,b.end_date FROM edb_data_calculate_tbz AS a
+	sql := ` SELECT a.*,b.start_date,b.end_date FROM edb_info_calculate_tbz AS a
 			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? `
 	err = o.Raw(sql, edbInfoId).QueryRow(&item)

services/data/data_calculate.go

@@ -63,8 +63,8 @@ func RefreshCalculate(edbInfoIdArr []*data_manage.EdbInfo, edbInfoId int, edbCod
 	for sk, sv := range saveDataMap {
 		formulaStr = strings.ToUpper(formulaStr)
 		formulaFormStr := ReplaceFormula(edbInfoIdArr, sv, formulaMap, formulaStr, edbInfoIdBytes)
-		if formulaFormStr != "" {
-			utils.FileLog.Info("formulaFormStr:%s", formulaFormStr)
+
+		if formulaFormStr != "" && !strings.Contains(formulaFormStr, "/0") {
 			expression := formula.NewExpression(formulaFormStr)
 			calResult, err := expression.Evaluate()
 			if err != nil {

services/data/edb_info.go

@@ -218,7 +218,7 @@ func RefreshDataFromCalculateAll() (err error) {
 			var edbInfoIdBytes []string
 			calculateMap, err := data_manage.GetEdbInfoCalculateDetail(int(v.EdbInfoId))
 			if err != nil {
-				return err
+				return errors.New("GetEdbInfoCalculateDetail Err:" + err.Error())
 			}
 			var formulaStr string
 			edbInfoList := make([]*data_manage.EdbInfo, 0)
@@ -230,67 +230,67 @@ func RefreshDataFromCalculateAll() (err error) {
 			}
 			err = RefreshCalculate(edbInfoList, edbInfoId, edbCode, v.CalculateFormula, startDate, endDate, edbInfoIdBytes)
 			if err != nil {
-				return err
+				return errors.New("RefreshCalculate Err:" + err.Error())
 			}
 		} else if v.Source == utils.DATA_SOURCE_CALCULATE_LJZZY {
 			calculateLjzzy, err := data_manage.GetEdbInfoCalculateLjzzyDetail(edbInfoId)
 			if err != nil {
-				return err
+				return errors.New("GetEdbInfoCalculateLjzzyDetail Err:" + err.Error())
 			}
 			fromEdbInfo, err := data_manage.GetEdbInfoById(calculateLjzzy.FromEdbInfoId)
 			if err != nil {
-				return err
+				return errors.New("GetEdbInfoById Err:" + err.Error())
 			}
 			year := time.Now().Year()
 			startDate := strconv.Itoa(year) + "-01" + "-01"
 			endDate := time.Now().Format(utils.FormatDate)
 			err = data_manage.RefreshCalculateLjzzy(edbInfoId, fromEdbInfo, edbCode, startDate, endDate)
 			if err != nil {
-				return err
+				return errors.New("RefreshCalculateLjzzy Err:" + err.Error())
 			}
 		} else if v.Source == utils.DATA_SOURCE_CALCULATE_TBZ {
 			calculateTbz, err := data_manage.GetEdbInfoCalculateTbzDetail(edbInfoId)
 			if err != nil {
-				return err
+				return errors.New("GetEdbInfoCalculateTbzDetail Err:" + err.Error())
 			}
 			fromEdbInfo, err := data_manage.GetEdbInfoById(calculateTbz.FromEdbInfoId)
 			if err != nil {
-				return err
+				return errors.New("GetEdbInfoById Err:" + err.Error())
 			}
 			startDate := time.Now().AddDate(-1, -2, 0).Format(utils.FormatDate)
 			endDate := time.Now().Format(utils.FormatDate)
 			err = data_manage.RefreshCalculateTbz(edbInfoId, fromEdbInfo, calculateTbz.EdbCode, startDate, endDate)
 			if err != nil {
-				return err
+				return errors.New("RefreshCalculateTbz Err:" + err.Error())
 			}
 		} else if v.Source == utils.DATA_SOURCE_CALCULATE_TCZ {
 			calculateTcz, err := data_manage.GetEdbInfoCalculateTczDetail(edbInfoId)
 			if err != nil {
-				return err
+				return errors.New("GetEdbInfoCalculateTczDetail Err:" + err.Error())
 			}
 			fromEdbInfo, err := data_manage.GetEdbInfoById(calculateTcz.FromEdbInfoId)
 			if err != nil {
-				return err
+				return errors.New("GetEdbInfoById Err:" + err.Error())
 			}
 			startDate := time.Now().AddDate(-1, -2, 0).Format(utils.FormatDate)
 			endDate := time.Now().Format(utils.FormatDate)
 			err = data_manage.RefreshCalculateTcz(edbInfoId, fromEdbInfo, calculateTcz.EdbCode, startDate, endDate)
 			if err != nil {
-				return err
+				return errors.New("RefreshCalculateTcz Err:" + err.Error())
 			}
 		} else if v.Source == utils.DATA_SOURCE_CALCULATE_NSZYDPJJS {
 			calculateNszydpjjs, err := data_manage.GetEdbInfoCalculateNszydpjjsDetail(edbInfoId)
 			if err != nil {
-				return err
+				return errors.New("GetEdbInfoCalculateNszydpjjsDetail Err:" + err.Error())
 			}
 			fromEdbInfo, err := data_manage.GetEdbInfoById(calculateNszydpjjs.FromEdbInfoId)
 			if err != nil {
-				return err
+				return errors.New("GetEdbInfoById Err:" + err.Error())
 			}
 			formulaInt, _ := strconv.Atoi(v.CalculateFormula)
 			err = data_manage.RefreshCalculateNszydpjjs(edbInfoId, v.Source, formulaInt, fromEdbInfo, calculateNszydpjjs.EdbCode)
 			if err != nil {
-				return err
+				return errors.New("RefreshCalculateNszydpjjs Err:" + err.Error())
 			}
 		} else {
 			msg := "刷新失败,无效的指标渠道"

services/task.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 	"github.com/beego/beego/v2/task"
-	"hongze/hongze_task/services/data"
 	"hongze/hongze_task/services/company_contract"
+	"hongze/hongze_task/services/data"
 	"hongze/hongze_task/utils"
 )
 
@@ -142,6 +142,6 @@ func RefreshCalculateData(cont context.Context) (err error) {
 	//计算指标
 	go data.RefreshDataFromCalculateAll()
 	//刷新公历转农历数据
-	go data.RefreshDataFromQuarterAll()
+	//go data.RefreshDataFromQuarterAll()
 	return
-}
+}

utils/constants.go

@@ -72,6 +72,7 @@ const (
 	DATA_SOURCE_CALCULATE_TCZ                  //同差值
 	DATA_SOURCE_CALCULATE_NSZYDPJJS            //N数值移动平均计算
 	DATA_SOURCE_QUARTER                        //公历转农历
+	DATA_SOURCE_MANUAL                         //手工指标
 )
 
 //http://datawind.hzinsights.com:8040/hz_server