新增隆众渠道

models/data_manage/edb_data_table.go

@@ -25,6 +25,8 @@ func GetEdbDataTableName(source int) (tableName string) {
 		tableName = "edb_data_calculate_tcz"
 	case utils.DATA_SOURCE_CALCULATE_NSZYDPJJS:
 		tableName = "edb_data_calculate_nszydpjjs"
+	case utils.DATA_SOURCE_MANUAL:
+		tableName = "edb_data_manual"
 	default:
 		tableName = ""
 		errors.New("无效的渠道:" + strconv.Itoa(source))

models/data_manage/edb_info_calculate_ljzzy.go

@@ -151,6 +151,18 @@ func RefreshCalculateLjzzy(edbInfoId int, fromEdbInfo *EdbInfo, edbCode, startDa
 			return err
 		}
 	}
+
+	maxAndMinItem, err := GetEdbInfoMaxAndMinInfo(utils.DATA_SOURCE_CALCULATE_LJZZY, edbCode)
+	if err != nil {
+		return err
+	}
+	if maxAndMinItem != nil {
+		err = ModifyEdbInfoMaxAndMinInfo(edbInfoId, maxAndMinItem)
+		if err != nil {
+			return err
+		}
+	}
+
 	return
 }
 

models/data_manage/edb_info_calculate_nszydpjjs.go

@@ -137,6 +137,17 @@ func RefreshCalculateNszydpjjs(edbInfoId, source, formulaInt int, fromEdbInfo *E
 			return err
 		}
 	}
+
+	maxAndMinItem, err := GetEdbInfoMaxAndMinInfo(utils.DATA_SOURCE_CALCULATE_NSZYDPJJS, edbCode)
+	if err != nil {
+		return err
+	}
+	if maxAndMinItem != nil {
+		err = ModifyEdbInfoMaxAndMinInfo(edbInfoId, maxAndMinItem)
+		if err != nil {
+			return err
+		}
+	}
 	return
 }
 

models/data_manage/edb_info_calculate_tbz.go

@@ -263,6 +263,17 @@ func RefreshCalculateTbz(edbInfoId int, fromEdbInfo *EdbInfo, edbCode, startDate
 			return err
 		}
 	}
+
+	maxAndMinItem, err := GetEdbInfoMaxAndMinInfo(utils.DATA_SOURCE_CALCULATE_TBZ, edbCode)
+	if err != nil {
+		return err
+	}
+	if maxAndMinItem != nil {
+		err = ModifyEdbInfoMaxAndMinInfo(edbInfoId, maxAndMinItem)
+		if err != nil {
+			return err
+		}
+	}
 	return
 }
 

models/data_manage/edb_info_calculate_tcz.go

@@ -264,6 +264,17 @@ func RefreshCalculateTcz(edbInfoId int, fromEdbInfo *EdbInfo, edbCode, startDate
 			return err
 		}
 	}
+
+	maxAndMinItem, err := GetEdbInfoMaxAndMinInfo(utils.DATA_SOURCE_CALCULATE_TCZ, edbCode)
+	if err != nil {
+		return err
+	}
+	if maxAndMinItem != nil {
+		err = ModifyEdbInfoMaxAndMinInfo(edbInfoId, maxAndMinItem)
+		if err != nil {
+			return err
+		}
+	}
 	return
 }
 

services/data/data_calculate.go

@@ -35,6 +35,7 @@ func RefreshCalculate(edbInfoIdArr []*data_manage.EdbInfo, edbInfoId int, edbCod
 			pars = append(pars, endDate)
 		}
 		dataList, err := data_manage.GetEdbDataListAll(condition, pars, v.Source, 1)
+
 		if err != nil {
 			return err
 		}
@@ -60,14 +61,11 @@ 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") {
+		//if formulaFormStr != "" && !strings.Contains(formulaFormStr, "/0") {
+		if formulaFormStr != "" {
 			expression := formula.NewExpression(formulaFormStr)
 			calResult, err := expression.Evaluate()
 			if err != nil {
@@ -86,6 +84,7 @@ func RefreshCalculate(edbInfoIdArr []*data_manage.EdbInfo, edbInfoId int, edbCod
 			if err != nil && err.Error() != utils.ErrNoRow() {
 				return err
 			}
+			fmt.Println("line 89:", edbCode, sk, count)
 			if count <= 0 { //需要存入的数据
 				dataTime, _ := time.Parse(utils.FormatDate, sk)
 				timestamp := dataTime.UnixNano() / 1e6

services/data/edb_info.go

@@ -247,6 +247,7 @@ func RefreshDataFromCalculateAll() (err error) {
 	var pars []interface{}
 	condition += " AND edb_type=? "
 	pars = append(pars, 2)
+
 	items, err := data_manage.GetEdbInfoByCondition(condition, pars)
 	if err != nil {
 		return err
@@ -284,6 +285,7 @@ func RefreshDataFromCalculateAll() (err error) {
 				edbInfo, _ := data_manage.GetEdbInfoById(v.FromEdbInfoId)
 				edbInfoList = append(edbInfoList, edbInfo)
 			}
+			fmt.Println("RefreshCalculate:",edbInfoList, edbInfoId, edbCode, v.CalculateFormula, startDate, endDate, edbInfoIdBytes)
 			err = RefreshCalculate(edbInfoList, edbInfoId, edbCode, v.CalculateFormula, startDate, endDate, edbInfoIdBytes)
 			if err != nil {
 				return errors.New("RefreshCalculate Err:" + err.Error())

utils/constants.go

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