feat：新增直接拼接指标、累计值同比拼接、时间移位指标更新

models/data_manage/edb_data_calculate_time_shift.go

@@ -139,7 +139,7 @@ func GetEdbInfoCalculateTimeShiftDetail(edbInfoId int) (item *EdbInfoCalculateTb
 }
 
 //刷新所有变频数据
-func RefreshAllCalculateTimeShift(edbInfoId, source, formulaInt, moveType int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate, moveFrequency string) (err error) {
+func RefreshAllCalculateTimeShift(edbInfoId, source, formulaInt, moveType int, fromEdbInfo *EdbInfo, edbCode, moveFrequency string) (err error) {
 	o := orm.NewOrm()
 	o.Using("data")
 	o.Begin()
@@ -163,14 +163,14 @@ func RefreshAllCalculateTimeShift(edbInfoId, source, formulaInt, moveType int, f
 	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)
-	}
+	//if startDate != "" {
+	//	condition += " AND data_time>=? "
+	//	pars = append(pars, startDate)
+	//}
+	//if endDate != "" {
+	//	condition += " AND data_time<=? "
+	//	pars = append(pars, endDate)
+	//}
 
 	var shiftDay int
 	switch moveFrequency {
@@ -218,7 +218,7 @@ func RefreshAllCalculateTimeShift(edbInfoId, source, formulaInt, moveType int, f
 		existDataMap[v.DataTime] = v.Value
 	}
 	fmt.Println("existDataMap:", existDataMap)
-	addSql := ` INSERT INTO edb_data_calculate_bp(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+	addSql := ` INSERT INTO edb_data_calculate_time_shift (edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
 	var isAdd bool
 
 	existMap := make(map[string]string)
@@ -234,7 +234,8 @@ func RefreshAllCalculateTimeShift(edbInfoId, source, formulaInt, moveType int, f
 			timestamp := newDate.UnixNano() / 1e6
 			timestampStr := fmt.Sprintf("%d", timestamp)
 			valStr := decimal.NewFromFloat(currentItem.Value).String()
-			if existVal, ok := existDataMap[currentItem.DataTime]; !ok {
+			if existVal, ok := existDataMap[newDate.Format(utils.FormatDate)]; !ok {
+				isAdd = true
 				addSql += GetAddSql(edbInfoIdStr, edbCode, newDate.Format(utils.FormatDate), timestampStr, valStr)
 			} else {
 				if existVal != valStr {

models/data_manage/edb_info_calculate_bp.go

@@ -26,7 +26,7 @@ type EdbInfoCalculateBp struct {
 }
 
 //变频
-func RefreshCalculateBp(edbInfoId int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string) (err error) {
+func RefreshCalculateBp(edbInfoId int, fromEdbInfo *EdbInfo, edbCode string) (err error) {
 	o := orm.NewOrm()
 	o.Using("data")
 	o.Begin()
@@ -47,15 +47,15 @@ func RefreshCalculateBp(edbInfoId int, fromEdbInfo *EdbInfo, edbCode, startDate,
 	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)
-	}
+	//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)
 	if err != nil {
 		return err
@@ -158,7 +158,7 @@ func GetEdbInfoCalculateBpDetail(edbInfoId int) (item *EdbInfoCalculateTbzDetail
 	o := orm.NewOrm()
 	o.Using("data")
 	sql := ` SELECT a.*,b.start_date,b.end_date FROM edb_info_calculate_mapping AS a
-			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
+			INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? `
 	err = o.Raw(sql, edbInfoId).QueryRow(&item)
 	return

models/data_manage/edb_info_calculate_hbz.go

@@ -157,7 +157,7 @@ func GetEdbInfoCalculateHbzDetail(edbInfoId int) (item *EdbInfoCalculateTbzDetai
 	o := orm.NewOrm()
 	o.Using("data")
 	sql := ` SELECT a.*,b.start_date,b.end_date FROM edb_info_calculate_mapping AS a
-			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
+			INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? `
 	err = o.Raw(sql, edbInfoId).QueryRow(&item)
 	return

models/data_manage/edb_info_calculate_hcz.go

@@ -38,7 +38,7 @@ func HczDiv(current, pre float64) string {
 }
 
 //刷新环比值数据
-func RefreshCalculateHcz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string) (err error) {
+func RefreshCalculateHcz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode string) (err error) {
 	o := orm.NewOrm()
 	o.Using("data")
 	o.Begin()
@@ -60,14 +60,14 @@ func RefreshCalculateHcz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode, s
 	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)
-	}
+	//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)
 	if err != nil {
@@ -156,8 +156,8 @@ func GetEdbInfoCalculateHczDetail(edbInfoId int) (item *EdbInfoCalculateHczDetai
 	o := orm.NewOrm()
 	o.Using("data")
 	sql := ` SELECT a.*,b.start_date,b.end_date FROM edb_info_calculate_mapping AS a
-			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
+			INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? `
 	err = o.Raw(sql, edbInfoId).QueryRow(&item)
 	return
-}
+}

models/data_manage/edb_info_calculate_ljztbpj.go

@@ -29,7 +29,7 @@ type EdbInfoCalculateLjztbpjDetail struct {
 }
 
 // RefreshAllCalculateLjztbpj 刷新所有 累计值同比拼接 数据
-func RefreshAllCalculateLjztbpj(edbInfo *EdbInfoList) (err error) {
+func RefreshAllCalculateLjztbpj(edbInfo *EdbInfo) (err error) {
 	o := orm.NewOrm()
 	o.Using("data")
 	o.Begin()

models/data_manage/edb_info_calculate_ljzzy.go

@@ -26,7 +26,7 @@ type EdbInfoCalculateLjzzy struct {
 }
 
 //刷新累计值转月值数据
-func RefreshCalculateLjzzy(edbInfoId int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string) (err error) {
+func RefreshCalculateLjzzy(edbInfoId int, fromEdbInfo *EdbInfo, edbCode string) (err error) {
 	o := orm.NewOrm()
 	o.Using("data")
 	o.Begin()
@@ -48,14 +48,14 @@ func RefreshCalculateLjzzy(edbInfoId int, fromEdbInfo *EdbInfo, edbCode, startDa
 	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)
-	}
+	//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, 1)
 	if err != nil {
@@ -195,7 +195,7 @@ func GetEdbInfoCalculateLjzzyDetail(edbInfoId int) (item *EdbInfoCalculateLjzzyD
 	o := orm.NewOrm()
 	o.Using("data")
 	sql := ` SELECT a.*,b.start_date,b.end_date FROM edb_info_calculate_mapping AS a
-			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
+			INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? `
 	err = o.Raw(sql, edbInfoId).QueryRow(&item)
 	return
@@ -209,10 +209,10 @@ func GetEdbDataCalculateLjzzyByCodeAndDate(edbCode string, startDate string) (co
 	return
 }
 
-func ModifyEdbDataCalculateLjzzy(edbInfoId int64, dataTime,value string) (err error) {
+func ModifyEdbDataCalculateLjzzy(edbInfoId int64, dataTime, value string) (err error) {
 	o := orm.NewOrm()
 	o.Using("data")
 	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_mapping.go

@@ -107,7 +107,7 @@ func GetEdbInfoCalculateMappingDetail(edbInfoId int) (item *EdbInfoCalculateMapp
 	o := orm.NewOrm()
 	o.Using("data")
 	sql := ` SELECT a.*,b.start_date,b.end_date,b.calculate_formula,b.move_type,b.move_frequency FROM edb_info_calculate_mapping AS a
-			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
+			INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? `
 	err = o.Raw(sql, edbInfoId).QueryRow(&item)
 	return

models/data_manage/edb_info_calculate_nszydpjjs.go

@@ -170,7 +170,7 @@ func GetEdbInfoCalculateNszydpjjsDetail(edbInfoId int) (item *EdbInfoCalculateNs
 	o := orm.NewOrm()
 	o.Using("data")
 	sql := ` SELECT a.*,b.start_date,b.end_date FROM edb_info_calculate_mapping AS a
-			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
+			INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? `
 	err = o.Raw(sql, edbInfoId).QueryRow(&item)
 	return

models/data_manage/edb_info_calculate_tbz.go

@@ -35,7 +35,7 @@ func TbzDiv(a, b float64) string {
 }
 
 //刷新同比值数据
-func RefreshCalculateTbz(edbInfoId int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string) (err error) {
+func RefreshCalculateTbz(edbInfoId int, fromEdbInfo *EdbInfo, edbCode string) (err error) {
 	o := orm.NewOrm()
 	o.Using("data")
 	o.Begin()
@@ -59,14 +59,14 @@ func RefreshCalculateTbz(edbInfoId int, fromEdbInfo *EdbInfo, edbCode, startDate
 	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)
-	}
+	//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)
 	if err != nil {
@@ -280,7 +280,7 @@ func GetEdbInfoCalculateTbzDetail(edbInfoId int) (item *EdbInfoCalculateTbzDetai
 	o := orm.NewOrm()
 	o.Using("data")
 	sql := ` SELECT a.*,b.start_date,b.end_date FROM edb_info_calculate_mapping AS a
-			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
+			INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? `
 	err = o.Raw(sql, edbInfoId).QueryRow(&item)
 	return

models/data_manage/edb_info_calculate_tcz.go

@@ -35,7 +35,7 @@ func TczSub(a, b float64) string {
 }
 
 //刷新同差值数据
-func RefreshCalculateTcz(edbInfoId int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string) (err error) {
+func RefreshCalculateTcz(edbInfoId int, fromEdbInfo *EdbInfo, edbCode string) (err error) {
 	o := orm.NewOrm()
 	o.Using("data")
 	o.Begin()
@@ -59,14 +59,14 @@ func RefreshCalculateTcz(edbInfoId int, fromEdbInfo *EdbInfo, edbCode, startDate
 	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)
-	}
+	//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)
 	if err != nil {
@@ -281,7 +281,7 @@ func GetEdbInfoCalculateTczDetail(edbInfoId int) (item *EdbInfoCalculateTczDetai
 	o := orm.NewOrm()
 	o.Using("data")
 	sql := ` SELECT a.*,b.start_date,b.end_date FROM edb_info_calculate_mapping AS a
-			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
+			INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			WHERE a.edb_info_id=? `
 	err = o.Raw(sql, edbInfoId).QueryRow(&item)
 	return

models/data_manage/edb_info_calculate_zjpj.go

@@ -27,7 +27,7 @@ type EdbInfoCalculateZjpjDetail struct {
 }
 
 // RefreshAllCalculateZjpj 刷新所有 直接拼接 数据
-func RefreshAllCalculateZjpj(edbInfo *EdbInfoList) (err error) {
+func RefreshAllCalculateZjpj(edbInfo *EdbInfo) (err error) {
 	o := orm.NewOrm()
 	o.Using("data")
 	o.Begin()

models/db.go

@@ -83,8 +83,7 @@ func init() {
 		new(Edbdata),
 		new(data_manage.EdbInfoCalculateMapping),
 		new(UserViewStatistics),
-		new(data_manage.EdbInfo), //hz_data库的edb_info表
-		new(data_manage.EdbInfoCalculateMapping),
+		new(data_manage.EdbInfo),                 //hz_data库的edb_info表
 		new(data_manage.EdbDataCalculateZjpj),    //直接拼接
 		new(data_manage.EdbDataCalculateLjztbpj), //累计同比值拼接
 	)

services/data/data_calculate.go

@@ -13,7 +13,7 @@ import (
 )
 
 //指标运算刷新数据
-func RefreshCalculate(edbInfoIdArr []*data_manage.EdbInfo, edbInfoId int, edbCode, formulaStr, startDate, endDate string, edbInfoIdBytes []string) (err error) {
+func RefreshCalculate(edbInfoIdArr []*data_manage.EdbInfo, edbInfoId int, edbCode, formulaStr string, edbInfoIdBytes []string) (err error) {
 	defer func() {
 		if err != nil {
 			utils.FileLog.Info("Calculate Err:%s" + err.Error())
@@ -26,14 +26,14 @@ func RefreshCalculate(edbInfoIdArr []*data_manage.EdbInfo, edbInfoId int, edbCod
 		var pars []interface{}
 		condition += " AND edb_info_id=? "
 		pars = append(pars, v.EdbInfoId)
-		if startDate != "" {
-			condition += " AND data_time>=? "
-			pars = append(pars, startDate)
-		}
-		if endDate != "" {
-			condition += " AND data_time<=? "
-			pars = append(pars, endDate)
-		}
+		//if startDate != "" {
+		//	condition += " AND data_time>=? "
+		//	pars = append(pars, startDate)
+		//}
+		//if endDate != "" {
+		//	condition += " AND data_time<=? "
+		//	pars = append(pars, endDate)
+		//}
 		dataList, err := data_manage.GetEdbDataListAll(condition, pars, v.Source, 1)
 
 		if err != nil {
@@ -69,7 +69,7 @@ func RefreshCalculate(edbInfoIdArr []*data_manage.EdbInfo, edbInfoId int, edbCod
 			expression := formula.NewExpression(formulaFormStr)
 			calResult, err := expression.Evaluate()
 			if err != nil {
-				err = errors.New("计算失败：Err:" + err.Error() + ";formulaStr:" + formulaFormStr)
+				err = errors.New("计算失败,edbCode：" + fmt.Sprint(edbCode) + "：Err:" + err.Error() + ";formulaStr:" + formulaFormStr)
 				fmt.Println(err)
 				return err
 			}

services/data/edb_info.go

@@ -253,21 +253,21 @@ func RefreshDataFromCalculateAll() (err error) {
 		source := v.Source
 		fmt.Println(v.EdbInfoId, v.EdbCode, v.EdbName, v.SourceName, source)
 		if source == utils.DATA_SOURCE_CALCULATE {
-			startDate := ""
-			if v.Frequency == "日度" {
-				startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-			} else if v.Frequency == "周度" {
-				startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
-			} else if v.Frequency == "月度" {
-				startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
-			} else if v.Frequency == "季度" {
-				startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
-			} else if v.Frequency == "年度" {
-				startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
-			} else {
-				startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
-			}
-			endDate := time.Now().Format(utils.FormatDate)
+			//startDate := ""
+			//if v.Frequency == "日度" {
+			//	startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
+			//} else if v.Frequency == "周度" {
+			//	startDate = v.EndDate.AddDate(0, 0, -(utils.DATA_REFRESH * 7)).Format(utils.FormatDate)
+			//} else if v.Frequency == "月度" {
+			//	startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH, 0).Format(utils.FormatDate)
+			//} else if v.Frequency == "季度" {
+			//	startDate = v.EndDate.AddDate(0, -utils.DATA_REFRESH*3, 0).Format(utils.FormatDate)
+			//} else if v.Frequency == "年度" {
+			//	startDate = v.EndDate.AddDate(-utils.DATA_REFRESH, 0, 0).Format(utils.FormatDate)
+			//} else {
+			//	startDate = v.EndDate.AddDate(0, 0, -utils.DATA_REFRESH).Format(utils.FormatDate)
+			//}
+			//endDate := time.Now().Format(utils.FormatDate)
 			var edbInfoIdBytes []string
 			calculateMap, err := data_manage.GetEdbInfoCalculateDetail(int(v.EdbInfoId))
 			if err != nil {
@@ -281,24 +281,30 @@ func RefreshDataFromCalculateAll() (err error) {
 				edbInfo, _ := data_manage.GetEdbInfoById(v.FromEdbInfoId)
 				edbInfoList = append(edbInfoList, edbInfo)
 			}
-			endDate = ""
-			err = RefreshCalculate(edbInfoList, edbInfoId, edbCode, v.CalculateFormula, startDate, endDate, edbInfoIdBytes)
+			//endDate = ""
+			err = RefreshCalculate(edbInfoList, edbInfoId, edbCode, v.CalculateFormula, edbInfoIdBytes)
 			if err != nil {
 				return errors.New("RefreshCalculate Err:" + err.Error())
 			}
 		} else if source == utils.DATA_SOURCE_CALCULATE_LJZZY {
 			calculateLjzzy, err := data_manage.GetEdbInfoCalculateLjzzyDetail(edbInfoId)
 			if err != nil {
+				if err.Error() == utils.ErrNoRow() {
+					continue
+				}
 				return errors.New("GetEdbInfoCalculateLjzzyDetail Err:" + err.Error())
 			}
 			fromEdbInfo, err := data_manage.GetEdbInfoById(calculateLjzzy.FromEdbInfoId)
 			if err != nil {
+				if err.Error() == utils.ErrNoRow() {
+					continue
+				}
 				return errors.New("GetEdbInfoById Err:" + err.Error())
 			}
-			year := time.Now().Year() - 1
-			startDate := strconv.Itoa(year) + "-01" + "-01"
-			endDate := "" //time.Now().Format(utils.FormatDate)
-			err = data_manage.RefreshCalculateLjzzy(edbInfoId, fromEdbInfo, edbCode, startDate, endDate)
+			//year := time.Now().Year() - 1
+			//startDate := strconv.Itoa(year) + "-01" + "-01"
+			//endDate := "" //time.Now().Format(utils.FormatDate)
+			err = data_manage.RefreshCalculateLjzzy(edbInfoId, fromEdbInfo, edbCode)
 			if err != nil {
 				return errors.New("RefreshCalculateLjzzy Err:" + err.Error())
 			}
@@ -309,11 +315,14 @@ func RefreshDataFromCalculateAll() (err error) {
 			}
 			fromEdbInfo, err := data_manage.GetEdbInfoById(calculateTbz.FromEdbInfoId)
 			if err != nil {
+				if err.Error() == utils.ErrNoRow() {
+					continue
+				}
 				return errors.New("GetEdbInfoById Err:" + err.Error())
 			}
-			startDate := time.Now().AddDate(-2, -2, 0).Format(utils.FormatDate)
-			endDate := "" //time.Now().Format(utils.FormatDate)
-			err = data_manage.RefreshCalculateTbz(edbInfoId, fromEdbInfo, calculateTbz.EdbCode, startDate, endDate)
+			//startDate := time.Now().AddDate(-2, -2, 0).Format(utils.FormatDate)
+			//endDate := "" //time.Now().Format(utils.FormatDate)
+			err = data_manage.RefreshCalculateTbz(edbInfoId, fromEdbInfo, calculateTbz.EdbCode)
 			if err != nil {
 				return errors.New("RefreshCalculateTbz Err:" + err.Error())
 			}
@@ -324,11 +333,14 @@ func RefreshDataFromCalculateAll() (err error) {
 			}
 			fromEdbInfo, err := data_manage.GetEdbInfoById(calculateTcz.FromEdbInfoId)
 			if err != nil {
+				if err.Error() == utils.ErrNoRow() {
+					continue
+				}
 				return errors.New("GetEdbInfoById Err:" + err.Error())
 			}
-			startDate := time.Now().AddDate(-2, -2, 0).Format(utils.FormatDate)
-			endDate := "" //time.Now().Format(utils.FormatDate)
-			err = data_manage.RefreshCalculateTcz(edbInfoId, fromEdbInfo, calculateTcz.EdbCode, startDate, endDate)
+			//startDate := time.Now().AddDate(-2, -2, 0).Format(utils.FormatDate)
+			//endDate := "" //time.Now().Format(utils.FormatDate)
+			err = data_manage.RefreshCalculateTcz(edbInfoId, fromEdbInfo, calculateTcz.EdbCode)
 			if err != nil {
 				return errors.New("RefreshCalculateTcz Err:" + err.Error())
 			}
@@ -339,6 +351,9 @@ func RefreshDataFromCalculateAll() (err error) {
 			}
 			fromEdbInfo, err := data_manage.GetEdbInfoById(calculateNszydpjjs.FromEdbInfoId)
 			if err != nil {
+				if err.Error() == utils.ErrNoRow() {
+					continue
+				}
 				return errors.New("GetEdbInfoById Err:" + err.Error())
 			}
 			formulaInt, _ := strconv.Atoi(v.CalculateFormula)
@@ -353,6 +368,9 @@ func RefreshDataFromCalculateAll() (err error) {
 			}
 			fromEdbInfo, err := data_manage.GetEdbInfoById(calculateHbz.FromEdbInfoId)
 			if err != nil {
+				if err.Error() == utils.ErrNoRow() {
+					continue
+				}
 				return errors.New("GetEdbInfoById Err:" + err.Error())
 			}
 			//startDate := time.Now().AddDate(-2, -2, 0).Format(utils.FormatDate)
@@ -369,11 +387,14 @@ func RefreshDataFromCalculateAll() (err error) {
 			}
 			fromEdbInfo, err := data_manage.GetEdbInfoById(calculateHcz.FromEdbInfoId)
 			if err != nil {
+				if err.Error() == utils.ErrNoRow() {
+					continue
+				}
 				return errors.New("GetEdbInfoById Err:" + err.Error())
 			}
-			startDate := time.Now().AddDate(-2, -2, 0).Format(utils.FormatDate)
-			endDate := "" //time.Now().Format(utils.FormatDate)
-			err = data_manage.RefreshCalculateHcz(edbInfoId, source, fromEdbInfo, calculateHcz.EdbCode, startDate, endDate)
+			//startDate := time.Now().AddDate(-2, -2, 0).Format(utils.FormatDate)
+			//endDate := "" //time.Now().Format(utils.FormatDate)
+			err = data_manage.RefreshCalculateHcz(edbInfoId, source, fromEdbInfo, calculateHcz.EdbCode)
 			if err != nil {
 				return errors.New("RefreshCalculateTbz Err:" + err.Error())
 			}
@@ -385,11 +406,14 @@ func RefreshDataFromCalculateAll() (err error) {
 			if calculateBp != nil {
 				fromEdbInfo, err := data_manage.GetEdbInfoById(calculateBp.FromEdbInfoId)
 				if err != nil {
+					if err.Error() == utils.ErrNoRow() {
+						continue
+					}
 					return errors.New("GetEdbInfoById Err:" + err.Error())
 				}
-				startDate := time.Now().AddDate(-2, -2, 0).Format(utils.FormatDate)
-				endDate := "" //time.Now().Format(utils.FormatDate)
-				err = data_manage.RefreshCalculateBp(edbInfoId, fromEdbInfo, calculateBp.EdbCode, startDate, endDate)
+				//startDate := time.Now().AddDate(-2, -2, 0).Format(utils.FormatDate)
+				//endDate := "" //time.Now().Format(utils.FormatDate)
+				err = data_manage.RefreshCalculateBp(edbInfoId, fromEdbInfo, calculateBp.EdbCode)
 				if err != nil {
 					return errors.New("RefreshCalculateTbz Err:" + err.Error())
 				}
@@ -401,23 +425,40 @@ func RefreshDataFromCalculateAll() (err error) {
 			}
 			fromEdbInfo, err := data_manage.GetEdbInfoById(calculate.FromEdbInfoId)
 			if err != nil {
+				if err.Error() == utils.ErrNoRow() {
+					continue
+				}
 				return fmt.Errorf("GetEdbInfoById Err:" + err.Error())
 			}
-			startDate := v.StartDate.Format(utils.FormatDate)
-			endDate := time.Now().Format(utils.FormatDate)
+			//startDate := v.StartDate.Format(utils.FormatDate)
+			//endDate := time.Now().Format(utils.FormatDate)
 			formulaInt, _ := strconv.Atoi(calculate.CalculateFormula)
-			err = data_manage.RefreshAllCalculateTimeShift(edbInfoId, source, formulaInt, calculate.MoveType, fromEdbInfo, calculate.EdbCode, startDate, endDate, calculate.MoveFrequency)
+			err = data_manage.RefreshAllCalculateTimeShift(edbInfoId, source, formulaInt, calculate.MoveType, fromEdbInfo, calculate.EdbCode, calculate.MoveFrequency)
 			if err != nil {
 				return fmt.Errorf("RefreshAllCalculateTimeShift Err:" + err.Error())
 			}
 
 		} else if source == utils.DATA_SOURCE_CALCULATE_ZJPJ { //刷新直接拼接
-			err = data_manage.RefreshAllCalculateZjpj(v)
+			tmpEdbInfo, err := data_manage.GetEdbInfoById(v.EdbInfoId)
+			if err != nil {
+				if err.Error() == utils.ErrNoRow() {
+					continue
+				}
+				return fmt.Errorf("GetEdbInfoById Err:" + err.Error())
+			}
+			err = data_manage.RefreshAllCalculateZjpj(tmpEdbInfo)
 			if err != nil {
 				return fmt.Errorf("RefreshAllCalculateZjpj Err:" + err.Error())
 			}
 		} else if source == utils.DATA_SOURCE_CALCULATE_LJZTBPJ { //刷新累计值同比拼接
-			err = data_manage.RefreshAllCalculateLjztbpj(v)
+			tmpEdbInfo, err := data_manage.GetEdbInfoById(v.EdbInfoId)
+			if err != nil {
+				if err.Error() == utils.ErrNoRow() {
+					continue
+				}
+				return fmt.Errorf("GetEdbInfoById Err:" + err.Error())
+			}
+			err = data_manage.RefreshAllCalculateLjztbpj(tmpEdbInfo)
 			if err != nil {
 				return fmt.Errorf("RefreshAllCalculateLjztbpj Err:" + err.Error())
 			}

services/task.go

@@ -708,3 +708,21 @@ func deleteTask() {
 		}
 	}
 }
+
+func init() {
+	fmt.Println("进来了")
+	//wg := sync.WaitGroup{}
+	//wg.Add(1)
+	fmt.Println("开始刷新手工数据")
+	//手工数据
+	//go data.RefreshDataFromManual(&wg)
+
+	//wg.Wait()
+	fmt.Println("开始刷新计算指标")
+	//计算指标
+	data.RefreshDataFromCalculateAll()
+
+	time.Sleep(2 * time.Second)
+	fmt.Println("结束了")
+	return
+}