Browse Source

睿姿得数据落库

gmy 4 months ago
parent
commit
18de6edb2f

+ 60 - 9
controllers/base_from_rzd.go

@@ -178,7 +178,7 @@ func (this *BaseFromRzdController) AddRzdClassify() {
 		ModifyTime:   utils.GetCurrentTime(),
 	}
 
-	lyClassify, err := models.AddRzdClassify(rzdClassify)
+	lyClassify, err := models.AddRzdClassify(&rzdClassify)
 	if err != nil {
 		return
 	}
@@ -320,8 +320,8 @@ func (this *BaseFromRzdController) GetRzdIndexDataByIndexIdAndDataTime() {
 		this.ServeJSON()
 	}()
 	var reqData struct {
-		IndexId  int    `json:"IndexId"`
-		DataTime string `json:"DataTime"`
+		IndexCode string `json:"IndexCode"`
+		DataTime  string `json:"DataTime"`
 	}
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &reqData)
 	if err != nil {
@@ -329,10 +329,10 @@ func (this *BaseFromRzdController) GetRzdIndexDataByIndexIdAndDataTime() {
 		return
 	}
 
-	indexId := reqData.IndexId
-	if indexId == 0 {
-		br.Msg = "请输入指标id!"
-		br.ErrMsg = "请输入指标id"
+	indexCode := reqData.IndexCode
+	if indexCode == "" {
+		br.Msg = "请输入指标code!"
+		br.ErrMsg = "请输入指标code"
 		return
 	}
 
@@ -343,7 +343,7 @@ func (this *BaseFromRzdController) GetRzdIndexDataByIndexIdAndDataTime() {
 		return
 	}
 
-	rzdData, err := models.GetRzdDataByIndexCodeAndDataTime(indexId, dataTime)
+	rzdData, err := models.GetRzdDataByIndexCodeAndDataTime(indexCode, dataTime)
 	if err != nil {
 		return
 	}
@@ -407,7 +407,7 @@ func (this *BaseFromRzdController) UpdateRzdDataById() {
 // GetRzdEdbDataByIndexCodeAndDataTime
 // @Title 根据指标编码和精确日期获取指标库数据
 // @Description 根据指标编码和精确日期获取指标库数据
-// @Success 200 {object} []models.EdbDataLy
+// @Success 200 {object} []models.EdbDataRzd
 // @router /get/edb/rzd/data/by/code/and/time [post]
 func (this *BaseFromRzdController) GetRzdEdbDataByIndexCodeAndDataTime() {
 	br := new(models.BaseResponse).Init()
@@ -455,6 +455,57 @@ func (this *BaseFromRzdController) GetRzdEdbDataByIndexCodeAndDataTime() {
 	br.Msg = "获取成功"
 }
 
+// GetRzdEdbInfoByIndexCode
+// @Title 根据指标编码获取指标库指标
+// @Description 根据指标编码获取指标库指标
+// @Success 200 {object} []models.EdbDataRzd
+// @router /get/rzd/edb/info/by/code [post]
+func (this *BaseFromRzdController) GetRzdEdbInfoByIndexCode() {
+	br := new(models.BaseResponse).Init()
+	var cacheKey string
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		_ = utils.Rc.Delete(cacheKey)
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	var reqData struct {
+		IndexCode string `json:"IndexCode"`
+		Source    int    `json:"Source"`
+	}
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &reqData)
+	if err != nil {
+		br.ErrMsg = "无法解析请求体"
+		return
+	}
+
+	indexCode := reqData.IndexCode
+	if indexCode == "" {
+		br.Msg = "请输入指标id!"
+		br.ErrMsg = "请输入指标id"
+		return
+	}
+	source := reqData.Source
+	if source == 0 {
+		br.Msg = "请输入来源!"
+		br.ErrMsg = "请输入来源"
+		return
+	}
+
+	lyEdbData, err := models.GetEdbInfoByEdbCode(source, indexCode)
+	if err != nil {
+		return
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Data = lyEdbData
+	br.Msg = "获取成功"
+}
+
 // UpdateRzdEdbDataById
 // @Title 更新指标库数据 须根据指标编码和日期更新 仅适合月度数据
 // @Description 更新指标库数据 须根据指标编码和日期更新 仅适合月度数据

+ 2 - 2
models/base_from_rzd_classify.go

@@ -17,7 +17,7 @@ type BaseFromRzdClassify struct {
 }
 
 func init() {
-	orm.RegisterModel(new(BaseFromRzdData))
+	orm.RegisterModel(new(BaseFromRzdClassify))
 }
 
 // GetRzdClassifyByName 根据分类名称查询
@@ -32,7 +32,7 @@ func GetRzdClassifyByName(classifyName string) (item *BaseFromRzdClassify, err e
 }
 
 // AddRzdClassify 新增分类
-func AddRzdClassify(classify BaseFromRzdClassify) (int64, error) {
+func AddRzdClassify(classify *BaseFromRzdClassify) (int64, error) {
 	o := orm.NewOrm()
 	id, err := o.Insert(classify)
 	if err != nil {

+ 3 - 3
models/base_from_rzd_data.go

@@ -1,4 +1,4 @@
-// @Author gmy 2024/8/7 9:50:00
+// @Author gmy 2024/10/21 9:50:00
 package models
 
 import (
@@ -28,10 +28,10 @@ func AddRzdDataList(items []BaseFromRzdData) (err error) {
 }
 
 // GetRzdDataByIndexCodeAndDataTime 根据指标id和数据日期查询数据
-func GetRzdDataByIndexCodeAndDataTime(indexId int, dataTime string) (items []BaseFromRzdData, err error) {
+func GetRzdDataByIndexCodeAndDataTime(indexCode string, dataTime string) (items []BaseFromRzdData, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT * FROM base_from_rzd_data WHERE index_code=? AND data_time=?`
-	_, err = o.Raw(sql, indexId, dataTime).QueryRows(&items)
+	_, err = o.Raw(sql, indexCode, dataTime).QueryRows(&items)
 	if errors.Is(err, orm.ErrNoRows) {
 		return nil, nil
 	}

+ 117 - 0
routers/commentsRouter.go

@@ -241,6 +241,123 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_index_lib/controllers:BaseFromRzdController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:BaseFromRzdController"],
+        beego.ControllerComments{
+            Method: "Add",
+            Router: `/add`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_index_lib/controllers:BaseFromRzdController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:BaseFromRzdController"],
+        beego.ControllerComments{
+            Method: "AddBatchRzdData",
+            Router: `/add/batch/rzd/data`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_index_lib/controllers:BaseFromRzdController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:BaseFromRzdController"],
+        beego.ControllerComments{
+            Method: "AddBatchRzdEdbData",
+            Router: `/add/batch/rzd/edb/data`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_index_lib/controllers:BaseFromRzdController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:BaseFromRzdController"],
+        beego.ControllerComments{
+            Method: "AddRzdClassify",
+            Router: `/add/rzd/classify`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_index_lib/controllers:BaseFromRzdController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:BaseFromRzdController"],
+        beego.ControllerComments{
+            Method: "AddRzdIndex",
+            Router: `/add/rzd/index`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_index_lib/controllers:BaseFromRzdController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:BaseFromRzdController"],
+        beego.ControllerComments{
+            Method: "GetRzdEdbDataByIndexCodeAndDataTime",
+            Router: `/get/edb/rzd/data/by/code/and/time`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_index_lib/controllers:BaseFromRzdController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:BaseFromRzdController"],
+        beego.ControllerComments{
+            Method: "GetRzdClassifyByName",
+            Router: `/get/rzd/classify/by/name`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_index_lib/controllers:BaseFromRzdController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:BaseFromRzdController"],
+        beego.ControllerComments{
+            Method: "GetRzdEdbInfoByIndexCode",
+            Router: `/get/rzd/edb/info/by/code`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_index_lib/controllers:BaseFromRzdController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:BaseFromRzdController"],
+        beego.ControllerComments{
+            Method: "GetRzdIndexByCode",
+            Router: `/get/rzd/index/by/code`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_index_lib/controllers:BaseFromRzdController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:BaseFromRzdController"],
+        beego.ControllerComments{
+            Method: "GetRzdIndexDataByIndexIdAndDataTime",
+            Router: `/get/rzd/index/data/by/code/and/time`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_index_lib/controllers:BaseFromRzdController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:BaseFromRzdController"],
+        beego.ControllerComments{
+            Method: "Refresh",
+            Router: `/refresh`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_index_lib/controllers:BaseFromRzdController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:BaseFromRzdController"],
+        beego.ControllerComments{
+            Method: "UpdateRzdDataById",
+            Router: `/update/rzd/data/by/id`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_index_lib/controllers:BaseFromRzdController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:BaseFromRzdController"],
+        beego.ControllerComments{
+            Method: "UpdateRzdEdbDataById",
+            Router: `/update/rzd/edb/data/by/id`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_index_lib/controllers:BaseFromTradeAnalysisController"] = append(beego.GlobalControllerRouter["eta/eta_index_lib/controllers:BaseFromTradeAnalysisController"],
         beego.ControllerComments{
             Method: "EdbRefresh",