Quellcode durchsuchen

fix:新增获取指标默认刷新配置的接口

Roc vor 1 Jahr
Ursprung
Commit
13b42e691b

+ 43 - 2
controllers/edb_refresh.go

@@ -1,7 +1,10 @@
 package controllers
 
 import (
+	"encoding/json"
 	"eta/eta_index_lib/models"
+	edb_refreshMol "eta/eta_index_lib/models/edb_refresh"
+	"eta/eta_index_lib/models/edb_refresh/request"
 	"eta/eta_index_lib/services/edb_refresh"
 	"eta/eta_index_lib/utils"
 )
@@ -22,7 +25,7 @@ func (this *EdbRefreshController) GetMysteelIndexConfigList() {
 		this.ServeJSON()
 	}()
 
-	list, err := edb_refresh.GetDefaultConfigList(utils.DATA_SOURCE_MYSTEEL_CHEMICAL, 0)
+	list, err := edb_refresh.GetPreviousHalfHourDefaultConfigList(utils.DATA_SOURCE_MYSTEEL_CHEMICAL, 0)
 
 	if err != nil {
 		br.Msg = "获取失败"
@@ -47,7 +50,7 @@ func (this *EdbRefreshController) GetSmmConfigList() {
 		this.ServeJSON()
 	}()
 
-	list, err := edb_refresh.GetDefaultConfigList(utils.DATA_SOURCE_YS, 0)
+	list, err := edb_refresh.GetPreviousHalfHourDefaultConfigList(utils.DATA_SOURCE_YS, 0)
 
 	if err != nil {
 		br.Msg = "获取失败"
@@ -59,3 +62,41 @@ func (this *EdbRefreshController) GetSmmConfigList() {
 	br.Msg = "获取成功"
 	br.Data = list
 }
+
+// GetDefaultConfigList
+// @Title 获取默认的刷新配置
+// @Description 获取默认的刷新配置
+// @Success 200 {object}
+// @router /config/default/list [post]
+func (this *EdbRefreshController) GetDefaultConfigList() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	var req request.GetEdbRefreshConfigReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常!"
+		br.ErrMsg = "参数解析失败,Err:" + err.Error()
+		return
+	}
+	condition := ` AND source = ? AND sub_source = ? `
+	pars := make([]interface{}, 0)
+	pars = append(pars, req.Source, req.SubSource)
+
+	list, err := edb_refreshMol.GetListByCondition(condition, pars)
+	if err != nil {
+		return
+	}
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败,ERR:" + err.Error()
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = list
+}

+ 7 - 0
models/edb_refresh/request/edb_info_refresh.go

@@ -50,3 +50,10 @@ type SaveEdbRefreshStatusReq struct {
 	EdbSelectIdList []int  `description:"选择的指标id列表"`
 	ModifyStatus    string `description:"需要更改的状态,枚举值:启用、暂停"`
 }
+
+// GetEdbRefreshConfigReq
+// @Description: 获取默认配置的请求参数
+type GetEdbRefreshConfigReq struct {
+	Source    int `description:"指标来源ID"`
+	SubSource int `description:"子来源"`
+}

+ 9 - 0
routers/commentsRouter.go

@@ -385,6 +385,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_index_lib/controllers:EdbRefreshController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:EdbRefreshController"],
+        beego.ControllerComments{
+            Method: "GetDefaultConfigList",
+            Router: `/config/default/list`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_index_lib/controllers:EdbRefreshController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:EdbRefreshController"],
         beego.ControllerComments{
             Method: "GetMysteelIndexConfigList",

+ 3 - 3
services/edb_refresh/edb_refresh.go

@@ -11,15 +11,15 @@ import (
 	"time"
 )
 
-// GetDefaultConfigList
-// @Description: 获取默认配置列表
+// GetPreviousHalfHourDefaultConfigList
+// @Description: 获取上半个小时的默认配置列表
 // @author: Roc
 // @datetime 2024-01-11 14:46:54
 // @param source int
 // @param subSource int
 // @return list []*edb_refresh.EdbRefreshDefaultConfig
 // @return err error
-func GetDefaultConfigList(source, subSource int) (list []*edb_refresh.EdbRefreshDefaultConfig, err error) {
+func GetPreviousHalfHourDefaultConfigList(source, subSource int) (list []*edb_refresh.EdbRefreshDefaultConfig, err error) {
 	defer func() {
 		if err != nil {
 			fmt.Println(err)