Merge branch 'eta_2.2.5_rzd_1012@guomengyuan' into debug

controllers/base_from_rzd.go

@@ -632,3 +632,37 @@ func (this *BaseFromRzdController) AddBatchRzdEdbData() {
 	br.Success = true
 	br.Msg = "处理成功"
 }
+
+// UpdateRzdEdbData
+// @Title 修改指标数据
+// @Description 修改指标数据
+// @Success 200 string "处理成功"
+// @router /update/rzd/edb/data [post]
+func (this *BaseFromRzdController) UpdateRzdEdbData() {
+	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 req models.BaseFromRzdData
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+
+	err = models.UpdateRzdData(&req)
+	if err != nil {
+		return
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "处理成功"
+}

models/base_from_rzd_data.go

@@ -28,12 +28,15 @@ func AddRzdDataList(items []BaseFromRzdData) (err error) {
 }
 
 // GetRzdDataByIndexCodeAndDataTime 根据指标id和数据日期查询数据
-func GetRzdDataByIndexCodeAndDataTime(indexCode string, 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, indexCode, dataTime).QueryRows(&items)
+	err = o.Raw(sql, indexCode, dataTime).QueryRow(&items) // 使用 QueryRow
 	if errors.Is(err, orm.ErrNoRows) {
-		return nil, nil
+		return items, nil
+	}
+	if err != nil {
+		return items, err
 	}
 	return
 }
@@ -59,3 +62,10 @@ func GetBaseFromRzdDataByCondition(condition string, pars []interface{}) (items
 	}
 	return
 }
+
+// UpdateRzdData 修改睿姿得数据
+func UpdateRzdData(item *BaseFromRzdData) (err error) {
+	o := orm.NewOrm()
+	_, err = o.Update(item)
+	return
+}

models/base_from_rzd_index.go

@@ -11,7 +11,7 @@ type BaseFromRzdIndex struct {
 	BaseFromRzdIndexId   int    `orm:"column(base_from_rzd_index_id);pk"`
 	CreateTime           string `orm:"column(create_time)"`
 	ModifyTime           string `orm:"column(modify_time)"`
-	BaseFromLyClassifyId int    `orm:"column(base_from_ly_classify_id)"`
+	BaseFromLyClassifyId int    `orm:"column(base_from_rzd_classify_id)"`
 	IndexCode            string `orm:"column(index_code)"`
 	IndexName            string `orm:"column(index_name)"`
 	Frequency            string `orm:"column(frequency)"`

routers/commentsRouter.go

@@ -358,6 +358,15 @@ 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: "UpdateRzdEdbData",
+            Router: `/update/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: "UpdateRzdEdbDataById",