Merge branch 'fix/pb_end_date' into debug

# Conflicts:
#	logic/base_edb_info.go

controllers/base_from_pb.go

@@ -6,6 +6,7 @@ import (
 	"eta/eta_index_lib/models"
 	"eta/eta_index_lib/services"
 	"eta/eta_index_lib/utils"
+	"fmt"
 	"strconv"
 	"time"
 )
@@ -43,7 +44,7 @@ func (this *PbController) 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.GetEdbDataFromPb(req.EdbCode, utils.BASE_START_DATE_UnSpace, utils.PB_BASE_END_DATE_UnSpace, "")
+		dataItem, err := services.GetEdbDataFromPb(req.EdbCode, utils.BASE_START_DATE_UnSpace, utils.GetPbNowEndDate(), "")
 		// 日志记录
 		num := 0
 		if dataItem != nil {
@@ -120,8 +121,26 @@ func (this *PbController) Refresh() {
 	utils.Rc.SetNX(cacheKey, 1, 1*time.Minute)
 
 	//开始日期格式化
-	startDateTime, _ := time.ParseInLocation(utils.FormatDate, req.StartDate, time.Local)
-	dataItem, err := services.GetEdbDataFromPb(req.EdbCode, startDateTime.Format(utils.FormatDateUnSpace), utils.PB_BASE_END_DATE_UnSpace, edbInfo.TerminalCode)
+	startDateTime, err := time.ParseInLocation(utils.FormatDate, req.StartDate, time.Local)
+	if err != nil {
+		br.Msg = "开始日期格式化异常！"
+		br.ErrMsg = fmt.Sprintf("开始日期格式化异常，请求日期：%s，Err:%s", req.StartDate, err.Error())
+		return
+	}
+	// 当前日期格式化
+	endDateStr := utils.GetPbNowEndDate()
+	endDateTime, err := time.ParseInLocation(utils.FormatDateUnSpace, endDateStr, time.Local)
+	if err != nil {
+		br.Msg = "结束日期格式化异常！"
+		br.ErrMsg = fmt.Sprintf("结束日期格式化异常，请求日期：%s，Err:%s", req.StartDate, err.Error())
+		return
+	}
+	if startDateTime.After(endDateTime) {
+		br.Msg = `指标刷新的开始日期早于当前日期！`
+		return
+	}
+
+	dataItem, err := services.GetEdbDataFromPb(req.EdbCode, startDateTime.Format(utils.FormatDateUnSpace), endDateTime.Format(utils.FormatDateUnSpace), edbInfo.TerminalCode)
 	// 日志记录
 	num := 0
 	if dataItem != nil {

controllers/base_from_pb_finance.go

@@ -6,6 +6,7 @@ import (
 	"eta/eta_index_lib/models"
 	"eta/eta_index_lib/services"
 	"eta/eta_index_lib/utils"
+	"fmt"
 	"strconv"
 	"strings"
 	"time"
@@ -54,7 +55,7 @@ func (this *PbFinanceController) Add() {
 			br.ErrMsg = "指标编码异常，请传入客户编码"
 			return
 		}
-		dataItem, err := services.GetEdbDataFromPbFinance(edbCodeArr[0], edbCodeArr[1], utils.BASE_START_DATE_UnSpace, utils.PB_BASE_END_DATE_UnSpace, "")
+		dataItem, err := services.GetEdbDataFromPbFinance(edbCodeArr[0], edbCodeArr[1], utils.BASE_START_DATE_UnSpace, utils.GetPbNowEndDate(), "")
 		// 日志记录
 		num := 0
 		if dataItem != nil {
@@ -132,7 +133,24 @@ func (this *PbFinanceController) Refresh() {
 		utils.Rc.Delete(cacheKey)
 	}()
 	//开始日期格式化
-	startDateTime, _ := time.ParseInLocation(utils.FormatDate, req.StartDate, time.Local)
+	startDateTime, err := time.ParseInLocation(utils.FormatDate, req.StartDate, time.Local)
+	if err != nil {
+		br.Msg = "开始日期格式化异常！"
+		br.ErrMsg = fmt.Sprintf("开始日期格式化异常，请求日期：%s，Err:%s", req.StartDate, err.Error())
+		return
+	}
+	// 当前日期格式化
+	endDateStr := utils.GetPbNowEndDate()
+	endDateTime, err := time.ParseInLocation(utils.FormatDateUnSpace, endDateStr, time.Local)
+	if err != nil {
+		br.Msg = "结束日期格式化异常！"
+		br.ErrMsg = fmt.Sprintf("结束日期格式化异常，请求日期：%s，Err:%s", req.StartDate, err.Error())
+		return
+	}
+	if startDateTime.After(endDateTime) {
+		br.Msg = `指标刷新的开始日期早于当前日期！`
+		return
+	}
 
 	//指标编码处理，将指标编码拆分成 company_code和edb_code
 	edbCode := req.EdbCode
@@ -142,7 +160,7 @@ func (this *PbFinanceController) Refresh() {
 		br.ErrMsg = "指标编码异常，请传入客户编码"
 		return
 	}
-	dataItem, err := services.GetEdbDataFromPbFinance(edbCodeArr[0], edbCodeArr[1], startDateTime.Format(utils.FormatDateUnSpace), utils.PB_BASE_END_DATE_UnSpace, edbInfo.TerminalCode)
+	dataItem, err := services.GetEdbDataFromPbFinance(edbCodeArr[0], edbCodeArr[1], startDateTime.Format(utils.FormatDateUnSpace), endDateTime.Format(utils.FormatDateUnSpace), edbInfo.TerminalCode)
 	// 日志记录
 	num := 0
 	if dataItem != nil {

logic/base_edb_info.go

@@ -36,11 +36,11 @@ func RefreshBaseEdbInfo(edbInfo *models.EdbInfo, startDate string) (isHandling b
 		err = ccfOb.Refresh(edbInfo.EdbInfoId, edbInfo.EdbCode, startDate)
 	case utils.DATA_SOURCE_SCI_HQ:
 		err = models.RefreshEdbDataFromSciHq(edbInfo.EdbInfoId, edbInfo.EdbCode, startDate)
+	case utils.DATA_SOURCE_RZD:
+		err = models.RefreshEdbDataFromRzd(edbInfo.EdbInfoId, edbInfo.EdbCode, startDate)
 	case utils.DATA_SOURCE_RADISH_RESEARCH:
 		ob := new(models.BaseFromRadishResearch)
 		err = ob.Refresh(edbInfo.EdbInfoId, edbInfo.EdbCode, startDate)
-	case utils.DATA_SOURCE_RZD:
-		err = models.RefreshEdbDataFromRzd(edbInfo.EdbInfoId, edbInfo.EdbCode, startDate)
 	default:
 		return
 	}

models/base_from_mysteel_chemical.go

@@ -637,6 +637,7 @@ type MySteelChemicalApiResp struct {
 	Message   string                    `json:"message" description:"显示执行信息"`
 	Data      []*MySteelChemicalApiData `json:"data" description:"数据"`
 }
+
 type MySteelChemicalApiInfoResp struct {
 	Code      string                  `json:"code" description:"200成功，其他失败"`
 	Success   bool                    `json:"success" description:"true 成功，false 失败"`
@@ -664,8 +665,8 @@ type MySteelChemicalApiData struct {
 }
 
 type MySteelChemicalApiDataList struct {
-	PublishTime int64   `json:"PUBLISH_TIME"`
-	IndexCode   string  `json:"INDEX_CODE"`
-	DataDate    string  `json:"DATA_DATE"`
-	DataValue   float64 `json:"DATA_VALUE"`
+	PublishTime int64            `json:"PUBLISH_TIME"`
+	IndexCode   string           `json:"INDEX_CODE"`
+	DataDate    string           `json:"DATA_DATE"`
+	DataValue   sql2.NullFloat64 `json:"DATA_VALUE"`
 }

services/base_from_mysteel_chemical.go

@@ -230,18 +230,22 @@ func tranformData(dataResp *models.MySteelChemicalApiResp) (items [][]*models.Ba
 		tmpDateDataMap := make(map[string]*models.BaseFromMysteelChemicalData)
 		tmpDataItems := make([]*models.BaseFromMysteelChemicalData, 0)
 		for _, vv := range v.DataList {
+			// 如果数据值为null那么直接忽略
+			if !vv.DataValue.Valid {
+				continue
+			}
 			tmpData := new(models.BaseFromMysteelChemicalData)
 			tmpData.IndexCode = vv.IndexCode
 			// 如果存在多条数据，则取发布时间最新的数据
 			pub, ok := tmpNewDataMap[vv.DataDate]
 			if !ok {
 				tmpNewDataMap[vv.DataDate] = vv.PublishTime
-				tmpData.Value = strconv.FormatFloat(vv.DataValue, 'f', -1, 64)
+				tmpData.Value = strconv.FormatFloat(vv.DataValue.Float64, 'f', -1, 64)
 			} else {
 				if pub < vv.PublishTime {
 					tmpNewDataMap[vv.DataDate] = vv.PublishTime
 					tmpData = tmpDateDataMap[vv.DataDate]
-					tmpData.Value = strconv.FormatFloat(vv.DataValue, 'f', -1, 64)
+					tmpData.Value = strconv.FormatFloat(vv.DataValue.Float64, 'f', -1, 64)
 				}
 				continue
 			}

utils/common.go

@@ -1899,3 +1899,12 @@ func FormatZhDate(dateStr string) (newDateTimeStr string, err error) {
 	targetDate := time.Date(year, time.Month(month), day, 0, 0, 0, 0, time.UTC)
 	return targetDate.Format(FormatDate), nil
 }
+
+// GetPbNowEndDate
+// @Description: 获取彭博的基础数据结束日期
+// @author: Roc
+// @datetime 2025-04-03 09:05:26
+// @return string
+func GetPbNowEndDate() string {
+	return time.Now().Format(FormatDateUnSpace) //彭博的基础数据结束日期
+}