feat：新增指标接口

controllers/base_from_pb.go

@@ -13,6 +13,7 @@ type PbController struct {
 	BaseAuthController
 }
 
+// Add
 // @Title 编辑指标接口
 // @Description 编辑指标接口
 // @Success 200 {object} data_manage.EditEdbInfoReq
@@ -56,7 +57,7 @@ func (this *PbController) Add() {
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "获取成功"
-	}else{
+	} else {
 		br.Ret = 501
 		br.Success = true
 		br.Msg = "系统处理中，请稍后重试"

controllers/base_from_wind.go

@@ -13,6 +13,7 @@ type WindController struct {
 	BaseAuthController
 }
 
+// Add
 // @Title 编辑指标接口
 // @Description 编辑指标接口
 // @Success 200 {object} data_manage.EditEdbInfoReq
@@ -56,7 +57,7 @@ func (this *WindController) Add() {
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "获取成功"
-	}else{
+	} else {
 		br.Ret = 501
 		br.Success = true
 		br.Msg = "系统处理中，请稍后重试"

go.mod

@@ -3,11 +3,13 @@ module hongze/hongze_edb_lib
 go 1.16
 
 require (
+	github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20211223021540-a6a1e1173105 // indirect
 	github.com/beego/bee/v2 v2.0.2
 	github.com/beego/beego/v2 v2.0.1
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/go-sql-driver/mysql v1.6.0
 	github.com/rdlucklib/rdluck_tools v1.0.3
 	github.com/shopspring/decimal v1.3.1
+	github.com/yidane/formula v0.0.0-20210902154546-0782e1736717 // indirect
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
 )

go.sum

@@ -21,6 +21,9 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
 github.com/alicebob/miniredis v2.5.0+incompatible/go.mod h1:8HZjEj4yU0dwhYHky+DxYx+6BMjkBbe5ONFIF1MXffk=
+github.com/antlr/antlr4 v0.0.0-20211223021540-a6a1e1173105 h1:+SwIuOsN5EJwXMomA0b1mgdLO6scoXowdxHI1alBrJA=
+github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20211223021540-a6a1e1173105 h1:80Iu0Rujat7jabX6Egx/dU/ijgsMp4WtDr9LAv3dMmo=
+github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20211223021540-a6a1e1173105/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
@@ -296,6 +299,8 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1
 github.com/ugorji/go v0.0.0-20171122102828-84cb69a8af83/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ=
 github.com/wendal/errors v0.0.0-20130201093226-f66c77a7882b/go.mod h1:Q12BUT7DqIlHRmgv3RskH+UCM/4eqVMgI0EMmlSpAXc=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
+github.com/yidane/formula v0.0.0-20210902154546-0782e1736717 h1:9CTJJpdISGxMAELfVlprj5kZEsJEaNAWiobv8ZAd72U=
+github.com/yidane/formula v0.0.0-20210902154546-0782e1736717/go.mod h1:9/dQiKiN04yPMdgsuFmKGuI2Hdp6OmFV9gSWS1col6g=
 github.com/ylywyn/jpush-api-go-client v0.0.0-20190906031852-8c4466c6e369/go.mod h1:Nv7wKD2/bCdKUFNKcJRa99a+1+aSLlCRJFriFYdjz/I=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/gopher-lua v0.0.0-20171031051903-609c9cd26973/go.mod h1:aEV29XrmTYFr3CiRxZeGHpkvbwq+prZduBqMaascyCU=

models/edb_data_base.go

@@ -1,6 +1,7 @@
 package models
 
 import (
+	"github.com/beego/beego/v2/client/orm"
 	"hongze/hongze_edb_lib/utils"
 	"time"
 )
@@ -41,4 +42,15 @@ func GetAddSql(edbInfoId, edbCode, dataTime, timestampStr string, value string)
 
 type AddEdbInfoReq struct {
 	EdbCode    string `description:"指标编码"`
+}
+
+// GetEdbInfoCountByCondition 获取指标数量
+func GetEdbInfoCountByCondition(condition string, pars []interface{}) (count int, err error) {
+	o := orm.NewOrm()
+	sql := ` SELECT COUNT(1) AS count FROM edb_info WHERE 1=1 `
+	if condition != "" {
+		sql += condition
+	}
+	err = o.Raw(sql, pars).QueryRow(&count)
+	return
 }

routers/router.go

@@ -20,6 +20,21 @@ func init() {
 				&controllers.ThsController{},
 			),
 		),
+		beego.NSNamespace("/pb",
+			beego.NSInclude(
+				&controllers.PbController{},
+			),
+		),
+		beego.NSNamespace("/wind",
+			beego.NSInclude(
+				&controllers.WindController{},
+			),
+		),
+		beego.NSNamespace("/calculate",
+			beego.NSInclude(
+				&controllers.CalculateController{},
+			),
+		),
 	)
 	beego.AddNamespace(ns)
-}
+}

utils/constants.go

@@ -66,3 +66,8 @@ var (
 	Hz_Pb_Data_Url   = "http://datapb.hzinsights.com:8040/"   //彭博接口地址
 	EDB_DATA_LIMIT = 10
 )
+
+const (
+	DATA_PREFIX  = "hz_data"
+	CHART_PREFIX = "hz_chart"
+)