Merge branch 'debug' of http://8.136.199.33:3000/hongze/hongze_edb_lib into debug

controllers/base_from_calculate.go

@@ -587,7 +587,7 @@ func (this *CalculateController) Refresh() {
 			startDate = sTime.Format(utils.FormatDate)
 
 			var edbInfoIdBytes []string
-			calculateMap, err := models.GetEdbInfoCalculateDetail(edbInfo.EdbInfoId)
+			calculateMap, err := models.GetEdbInfoCalculateDetailList(edbInfo.EdbInfoId)
 			if err != nil {
 				errMsg = "GetEdbInfoCalculateDetail Err:" + err.Error()
 				break
@@ -607,7 +607,7 @@ func (this *CalculateController) Refresh() {
 				break
 			}
 		case utils.DATA_SOURCE_CALCULATE_LJZZY: //刷新累计值转月值
-			calculateLjzzy, err := models.GetEdbInfoCalculateLjzzyDetail(edbInfoId)
+			calculateLjzzy, err := models.GetEdbInfoCalculateMappingDetail(edbInfoId)
 			if err != nil {
 				errMsg = "GetEdbInfoCalculateLjzzyDetail Err:" + err.Error()
 				break
@@ -625,7 +625,7 @@ func (this *CalculateController) Refresh() {
 				break
 			}
 		case utils.DATA_SOURCE_CALCULATE_TBZ: //刷新同比值
-			calculateTbz, err := models.GetEdbInfoCalculateTbzDetail(edbInfoId)
+			calculateTbz, err := models.GetEdbInfoCalculateMappingDetail(edbInfoId)
 			if err != nil {
 				errMsg = "GetEdbInfoCalculateTbzDetail Err:" + err.Error()
 				break
@@ -643,7 +643,7 @@ func (this *CalculateController) Refresh() {
 				break
 			}
 		case utils.DATA_SOURCE_CALCULATE_TCZ: //同差值
-			calculateTcz, err := models.GetEdbInfoCalculateTczDetail(edbInfoId)
+			calculateTcz, err := models.GetEdbInfoCalculateMappingDetail(edbInfoId)
 			if err != nil {
 				errMsg = "GetEdbInfoCalculateTczDetail Err:" + err.Error()
 				break
@@ -661,7 +661,7 @@ func (this *CalculateController) Refresh() {
 				break
 			}
 		case utils.DATA_SOURCE_CALCULATE_NSZYDPJJS: //N数值移动平均计算
-			calculateNszydpjjs, err := models.GetEdbInfoCalculateNszydpjjsDetail(edbInfoId)
+			calculateNszydpjjs, err := models.GetEdbInfoCalculateMappingDetail(edbInfoId)
 			if err != nil {
 				errMsg = "GetEdbInfoCalculateNszydpjjsDetail Err:" + err.Error()
 				break
@@ -679,7 +679,7 @@ func (this *CalculateController) Refresh() {
 				break
 			}
 		case utils.DATA_SOURCE_CALCULATE_HBZ: //刷新环比值
-			calculateTbz, err := models.GetEdbInfoCalculateHbzDetail(edbInfoId)
+			calculateTbz, err := models.GetEdbInfoCalculateMappingDetail(edbInfoId)
 			if err != nil {
 				errMsg = "GetEdbInfoCalculateHbzDetail Err:" + err.Error()
 				break
@@ -698,7 +698,7 @@ func (this *CalculateController) Refresh() {
 				break
 			}
 		case utils.DATA_SOURCE_CALCULATE_HCZ: //刷新环差值
-			calculateTbz, err := models.GetEdbInfoCalculateHczDetail(edbInfoId)
+			calculateTbz, err := models.GetEdbInfoCalculateMappingDetail(edbInfoId)
 			if err != nil {
 				errMsg = "GetEdbInfoCalculateHczDetail Err:" + err.Error()
 				break
@@ -717,7 +717,7 @@ func (this *CalculateController) Refresh() {
 				break
 			}
 		case utils.DATA_SOURCE_CALCULATE_BP: //刷新变频
-			calculateTbz, err := models.GetEdbInfoCalculateBpDetail(edbInfoId)
+			calculateTbz, err := models.GetEdbInfoCalculateMappingDetail(edbInfoId)
 			if err != nil {
 				errMsg = "GetEdbInfoCalculateTbzDetail Err:" + err.Error()
 				break

models/base_from_calculate.go

@@ -334,31 +334,3 @@ type EdbInfoCalculateBatchEditReq struct {
 		FromTag   string `description:"指标对应标签"`
 	}
 }
-
-type EdbInfoCalculateDetail struct {
-	EdbInfoCalculateId int       `orm:"column(edb_info_calculate_id);pk"`
-	EdbInfoId          int       `description:"指标id"`
-	EdbCode            string    `description:"指标编码"`
-	FromEdbInfoId      int       `description:"计算指标id"`
-	FromEdbCode        string    `description:"计算指标编码"`
-	FromEdbName        string    `description:"计算指标名称"`
-	FromSource         int       `description:"计算指标来源"`
-	FromSourceName     string    `description:"计算指标来源名称"`
-	FromTag            string    `description:"来源指标标签"`
-	Sort               int       `description:"计算指标名称排序"`
-	CreateTime         time.Time `description:"创建时间"`
-	ModifyTime         time.Time `description:"修改时间"`
-	StartDate          string    `description:"开始日期"`
-	EndDate            string    `description:"结束日期"`
-	EdbType            int       `description:"指标类型:1:基础指标,2:计算指标"`
-}
-
-func GetEdbInfoCalculateDetail(edbInfoId int) (list []*EdbInfoCalculateDetail, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT a.*,b.start_date,b.end_date,b.edb_type FROM edb_info_calculate_mapping AS a
-			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
-			WHERE a.edb_info_id=? ORDER BY sort ASC `
-
-	_, err = o.Raw(sql, edbInfoId).QueryRows(&list)
-	return
-}

models/edb_data_calculate_bp.go

@@ -11,32 +11,6 @@ import (
 	"time"
 )
 
-type EdbInfoCalculateBpDetail struct {
-	EdbInfoCalculateBpId int       `orm:"column(edb_info_calculate_bp_id);pk"`
-	EdbInfoId            int       `description:"指标id"`
-	EdbCode              string    `description:"指标编码"`
-	FromEdbInfoId        int       `description:"计算指标id"`
-	FromEdbCode          string    `description:"计算指标编码"`
-	FromEdbName          string    `description:"计算指标名称"`
-	FromSource           int       `description:"计算指标来源"`
-	FromSourceName       string    `description:"计算指标来源名称"`
-	FromTag              string    `description:"来源指标标签"`
-	Sort                 int       `description:"计算指标名称排序"`
-	CreateTime           time.Time `description:"创建时间"`
-	ModifyTime           time.Time `description:"修改时间"`
-	StartDate            string    `description:"开始日期"`
-	EndDate              string    `description:"结束日期"`
-}
-
-func GetEdbInfoCalculateBpDetail(edbInfoId int) (item *EdbInfoCalculateTbzDetail, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT a.*,b.start_date,b.end_date FROM edb_info_calculate_mapping AS a
-			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
-			WHERE a.edb_info_id=? `
-	err = o.Raw(sql, edbInfoId).QueryRow(&item)
-	return
-}
-
 // AddCalculateBp 变频
 func AddCalculateBp(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbInfo, edbCode, uniqueCode string, sysUserId int, sysUserRealName string) (edbInfoId int, err error) {
 	o := orm.NewOrm()

models/edb_data_calculate_hbz.go

@@ -11,32 +11,6 @@ import (
 	"time"
 )
 
-type EdbInfoCalculateHbzDetail struct {
-	EdbInfoCalculateTbzId int       `orm:"column(edb_info_calculate_tbz_id);pk"`
-	EdbInfoId             int       `description:"指标id"`
-	EdbCode               string    `description:"指标编码"`
-	FromEdbInfoId         int       `description:"计算指标id"`
-	FromEdbCode           string    `description:"计算指标编码"`
-	FromEdbName           string    `description:"计算指标名称"`
-	FromSource            int       `description:"计算指标来源"`
-	FromSourceName        string    `description:"计算指标来源名称"`
-	FromTag               string    `description:"来源指标标签"`
-	Sort                  int       `description:"计算指标名称排序"`
-	CreateTime            time.Time `description:"创建时间"`
-	ModifyTime            time.Time `description:"修改时间"`
-	StartDate             string    `description:"开始日期"`
-	EndDate               string    `description:"结束日期"`
-}
-
-func GetEdbInfoCalculateHbzDetail(edbInfoId int) (item *EdbInfoCalculateTbzDetail, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT a.*,b.start_date,b.end_date FROM edb_info_calculate_mapping AS a
-			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
-			WHERE a.edb_info_id=? `
-	err = o.Raw(sql, edbInfoId).QueryRow(&item)
-	return
-}
-
 // AddCalculateHbz 新增环比值指标
 func AddCalculateHbz(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbInfo, edbCode, uniqueCode string, sysUserId int, sysUserRealName string, formulaInt int) (edbInfoId int, err error) {
 	o := orm.NewOrm()

models/edb_data_calculate_hcz.go

@@ -11,32 +11,6 @@ import (
 	"time"
 )
 
-type EdbInfoCalculateHczDetail struct {
-	EdbInfoCalculateHczId int       `orm:"column(edb_info_calculate_hcz_id);pk"`
-	EdbInfoId             int       `description:"指标id"`
-	EdbCode               string    `description:"指标编码"`
-	FromEdbInfoId         int       `description:"计算指标id"`
-	FromEdbCode           string    `description:"计算指标编码"`
-	FromEdbName           string    `description:"计算指标名称"`
-	FromSource            int       `description:"计算指标来源"`
-	FromSourceName        string    `description:"计算指标来源名称"`
-	FromTag               string    `description:"来源指标标签"`
-	Sort                  int       `description:"计算指标名称排序"`
-	CreateTime            time.Time `description:"创建时间"`
-	ModifyTime            time.Time `description:"修改时间"`
-	StartDate             string    `description:"开始日期"`
-	EndDate               string    `description:"结束日期"`
-}
-
-func GetEdbInfoCalculateHczDetail(edbInfoId int) (item *EdbInfoCalculateHczDetail, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT a.*,b.start_date,b.end_date FROM edb_info_calculate_mapping AS a
-			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
-			WHERE a.edb_info_id=? `
-	err = o.Raw(sql, edbInfoId).QueryRow(&item)
-	return
-}
-
 // AddCalculateHcz 新增环差值指标
 func AddCalculateHcz(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbInfo, edbCode, uniqueCode string, sysUserId int, sysUserRealName string, formulaInt int) (edbInfoId int, err error) {
 	o := orm.NewOrm()

models/edb_data_calculate_ljzzy.go

@@ -11,32 +11,6 @@ import (
 	"time"
 )
 
-type EdbInfoCalculateLjzzyDetail struct {
-	EdbInfoCalculateLjzzyId int       `orm:"column(edb_info_calculate_ljzzy_id);pk"`
-	EdbInfoId               int       `description:"指标id"`
-	EdbCode                 string    `description:"指标编码"`
-	FromEdbInfoId           int       `description:"计算指标id"`
-	FromEdbCode             string    `description:"计算指标编码"`
-	FromEdbName             string    `description:"计算指标名称"`
-	FromSource              int       `description:"计算指标来源"`
-	FromSourceName          string    `description:"计算指标来源名称"`
-	FromTag                 string    `description:"来源指标标签"`
-	Sort                    int       `description:"计算指标名称排序"`
-	CreateTime              time.Time `description:"创建时间"`
-	ModifyTime              time.Time `description:"修改时间"`
-	StartDate               string    `description:"开始日期"`
-	EndDate                 string    `description:"结束日期"`
-}
-
-func GetEdbInfoCalculateLjzzyDetail(edbInfoId int) (item *EdbInfoCalculateLjzzyDetail, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT a.*,b.start_date,b.end_date FROM edb_info_calculate_mapping AS a
-			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
-			WHERE a.edb_info_id=? `
-	err = o.Raw(sql, edbInfoId).QueryRow(&item)
-	return
-}
-
 // AddCalculateLjzzy 累计值转月
 func AddCalculateLjzzy(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbInfo, edbCode, uniqueCode string, sysUserId int, sysUserRealName string) (edbInfoId int, err error) {
 	o := orm.NewOrm()

models/edb_data_calculate_nszydbpjjs.go

@@ -11,32 +11,6 @@ import (
 	"time"
 )
 
-type EdbInfoCalculateNszydpjjsDetail struct {
-	EdbInfoCalculateNszydpjjsId int       `orm:"column(edb_info_calculate_nszydpjjs_id);pk"`
-	EdbInfoId                   int       `description:"指标id"`
-	EdbCode                     string    `description:"指标编码"`
-	FromEdbInfoId               int       `description:"计算指标id"`
-	FromEdbCode                 string    `description:"计算指标编码"`
-	FromEdbName                 string    `description:"计算指标名称"`
-	FromSource                  int       `description:"计算指标来源"`
-	FromSourceName              string    `description:"计算指标来源名称"`
-	FromTag                     string    `description:"来源指标标签"`
-	Sort                        int       `description:"计算指标名称排序"`
-	CreateTime                  time.Time `description:"创建时间"`
-	ModifyTime                  time.Time `description:"修改时间"`
-	StartDate                   string    `description:"开始日期"`
-	EndDate                     string    `description:"结束日期"`
-}
-
-func GetEdbInfoCalculateNszydpjjsDetail(edbInfoId int) (item *EdbInfoCalculateNszydpjjsDetail, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT a.*,b.start_date,b.end_date FROM edb_info_calculate_mapping AS a
-			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
-			WHERE a.edb_info_id=? `
-	err = o.Raw(sql, edbInfoId).QueryRow(&item)
-	return
-}
-
 // AddCalculateNszydpjjs N数值移动平均计算
 func AddCalculateNszydpjjs(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbInfo, edbCode, uniqueCode string, sysUserId int, sysUserRealName string, formulaInt int) (edbInfoId int, err error) {
 	o := orm.NewOrm()

models/edb_data_calculate_tbz.go

@@ -11,32 +11,6 @@ import (
 	"time"
 )
 
-type EdbInfoCalculateTbzDetail struct {
-	EdbInfoCalculateTbzId int       `orm:"column(edb_info_calculate_tbz_id);pk"`
-	EdbInfoId             int       `description:"指标id"`
-	EdbCode               string    `description:"指标编码"`
-	FromEdbInfoId         int       `description:"计算指标id"`
-	FromEdbCode           string    `description:"计算指标编码"`
-	FromEdbName           string    `description:"计算指标名称"`
-	FromSource            int       `description:"计算指标来源"`
-	FromSourceName        string    `description:"计算指标来源名称"`
-	FromTag               string    `description:"来源指标标签"`
-	Sort                  int       `description:"计算指标名称排序"`
-	CreateTime            time.Time `description:"创建时间"`
-	ModifyTime            time.Time `description:"修改时间"`
-	StartDate             string    `description:"开始日期"`
-	EndDate               string    `description:"结束日期"`
-}
-
-func GetEdbInfoCalculateTbzDetail(edbInfoId int) (item *EdbInfoCalculateTbzDetail, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT a.*,b.start_date,b.end_date FROM edb_info_calculate_mapping AS a
-			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
-			WHERE a.edb_info_id=? `
-	err = o.Raw(sql, edbInfoId).QueryRow(&item)
-	return
-}
-
 // AddCalculateTbz 同比值
 func AddCalculateTbz(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbInfo, edbCode, uniqueCode string, sysUserId int, sysUserRealName string) (edbInfoId int, err error) {
 	o := orm.NewOrm()

models/edb_data_calculate_tcz.go

@@ -11,32 +11,6 @@ import (
 	"time"
 )
 
-type EdbInfoCalculateTczDetail struct {
-	EdbInfoCalculateTczId int       `orm:"column(edb_info_calculate_tcz_id);pk"`
-	EdbInfoId             int       `description:"指标id"`
-	EdbCode               string    `description:"指标编码"`
-	FromEdbInfoId         int       `description:"计算指标id"`
-	FromEdbCode           string    `description:"计算指标编码"`
-	FromEdbName           string    `description:"计算指标名称"`
-	FromSource            int       `description:"计算指标来源"`
-	FromSourceName        string    `description:"计算指标来源名称"`
-	FromTag               string    `description:"来源指标标签"`
-	Sort                  int       `description:"计算指标名称排序"`
-	CreateTime            time.Time `description:"创建时间"`
-	ModifyTime            time.Time `description:"修改时间"`
-	StartDate             string    `description:"开始日期"`
-	EndDate               string    `description:"结束日期"`
-}
-
-func GetEdbInfoCalculateTczDetail(edbInfoId int) (item *EdbInfoCalculateTczDetail, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT a.*,b.start_date,b.end_date FROM edb_info_calculate_mapping AS a
-			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
-			WHERE a.edb_info_id=? `
-	err = o.Raw(sql, edbInfoId).QueryRow(&item)
-	return
-}
-
 // AddCalculateTcz 同差值
 func AddCalculateTcz(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbInfo, edbCode, uniqueCode string, sysUserId int, sysUserRealName string) (edbInfoId int, err error) {
 	o := orm.NewOrm()

models/edb_data_calculate_time_shift.go

@@ -11,37 +11,6 @@ import (
 	"time"
 )
 
-type EdbInfoCalculateMappingView struct {
-	EdbInfoCalculateMappingId int       `orm:"column(edb_info_calculate_mapping_id);pk"`
-	EdbInfoId                 int       `description:"计算指标id"`
-	Source                    int       `description:"计算指标来源"`
-	SourceName                string    `description:"计算指标来源名称"`
-	EdbCode                   string    `description:"计算指标编码"`
-	FromEdbInfoId             int       `description:"基础指标id"`
-	FromEdbCode               string    `description:"基础指标编码"`
-	FromEdbName               string    `description:"基础指标名称"`
-	FromSource                int       `description:"基础指标来源"`
-	FromSourceName            string    `description:"基础指标来源名称"`
-	FromTag                   string    `description:"来源指标标签"`
-	Sort                      int       `description:"计算指标名称排序"`
-	CreateTime                time.Time `description:"创建时间"`
-	ModifyTime                time.Time `description:"修改时间"`
-	StartDate                 string    `description:"开始日期"`
-	EndDate                   string    `description:"结束日期"`
-	CalculateFormula          string    `description:"N值"`
-	MoveType                  int       `description:"移动方式:1:领先(默认),2:滞后"`
-	MoveFrequency             string    `description:"移动频度"`
-}
-
-func GetEdbInfoCalculateMappingDetail(edbInfoId int) (item *EdbInfoCalculateMappingView, err error) {
-	o := orm.NewOrm()
-	sql := ` SELECT a.*,b.start_date,b.end_date,b.calculate_formula,b.move_type,b.move_frequency FROM edb_info_calculate_mapping AS a
-			INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
-			WHERE a.edb_info_id=? `
-	err = o.Raw(sql, edbInfoId).QueryRow(&item)
-	return
-}
-
 // AddCalculateTimeShift 时间移位
 func AddCalculateTimeShift(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbInfo, edbCode, uniqueCode string, sysUserId int, sysUserRealName string) (edbInfoId int, err error) {
 	o := orm.NewOrm()

models/edb_info_calculate_mapping.go

@@ -29,3 +29,66 @@ func AddEdbInfoCalculateMappingMulti(items []*EdbInfoCalculateMapping) (err erro
 	_, err = o.InsertMulti(1, items)
 	return
 }
+
+// EdbInfoCalculateMappingView
+type EdbInfoCalculateMappingView struct {
+	EdbInfoCalculateMappingId int       `orm:"column(edb_info_calculate_mapping_id);pk"`
+	EdbInfoId                 int       `description:"计算指标id"`
+	Source                    int       `description:"计算指标来源"`
+	SourceName                string    `description:"计算指标来源名称"`
+	EdbCode                   string    `description:"计算指标编码"`
+	FromEdbInfoId             int       `description:"基础指标id"`
+	FromEdbCode               string    `description:"基础指标编码"`
+	FromEdbName               string    `description:"基础指标名称"`
+	FromSource                int       `description:"基础指标来源"`
+	FromSourceName            string    `description:"基础指标来源名称"`
+	FromTag                   string    `description:"来源指标标签"`
+	Sort                      int       `description:"计算指标名称排序"`
+	CreateTime                time.Time `description:"创建时间"`
+	ModifyTime                time.Time `description:"修改时间"`
+	StartDate                 string    `description:"开始日期"`
+	EndDate                   string    `description:"结束日期"`
+	CalculateFormula          string    `description:"N值"`
+	MoveType                  int       `description:"移动方式:1:领先(默认),2:滞后"`
+	MoveFrequency             string    `description:"移动频度"`
+}
+
+// GetEdbInfoCalculateMappingDetail 获取单条关联指标
+func GetEdbInfoCalculateMappingDetail(edbInfoId int) (item *EdbInfoCalculateMappingView, err error) {
+	o := orm.NewOrm()
+	sql := ` SELECT a.*,b.start_date,b.end_date,b.calculate_formula,b.move_type,b.move_frequency FROM edb_info_calculate_mapping AS a
+			INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
+			WHERE a.edb_info_id=? `
+	err = o.Raw(sql, edbInfoId).QueryRow(&item)
+	return
+}
+
+// EdbInfoCalculateDetail
+type EdbInfoCalculateDetail struct {
+	EdbInfoCalculateId int       `orm:"column(edb_info_calculate_id);pk"`
+	EdbInfoId          int       `description:"指标id"`
+	EdbCode            string    `description:"指标编码"`
+	FromEdbInfoId      int       `description:"计算指标id"`
+	FromEdbCode        string    `description:"计算指标编码"`
+	FromEdbName        string    `description:"计算指标名称"`
+	FromSource         int       `description:"计算指标来源"`
+	FromSourceName     string    `description:"计算指标来源名称"`
+	FromTag            string    `description:"来源指标标签"`
+	Sort               int       `description:"计算指标名称排序"`
+	CreateTime         time.Time `description:"创建时间"`
+	ModifyTime         time.Time `description:"修改时间"`
+	StartDate          string    `description:"开始日期"`
+	EndDate            string    `description:"结束日期"`
+	EdbType            int       `description:"指标类型:1:基础指标,2:计算指标"`
+}
+
+// GetEdbInfoCalculateDetailList 获取关联指标列表
+func GetEdbInfoCalculateDetailList(edbInfoId int) (list []*EdbInfoCalculateDetail, err error) {
+	o := orm.NewOrm()
+	sql := ` SELECT a.*,b.start_date,b.end_date,b.edb_type FROM edb_info_calculate_mapping AS a
+			INNER JOIN edb_info AS b ON a.from_edb_info_id=b.edb_info_id
+			WHERE a.edb_info_id=? ORDER BY sort ASC `
+
+	_, err = o.Raw(sql, edbInfoId).QueryRows(&list)
+	return
+}

swagger/swagger.json

@@ -26,7 +26,7 @@
                     "200": {
                         "description": "",
                         "schema": {
-                            "$ref": "#/definitions/data_manage.EditEdbInfoReq"
+                            "$ref": "#/definitions/models.EditEdbInfoReq"
                         }
                     }
                 }
@@ -46,7 +46,7 @@
                         "description": "type json string",
                         "required": true,
                         "schema": {
-                            "$ref": "#/definitions/data_manage.EdbInfoCalculateBatchSaveReq"
+                            "$ref": "#/definitions/models.EdbInfoCalculateBatchSaveReq"
                         }
                     }
                 ],
@@ -57,6 +57,23 @@
                 }
             }
         },
+        "/calculate/refresh": {
+            "post": {
+                "tags": [
+                    "calculate"
+                ],
+                "description": "刷新计算指标接口",
+                "operationId": "CalculateController.刷新计算指标接口",
+                "responses": {
+                    "200": {
+                        "description": "",
+                        "schema": {
+                            "$ref": "#/definitions/models.RefreshEdbInfoReq"
+                        }
+                    }
+                }
+            }
+        },
         "/lt/add": {
             "post": {
                 "tags": [
@@ -331,12 +348,8 @@
         }
     },
     "definitions": {
-        "data_manage.EdbInfoCalculateBatchSaveReq": {
-            "title": "EdbInfoCalculateBatchSaveReq",
-            "type": "object"
-        },
-        "data_manage.EditEdbInfoReq": {
-            "title": "EditEdbInfoReq",
+        "10348.0xc00052c870.false": {
+            "title": "false",
             "type": "object"
         },
         "models.AddEdbInfoReq": {
@@ -349,6 +362,80 @@
                 }
             }
         },
+        "models.EdbInfoCalculateBatchSaveReq": {
+            "title": "EdbInfoCalculateBatchSaveReq",
+            "type": "object",
+            "properties": {
+                "AdminId": {
+                    "description": "添加人id",
+                    "type": "integer",
+                    "format": "int64"
+                },
+                "AdminName": {
+                    "description": "添加人名称",
+                    "type": "string"
+                },
+                "CalculateFormula": {
+                    "description": "计算公式",
+                    "type": "string"
+                },
+                "ClassifyId": {
+                    "description": "分类id",
+                    "type": "integer",
+                    "format": "int64"
+                },
+                "EdbInfoId": {
+                    "description": "指标id",
+                    "type": "integer",
+                    "format": "int64"
+                },
+                "EdbInfoIdArr": {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/10348.0xc00052c870.false"
+                    }
+                },
+                "EdbName": {
+                    "description": "指标名称",
+                    "type": "string"
+                },
+                "Formula": {
+                    "description": "N值/移动天数",
+                    "type": "string"
+                },
+                "Frequency": {
+                    "description": "频度",
+                    "type": "string"
+                },
+                "FromEdbInfoId": {
+                    "description": "计算来源指标id",
+                    "type": "integer",
+                    "format": "int64"
+                },
+                "MoveFrequency": {
+                    "description": "移动频度:天/周/月/季/年",
+                    "type": "string"
+                },
+                "MoveType": {
+                    "description": "移动方式:1:领先(默认),2:滞后",
+                    "type": "integer",
+                    "format": "int64"
+                },
+                "Source": {
+                    "description": "来源:1:同花顺,2:wind,3:彭博,4:指标运算,5:累计值转月,6:同比值,7:同差值,8:N数值移动平均计算,12:环比值,13:环差值,14:变频",
+                    "type": "integer",
+                    "format": "int64"
+                },
+                "Unit": {
+                    "description": "单位",
+                    "type": "string"
+                }
+            }
+        },
+        "models.EditEdbInfoReq": {
+            "title": "EditEdbInfoReq",
+            "type": "object"
+        },
         "models.RefreshEdbInfoReq": {
             "title": "RefreshEdbInfoReq",
             "type": "object",

swagger/swagger.yml

@@ -21,7 +21,7 @@ paths:
         "200":
           description: ""
           schema:
-            $ref: '#/definitions/data_manage.EditEdbInfoReq'
+            $ref: '#/definitions/models.EditEdbInfoReq'
   /calculate/batch/save:
     post:
       tags:
@@ -34,10 +34,21 @@ paths:
         description: type json string
         required: true
         schema:
-          $ref: '#/definitions/data_manage.EdbInfoCalculateBatchSaveReq'
+          $ref: '#/definitions/models.EdbInfoCalculateBatchSaveReq'
       responses:
         Ret=200:
           description: 返回指标id
+  /calculate/refresh:
+    post:
+      tags:
+      - calculate
+      description: 刷新计算指标接口
+      operationId: CalculateController.刷新计算指标接口
+      responses:
+        "200":
+          description: ""
+          schema:
+            $ref: '#/definitions/models.RefreshEdbInfoReq'
   /lt/add:
     post:
       tags:
@@ -215,11 +226,8 @@ paths:
           schema:
             $ref: '#/definitions/models.RefreshEdbInfoReq'
 definitions:
-  data_manage.EdbInfoCalculateBatchSaveReq:
-    title: EdbInfoCalculateBatchSaveReq
-    type: object
-  data_manage.EditEdbInfoReq:
-    title: EditEdbInfoReq
+  10348.0xc00052c870.false:
+    title: "false"
     type: object
   models.AddEdbInfoReq:
     title: AddEdbInfoReq
@@ -228,6 +236,62 @@ definitions:
       EdbCode:
         description: 指标编码
         type: string
+  models.EdbInfoCalculateBatchSaveReq:
+    title: EdbInfoCalculateBatchSaveReq
+    type: object
+    properties:
+      AdminId:
+        description: 添加人id
+        type: integer
+        format: int64
+      AdminName:
+        description: 添加人名称
+        type: string
+      CalculateFormula:
+        description: 计算公式
+        type: string
+      ClassifyId:
+        description: 分类id
+        type: integer
+        format: int64
+      EdbInfoId:
+        description: 指标id
+        type: integer
+        format: int64
+      EdbInfoIdArr:
+        type: array
+        items:
+          $ref: '#/definitions/10348.0xc00052c870.false'
+      EdbName:
+        description: 指标名称
+        type: string
+      Formula:
+        description: N值/移动天数
+        type: string
+      Frequency:
+        description: 频度
+        type: string
+      FromEdbInfoId:
+        description: 计算来源指标id
+        type: integer
+        format: int64
+      MoveFrequency:
+        description: 移动频度:天/周/月/季/年
+        type: string
+      MoveType:
+        description: 移动方式:1:领先(默认),2:滞后
+        type: integer
+        format: int64
+      Source:
+        description: 来源:1:同花顺,2:wind,3:彭博,4:指标运算,5:累计值转月,6:同比值,7:同差值,8:N数值移动平均计算,12:环比值,13:环差值,14:变频
+        type: integer
+        format: int64
+      Unit:
+        description: 单位
+        type: string
+  models.EditEdbInfoReq:
+    title: EditEdbInfoReq
+    type: object
   models.RefreshEdbInfoReq:
     title: RefreshEdbInfoReq
     type: object