获取嘉悦数据源

controller/index_data/jiayue_index.go

@@ -2,11 +2,8 @@ package index_data
 
 import (
 	"eta/eta_bridge/controller/resp"
-	"eta/eta_bridge/global"
-	"eta/eta_bridge/models/request/index_data"
 	index_data_service "eta/eta_bridge/services/index_data"
 	"github.com/gin-gonic/gin"
-	"github.com/go-playground/validator/v10"
 )
 
 type JiaYueIndexController struct{}
@@ -16,26 +13,21 @@ type JiaYueIndexController struct{}
 // @Success 200 {string} string "操作成功"
 // @Router /jiayue/index [get]
 func (j *JiaYueIndexController) GetData(c *gin.Context) {
-	var req index_data.IndexReq
-	err := c.Bind(&req)
-	if err != nil {
-		errs, ok := err.(validator.ValidationErrors)
-		if !ok {
-			resp.FailData("参数解析失败", "Err:"+err.Error(), c)
-			return
-		}
-		resp.FailData("参数解析失败", errs.Translate(global.Trans), c)
-		return
-	}
-	if req.IndexCode == "" {
+	indexCode := c.DefaultQuery("index_code", "")
+	source := c.DefaultQuery("source", "")
+	startDate := c.DefaultQuery("start_date", "")
+	endDate := c.DefaultQuery("end_date", "")
+
+	if indexCode == "" {
 		resp.FailMsg("请输入指标code码", "请输入指标code码", c)
 		return
 	}
-	if req.Source == "" {
+	if source == "" {
 		resp.FailMsg("请输入指标来源", "请输入指标来源", c)
 		return
 	}
-	data, err, errMsg := index_data_service.GetIndexFromJiaYue(req.IndexCode, req.Source)
+
+	data, err, errMsg := index_data_service.GetIndexFromJiaYue(indexCode, source, startDate, endDate)
 	if err != nil {
 		resp.FailMsg("查询失败", errMsg, c)
 		return

routers/index_data.go

@@ -10,5 +10,5 @@ func InitIndexData(r *gin.RouterGroup) {
 	control := new(index_data.JiaYueIndexController)
 	//group := r.Group("index_data/").Use(middleware.Token())
 	group := r.Group("index_data/")
-	group.POST("jiayue/index", control.GetData)
+	group.GET("jiayue/index", control.GetData)
 }

services/index_data/jiayue_platform.go

@@ -9,7 +9,7 @@ import (
 	"fmt"
 )
 
-func GetIndexFromJiaYue(indexCode, source string) (data *response.IndexResp, err error, errMsg string) {
+func GetIndexFromJiaYue(indexCode, source, startDate, endDate string) (data *response.IndexResp, err error, errMsg string) {
 	defer func() {
 		if err != nil {
 			global.LOG.Info("GetIndexFromJiaYue: " + errMsg)
@@ -35,7 +35,21 @@ func GetIndexFromJiaYue(indexCode, source string) (data *response.IndexResp, err
 		err = errors.New(errMsg)
 		return
 	}
-	indexData, err := jiayue.GetDictData(index.TableName, index.Id)
+
+	var pars []interface{}
+	condition := " INDEX_ID = :1"
+	pars = append(pars, index.Id)
+
+	if startDate != "" {
+		condition += " AND INDEX_DATE >= TO_DATE (:1, 'yyyy-mm-dd')"
+		pars = append(pars, startDate)
+	}
+	if endDate != "" {
+		condition += " AND INDEX_DATE <= TO_DATE (:1, 'yyyy-mm-dd')"
+		pars = append(pars, endDate)
+	}
+
+	indexData, err := jiayue.GetDictData(index.TableName, condition, pars)
 	if err != nil {
 		errMsg = fmt.Sprintf("嘉悦物产指标数据信息查询失败，Err: %s", err)
 		return