Merge branch 'debug' of http://8.136.199.33:3000/hongze/hongze_edb_lib into debug

controllers/base_from_calculate.go

@@ -579,13 +579,13 @@ func (this *CalculateController) Refresh() {
 
 		switch source {
 		case utils.DATA_SOURCE_CALCULATE:
-			startDate = edbInfo.StartDate
-			sTime, err := time.Parse(utils.FormatDate, edbInfo.EndDate)
-			if err != nil {
-				return
-			}
-			startDate = sTime.Format(utils.FormatDate)
-
+			//startDate = edbInfo.StartDate
+			//sTime, err := time.Parse(utils.FormatDate, edbInfo.EndDate)
+			//if err != nil {
+			//	return
+			//}
+			//startDate = sTime.Format(utils.FormatDate)
+			startDate = ""
 			var edbInfoIdBytes []string
 			calculateMap, err := models.GetEdbInfoCalculateDetailList(edbInfo.EdbInfoId)
 			if err != nil {
@@ -602,7 +602,7 @@ func (this *CalculateController) Refresh() {
 				edbInfoList = append(edbInfoList, edbInfo)
 			}
 			err = models.RefreshAllCalculate(edbInfoList, edbInfo.EdbInfoId, source, edbInfo.EdbCode, edbInfo.CalculateFormula, startDate, endDate, edbInfoIdBytes)
-			if err != nil {
+			if err != nil && err.Error() != utils.ErrNoRow() {
 				errMsg = "RefreshCalculate Err:" + err.Error()
 				break
 			}
@@ -620,7 +620,7 @@ func (this *CalculateController) Refresh() {
 			startDate = edbInfo.StartDate
 			endDate = time.Now().Format(utils.FormatDate)
 			err = models.RefreshAllCalculateLjzzy(edbInfoId, source, fromEdbInfo, calculateLjzzy.EdbCode, startDate, endDate)
-			if err != nil {
+			if err != nil && err.Error() != utils.ErrNoRow() {
 				errMsg = "RefreshAllCalculateLjzzy Err:" + err.Error()
 				break
 			}
@@ -638,7 +638,7 @@ func (this *CalculateController) Refresh() {
 			startDate = edbInfo.StartDate
 			endDate = time.Now().Format(utils.FormatDate)
 			err = models.RefreshAllCalculateTbz(edbInfoId, source, fromEdbInfo, calculateTbz.EdbCode, startDate, endDate)
-			if err != nil {
+			if err != nil && err.Error() != utils.ErrNoRow() {
 				errMsg = "RefreshAllCalculateTbz Err:" + err.Error()
 				break
 			}
@@ -656,7 +656,7 @@ func (this *CalculateController) Refresh() {
 			startDate = edbInfo.StartDate
 			endDate = time.Now().Format(utils.FormatDate)
 			err = models.RefreshAllCalculateTcz(edbInfoId, source, fromEdbInfo, calculateTcz.EdbCode, startDate, endDate)
-			if err != nil {
+			if err != nil && err.Error() != utils.ErrNoRow() {
 				errMsg = "RefreshCalculateTcz Err:" + err.Error()
 				break
 			}
@@ -674,7 +674,7 @@ func (this *CalculateController) Refresh() {
 			formulaInt, _ := strconv.Atoi(edbInfo.CalculateFormula)
 			startDate = edbInfo.StartDate
 			err = models.RefreshAllCalculateNszydpjjs(edbInfoId, edbInfo.Source, formulaInt, fromEdbInfo, calculateNszydpjjs.EdbCode, startDate)
-			if err != nil {
+			if err != nil && err.Error() != utils.ErrNoRow() {
 				errMsg = "RefreshCalculateNszydpjjs Err:" + err.Error()
 				break
 			}
@@ -693,7 +693,7 @@ func (this *CalculateController) Refresh() {
 			endDate = time.Now().Format(utils.FormatDate)
 			formulaInt, _ := strconv.Atoi(edbInfo.CalculateFormula)
 			err = models.RefreshAllCalculateHbz(edbInfoId, source, fromEdbInfo, calculateTbz.EdbCode, startDate, endDate, formulaInt)
-			if err != nil {
+			if err != nil && err.Error() != utils.ErrNoRow() {
 				errMsg = "RefreshAllCalculateHbz Err:" + err.Error()
 				break
 			}
@@ -712,7 +712,7 @@ func (this *CalculateController) Refresh() {
 			endDate = time.Now().Format(utils.FormatDate)
 			formulaInt, _ := strconv.Atoi(edbInfo.CalculateFormula)
 			err = models.RefreshAllCalculateHcz(edbInfoId, source, fromEdbInfo, calculateTbz.EdbCode, startDate, endDate, formulaInt)
-			if err != nil {
+			if err != nil && err.Error() != utils.ErrNoRow() {
 				errMsg = "RefreshAllCalculateHcz Err:" + err.Error()
 				break
 			}
@@ -730,7 +730,7 @@ func (this *CalculateController) Refresh() {
 			startDate = edbInfo.StartDate
 			endDate = time.Now().Format(utils.FormatDate)
 			err = models.RefreshAllCalculateBp(edbInfoId, source, fromEdbInfo, calculateTbz.EdbCode, startDate, endDate)
-			if err != nil {
+			if err != nil && err.Error() != utils.ErrNoRow() {
 				errMsg = "RefreshAllCalculateBp Err:" + err.Error()
 				break
 			}
@@ -749,18 +749,18 @@ func (this *CalculateController) Refresh() {
 			endDate = time.Now().Format(utils.FormatDate)
 			formulaInt, _ := strconv.Atoi(calculate.CalculateFormula)
 			err = models.RefreshAllCalculateTimeShift(edbInfoId, source, formulaInt, calculate.MoveType, fromEdbInfo, calculate.EdbCode, startDate, endDate, calculate.MoveFrequency)
-			if err != nil {
+			if err != nil && err.Error() != utils.ErrNoRow() {
 				errMsg = "RefreshAllCalculateTimeShift Err:" + err.Error()
 			}
 		case utils.DATA_SOURCE_CALCULATE_ZJPJ: //刷新直接拼接
 			err = models.RefreshAllCalculateZjpj(edbInfo)
-			if err != nil {
+			if err != nil && err.Error() != utils.ErrNoRow() {
 				errMsg = "RefreshAllCalculateZjpj Err:" + err.Error()
 				break
 			}
 		case utils.DATA_SOURCE_CALCULATE_LJZTBPJ: //刷新累计值同比拼接
 			err = models.RefreshAllCalculateLjztbpj(edbInfo)
-			if err != nil {
+			if err != nil && err.Error() != utils.ErrNoRow() {
 				errMsg = "RefreshAllCalculateLjztbpj Err:" + err.Error()
 				break
 			}

controllers/base_from_cffex.go

@@ -13,7 +13,6 @@ type CffexController struct {
 	BaseAuthController
 }
 
-
 // @Title 新增中金所指标接口
 // @Description 新增中金所指标接口
 // @Success 200 {object} models.AddEdbInfoReq
@@ -92,7 +91,7 @@ func (this *CffexController) Refresh() {
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
 		err = models.RefreshEdbDataFromCffex(req.EdbInfoId, req.EdbCode, req.StartDate)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"
 			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromCffex，Err:" + err.Error()
 			return
@@ -105,4 +104,4 @@ func (this *CffexController) Refresh() {
 		br.Success = true
 		br.Msg = "系统处理中，请稍后重试"
 	}
-}
+}

controllers/base_from_dl.go

@@ -13,7 +13,6 @@ type DlController struct {
 	BaseAuthController
 }
 
-
 // @Title 新增大商所指标接口
 // @Description 新增大商所指标接口
 // @Success 200 {object} models.AddEdbInfoReq
@@ -92,7 +91,7 @@ func (this *DlController) Refresh() {
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
 		err = models.RefreshEdbDataFromDl(req.EdbInfoId, req.EdbCode, req.StartDate)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"
 			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromDl，Err:" + err.Error()
 			return
@@ -105,4 +104,4 @@ func (this *DlController) Refresh() {
 		br.Success = true
 		br.Msg = "系统处理中，请稍后重试"
 	}
-}
+}

controllers/base_from_gie.go

@@ -91,7 +91,7 @@ func (this *GieController) Refresh() {
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
 		err = models.RefreshEdbDataFromGie(req.EdbInfoId, req.EdbCode, req.StartDate)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"
 			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromGie，Err:" + err.Error()
 			return
@@ -104,4 +104,4 @@ func (this *GieController) Refresh() {
 		br.Success = true
 		br.Msg = "系统处理中，请稍后重试"
 	}
-}
+}

controllers/base_from_lt.go

@@ -39,13 +39,13 @@ func (this *LtController) Add() {
 		br.ErrMsg = "请输入指标编码，指标编码为空"
 		return
 	}
-	cacheKey = utils.CACHE_EDB_DATA_ADD+ strconv.Itoa(source) + "_" + req.EdbCode
+	cacheKey = utils.CACHE_EDB_DATA_ADD + strconv.Itoa(source) + "_" + req.EdbCode
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
 		dataItem, err := services.GetEdbDataFromLt(req.EdbCode, utils.BASE_START_DATE, utils.BASE_END_DATE)
 		if err != nil {
 			br.Msg = "获取指标信息失败！"
-			br.ErrMsg = "获取指标信息失败 GetEdbDataFromWind，Err:" + err.Error()
+			br.ErrMsg = "获取指标信息失败 GetEdbDataFromLt，Err:" + err.Error()
 			return
 		}
 		err = models.AddEdbDataFromLt(req.EdbCode, dataItem)
@@ -103,8 +103,8 @@ func (this *LtController) Refresh() {
 			br.ErrMsg = "获取指标信息失败 GetEdbDataFromLt，Err:" + err.Error()
 			return
 		}
-		err = models.RefreshEdbDataFromLt(req.EdbInfoId, req.EdbCode, req.StartDate,dataItem)
-		if err != nil {
+		err = models.RefreshEdbDataFromLt(req.EdbInfoId, req.EdbCode, req.StartDate, dataItem)
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"
 			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromLt，Err:" + err.Error()
 			return
@@ -117,4 +117,4 @@ func (this *LtController) Refresh() {
 		br.Success = true
 		br.Msg = "系统处理中，请稍后重试"
 	}
-}
+}

controllers/base_from_lz.go

@@ -38,7 +38,7 @@ func (this *LzController) Add() {
 		br.ErrMsg = "请输入指标编码，指标编码为空"
 		return
 	}
-	cacheKey = utils.CACHE_EDB_DATA_ADD+ strconv.Itoa(source) + "_" + req.EdbCode
+	cacheKey = utils.CACHE_EDB_DATA_ADD + strconv.Itoa(source) + "_" + req.EdbCode
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
 		err = models.AddEdbDataFromLz(req.EdbCode)
@@ -57,7 +57,6 @@ func (this *LzController) Add() {
 	}
 }
 
-
 // @Title 刷新隆众指标接口
 // @Description 刷新隆众指标接口
 // @Success 200 {object} models.RefreshEdbInfoReq
@@ -92,7 +91,7 @@ func (this *LzController) Refresh() {
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
 		err = models.RefreshEdbDataFromLz(req.EdbInfoId, req.EdbCode, req.StartDate)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"
 			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromLz，Err:" + err.Error()
 			return
@@ -105,4 +104,4 @@ func (this *LzController) Refresh() {
 		br.Success = true
 		br.Msg = "系统处理中，请稍后重试"
 	}
-}
+}

controllers/base_from_manual.go

@@ -91,7 +91,7 @@ func (this *ManualController) Refresh() {
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
 		err = models.RefreshEdbDataFromManual(req.EdbInfoId, req.EdbCode, req.StartDate)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"
 			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromManual，Err:" + err.Error()
 			return
@@ -104,4 +104,4 @@ func (this *ManualController) Refresh() {
 		br.Success = true
 		br.Msg = "系统处理中，请稍后重试"
 	}
-}
+}

controllers/base_from_mysteel.go

@@ -91,7 +91,7 @@ func (this *MySteelController) Refresh() {
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
 		err = models.RefreshEdbDataFromMysteel(req.EdbInfoId, req.EdbCode, req.StartDate)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"
 			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromMysteel，Err:" + err.Error()
 			return
@@ -104,4 +104,4 @@ func (this *MySteelController) Refresh() {
 		br.Success = true
 		br.Msg = "系统处理中，请稍后重试"
 	}
-}
+}

controllers/base_from_pb.go

@@ -97,14 +97,17 @@ func (this *PbController) Refresh() {
 	cacheKey = utils.CACHE_EDB_DATA_REFRESH + strconv.Itoa(source) + "_" + req.EdbCode
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
-		dataItem, err := services.GetEdbDataFromPb(req.EdbCode, req.StartDate, utils.BASE_END_DATE_UnSpace)
+
+		//开始日期格式化
+		startDateTime, _ := time.Parse(utils.FormatDate, req.StartDate)
+		dataItem, err := services.GetEdbDataFromPb(req.EdbCode, startDateTime.Format(utils.FormatDateUnSpace), utils.BASE_END_DATE_UnSpace)
 		if err != nil {
 			br.Msg = "获取指标信息失败！"
 			br.ErrMsg = "获取指标信息失败 GetEdbDataFromPb，Err:" + err.Error()
 			return
 		}
 		err = models.RefreshEdbDataFromPb(req.EdbInfoId, req.EdbCode, req.StartDate, dataItem)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"
 			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromPb，Err:" + err.Error()
 			return
@@ -117,4 +120,4 @@ func (this *PbController) Refresh() {
 		br.Success = true
 		br.Msg = "系统处理中，请稍后重试"
 	}
-}
+}

controllers/base_from_sh.go

@@ -13,7 +13,6 @@ type ShController struct {
 	BaseAuthController
 }
 
-
 // @Title 新增上期所指标接口
 // @Description 新增上期所指标接口
 // @Success 200 {object} models.AddEdbInfoReq
@@ -92,7 +91,7 @@ func (this *ShController) Refresh() {
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
 		err = models.RefreshEdbDataFromSh(req.EdbInfoId, req.EdbCode, req.StartDate)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"
 			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromSh，Err:" + err.Error()
 			return
@@ -105,4 +104,4 @@ func (this *ShController) Refresh() {
 		br.Success = true
 		br.Msg = "系统处理中，请稍后重试"
 	}
-}
+}

controllers/base_from_shfe.go

@@ -13,7 +13,6 @@ type ShfeController struct {
 	BaseAuthController
 }
 
-
 // @Title 新增上期能源指标接口
 // @Description 新增上期能源指标接口
 // @Success 200 {object} models.AddEdbInfoReq
@@ -92,7 +91,7 @@ func (this *ShfeController) Refresh() {
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
 		err = models.RefreshEdbDataFromShfe(req.EdbInfoId, req.EdbCode, req.StartDate)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"
 			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromShfe，Err:" + err.Error()
 			return
@@ -105,4 +104,4 @@ func (this *ShfeController) Refresh() {
 		br.Success = true
 		br.Msg = "系统处理中，请稍后重试"
 	}
-}
+}

controllers/base_from_smm.go

@@ -38,7 +38,7 @@ func (this *SmmController) Add() {
 		br.ErrMsg = "请输入指标编码，指标编码为空"
 		return
 	}
-	cacheKey = utils.CACHE_EDB_DATA_ADD+ strconv.Itoa(source) + "_" + req.EdbCode
+	cacheKey = utils.CACHE_EDB_DATA_ADD + strconv.Itoa(source) + "_" + req.EdbCode
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
 		err = models.AddEdbDataFromSmm(req.EdbCode)
@@ -91,7 +91,7 @@ func (this *SmmController) Refresh() {
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
 		err = models.RefreshEdbDataFromSmm(req.EdbInfoId, req.EdbCode, req.StartDate)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"
 			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromSmm，Err:" + err.Error()
 			return
@@ -104,4 +104,4 @@ func (this *SmmController) Refresh() {
 		br.Success = true
 		br.Msg = "系统处理中，请稍后重试"
 	}
-}
+}

controllers/base_from_ths.go

@@ -104,7 +104,7 @@ func (this *ThsController) Refresh() {
 			return
 		}
 		err = models.RefreshEdbDataFromThs(req.EdbInfoId, req.EdbCode, req.StartDate, dataItem)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"
 			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromThs，Err:" + err.Error()
 			return
@@ -117,4 +117,4 @@ func (this *ThsController) Refresh() {
 		br.Success = true
 		br.Msg = "系统处理中，请稍后重试"
 	}
-}
+}

controllers/base_from_wind.go

@@ -6,6 +6,7 @@ import (
 	"hongze/hongze_edb_lib/services"
 	"hongze/hongze_edb_lib/utils"
 	"strconv"
+	"strings"
 	"time"
 )
 
@@ -42,7 +43,14 @@ func (this *WindController) Add() {
 	cacheKey = utils.CACHE_EDB_DATA_ADD + strconv.Itoa(source) + "_" + req.EdbCode
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
-		dataItem, err := services.GetEdbDataFromWind(req.EdbCode, utils.BASE_START_DATE, utils.BASE_END_DATE)
+
+		//期货数据，就默认到今天，特殊处理下
+		endDate := utils.BASE_END_DATE
+		if strings.Contains(req.EdbCode, ".") {
+			endDate = time.Now().Format(utils.FormatDate)
+		}
+
+		dataItem, err := services.GetEdbDataFromWind(req.EdbCode, utils.BASE_START_DATE, endDate)
 		if err != nil {
 			br.Msg = "获取指标信息失败！"
 			br.ErrMsg = "获取指标信息失败 GetEdbDataFromWind，Err:" + err.Error()
@@ -97,14 +105,21 @@ func (this *WindController) Refresh() {
 	cacheKey = utils.CACHE_EDB_DATA_REFRESH + strconv.Itoa(source) + "_" + req.EdbCode
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
-		dataItem, err := services.GetEdbDataFromWind(req.EdbCode, req.StartDate, utils.BASE_END_DATE)
+
+		//期货数据，就默认到今天，特殊处理下
+		endDate := utils.BASE_END_DATE
+		if strings.Contains(req.EdbCode, ".") {
+			endDate = time.Now().Format(utils.FormatDate)
+		}
+
+		dataItem, err := services.GetEdbDataFromWind(req.EdbCode, req.StartDate, endDate)
 		if err != nil {
 			br.Msg = "获取指标信息失败！"
 			br.ErrMsg = "获取指标信息失败 GetEdbDataFromWind，Err:" + err.Error()
 			return
 		}
 		err = models.RefreshEdbDataFromWind(req.EdbInfoId, req.EdbCode, req.StartDate, dataItem)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"
 			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromWind，Err:" + err.Error()
 			return

controllers/base_from_zz.go

@@ -91,7 +91,7 @@ func (this *ZzController) Refresh() {
 	if !utils.Rc.IsExist(cacheKey) {
 		utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
 		err = models.RefreshEdbDataFromZz(req.EdbInfoId, req.EdbCode, req.StartDate)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "刷新指标信息失败！"
 			br.ErrMsg = "刷新指标信息失败 RefreshEdbDataFromZz，Err:" + err.Error()
 			return
@@ -104,4 +104,4 @@ func (this *ZzController) Refresh() {
 		br.Success = true
 		br.Msg = "系统处理中，请稍后重试"
 	}
-}
+}

main.go

@@ -7,8 +7,8 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/beego/beego/v2/server/web"
 	"github.com/beego/beego/v2/adapter/logs"
+	"github.com/beego/beego/v2/server/web"
 	"github.com/beego/beego/v2/server/web/context"
 )
 

models/base_from_calculate.go

@@ -68,7 +68,7 @@ func AddCalculate(edbInfoIdArr []*EdbInfo, edbInfoId int, edbCode, formulaStr st
 		item.DataMap = dataMap
 	}
 	formulaMap := services.CheckFormula(formulaStr)
-	addSql := ` INSERT INTO edb_data_calculate(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+	addSql := ` INSERT INTO edb_data_calculate(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	nowStr := time.Now().Format(utils.FormatDateTime)
 	var isAdd bool
 	for sk, sv := range saveDataMap {
@@ -146,10 +146,10 @@ func RefreshAllCalculate(edbInfoIdArr []*EdbInfo, edbInfoId, source int, edbCode
 			condition += " AND data_time>=? "
 			pars = append(pars, startDate)
 		}
-		if endDate != "" {
-			condition += " AND data_time<=? "
-			pars = append(pars, endDate)
-		}
+		//if endDate != "" {
+		//	condition += " AND data_time<=? "
+		//	pars = append(pars, endDate)
+		//}
 		fmt.Println("v.Source:", v.Source)
 		dataList, err := GetEdbDataListAll(condition, pars, v.Source, 1)
 		if err != nil {
@@ -173,7 +173,7 @@ func RefreshAllCalculate(edbInfoIdArr []*EdbInfo, edbInfoId, source int, edbCode
 	}
 
 	formulaMap := services.CheckFormula(formulaStr)
-	addSql := ` INSERT INTO edb_data_calculate(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+	addSql := ` INSERT INTO edb_data_calculate(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
 
 	//获取指标所有数据
@@ -191,6 +191,8 @@ func RefreshAllCalculate(edbInfoIdArr []*EdbInfo, edbInfoId, source int, edbCode
 	}
 	edbInfoIdStr := strconv.Itoa(edbInfoId)
 	existDataMap := make(map[string]string)
+
+	removeDateList := make([]string, 0) //需要移除的日期
 	for sk, sv := range saveDataMap {
 		fmt.Println(sk, sv)
 		formulaStr = strings.ToUpper(formulaStr)
@@ -200,6 +202,11 @@ func RefreshAllCalculate(edbInfoIdArr []*EdbInfo, edbInfoId, source int, edbCode
 			expression := formula.NewExpression(formulaFormStr)
 			calResult, err := expression.Evaluate()
 			if err != nil {
+				// 分母为0的报错
+				if strings.Contains(err.Error(), "divide by zero") {
+					removeDateList = append(removeDateList, sk)
+					continue
+				}
 				err = errors.New("计算失败：Err:" + err.Error() + ";formulaStr:" + formulaFormStr)
 				fmt.Println(err)
 				return err
@@ -234,6 +241,7 @@ func RefreshAllCalculate(edbInfoIdArr []*EdbInfo, edbInfoId, source int, edbCode
 			}
 		}
 	}
+
 	if isAdd {
 		addSql = strings.TrimRight(addSql, ",")
 		_, err = o.Raw(addSql).Exec()
@@ -242,6 +250,20 @@ func RefreshAllCalculate(edbInfoIdArr []*EdbInfo, edbInfoId, source int, edbCode
 			return
 		}
 	}
+
+	if len(removeDateList) > 0 {
+		removeDateStr := strings.Join(removeDateList, `","`)
+		removeDateStr = `"` + removeDateStr + `"`
+		//如果拼接指标变更了，那么需要删除所有的指标数据
+		tableName := GetEdbDataTableName(source)
+		sql := fmt.Sprintf(` DELETE FROM %s WHERE edb_info_id = ? and data_time in (%s) `, tableName, removeDateStr)
+
+		_, err = o.Raw(sql, edbInfoId).Exec()
+		if err != nil {
+			err = fmt.Errorf("删除计算失败的计算指标数据失败,Err:" + err.Error())
+			return
+		}
+	}
 	return
 }
 

models/base_from_manual.go

@@ -149,7 +149,7 @@ func RefreshEdbDataFromManual(edbInfoId int, edbCode, startDate string) (err err
 	}
 	for _, v := range existList {
 		if _, ok := manualMap[v.DataTime]; !ok {
-			go DeleteEdbDataById(v.EdbDataId, utils.DATA_SOURCE_MANUAL)
+			go DeleteEdbDataById(utils.DATA_SOURCE_MANUAL, v.EdbDataId)
 		}
 	}
 	if isAdd {

models/base_from_mysteel.go

@@ -19,7 +19,7 @@ type GlData struct {
 
 func GetGlDataByCondition(condition string, pars []interface{}) (item []*GlData, err error) {
 	condition += " AND IS_DELETE=0 "
-	sql := ` SELECT * FROM mb_index_main_data WHERE 1=1 `
+	sql := ` SELECT * FROM mb_index_main_data WHERE 1=1 AND DATA_VALUE is not null `
 	o := orm.NewOrmUsingDB("gl")
 	if condition != "" {
 		sql += condition
@@ -131,7 +131,7 @@ func RefreshEdbDataFromMysteel(edbInfoId int, edbCode, startDate string) (err er
 	for _, v := range glDataList {
 		item := v
 		eDate := item.DataTime
-		sValue :=utils.SubFloatToString(item.InputValue, 30)
+		sValue := utils.SubFloatToString(item.InputValue, 30)
 
 		if findItem, ok := existMap[v.DataTime]; !ok {
 			if sValue != "" {

models/base_from_wind.go

@@ -27,7 +27,7 @@ func AddEdbDataFromWind(edbCode string, item *services.EdbDataFromWind) (err err
 		t := time.Unix(v, 0)
 		dateTime := t.Format(utils.FormatDate)
 		val := item.Close[k]
-		saveVal:=utils.SubFloatToString(val, 20)
+		saveVal := utils.SubFloatToString(val, 20)
 		addSql += GetAddSql("0", edbCode, dateTime, timeStr, saveVal)
 
 		isAdd = true
@@ -55,7 +55,7 @@ func RefreshEdbDataFromWind(edbInfoId int, edbCode, startDate string, item *serv
 	condition += " AND edb_info_id=? "
 	pars = append(pars, edbInfoId)
 
-	if startDate!="" {
+	if startDate != "" {
 		condition += " AND data_time>=? "
 		pars = append(pars, startDate)
 	}
@@ -100,5 +100,6 @@ func RefreshEdbDataFromWind(edbInfoId int, edbCode, startDate string, item *serv
 			return
 		}
 	}
+
 	return
 }

models/db.go

@@ -1,10 +1,10 @@
 package models
 
 import (
+	"github.com/beego/beego/v2/client/orm"
 	_ "github.com/go-sql-driver/mysql"
 	"hongze/hongze_edb_lib/utils"
 	"time"
-	"github.com/beego/beego/v2/client/orm"
 )
 
 func init() {
@@ -31,5 +31,8 @@ func init() {
 
 	orm.Debug = true
 	//注册对象
-	orm.RegisterModel()
+	orm.RegisterModel(
+		new(EdbDataCalculateZjpj),
+		new(EdbDataCalculateLjztbpj),
+	)
 }

models/edb_data_base.go

@@ -109,3 +109,14 @@ type RefreshEdbInfoReq struct {
 	EdbCode   string `description:"指标编码"`
 	StartDate string `description:"开始日期"`
 }
+
+// GetAllEdbDataList 获取所有的指标数据列表
+func GetAllEdbDataList(edbInfoId, source int) (existDataList []*EdbData, err error) {
+	o := orm.NewOrm()
+	dataTableName := GetEdbDataTableName(source)
+	fmt.Println("dataTableName:", dataTableName)
+	sql := `SELECT * FROM %s WHERE edb_info_id=? order by data_time asc`
+	sql = fmt.Sprintf(sql, dataTableName)
+	_, err = o.Raw(sql, edbInfoId).QueryRows(&existDataList)
+	return
+}

models/edb_data_calculate_bp.go

@@ -97,7 +97,7 @@ func AddCalculateBp(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbInfo, edb
 		return edbInfoId, err
 	}
 
-	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_bp(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
 	existMap := make(map[string]string)
 	dataLen := len(dataList)
@@ -273,7 +273,7 @@ func EditCalculateBp(req *EdbInfoCalculateBatchEditReq, fromEdbInfo *EdbInfo, ed
 		if err != nil {
 			return edbInfoId, err
 		}
-		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_bp(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 		var isAdd bool
 		existMap := make(map[string]string)
 		dataLen := len(dataList)
@@ -328,8 +328,8 @@ func EditCalculateBp(req *EdbInfoCalculateBatchEditReq, fromEdbInfo *EdbInfo, ed
 	return
 }
 
-// RefreshAllCalculateBp 刷新所有变频数据
-func RefreshAllCalculateBp(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string) (err error) {
+// RefreshAllCalculateBpBak 刷新所有变频数据
+func RefreshAllCalculateBpBak(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string) (err error) {
 	o := orm.NewOrm()
 	to, err := o.Begin()
 	if err != nil {
@@ -391,7 +391,7 @@ func RefreshAllCalculateBp(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode,
 		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_bp(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
 
 	existMap := make(map[string]string)
@@ -468,3 +468,185 @@ func RefreshAllCalculateBp(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode,
 	}
 	return
 }
+
+func RefreshAllCalculateBp(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode, startDate, endDate string) (err error) {
+	o := orm.NewOrm()
+	to, err := o.Begin()
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err != nil {
+			fmt.Println("RefreshAllCalculateBp,Err:" + err.Error())
+			_ = to.Rollback()
+		} else {
+			_ = to.Commit()
+		}
+	}()
+
+	if err != nil {
+		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, 1)
+	if err != nil {
+		return err
+	}
+	var dateArr []string
+	dataMap := make(map[string]*EdbInfoSearchData)
+	fromDataMap := make(map[string]float64)
+	//来源指指标数据
+	for _, v := range dataList {
+		dateArr = append(dateArr, v.DataTime)
+		dataMap[v.DataTime] = v
+		fromDataMap[v.DataTime] = v.Value
+	}
+	fmt.Println("source:", source)
+
+	//获取变频指标所有数据
+	existDataList, err := GetAllEdbDataList(edbInfoId, source)
+	if err != nil {
+		return
+	}
+	//计算指标的map
+	existDataMap := make(map[string]*EdbData, 0)
+
+	addSql := ` INSERT INTO edb_data_calculate_bp(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	var isAdd bool
+
+	var lastValue float64   //最后数据的值(float64)
+	var lastValueStr string //最后数据的值(string)
+	//待删除的日期
+	removeDateList := make([]string, 0)
+	if len(existDataList) > 0 {
+		//第一个已经入库的日期
+		firstExistDataTimeStr := existDataList[0].DataTime //计算指标数据第一条的日期字符串
+		if len(dateArr) > 0 {
+			firstFromDataTimeStr := dateArr[0]                                                             //来源数据第一条的日期字符串
+			firstExistDataTime, _ := time.Parse(utils.FormatDate, firstExistDataTimeStr)                   //计算指标数据第一条的日期（time类型）
+			firstFromDataTime, _ := time.Parse(utils.FormatDate, firstFromDataTimeStr)                     //来源数据第一条的日期（time类型）
+			nowDateStr := time.Now().Format(utils.FormatDate)                                              //当天日期字符串
+			nowDate, _ := time.ParseInLocation(utils.FormatDate, nowDateStr, firstFromDataTime.Location()) //当天日期（time类型）
+
+			lastValue = fromDataMap[firstFromDataTimeStr]
+			lastValueStr = decimal.NewFromFloat(lastValue).String()
+			//第一步： 判断来源指标的开始时间与计算指标的开始时间是否相等，相等的话，那么就不需要对两个时间之间的数据做处理
+			if firstExistDataTimeStr != firstFromDataTimeStr {
+				if firstExistDataTime.Before(firstFromDataTime) { //如果计算指标第一条数据的开始时间 早于 来源指标的第一条开始时间，那么需要对两个时间之间的计算指标数据做 删除处理
+					for _, v := range existDataList {
+						if v.DataTime == firstFromDataTimeStr {
+							if tmpLastValue, ok := fromDataMap[firstFromDataTimeStr]; ok { //来源指标当天的数据
+								lastValue = tmpLastValue
+								lastValueStr = decimal.NewFromFloat(lastValue).String()
+							}
+							break
+						}
+						removeDateList = append(removeDateList, v.DataTime)
+					}
+				} else {
+					for _, v := range dateArr { //如果计算指标第一条数据的开始时间 晚于 来源指标的第一条开始时间，那么需要对两个时间之间的计算指标数据做 新增处理
+						if v == firstExistDataTimeStr {
+							if tmpLastValue, ok := fromDataMap[v]; ok { //来源指标当天的数据
+								lastValue = tmpLastValue
+								lastValueStr = decimal.NewFromFloat(lastValue).String()
+							}
+							break
+						}
+
+						currentDate, _ := time.Parse(utils.FormatDate, v)
+						timestamp := currentDate.UnixNano() / 1e6
+						timestampStr := fmt.Sprintf("%d", timestamp)
+						addSql += GetAddSql(edbInfoIdStr, edbCode, v, timestampStr, lastValueStr)
+
+						isAdd = true
+					}
+				}
+			}
+
+			//第二步 剩余数据每天修改
+
+			day := int(nowDate.Sub(firstExistDataTime).Hours() / float64(24))
+
+			//第二步： 已经入库的数据处理
+			for _, v := range existDataList {
+				existDataMap[v.DataTime] = v
+			}
+
+			for k := day; k >= 0; k-- {
+				needDay := nowDate.AddDate(0, 0, -k)
+				needDayStr := needDay.Format(utils.FormatDate)
+				tmpExistData, ok := existDataMap[needDayStr]
+				if ok {
+					if tmpLastValue, ok := fromDataMap[tmpExistData.DataTime]; ok { //来源指标当天的数据
+						lastValue = tmpLastValue
+						lastValueStr = decimal.NewFromFloat(lastValue).String()
+					}
+					//如果对应的值不匹配
+					if tmpExistData.Value != lastValueStr {
+						err = ModifyEdbDataById(source, tmpExistData.EdbDataId, lastValueStr)
+						if err != nil {
+							return err
+						}
+					}
+				} else {
+					timestamp := needDay.UnixNano() / 1e6
+					timestampStr := fmt.Sprintf("%d", timestamp)
+					addSql += GetAddSql(edbInfoIdStr, edbCode, needDayStr, timestampStr, lastValueStr)
+
+					isAdd = true
+				}
+			}
+		} else {
+			//如果没有来源指标数据，那么已经入库的计算指标数据需要全部删除
+			tableName := GetEdbDataTableName(source)
+			sql := fmt.Sprintf(` DELETE FROM %s WHERE edb_info_id = ?`, tableName)
+			_, err = o.Raw(sql, edbInfoId).Exec()
+			if err != nil {
+				err = fmt.Errorf("删除所有的变频指标数据失败,Err:" + err.Error())
+				return
+			}
+
+			//for _, v := range existDataList {
+			//	removeDateList = append(removeDateList, v.DataTime)
+			//}
+		}
+	}
+
+	// 删除不需要的指标数据
+	if len(removeDateList) > 0 {
+		removeDateStr := strings.Join(removeDateList, `","`)
+		removeDateStr = `"` + removeDateStr + `"`
+		//如果拼接指标变更了，那么需要删除所有的指标数据
+		tableName := GetEdbDataTableName(source)
+		sql := fmt.Sprintf(` DELETE FROM %s WHERE edb_info_id = ? and data_time in (%s) `, tableName, removeDateStr)
+
+		_, err = o.Raw(sql, edbInfoId).Exec()
+		if err != nil {
+			err = fmt.Errorf("删除不存在的变频指标数据失败,Err:" + err.Error())
+			return
+		}
+	}
+
+	if isAdd {
+		addSql = strings.TrimRight(addSql, ",")
+		_, err = o.Raw(addSql).Exec()
+	}
+	return
+}

models/edb_data_calculate_hbz.go

@@ -96,7 +96,7 @@ func AddCalculateHbz(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbInfo, ed
 		return edbInfoId, err
 	}
 
-	addSql := ` INSERT INTO edb_data_calculate_hbz(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+	addSql := ` INSERT INTO edb_data_calculate_hbz(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
 	existMap := make(map[string]string)
 	dataLen := len(dataList)
@@ -226,7 +226,7 @@ func EditCalculateHbz(req *EdbInfoCalculateBatchEditReq, fromEdbInfo *EdbInfo, e
 		if err != nil {
 			return edbInfoId, err
 		}
-		addSql := ` INSERT INTO edb_data_calculate_hbz(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+		addSql := ` INSERT INTO edb_data_calculate_hbz(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 		var isAdd bool
 		existMap := make(map[string]string)
 		dataLen := len(dataList)
@@ -294,10 +294,10 @@ func RefreshAllCalculateHbz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode
 		condition += " AND data_time>=? "
 		pars = append(pars, startDate)
 	}
-	if endDate != "" {
-		condition += " AND data_time<=? "
-		pars = append(pars, endDate)
-	}
+	//if endDate != "" {
+	//	condition += " AND data_time<=? "
+	//	pars = append(pars, endDate)
+	//}
 
 	dataList, err := GetEdbDataListAll(condition, pars, fromEdbInfo.Source, 0)
 	if err != nil {
@@ -324,7 +324,7 @@ func RefreshAllCalculateHbz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode
 	for _, v := range existDataList {
 		existDataMap[v.DataTime] = v.Value
 	}
-	addSql := ` INSERT INTO edb_data_calculate_hbz(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+	addSql := ` INSERT INTO edb_data_calculate_hbz(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
 	existMap := make(map[string]string)
 	dataLen := len(dataList)

models/edb_data_calculate_hcz.go

@@ -97,7 +97,7 @@ func AddCalculateHcz(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbInfo, ed
 		return edbInfoId, err
 	}
 
-	addSql := ` INSERT INTO edb_data_calculate_hcz(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+	addSql := ` INSERT INTO edb_data_calculate_hcz(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
 	existMap := make(map[string]string)
 	dataLen := len(dataList)
@@ -241,7 +241,7 @@ func EditCalculateHcz(req *EdbInfoCalculateBatchEditReq, fromEdbInfo *EdbInfo, e
 			dataMap[v.DataTime] = v
 		}
 
-		addSql := ` INSERT INTO edb_data_calculate_hcz(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+		addSql := ` INSERT INTO edb_data_calculate_hcz(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 		var isAdd bool
 		existMap := make(map[string]string)
 		dataLen := len(dataList)
@@ -310,10 +310,10 @@ func RefreshAllCalculateHcz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode
 		condition += " AND data_time>=? "
 		pars = append(pars, startDate)
 	}
-	if endDate != "" {
-		condition += " AND data_time<=? "
-		pars = append(pars, endDate)
-	}
+	//if endDate != "" {
+	//	condition += " AND data_time<=? "
+	//	pars = append(pars, endDate)
+	//}
 
 	dataList, err := GetEdbDataListAll(condition, pars, fromEdbInfo.Source, 0)
 	if err != nil {
@@ -341,7 +341,7 @@ func RefreshAllCalculateHcz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode
 		existDataMap[v.DataTime] = v.Value
 	}
 	fmt.Println("existDataMap:", existDataMap)
-	addSql := ` INSERT INTO edb_data_calculate_hcz(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+	addSql := ` INSERT INTO edb_data_calculate_hcz(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
 	existMap := make(map[string]string)
 	dataLen := len(dataList)

models/edb_data_calculate_ljzzy.go

@@ -118,7 +118,7 @@ func AddCalculateLjzzy(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbInfo,
 		}
 	}
 
-	addSql := ` INSERT INTO edb_data_calculate_ljzzy(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+	addSql := ` INSERT INTO edb_data_calculate_ljzzy(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
 	existMap := make(map[string]string)
 	for yk, yv := range yearMap {
@@ -337,7 +337,7 @@ func EditCalculateLjzzy(req *EdbInfoCalculateBatchEditReq, fromEdbInfo *EdbInfo,
 			}
 		}
 
-		addSql := ` INSERT INTO edb_data_calculate_ljzzy(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+		addSql := ` INSERT INTO edb_data_calculate_ljzzy(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 		nowStr := time.Now().Format(utils.FormatDateTime)
 		var isAdd bool
 
@@ -445,10 +445,10 @@ func RefreshAllCalculateLjzzy(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCo
 		condition += " AND data_time>=? "
 		pars = append(pars, startDate)
 	}
-	if endDate != "" {
-		condition += " AND data_time<=? "
-		pars = append(pars, endDate)
-	}
+	//if endDate != "" {
+	//	condition += " AND data_time<=? "
+	//	pars = append(pars, endDate)
+	//}
 
 	dataList, err := GetEdbDataListAll(condition, pars, fromEdbInfo.Source, 1)
 	if err != nil {
@@ -476,7 +476,7 @@ func RefreshAllCalculateLjzzy(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCo
 		}
 	}
 
-	addSql := ` INSERT INTO edb_data_calculate_ljzzy(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+	addSql := ` INSERT INTO edb_data_calculate_ljzzy(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
 	//获取指标所有数据
 	existDataList := make([]*EdbData, 0)

models/edb_data_calculate_nszydbpjjs.go

@@ -99,7 +99,7 @@ func AddCalculateNszydpjjs(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbIn
 		dataMap[v.DataTime] = v
 	}
 
-	addSql := ` INSERT INTO edb_data_calculate_nszydpjjs(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+	addSql := ` INSERT INTO edb_data_calculate_nszydpjjs(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
 
 	arrLen := len(dateArr)
@@ -253,7 +253,7 @@ func EditCalculateNszydpjjs(req *EdbInfoCalculateBatchEditReq, fromEdbInfo *EdbI
 			dataMap[v.DataTime] = v
 		}
 
-		addSql := ` INSERT INTO edb_data_calculate_nszydpjjs(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+		addSql := ` INSERT INTO edb_data_calculate_nszydpjjs(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 		var isAdd bool
 
 		arrLen := len(dateArr)
@@ -371,7 +371,7 @@ func RefreshAllCalculateNszydpjjs(edbInfoId, source, formulaInt int, fromEdbInfo
 		fromDataMap[v.DataTime] = v
 	}
 
-	addSql := ` INSERT INTO edb_data_calculate_nszydpjjs(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+	addSql := ` INSERT INTO edb_data_calculate_nszydpjjs(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
 	dataTableName := GetEdbDataTableName(source)
 	arrLen := len(fromDateArr)

models/edb_data_calculate_tbz.go

@@ -104,7 +104,7 @@ func AddCalculateTbz(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbInfo, ed
 		dataMap[v.DataTime] = v
 	}
 
-	addSql := ` INSERT INTO edb_data_calculate_tbz(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+	addSql := ` INSERT INTO edb_data_calculate_tbz(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
 	existMap := make(map[string]string)
 	for _, av := range dateArr {
@@ -350,7 +350,7 @@ func EditCalculateTbz(req *EdbInfoCalculateBatchEditReq, fromEdbInfo *EdbInfo, e
 			dataMap[v.DataTime] = v
 		}
 
-		addSql := ` INSERT INTO edb_data_calculate_tbz(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+		addSql := ` INSERT INTO edb_data_calculate_tbz(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 		var isAdd bool
 		for _, av := range dateArr {
 			currentItem := dataMap[av]
@@ -478,8 +478,8 @@ func RefreshAllCalculateTbz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode
 		return
 	}
 	defer func() {
-		fmt.Println("RefreshAllCalculateTbz,Err:" + err.Error())
 		if err != nil {
+			fmt.Println("RefreshAllCalculateTbz,Err:" + err.Error())
 			_ = to.Rollback()
 		} else {
 			_ = to.Commit()
@@ -502,10 +502,10 @@ func RefreshAllCalculateTbz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode
 		condition += " AND data_time>=? "
 		pars = append(pars, startDate)
 	}
-	if endDate != "" {
-		condition += " AND data_time<=? "
-		pars = append(pars, endDate)
-	}
+	//if endDate != "" {
+	//	condition += " AND data_time<=? "
+	//	pars = append(pars, endDate)
+	//}
 
 	dataList, err := GetEdbDataListAll(condition, pars, fromEdbInfo.Source, 0)
 	if err != nil {
@@ -533,7 +533,7 @@ func RefreshAllCalculateTbz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode
 		existDataMap[v.DataTime] = v.Value
 	}
 	fmt.Println("existDataMap:", existDataMap)
-	addSql := ` INSERT INTO edb_data_calculate_tbz(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+	addSql := ` INSERT INTO edb_data_calculate_tbz(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
 	existAddDataMap := make(map[string]string)
 	for _, av := range dateArr {

models/edb_data_calculate_tcz.go

@@ -107,7 +107,7 @@ func AddCalculateTcz(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbInfo, ed
 		dataMap[v.DataTime] = v
 	}
 	fmt.Println("Frequency:", fromEdbInfo.Frequency)
-	addSql := ` INSERT INTO edb_data_calculate_tcz(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+	addSql := ` INSERT INTO edb_data_calculate_tcz(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
 	existMap := make(map[string]string)
 	for _, av := range dateArr {
@@ -356,7 +356,7 @@ func EditCalculateTcz(req *EdbInfoCalculateBatchEditReq, fromEdbInfo *EdbInfo, e
 			dataMap[v.DataTime] = v
 		}
 
-		addSql := ` INSERT INTO edb_data_calculate_tcz(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+		addSql := ` INSERT INTO edb_data_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)
@@ -510,10 +510,10 @@ func RefreshAllCalculateTcz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode
 		condition += " AND data_time>=? "
 		pars = append(pars, startDate)
 	}
-	if endDate != "" {
-		condition += " AND data_time<=? "
-		pars = append(pars, endDate)
-	}
+	//if endDate != "" {
+	//	condition += " AND data_time<=? "
+	//	pars = append(pars, endDate)
+	//}
 
 	dataList, err := GetEdbDataListAll(condition, pars, fromEdbInfo.Source, 0)
 	if err != nil {
@@ -539,7 +539,7 @@ func RefreshAllCalculateTcz(edbInfoId, source int, fromEdbInfo *EdbInfo, edbCode
 		existDataMap[v.DataTime] = v.Value
 	}
 
-	addSql := ` INSERT INTO edb_data_calculate_tcz(edb_info_id,edb_code,data_time,value,create_time,modify_time,status,data_timestamp) values `
+	addSql := ` INSERT INTO edb_data_calculate_tcz(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
 	existAddDataMap := make(map[string]string)
 	for _, av := range dateArr {

models/edb_data_calculate_time_shift.go

@@ -116,7 +116,7 @@ func AddCalculateTimeShift(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbIn
 		return edbInfoId, err
 	}
 
-	addSql := ` INSERT INTO edb_data_calculate_time_shift(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,data_timestamp) values `
 	var isAdd bool
 	existMap := make(map[string]string)
 	dataLen := len(dataList)
@@ -266,7 +266,7 @@ func EditCalculateTimeShift(req *EdbInfoCalculateBatchEditReq, fromEdbInfo *EdbI
 		if err != nil {
 			return edbInfoId, err
 		}
-		addSql := ` INSERT INTO edb_data_calculate_time_shift(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,data_timestamp) values `
 		var isAdd bool
 		existMap := make(map[string]string)
 		dataLen := len(dataList)
@@ -332,10 +332,10 @@ func RefreshAllCalculateTimeShift(edbInfoId, source, formulaInt, moveType int, f
 		condition += " AND data_time>=? "
 		pars = append(pars, startDate)
 	}
-	if endDate != "" {
-		condition += " AND data_time<=? "
-		pars = append(pars, endDate)
-	}
+	//if endDate != "" {
+	//	condition += " AND data_time<=? "
+	//	pars = append(pars, endDate)
+	//}
 
 	var shiftDay int
 	switch moveFrequency {
@@ -383,7 +383,7 @@ func RefreshAllCalculateTimeShift(edbInfoId, source, formulaInt, moveType int, f
 		existDataMap[v.DataTime] = v.Value
 	}
 	fmt.Println("existDataMap:", existDataMap)
-	addSql := ` INSERT INTO edb_data_calculate_time_shift(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,data_timestamp) values `
 	var isAdd bool
 
 	existMap := make(map[string]string)

services/base_from_pb.go

@@ -3,10 +3,9 @@ package services
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/rdlucklib/rdluck_tools/http"
 	"hongze/hongze_edb_lib/utils"
 	"net/url"
-
-	"github.com/rdlucklib/rdluck_tools/http"
 )
 
 type EdbDataFromPb struct {
@@ -24,14 +23,14 @@ func GetEdbDataFromPb(edbCode, startDate, endDate string) (item *EdbDataFromPb,
 	utils.FileLog.Info("bpUrl:" + bpUrl)
 	body, err := http.Get(bpUrl)
 	if err != nil {
-		utils.FileLog.Info("GetEdbDataByPb Err:"+err.Error())
+		utils.FileLog.Info("GetEdbDataByPb Err:" + err.Error())
 		return
 	}
 	utils.FileLog.Info("GetEdbDataByPb result:" + string(body))
 	item = new(EdbDataFromPb)
 	err = json.Unmarshal(body, &item)
 	if err != nil {
-		utils.FileLog.Info("GetEdbDataByPb Unmarshal Err:"+err.Error())
+		utils.FileLog.Info("GetEdbDataByPb Unmarshal Err:" + err.Error())
 		return
 	}
 	edbCode, _ = url.QueryUnescape(edbCode)