Merge remote-tracking branch 'origin/master'

controllers/data_manage/chart_info.go

@@ -804,8 +804,9 @@ func (this *ChartInfoController) ChartInfoDetail() {
 		chartInfo, err = data_manage.GetChartInfoViewById(chartInfoId)
 		if err != nil {
 			if err.Error() == utils.ErrNoRow() {
-				br.Msg = "图被删除，请刷新页面"
-				br.ErrMsg = "图被删除，请刷新页面，Err:" + err.Error()
+				br.Msg = "该图表已删除，自动查看下一图表"
+				br.ErrMsg = "该图表已删除，自动查看下一图表，Err:" + err.Error()
+				br.Ret = 406
 				return
 			}
 			br.Msg = "获取失败"
@@ -1154,8 +1155,9 @@ func (this *ChartInfoController) ChartInfoDetailV2() {
 	chartInfo, err := data_manage.GetChartInfoViewById(chartInfoId)
 	if err != nil {
 		if err.Error() == utils.ErrNoRow() {
-			br.Msg = "图被删除，请刷新页面"
-			br.ErrMsg = "图被删除，请刷新页面，Err:" + err.Error()
+			br.Msg = "该图表已删除，自动查看下一图表"
+			br.ErrMsg = "该图表已删除，自动查看下一图表，Err:" + err.Error()
+			br.Ret = 406
 			return
 		}
 		br.Msg = "获取失败"

controllers/data_manage/edb_info.go

@@ -2966,14 +2966,18 @@ func (this *ChartInfoController) EdbInfoData() {
 
 	edbInfo, err := data_manage.GetEdbInfoById(edbInfoId)
 	if err != nil {
+		if err.Error() == utils.ErrNoRow() {
+			br.Ret = 200
+			return
+		}
 		br.Msg = "获取失败"
-		br.Msg = "获取失败,Err:" + err.Error()
+		br.ErrMsg = "获取失败,Err:" + err.Error()
 		return
 	}
 	dataList, err := data_manage.GetEdbDataList(edbInfo.Source, edbInfoId, startDate, endDate)
 	if err != nil {
 		br.Msg = "获取失败"
-		br.Msg = "获取失败,Err:" + err.Error()
+		br.ErrMsg = "获取失败,Err:" + err.Error()
 		return
 	}
 	resp := new(data_manage.EdbInfoDataResp)

models/base.go

@@ -25,7 +25,7 @@ type BaseResponseRef struct {
 }
 
 type BaseResponseResult struct {
-	Ret     int    `description:"状态:200 成功，408 重新登录,403:为失败"`
+	Ret     int    `description:"状态:200 成功，408 重新登录,403:为失败, 406:已被删除"`
 	Msg     string `description:"提示信息，对用户展示"`
 	ErrMsg  string `description:"错误信息，供开发定位问题"`
 	ErrCode string `description:"错误编码，预留"`