排序问题优化

models/tables/trade_analysis/trade_analysis.go

@@ -40,11 +40,38 @@ func (v TradeClassifyNameListSort) Swap(i, j int) {
 func (v TradeClassifyNameListSort) Less(i, j int) bool {
 	return v[i].Sort < v[j].Sort
 }
+
+type TradeClassifyNameListItemSort []TradeClassifyNameListItem
+func (v TradeClassifyNameListItemSort) Len() int {
+	return len(v)
+}
+
+func (v TradeClassifyNameListItemSort) Swap(i, j int) {
+	v[i], v[j] = v[j], v[i]
+}
+
+func (v TradeClassifyNameListItemSort) Less(i, j int) bool {
+	return v[i].ClassifyName < v[j].ClassifyName
+}
+
 type TradeClassifyNameListItem struct {
 	ClassifyName string                          `description:"交易分类" json:"classify_name"`
 	Items        []TradeClassifyNameListItemItem `description:"合约代码" json:"items"`
 }
 
+type TradeClassifyNameListItemItemSort []TradeClassifyNameListItemItem
+func (v TradeClassifyNameListItemItemSort) Len() int {
+	return len(v)
+}
+
+func (v TradeClassifyNameListItemItemSort) Swap(i, j int) {
+	v[i], v[j] = v[j], v[i]
+}
+
+func (v TradeClassifyNameListItemItemSort) Less(i, j int) bool {
+	return v[i].ClassifyType < v[j].ClassifyType
+}
+
 type TradeClassifyNameListItemItem struct {
 	ClassifyType string `json:"classify_type"` //分类名称下的类型
 }

services/trade_analysis/trade_analysis.go

@@ -93,6 +93,7 @@ func GetClassifyName() (list trade_analysis.TradeClassifyNameListSort, err error
 				}
 			}
 			for n, l := range classifyMap {
+				sort.Sort(trade_analysis.TradeClassifyNameListItemItemSort(l))
 				tmpItems := trade_analysis.TradeClassifyNameListItem{
 					ClassifyName: n,
 					Items:        l,
@@ -101,6 +102,7 @@ func GetClassifyName() (list trade_analysis.TradeClassifyNameListSort, err error
 				tmp.Num ++
 			}
 		}
+		sort.Sort(trade_analysis.TradeClassifyNameListItemSort(tmp.Items))
 		list = append(list, tmp)
 		i ++
 	}
@@ -115,6 +117,10 @@ func getZhengzhouClassifyName(code string) (name string) {
 		name = "PTA"
 		return
 	}
+	if strings.HasPrefix(code,"TA") {
+		name = "PTA"
+		return
+	}
 	if strings.HasPrefix(code,"ZC") {
 		name="动力煤"
 		return