zqbao пре 9 месеци
родитељ
комит
d840d07727
2 измењених фајлова са 20 додато и 5 уклоњено
  1. 13 5
      controllers/chart.go
  2. 7 0
      models/chart.go

+ 13 - 5
controllers/chart.go

@@ -64,6 +64,7 @@ func (this *ChartController) List() {
 // @Title Detail
 // @Description 获得图表详情
 // @Param   ChartInfoId   query   int  true       "图表详情id"
+// @Param    UniqueCode  query   string  true       "图表唯一id"
 // @Success 200 {object} models.BaseResponse
 // @Failure 403 {object} models.BaseResponse
 // @router /detail [get]
@@ -75,20 +76,27 @@ func (this *ChartController) Detail() {
 	}()
 
 	chartInfoId, _ := this.GetInt("ChartInfoId")
-	if chartInfoId <= 0 {
+	uniqueCode := this.GetString("UniqueCode")
+	if chartInfoId <= 0 && uniqueCode == "" {
 		br.Msg = "图表id错误"
 		return
 	}
 
-	chart, err := models.GetChartById(chartInfoId)
+	var chart *models.ChartInfoView
+	var err error
+	if chartInfoId > 0 {
+		chart, err = models.GetChartById(chartInfoId)
+	} else {
+		chart, err = models.GetChartByUniqueCode(uniqueCode)
+	}
 	if err != nil {
-		br.Msg = "获取图表列表失败"
-		br.ErrMsg = "获取图表列表失败,系统错误,Err:" + err.Error()
+		br.Msg = "获取图表详情失败"
+		br.ErrMsg = "获取图表详情失败,系统错误,Err:" + err.Error()
 		return
 	}
 
 	br.Ret = 200
-	br.Msg = "获取图表列表成功"
+	br.Msg = "获取图表成功"
 	br.Success = true
 	br.Data = chart
 }

+ 7 - 0
models/chart.go

@@ -102,3 +102,10 @@ func GetChartById(chartInfoId int) (item *ChartInfoView, err error) {
 	err = o.Raw(sql, chartInfoId).QueryRow(&item)
 	return
 }
+
+func GetChartByUniqueCode(uniqueCode string) (item *ChartInfoView, err error) {
+	o := orm.NewOrmUsingDB("data")
+	sql := ` SELECT * FROM chart_info WHERE unique_code=?`
+	err = o.Raw(sql, uniqueCode).QueryRow(&item)
+	return
+}