Browse Source

新增分页获取指标数据

tuoling805 1 year ago
parent
commit
15d031639e

+ 44 - 0
controllers/base_from_mysteel_chemical.go

@@ -716,3 +716,47 @@ func (this *MySteelChemicalController) GetIndexLimitByFrequency() {
 	br.Success = true
 	br.Msg = "处理成功"
 }
+
+// @Title 获取钢联指标分页数据
+// @Description 获取钢联指标分页数据
+// @Success 200 {object} models.HandleMysteelIndexResp
+// @router /getIndexPageByFrequency [post]
+func (this *MySteelChemicalController) GetIndexPageByFrequency() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	var req models.GetIndexPageByFrequencyPageReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常!"
+		br.ErrMsg = "参数解析失败,Err:" + err.Error()
+		return
+	}
+
+	var condition string
+	var pars []interface{}
+
+	if req.Frequency != "" {
+		condition += ` AND frequency = ? `
+		pars = append(pars, req.Frequency)
+	}
+
+	if req.EndDate != "" {
+		condition += ` AND end_date < ? `
+		pars = append(pars, req.EndDate)
+	}
+
+	indexObj := new(models.BaseFromMysteelChemicalIndex)
+	// 获取未合并的指标总数量
+	indexTotal, err := indexObj.GetIndexPageByFrequency(condition, pars, req.StartSize, req.PageSize)
+	if err != nil {
+		return
+	}
+
+	br.Data = indexTotal
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "处理成功"
+}

+ 19 - 0
models/base_from_mysteel_chemical.go

@@ -465,3 +465,22 @@ func (m *BaseFromMysteelChemicalIndex) GetIndexLimitByFrequency(frequency string
 	_, err = o.Raw(sql, frequency, limit).QueryRows(&items)
 	return
 }
+
+type GetIndexPageByFrequencyPageReq struct {
+	Frequency string
+	EndDate   string
+	StartSize int
+	PageSize  int
+}
+
+// GetNoMergeIndexByFrequencyPage 获取未合并的指标列表
+func (m *BaseFromMysteelChemicalIndex) GetIndexPageByFrequency(condition string, pars []interface{}, startSize, pageSize int) (items []*BaseFromMysteelChemicalIndex, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE 1=1 `
+	if condition != "" {
+		sql += condition
+	}
+	sql += ` LIMIT ?,?  `
+	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	return
+}

+ 9 - 0
routers/commentsRouter.go

@@ -439,6 +439,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_index_lib/controllers:MySteelChemicalController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:MySteelChemicalController"],
+        beego.ControllerComments{
+            Method: "GetIndexPageByFrequency",
+            Router: `/getIndexPageByFrequency`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_index_lib/controllers:MySteelChemicalController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:MySteelChemicalController"],
         beego.ControllerComments{
             Method: "GetIndexRefreshMethanolByMergeFile",