fix

controllers/chart.go

@@ -117,44 +117,44 @@ func (this *ChartController) List() {
 	br.Msg = "获取成功"
 }
 
-// Detail
-// @Title 图表详情
-// @Description 图表详情(这个接口的意义不大, 拿到数据也没啥用=_=!)
-// @Success 200 {object} models.Report
-// @router /detail [get]
-//func (this *ChartController) Detail() {
-//	br := new(models.BaseResponse).Init()
-//	defer func() {
-//		this.Data["json"] = br
-//		this.ServeJSON()
-//	}()
-//
-//	unicode := this.GetString("UniqueCode")
-//	if unicode == "" {
-//		br.Msg = "参数有误"
-//		return
-//	}
-//	chartOb := new(data_manage.ChartInfo)
-//	_, e := chartOb.GetItemByCode(unicode)
-//	if e != nil {
-//		if e.Error() == utils.ErrNoRow() {
-//			br.Msg = "图表不存在"
-//			return
-//		}
-//		br.Msg = "获取失败"
-//		br.ErrMsg = "ChartDetail GetItemByCode err: " + e.Error()
-//		return
-//	}
-//
-//	// 从edb_chart_lib中获取图详情, 这边只做部分数据的返回
-//	detail, e := services.GetChartDetailFromChartLibByUnicode(unicode)
-//	if e != nil {
-//		br.Msg = "获取失败"
-//		br.ErrMsg = "ChartDetail GetChartDetailFromChartLibByUnicode err: " + e.Error()
-//		return
-//	}
-//
-//	br.Data = detail
-//	br.Ret = 200
-//	br.Msg = "获取成功"
-//}
+//Detail
+//@Title 图表详情
+//@Description 图表详情(这个接口的意义不大, 拿到数据也没啥用=_=!)
+//@Success 200 {object} models.Report
+//@router /detail [get]
+func (this *ChartController) Detail() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	unicode := this.GetString("UniqueCode")
+	if unicode == "" {
+		br.Msg = "参数有误"
+		return
+	}
+	chartOb := new(data_manage.ChartInfo)
+	_, e := chartOb.GetItemByCode(unicode)
+	if e != nil {
+		if e.Error() == utils.ErrNoRow() {
+			br.Msg = "图表不存在"
+			return
+		}
+		br.Msg = "获取失败"
+		br.ErrMsg = "ChartDetail GetItemByCode err: " + e.Error()
+		return
+	}
+
+	// 从edb_chart_lib中获取图详情, 这边只做部分数据的返回
+	detail, e := services.GetChartDetailFromChartLibByUnicode(unicode)
+	if e != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "ChartDetail GetChartDetailFromChartLibByUnicode err: " + e.Error()
+		return
+	}
+
+	br.Data = detail
+	br.Ret = 200
+	br.Msg = "获取成功"
+}

models/data_manage/chart_info.go

@@ -17,7 +17,7 @@ type ChartInfo struct {
 	SysUserId         int       `description:"创建人ID"`
 	SysUserRealName   string    `description:"创建人姓名"`
 	UniqueCode        string    `description:"图表唯一编码"`
-	DateType          int       `description:"日期类型:1:00年至今,2:10年至今,3:15年至今，4：年初至今，5:自定义时间"`
+	DateType          int       `description:"日期类型:1:00年至今,2:10年至今,3:15年至今，4：21年至今，5:自定义时间，6:起始日期至今，7:18年至今，8:19年至今，9:20年至今，11:22年至今，20:最近N年"`
 	StartDate         string    `description:"自定义开始日期"`
 	EndDate           string    `description:"自定义结束日期"`
 	IsSetName         int       `description:"设置名称"`
@@ -25,7 +25,7 @@ type ChartInfo struct {
 	ChartType         int       `description:"生成样式:1:曲线图,2:季节性图,3:面积图，4：柱状图，5：散点图，6：组合图，7：柱方图，8：商品价格曲线图，9：相关性图"`
 	Calendar          string    `description:"公历/农历"`
 	SeasonStartDate   string    `description:"季节性图开始日期"`
-	SeasonEndDate     string    `description:"季节性图开始日期"`
+	SeasonEndDate     string    `description:"季节性图结束日期"`
 	ChartImage        string    `description:"图表图片"`
 	Sort              int       `description:"排序字段，数字越小越排前面"`
 	LeftMin           string    `description:"图表左侧最小值"`
@@ -38,8 +38,8 @@ type ChartInfo struct {
 	ExtraConfig       string    `description:"图表额外配置,json数据"`
 	SeasonExtraConfig string    `description:"季节性图表中的配置,json数据"`
 	StartYear         int       `description:"当选择的日期类型为最近N年类型时，即date_type=20, 用start_year表示N"`
-	CreateTime        time.Time `description:"创建时间"`
-	ModifyTime        time.Time `description:"更新时间"`
+	CreateTime        time.Time `json:"-"description:"创建时间"`
+	ModifyTime        time.Time `json:"-"description:"更新时间"`
 }
 
 func (m *ChartInfo) GetItemsByCondition(cond string, pars []interface{}, fieldArr []string, orderRule string) (items []*ChartInfo, err error) {

models/data_manage/edb_info.go

@@ -100,6 +100,7 @@ type EdbInfoItem struct {
 	NoUpdate     int     `description:"是否停更: 0-继续更新; 1-停止更新"`
 	CreateTime   string  `description:"创建时间"`
 	ModifyTime   string  `description:"更新时间"`
+	SysUserRealName  string    `description:"创建人姓名"`
 	//EdbData      []*EdbDataItem `description:"指标数据"`
 }
 
@@ -130,6 +131,7 @@ func FormatEdbInfo2Item(origin *EdbInfo) (item *EdbInfoItem) {
 	item.ChartImage = origin.ChartImage
 	item.Calendar = origin.Calendar
 	item.DataDateType = origin.DataDateType
+	item.SysUserRealName = origin.SysUserRealName
 	item.CreateTime = utils.TimeTransferString(utils.FormatDateTime, origin.CreateTime)
 	item.ModifyTime = utils.TimeTransferString(utils.FormatDateTime, origin.ModifyTime)
 	//item.EdbData = edbData

routers/commentsRouter.go

@@ -25,6 +25,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_hub/controllers:ChartController"] = append(beego.GlobalControllerRouter["eta/eta_hub/controllers:ChartController"],
+        beego.ControllerComments{
+            Method: "Detail",
+            Router: `/detail`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_hub/controllers:ChartController"] = append(beego.GlobalControllerRouter["eta/eta_hub/controllers:ChartController"],
         beego.ControllerComments{
             Method: "List",

services/chart.go

@@ -24,7 +24,7 @@ func GetChartDetailFromChartLibByUnicode(unicode string) (detail *data_manage.Ch
 
 	apiDetail, e := CurlChartLibChartDetailApi(unicode)
 	if e != nil {
-		err = fmt.Errorf("")
+		err = fmt.Errorf("CurlChartLibChartDetailApi Err: %s", e.Error())
 		return
 	}
 	detail = apiDetail