Roc 1 year ago
parent
commit
3210efd121
3 changed files with 24 additions and 7 deletions
  1. 15 1
      controllers/commodity_trade_base_index.go
  2. 5 5
      controllers/target.go
  3. 4 1
      models/target.go

+ 15 - 1
controllers/commodity_trade_base_index.go

@@ -66,7 +66,22 @@ func (this *TradeCommonController) ExchangeClassify() {
 		this.ServeJSON()
 	}()
 	exchange := this.GetString("Exchange")
+
+	var respItem [][]*string
+
 	latestData, err := data_manage.GetLatestDate(exchange)
+	if err != nil {
+		br.Msg = "获取失败"
+		return
+	}
+	if len(latestData) <= 0 {
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "获取成功"
+		br.Data = respItem
+		return
+	}
+
 	var dataTime []*string
 	if latestData != nil {
 		dataTime = append(dataTime, &latestData[0].DataTime)
@@ -77,7 +92,6 @@ func (this *TradeCommonController) ExchangeClassify() {
 		br.ErrMsg = "获取种类失败,Err:" + err.Error()
 		return
 	}
-	var respItem [][]*string
 	respItem = append(respItem, classifyName)
 	respItem = append(respItem, dataTime)
 	br.Ret = 200

+ 5 - 5
controllers/target.go

@@ -550,11 +550,11 @@ func (this *TargetController) TargetAdd() {
 		return
 	}
 
-	if tradeCode == "" {
-		br.Msg = "数据异常"
-		br.ErrMsg = "最大编码为空"
-		return
-	}
+	//if tradeCode == "" {
+	//	br.Msg = "数据异常"
+	//	br.ErrMsg = "最大编码为空"
+	//	return
+	//}
 	maxTradeCode, err := utils.GetMaxTradeCode(tradeCode)
 	if err != nil {
 		br.Msg = "数据异常"

+ 4 - 1
models/target.go

@@ -242,11 +242,14 @@ type EdbinfoAddReq struct {
 	NoticeTime string `description:"通知时间"`
 }
 
-// 获取指标最大trade_code
+// GetMaxTradeCode 获取指标最大trade_code
 func GetMaxTradeCode() (max_trade_code string, err error) {
 	sql := " SELECT MAX(TRADE_CODE) AS max_trade_code FROM edbinfo WHERE LEFT(TRADE_CODE,1)='W' AND TRADE_CODE not like '%index%'"
 	o := orm.NewOrmUsingDB("edb")
 	err = o.Raw(sql).QueryRow(&max_trade_code)
+	if (err != nil && err.Error() == utils.ErrNoRow()) || max_trade_code == `` {
+		max_trade_code = "W00"
+	}
 	return
 }