涌益周度数据

models/base_from_yongyi.go

@@ -10,6 +10,7 @@ type YongyiExcelIndex struct {
 	IndexName    string `description:"指标名称"`
 	IndexCode    string `description:"指标编码"`
 	Unit         string `description:"单位"`
+	Sort         int    `description:"排序号"`
 	Frequency    string `description:"频度"`
 	TerminalCode string `description:"编码"`
 	ExcelDataMap map[string]string

services/base_from_yongyi.go

@@ -9,6 +9,29 @@ import (
 	"github.com/tealeg/xlsx"
 )
 
+/*
+日度-商品猪出栏价
+日度-商品猪标肥价差
+日度-商品猪全国均价和宰量
+日度-屠宰企业屠宰量
+周度-商品猪出栏价
+周度-体重
+周度-屠宰厂宰前活猪重
+周度-各体重段价差
+周度-50公斤二元母猪价格
+周度-规模场15公斤仔猪出栏价
+周度-宰后结算价
+周度-冻品库存
+周度-冻品库存多样本
+周度-猪肉价（前三等级白条均价）
+月度出栏完成率
+月度计划出栏量
+月度-能繁母猪存栏（2020年2月新增）
+月度-小猪存栏（2020年5月新增）
+月度-中猪存栏（2020年5月新增）
+月度-大猪存栏（2020年5月新增）
+月度-商品猪出栏量
+*/
 func HandleYongyiExcelDaily(uploadPath string) (err error) {
 	xlFile, err := xlsx.OpenFile(uploadPath)
 	if err != nil {
@@ -60,3 +83,75 @@ func HandleYongyiExcelDaily(uploadPath string) (err error) {
 
 	return
 }
+
+func HandleYongyiExcelWeekly(uploadPath string) (err error) {
+	xlFile, err := xlsx.OpenFile(uploadPath)
+	if err != nil {
+		err = fmt.Errorf("打开文件失败, Err: %s", err)
+		return
+	}
+	defer func() {
+		if err != nil {
+			fmt.Println("file close err: " + err.Error())
+		}
+	}()
+
+	for _, sheet := range xlFile.Sheet {
+		var indexList []*models.YongyiExcelIndex
+		switch sheet.Name {
+		/*case "周度-商品猪出栏价":
+			indexList, err = base_from_yongyi.HandleYongyiExcelWeekly1(sheet)
+		case "周度-体重":
+			indexList, err = base_from_yongyi.HandleYongyiExcelWeekly2(sheet)
+		case "周度-屠宰厂宰前活猪重":
+			indexList, err = base_from_yongyi.HandleYongyiExcelWeekly3(sheet)
+		case "周度-各体重段价差":
+			indexList, err = base_from_yongyi.HandleYongyiExcelWeekly4(sheet)*/
+		/*case "周度-50公斤二元母猪价格":
+		case "周度-规模场15公斤仔猪出栏价":
+		case "周度-宰后结算价":
+		case "周度-冻品库存":
+			indexList, err = base_from_yongyi.HandleYongyiExcelWeekly5(sheet)
+		case "周度-冻品库存多样本":
+			indexList, err = base_from_yongyi.HandleYongyiExcelWeekly6(sheet)
+		case "周度-猪肉价（前三等级白条均价）":
+			indexList, err = base_from_yongyi.HandleYongyiExcelWeekly5(sheet)
+		case "月度出栏完成率":
+			indexList, err = base_from_yongyi.HandleYongyiExcelWeekly6(sheet)
+		case "月度计划出栏量":
+			indexList, err = base_from_yongyi.HandleYongyiExcelWeekly7(sheet)
+		case "月度-能繁母猪存栏（2020年2月新增）":
+			indexList, err = base_from_yongyi.HandleYongyiExcelWeekly8(sheet)
+		case "月度-小猪存栏（2020年5月新增）":
+		case "月度-中猪存栏（2020年5月新增）":
+		case "月度-大猪存栏（2020年5月新增）":
+			indexList, err = base_from_yongyi.HandleYongyiExcelWeekly9(sheet)*/
+		case "月度-商品猪出栏量":
+			indexList, err = base_from_yongyi.HandleYongyiExcelWeekly10(sheet)
+		default:
+			continue
+		}
+
+		if len(indexList) > 0 {
+			params := make(map[string]interface{})
+			params["List"] = indexList
+			_, e := PostEdbLib(params, utils.LIB_ROUTE_YONGYI_HANDLE)
+			if e != nil {
+				b, _ := json.Marshal(params)
+				utils.FileLog.Info("重置指标分类失败, err: %s, params: %s", e.Error(), string(b))
+				return
+			}
+			/*resp := new(models.EdbInfoResp)
+			if e := json.Unmarshal(result, &resp); e != nil {
+				utils.FileLog.Info("MethodClassifyReset Unmarshal err: %s", e.Error())
+				return
+			}
+			if resp.Ret != 200 {
+				utils.FileLog.Info("重置指标分类失败, Msg: %s, ErrMsg: %s", resp.Msg, resp.ErrMsg)
+				continue
+			}*/
+		}
+	}
+
+	return
+}

services/base_from_yongyi/daily.go

@@ -9,23 +9,6 @@ import (
 	"time"
 )
 
-var yongyiSheetMap map[string]*models.YongyiSheet
-var yongyiNotAddMap map[string][]string
-var yongyiSpecialNameMap map[string]map[string]string
-var yongyiSpecialUnitMap map[string]string
-
-func init() {
-	yongyiSheetMap = map[string]*models.YongyiSheet{
-		"出栏价":             {"商品猪出栏价", "日度-商品猪出栏价", "日度", "元/公斤"},
-		"标肥价差":           {"", "日度-商品猪标肥价差", "日度", "元/公斤"},
-		"价格+宰量":          {"", "", "日度", "元/公斤"},
-		"屠宰企业日度屠宰量": {"商品猪日屠宰量", "日度-屠宰企业屠宰量", "日度", "头/日"},
-	}
-	yongyiNotAddMap = map[string][]string{"出栏价": {"商品猪出栏价/全国/均价"}, "屠宰企业日度屠宰量": {"商品猪日屠宰量/合计（单位：头）"}}
-	yongyiSpecialNameMap = map[string]map[string]string{"价格+宰量": {"全国均价": "商品猪出栏价/全国/均价", "日屠宰量": "商品猪日屠宰量/全国"}}
-	yongyiSpecialUnitMap = map[string]string{"商品猪日屠宰量/全国": "头/日"}
-}
-
 // HandleYongyiExcelDaily1 日度-商品猪出栏价
 func HandleYongyiExcelDaily1(sheet *xlsx.Sheet) (indexList []*models.YongyiExcelIndex, err error) {
 	classifyName := "日度-商品猪出栏价"
@@ -123,6 +106,8 @@ func HandleYongyiExcelDaily1(sheet *xlsx.Sheet) (indexList []*models.YongyiExcel
 					indexItem.ClassifyName = classifyName
 					indexItem.IndexCode = fullIndexNamePingyin
 					indexItem.Frequency = frequency
+					// todo 排序
+					indexItem.Sort = i + k
 					indexItem.Unit = unit
 					indexItem.ExcelDataMap = make(map[string]string)
 				}
@@ -239,6 +224,8 @@ func HandleYongyiExcelDaily2(sheet *xlsx.Sheet) (indexList []*models.YongyiExcel
 					indexItem.ClassifyName = classifyName
 					indexItem.IndexCode = fullIndexNamePingyin
 					indexItem.Frequency = frequency
+					// todo 排序
+					indexItem.Sort = i + k
 					indexItem.Unit = unit
 					indexItem.ExcelDataMap = make(map[string]string)
 				}
@@ -323,6 +310,7 @@ func HandleYongyiExcelDaily3(sheet *xlsx.Sheet) (indexList []*models.YongyiExcel
 					indexItem.ClassifyName = classifyName
 					indexItem.IndexCode = fullIndexNamePingyin
 					indexItem.Frequency = frequency
+					indexItem.Sort = k
 					indexItem.Unit = unit
 					indexItem.ExcelDataMap = make(map[string]string)
 				}
@@ -417,6 +405,7 @@ func HandleYongyiExcelDaily4(sheet *xlsx.Sheet) (indexList []*models.YongyiExcel
 					indexItem.ClassifyName = classifyName
 					indexItem.IndexCode = fullIndexNamePingyin
 					indexItem.Frequency = frequency
+					indexItem.Sort = i
 					indexItem.Unit = unit
 					indexItem.ExcelDataMap = make(map[string]string)
 				}

services/base_from_yongyi/week.go

@@ -1 +1,1212 @@
 package base_from_yongyi
+
+import (
+	"eta/eta_data_analysis/models"
+	"eta/eta_data_analysis/utils"
+	"fmt"
+	"github.com/tealeg/xlsx"
+	"strconv"
+	"strings"
+	"time"
+)
+
+var YongyiWeeklySheetMap5 map[string]*models.YongyiSheet
+var YongyiWeeklySheetMap6 map[string]*models.YongyiSheet
+var YongyiWeeklySheetMap9 map[string]*models.YongyiSheet
+
+func init() {
+	YongyiWeeklySheetMap5 = map[string]*models.YongyiSheet{
+		"周度-50公斤二元母猪价格":    {"50公斤二元母猪价格", "周度-50公斤二元母猪价格", "周度", "元/头"},
+		"周度-规模场15公斤仔猪出栏价":  {"规模场15公斤仔猪出栏价", "周度-规模场15公斤仔猪出栏价", "周度", "元/头"},
+		"周度-宰后结算价":         {"宰后结算价", "周度-宰后结算价", "周度", "元/公斤"},
+		"周度-冻品库存":          {"冻品库存", "周度-冻品库存", "周度", "%"},
+		"周度-猪肉价（前三等级白条均价）": {"前三等级白条均价", "周度-猪肉价（前三等级白条均价）", "周度", "元/公斤"},
+	}
+	YongyiWeeklySheetMap6 = map[string]*models.YongyiSheet{
+		"周度-冻品库存多样本": {"冻品库存多样本", "周度-冻品库存多样本", "周度", "%"},
+		"月度出栏完成率":    {"", "月度出栏完成率", "旬度", "%"},
+	}
+	YongyiWeeklySheetMap9 = map[string]*models.YongyiSheet{
+		"月度-小猪存栏（2020年5月新增）": {"商品猪出栏价", "月度-小猪存栏（2020年5月新增）", "月度", "元/公斤"},
+		"月度-中猪存栏（2020年5月新增）": {"", "月度-中猪存栏（2020年5月新增）", "月度", "元/公斤"},
+		"月度-大猪存栏（2020年5月新增）": {"", "月度-大猪存栏（2020年5月新增）", "月度", "元/公斤"},
+	}
+}
+
+type ExcelDateRecordFirst struct {
+	Date time.Time `xlsx:"0"`
+}
+
+type ExcelDateRecord struct {
+	Date time.Time `xlsx:"1"`
+}
+
+// HandleYongyiExcelWeekly1 周度-商品猪出栏价
+func HandleYongyiExcelWeekly1(sheet *xlsx.Sheet) (indexList []*models.YongyiExcelIndex, err error) {
+	classifyName := "周度-商品猪出栏价"
+	frequency := "周度"
+	unit := "元/公斤"
+	namePrefix := "商品猪出栏价"
+	namePrefixPingin := "yyzxspzclj"
+
+	// 遍历行读取
+	indexList = make([]*models.YongyiExcelIndex, 0)
+	areaMap := make(map[int]string)
+	provinceMap := make(map[int]string)
+	maxRow := sheet.MaxRow
+	fmt.Println("最大行")
+	fmt.Println(maxRow)
+	// 指标名称
+	indexMap := make(map[string]*models.YongyiExcelIndex)
+	for i := 0; i < maxRow; i++ {
+		fmt.Printf("当前第%d行 \n", i)
+		if i == 0 { // 首行，表示时间
+			row := sheet.Row(i)
+			cells := row.Cells
+			for k, cell := range cells {
+				text := cell.String()
+				if k > 1 && text != "" {
+					// 检查单元格是否为合并单元格
+					if cell.HMerge > 0 {
+						for j := 1; j <= cell.HMerge; j++ {
+							areaMap[k+j] = text
+						}
+					}
+					if cell.VMerge > 0 {
+						provinceMap[k] = text
+					}
+					areaMap[k] = text
+				}
+			}
+		} else if i == 1 { //表示表头
+			// 处理 index指标表
+			row := sheet.Row(i)
+			cells := row.Cells
+			for k, cell := range cells {
+				text := cell.String()
+				if text != "" {
+					provinceMap[k] = text
+				}
+			}
+		} else { //数据列
+			row := sheet.Row(i)
+			cells := row.Cells
+			date := ""
+			for k, cell := range cells {
+				fmt.Printf("当前第%d列 \n", k)
+				text := cell.String()
+				if k == 0 {
+					continue
+				} else if k == 1 {
+					tmpRow := row
+					r := &ExcelDateRecord{}
+					if e := tmpRow.ReadStruct(r); e != nil {
+						err = fmt.Errorf("读取行，时间列失败 Err:%s", e)
+						return
+					}
+					date = r.Date.Format(utils.FormatDate)
+					fmt.Println(date)
+					continue
+				} else {
+					// 判断出不是字符的，则过滤
+					_, e := strconv.ParseFloat(text, 64)
+					if e != nil {
+						continue
+					}
+				}
+
+				area, ok1 := areaMap[k]
+				if !ok1 {
+					err = fmt.Errorf("找不到对应的区域，第%d行，第%d列", i, k)
+					return
+				}
+				province, ok2 := provinceMap[k]
+				if !ok2 {
+					err = fmt.Errorf("找不到对应的列名，第%d行，第%d列", i, k)
+					return
+				}
+				fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, province)
+				// 处理指标名称
+				fullIndexName := fmt.Sprintf("%s/%s/%s", namePrefix, area, province)
+				provincePingyin := utils.GetFullPingYin(province)
+				areaPingin := utils.GetFirstPingYin(area)
+				fullIndexNamePingyin := namePrefixPingin + areaPingin + provincePingyin
+
+				if province == "全  国1" || province == "全  国2" || province == "全国1" || province == "全国2" {
+					province = strings.ReplaceAll(province, " ", "")
+					fullIndexName = fmt.Sprintf("%s/%s", namePrefix, province)
+					fullIndexNamePingyin = namePrefixPingin + provincePingyin
+				}
+
+				indexItem, okIndex := indexMap[fullIndexName]
+				if !okIndex {
+					// 新增指标
+					indexItem = new(models.YongyiExcelIndex)
+					indexItem.IndexName = fullIndexName
+					indexItem.ClassifyName = classifyName
+					indexItem.IndexCode = fullIndexNamePingyin
+					indexItem.Frequency = frequency
+					indexItem.Sort = k
+					indexItem.Unit = unit
+					indexItem.ExcelDataMap = make(map[string]string)
+				}
+				fmt.Printf("indexItem%s", indexItem.IndexCode)
+
+				indexItem.ExcelDataMap[date] = text
+				indexMap[fullIndexName] = indexItem
+				continue
+			}
+		}
+	}
+	for _, v := range indexMap {
+		indexList = append(indexList, v)
+	}
+	return
+}
+
+// HandleYongyiExcelWeekly2 周度-体重
+func HandleYongyiExcelWeekly2(sheet *xlsx.Sheet) (indexList []*models.YongyiExcelIndex, err error) {
+	classifyName := "周度-体重"
+	frequency := "周度"
+	unit := "公斤"
+	namePrefix := "商品猪出栏体重"
+	namePrefixPingin := "yyzxspzcltz"
+
+	// 遍历行读取
+	indexList = make([]*models.YongyiExcelIndex, 0)
+	areaMap := make(map[int]string)
+	provinceMap := make(map[int]string)
+	maxRow := sheet.MaxRow
+	fmt.Println("最大行")
+	fmt.Println(maxRow)
+	// 指标名称
+	indexMap := make(map[string]*models.YongyiExcelIndex)
+	for i := 0; i < maxRow; i++ {
+		fmt.Printf("当前第%d行 \n", i)
+		if i == 0 { // 首行，表示时间
+			row := sheet.Row(i)
+			cells := row.Cells
+			for k, cell := range cells {
+				text := cell.String()
+				if k > 2 && text != "" {
+					// 检查单元格是否为合并单元格
+					if cell.HMerge > 0 {
+						for j := 1; j <= cell.HMerge; j++ {
+							areaMap[k+j] = text
+						}
+					}
+					if cell.VMerge > 0 {
+						provinceMap[k] = text
+					}
+					areaMap[k] = text
+				}
+			}
+		} else if i == 1 { //表示表头
+			// 处理 index指标表
+			row := sheet.Row(i)
+			cells := row.Cells
+			for k, cell := range cells {
+				text := cell.String()
+				if text != "" {
+					provinceMap[k] = text
+				}
+			}
+		} else { //数据列
+			row := sheet.Row(i)
+			cells := row.Cells
+			date := ""
+			name := ""
+			for k, cell := range cells {
+				fmt.Printf("当前第%d列 \n", k)
+				text := cell.String()
+				if k == 0 {
+					continue
+				} else if k == 1 {
+					tmpRow := row
+					r := &ExcelDateRecord{}
+					if e := tmpRow.ReadStruct(r); e != nil {
+						err = fmt.Errorf("读取行，时间列失败 Err:%s", e)
+						return
+					}
+					date = r.Date.Format(utils.FormatDate)
+					fmt.Println(date)
+					continue
+				} else if k == 2 {
+					name = text
+					continue
+				} else {
+					// 判断出不是字符的，则过滤
+					if text == "" {
+						continue
+					}
+					if strings.Contains(text, "%") {
+						text = strings.Replace(text, "%", "", 1)
+					}
+					_, e := strconv.ParseFloat(text, 64)
+					if e != nil {
+						continue
+					}
+				}
+
+				area, ok1 := areaMap[k]
+				if !ok1 {
+					err = fmt.Errorf("找不到对应的区域，第%d行，第%d列", i, k)
+					return
+				}
+				province, ok2 := provinceMap[k]
+				if !ok2 {
+					err = fmt.Errorf("找不到对应的列名，第%d行，第%d列", i, k)
+					return
+				}
+				fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, province)
+				// 处理指标名称
+				fullIndexName := fmt.Sprintf("%s/%s/%s/%s", namePrefix, area, province, name)
+				provincePingyin := utils.GetFullPingYin(province)
+				areaPingin := utils.GetFirstPingYin(area)
+				namePingin := utils.GetFirstPingYin(name)
+				fullIndexNamePingyin := namePrefixPingin + areaPingin + provincePingyin + namePingin
+
+				if province == "全  国1" || province == "全  国2" || province == "全国1" || province == "全国2" {
+					province = strings.ReplaceAll(province, " ", "")
+					fullIndexName = fmt.Sprintf("%s/%s/%s", namePrefix, province, name)
+					fullIndexNamePingyin = namePrefixPingin + provincePingyin + namePingin
+				}
+				if name == "90kg以下" || name == "150kg以上" {
+					unit = "%"
+				}
+				indexItem, okIndex := indexMap[fullIndexName]
+				if !okIndex {
+					// 新增指标
+					indexItem = new(models.YongyiExcelIndex)
+					indexItem.IndexName = fullIndexName
+					indexItem.ClassifyName = classifyName
+					indexItem.IndexCode = fullIndexNamePingyin
+					indexItem.Frequency = frequency
+					// todo 排序
+					indexItem.Sort = k
+					indexItem.Unit = unit
+					indexItem.ExcelDataMap = make(map[string]string)
+				}
+				fmt.Printf("indexItem%s", indexItem.IndexCode)
+
+				indexItem.ExcelDataMap[date] = text
+				indexMap[fullIndexName] = indexItem
+				continue
+			}
+		}
+	}
+	for _, v := range indexMap {
+		indexList = append(indexList, v)
+	}
+	return
+}
+
+// HandleYongyiExcelWeekly3 周度-屠宰厂宰前活猪重
+func HandleYongyiExcelWeekly3(sheet *xlsx.Sheet) (indexList []*models.YongyiExcelIndex, err error) {
+	classifyName := "周度-屠宰厂宰前活猪重"
+	frequency := "周度"
+	unit := "公斤"
+	namePrefix := "商品猪宰前活猪重"
+	namePrefixPingin := "yyzxspzzqhzz"
+
+	// 遍历行读取
+	indexList = make([]*models.YongyiExcelIndex, 0)
+	provinceMap := make(map[int]string)
+	maxRow := sheet.MaxRow
+	fmt.Println("最大行")
+	fmt.Println(maxRow)
+	// 指标名称
+	indexMap := make(map[string]*models.YongyiExcelIndex)
+	for i := 0; i < maxRow; i++ {
+		fmt.Printf("当前第%d行 \n", i)
+		if i < 2 {
+			continue
+		}
+		if i == 2 { // 首行，表示时间
+			row := sheet.Row(i)
+			cells := row.Cells
+			for k, cell := range cells {
+				text := cell.String()
+				if k > 2 && text != "" {
+					// 检查单元格是否为合并单元格
+					if cell.VMerge > 0 {
+						provinceMap[k] = text
+					}
+				}
+			}
+		} else if i == 3 { //表示表头
+			// 处理 index指标表
+			row := sheet.Row(i)
+			cells := row.Cells
+			for k, cell := range cells {
+				text := cell.String()
+				if text != "" {
+					provinceMap[k] = text
+				}
+			}
+		} else { //数据列
+			row := sheet.Row(i)
+			cells := row.Cells
+			date := ""
+			for k, cell := range cells {
+				fmt.Printf("当前第%d列 \n", k)
+				text := cell.String()
+				if k == 0 {
+					continue
+				} else if k == 1 {
+					tmpRow := row
+					r := &ExcelDateRecord{}
+					if e := tmpRow.ReadStruct(r); e != nil {
+						continue
+					}
+					date = r.Date.Format(utils.FormatDate)
+					fmt.Println(date)
+					continue
+				} else if k == 2 {
+					continue
+				} else {
+					// 判断出不是字符的，则过滤
+					if text == "" {
+						continue
+					}
+					if strings.Contains(text, "%") {
+						text = strings.Replace(text, "%", "", 1)
+					}
+					_, e := strconv.ParseFloat(text, 64)
+					if e != nil {
+						continue
+					}
+				}
+
+				province, ok2 := provinceMap[k]
+				if !ok2 {
+					err = fmt.Errorf("找不到对应的列名，第%d行，第%d列", i, k)
+					return
+				}
+				if province == "较上周" {
+					continue
+				} else if province == "全国平均" {
+					province = "全国"
+				}
+				fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, province)
+				// 处理指标名称
+				fullIndexName := fmt.Sprintf("%s/%s", namePrefix, province)
+				provincePingyin := utils.GetFullPingYin(province)
+				fullIndexNamePingyin := namePrefixPingin + provincePingyin
+
+				indexItem, okIndex := indexMap[fullIndexName]
+				if !okIndex {
+					// 新增指标
+					indexItem = new(models.YongyiExcelIndex)
+					indexItem.IndexName = fullIndexName
+					indexItem.ClassifyName = classifyName
+					indexItem.IndexCode = fullIndexNamePingyin
+					indexItem.Frequency = frequency
+					indexItem.Sort = k
+					indexItem.Unit = unit
+					indexItem.ExcelDataMap = make(map[string]string)
+				}
+				fmt.Printf("indexItem%s", indexItem.IndexCode)
+
+				indexItem.ExcelDataMap[date] = text
+				indexMap[fullIndexName] = indexItem
+				continue
+			}
+		}
+	}
+	for _, v := range indexMap {
+		indexList = append(indexList, v)
+	}
+	return
+}
+
+// HandleYongyiExcelWeekly4 周度-各体重段价差
+func HandleYongyiExcelWeekly4(sheet *xlsx.Sheet) (indexList []*models.YongyiExcelIndex, err error) {
+	classifyName := "周度-各体重段价差"
+	frequency := "周度"
+	unit := "元/斤"
+	namePrefixPingin := "yyzx"
+
+	// 遍历行读取
+	indexList = make([]*models.YongyiExcelIndex, 0)
+	provinceMap := make(map[int]string)
+	maxRow := sheet.MaxRow
+	fmt.Println("最大行")
+	fmt.Println(maxRow)
+	// 指标名称
+	indexMap := make(map[string]*models.YongyiExcelIndex)
+	for i := 0; i < maxRow; i++ {
+		fmt.Printf("当前第%d行 \n", i)
+		if i == 0 {
+			continue
+		} else if i == 1 { //表示表头
+			// 处理 index指标表
+			row := sheet.Row(i)
+			cells := row.Cells
+			for k, cell := range cells {
+				text := cell.String()
+				if text != "" {
+					provinceMap[k] = text
+				}
+			}
+		} else { //数据列
+			row := sheet.Row(i)
+			cells := row.Cells
+			date := ""
+			name := ""
+			for k, cell := range cells {
+				fmt.Printf("当前第%d列 \n", k)
+				text := cell.String()
+				if k == 0 {
+					continue
+				} else if k == 1 {
+					tmpRow := row
+					r := &ExcelDateRecord{}
+					if e := tmpRow.ReadStruct(r); e != nil {
+						err = fmt.Errorf("读取行，时间列失败 Err:%s", e)
+						return
+					}
+					date = r.Date.Format(utils.FormatDate)
+					fmt.Println(date)
+					continue
+				} else if k == 2 {
+					name = text
+					if name == "标猪" {
+						name += "价格"
+					} else {
+						name += "猪价格"
+					}
+					continue
+				} else {
+					// 判断出不是字符的，则过滤
+					if text == "" {
+						continue
+					}
+					_, e := strconv.ParseFloat(text, 64)
+					if e != nil {
+						continue
+					}
+				}
+
+				province, ok2 := provinceMap[k]
+				if !ok2 {
+					err = fmt.Errorf("找不到对应的列名，第%d行，第%d列", i, k)
+					return
+				}
+				if name != "标猪价格" && name != "150kg猪价格" && name != "175kg猪价格" && name != "200kg猪价格" {
+					continue
+				}
+
+				fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, province)
+				// 处理指标名称
+				fullIndexName := fmt.Sprintf("%s/%s", name, province)
+				provincePingyin := utils.GetFullPingYin(province)
+				namePingin := utils.GetFirstPingYin(name)
+				fullIndexNamePingyin := namePrefixPingin + namePingin + provincePingyin
+
+				indexItem, okIndex := indexMap[fullIndexName]
+				if !okIndex {
+					// 新增指标
+					indexItem = new(models.YongyiExcelIndex)
+					indexItem.IndexName = fullIndexName
+					indexItem.ClassifyName = classifyName
+					indexItem.IndexCode = fullIndexNamePingyin
+					indexItem.Frequency = frequency
+					// todo 排序
+					//indexItem.Sort = i*1000 + k
+					indexItem.Unit = unit
+					indexItem.ExcelDataMap = make(map[string]string)
+				}
+				fmt.Printf("IndexCode: %s", indexItem.IndexCode)
+
+				indexItem.ExcelDataMap[date] = text
+				indexMap[fullIndexName] = indexItem
+				continue
+			}
+		}
+	}
+	for _, v := range indexMap {
+		indexList = append(indexList, v)
+	}
+	return
+}
+
+// HandleYongyiExcelWeekly5 周度-50公斤二元母猪价格
+func HandleYongyiExcelWeekly5(sheet *xlsx.Sheet) (indexList []*models.YongyiExcelIndex, err error) {
+	info, ok := YongyiWeeklySheetMap5[sheet.Name]
+	if !ok {
+		return
+	}
+	classifyName := info.ClassifyName
+	frequency := info.Frequency
+	unit := info.Unit
+	namePrefix := info.NamePrefix
+	namePrefixPingin := "yyzx" + utils.GetFirstPingYin(namePrefix)
+	/*classifyName := "周度-50公斤二元母猪价格"
+	frequency := "周度"
+	unit := "元/头"
+	namePrefix := "50公斤二元母猪价格"
+	namePrefixPingin := "yyzx50gjeymzjg"*/
+
+	/*	classifyName := "周度-规模场15公斤仔猪出栏价"
+		frequency := "周度"
+		unit := "元/头"
+		namePrefix := "规模场15公斤仔猪出栏价"
+		namePrefixPingin := "yyzxgmc15gjzzclj"*/
+
+	// 遍历行读取
+	indexList = make([]*models.YongyiExcelIndex, 0)
+	provinceMap := make(map[int]string)
+	maxRow := sheet.MaxRow
+	fmt.Println("最大行")
+	fmt.Println(maxRow)
+	// 指标名称
+	indexMap := make(map[string]*models.YongyiExcelIndex)
+	for i := 0; i < maxRow; i++ {
+		fmt.Printf("当前第%d行 \n", i)
+		if i == 0 {
+			row := sheet.Row(i)
+			cells := row.Cells
+			for k, cell := range cells {
+				text := cell.String()
+				if k > 1 && text != "" {
+					if cell.VMerge > 0 {
+						provinceMap[k] = text
+					}
+				}
+			}
+			continue
+		} else if i == 1 { //表示表头
+			// 处理 index指标表
+			row := sheet.Row(i)
+			cells := row.Cells
+			for k, cell := range cells {
+				text := cell.String()
+				if text != "" {
+					provinceMap[k] = text
+				}
+			}
+		} else { //数据列
+			row := sheet.Row(i)
+			cells := row.Cells
+			date := ""
+			for k, cell := range cells {
+				fmt.Printf("当前第%d列 \n", k)
+				text := cell.String()
+				if k == 0 {
+					continue
+				} else if k == 1 {
+					tmpRow := row
+					r := &ExcelDateRecord{}
+					if e := tmpRow.ReadStruct(r); e != nil {
+						err = fmt.Errorf("读取行，时间列失败 Err:%s", e)
+						return
+					}
+					date = r.Date.Format(utils.FormatDate)
+					fmt.Println(date)
+					continue
+				} else {
+					// 判断出不是字符的，则过滤
+					if text == "" {
+						continue
+					}
+					_, e := strconv.ParseFloat(text, 64)
+					if e != nil {
+						continue
+					}
+				}
+
+				province, ok2 := provinceMap[k]
+				if !ok2 {
+					err = fmt.Errorf("找不到对应的列名，第%d行，第%d列", i, k)
+					return
+				}
+				if province == "全  国1" || province == "全  国2" || province == "全国1" || province == "全国2" {
+					province = strings.ReplaceAll(province, " ", "")
+				}
+				fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, province)
+				// 处理指标名称
+				fullIndexName := fmt.Sprintf("%s/%s", namePrefix, province)
+				provincePingyin := utils.GetFullPingYin(province)
+				fullIndexNamePingyin := namePrefixPingin + provincePingyin
+
+				indexItem, okIndex := indexMap[fullIndexName]
+				if !okIndex {
+					// 新增指标
+					indexItem = new(models.YongyiExcelIndex)
+					indexItem.IndexName = fullIndexName
+					indexItem.ClassifyName = classifyName
+					indexItem.IndexCode = fullIndexNamePingyin
+					indexItem.Frequency = frequency
+					indexItem.Sort = k
+					indexItem.Unit = unit
+					indexItem.ExcelDataMap = make(map[string]string)
+				}
+				fmt.Printf("IndexCode: %s", indexItem.IndexCode)
+
+				indexItem.ExcelDataMap[date] = text
+				indexMap[fullIndexName] = indexItem
+				continue
+			}
+		}
+	}
+	for _, v := range indexMap {
+		indexList = append(indexList, v)
+	}
+	return
+}
+
+// HandleYongyiExcelWeekly6 周度-冻品库存多样本
+func HandleYongyiExcelWeekly6(sheet *xlsx.Sheet) (indexList []*models.YongyiExcelIndex, err error) {
+	info, ok := YongyiWeeklySheetMap6[sheet.Name]
+	if !ok {
+		return
+	}
+	classifyName := info.ClassifyName
+	frequency := info.Frequency
+	unit := info.Unit
+	namePrefix := info.NamePrefix
+	namePrefixPingin := "yyzx" + utils.GetFirstPingYin(namePrefix)
+	/*classifyName := "周度-冻品库存多样本"
+	frequency := "周度"
+	unit := "%"
+	namePrefix := "冻品库存多样本"
+	namePrefixPingin := "yyzxdpkcdyb"*/
+
+	// 遍历行读取
+	indexList = make([]*models.YongyiExcelIndex, 0)
+	areaMap := make(map[int]string)
+	maxRow := sheet.MaxRow
+	fmt.Println("最大行")
+	fmt.Println(maxRow)
+	// 指标名称
+	indexMap := make(map[string]*models.YongyiExcelIndex)
+	for i := 0; i < maxRow; i++ {
+		fmt.Printf("当前第%d行 \n", i)
+		if i == 0 {
+			continue
+		} else if i == 1 { //表示表头
+			// 处理 index指标表
+			row := sheet.Row(i)
+			cells := row.Cells
+			for k, cell := range cells {
+				text := cell.String()
+				if text != "" {
+					areaMap[k] = text
+				}
+			}
+		} else { //数据列
+			row := sheet.Row(i)
+			cells := row.Cells
+			date := ""
+			for k, cell := range cells {
+				fmt.Printf("当前第%d列 \n", k)
+				text := cell.String()
+				if k == 0 {
+					tmpRow := row
+					r := &ExcelDateRecord{}
+					if e := tmpRow.ReadStruct(r); e != nil {
+						err = fmt.Errorf("读取行，时间列失败 Err:%s", e)
+						return
+					}
+					date = r.Date.Format(utils.FormatDate)
+					fmt.Println(date)
+					continue
+				} else {
+					// 判断出不是字符的，则过滤
+					if text == "" {
+						continue
+					}
+					_, e := strconv.ParseFloat(text, 64)
+					if e != nil {
+						continue
+					}
+				}
+
+				area, ok2 := areaMap[k]
+				if !ok2 {
+					err = fmt.Errorf("找不到对应的列名，第%d行，第%d列", i, k)
+					return
+				}
+				fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, area)
+				// 处理指标名称
+				fullIndexName := fmt.Sprintf("%s/%s", namePrefix, area)
+				areaPingyin := utils.GetFirstPingYin(area)
+				fullIndexNamePingyin := namePrefixPingin + areaPingyin
+
+				indexItem, okIndex := indexMap[fullIndexName]
+				if !okIndex {
+					// 新增指标
+					indexItem = new(models.YongyiExcelIndex)
+					indexItem.IndexName = fullIndexName
+					indexItem.ClassifyName = classifyName
+					indexItem.IndexCode = fullIndexNamePingyin
+					indexItem.Frequency = frequency
+					indexItem.Sort = k
+					indexItem.Unit = unit
+					indexItem.ExcelDataMap = make(map[string]string)
+				}
+				fmt.Printf("IndexCode: %s", indexItem.IndexCode)
+
+				indexItem.ExcelDataMap[date] = text
+				indexMap[fullIndexName] = indexItem
+				continue
+			}
+		}
+	}
+	for _, v := range indexMap {
+		indexList = append(indexList, v)
+	}
+	return
+}
+
+// HandleYongyiExcelWeekly7 月度计划出栏量
+func HandleYongyiExcelWeekly7(sheet *xlsx.Sheet) (indexList []*models.YongyiExcelIndex, err error) {
+	classifyName := "月度计划出栏量"
+	frequency := "月度"
+	unit := "%"
+	namePrefix := "月度计划出栏量环比"
+	namePrefixPingin := "yyzxydjhcllhb"
+
+	// 遍历行读取
+	indexList = make([]*models.YongyiExcelIndex, 0)
+	provinceMap := make(map[int]string)
+	firstMap := make(map[int]string)
+	maxRow := sheet.MaxRow
+	fmt.Println("最大行")
+	fmt.Println(maxRow)
+	// 指标名称
+	indexMap := make(map[string]*models.YongyiExcelIndex)
+	for i := 0; i < maxRow; i++ {
+		fmt.Printf("当前第%d行 \n", i)
+		if i == 0 {
+			// 处理 index指标表
+			row := sheet.Row(i)
+			cells := row.Cells
+			for k, cell := range cells {
+				text := cell.String()
+				if text != "" {
+					firstMap[k] = text
+				}
+			}
+			continue
+		} else if i == 1 { //表示表头
+			// 处理 index指标表
+			row := sheet.Row(i)
+			cells := row.Cells
+			for k, cell := range cells {
+				text := cell.String()
+				if text != "" {
+					provinceMap[k] = text
+				}
+			}
+		} else { //数据列
+			row := sheet.Row(i)
+			cells := row.Cells
+			date := ""
+			for k, cell := range cells {
+				fmt.Printf("当前第%d列 \n", k)
+				text := cell.String()
+				if k == 0 {
+					tmpRow := row
+					r := &ExcelDateRecordFirst{}
+					if e := tmpRow.ReadStruct(r); e != nil {
+						err = fmt.Errorf("读取行，时间列失败 Err:%s", e)
+						return
+					}
+					// 查询当月的最后一天
+					monthDate := r.Date.Format(utils.FormatYearMonthDate)
+					firstDayStr := monthDate + "-01"
+					tmpT, _ := time.ParseInLocation(utils.FormatDate, firstDayStr, time.Local)
+					date = tmpT.AddDate(0, 1, -1).Format(utils.FormatDate)
+					fmt.Println(date)
+					continue
+				} else {
+					// 判断出不是字符的，则过滤
+					if text == "" {
+						continue
+					}
+					if strings.Contains(text, "%") {
+						text = strings.Replace(text, "%", "", 1)
+					}
+					_, e := strconv.ParseFloat(text, 64)
+					if e != nil {
+						continue
+					}
+				}
+
+				province, ok1 := provinceMap[k]
+				if !ok1 {
+					err = fmt.Errorf("找不到对应的列名，第%d行，第%d列", i, k)
+					return
+				}
+				if province == "本月计划较上月实际销售" {
+					continue
+				}
+				fmt.Printf("当前第%d行第%d列, 当前省份: %s \n", i, k, province)
+				// 处理指标名称
+				fullIndexName := fmt.Sprintf("%s/%s", namePrefix, province)
+				provincePingyin := utils.GetFullPingYin(province)
+				fullIndexNamePingyin := namePrefixPingin + provincePingyin
+
+				if province == "数量" {
+					first, ok2 := firstMap[k]
+					if !ok2 {
+						continue
+					}
+					fullIndexName = first
+					firstPingyin := utils.GetFirstPingYin(first)
+					fullIndexNamePingyin = "yyzx" + firstPingyin
+					unit = "万头"
+				}
+
+				indexItem, okIndex := indexMap[fullIndexName]
+				if !okIndex {
+					// 新增指标
+					indexItem = new(models.YongyiExcelIndex)
+					indexItem.IndexName = fullIndexName
+					indexItem.ClassifyName = classifyName
+					indexItem.IndexCode = fullIndexNamePingyin
+					indexItem.Frequency = frequency
+					indexItem.Sort = k
+					indexItem.Unit = unit
+					indexItem.ExcelDataMap = make(map[string]string)
+				}
+				fmt.Printf("IndexCode: %s\n", indexItem.IndexCode)
+
+				indexItem.ExcelDataMap[date] = text
+				indexMap[fullIndexName] = indexItem
+				continue
+			}
+		}
+	}
+	for _, v := range indexMap {
+		indexList = append(indexList, v)
+	}
+	return
+}
+
+// HandleYongyiExcelWeekly8 月度-能繁母猪存栏（2020年2月新增）
+func HandleYongyiExcelWeekly8(sheet *xlsx.Sheet) (indexList []*models.YongyiExcelIndex, err error) {
+	classifyName := "月度-能繁母猪存栏（2020年2月新增）"
+	frequency := "月度"
+	unit := "头"
+	namePrefix := "能繁母猪存栏量"
+	namePrefixPingin := "yyzxnfmzcll"
+
+	// 遍历行读取
+	indexList = make([]*models.YongyiExcelIndex, 0)
+	areaMap := make(map[int]string)
+	maxRow := sheet.MaxRow
+	fmt.Println("最大行")
+	fmt.Println(maxRow)
+	// 指标名称
+	indexMap := make(map[string]*models.YongyiExcelIndex)
+	for i := 0; i < maxRow; i++ {
+		fmt.Printf("当前第%d行 \n", i)
+		if i <= 2 {
+			continue
+		} else if i == 3 { //表示表头
+			// 处理 index指标表
+			row := sheet.Row(i)
+			cells := row.Cells
+			for k, cell := range cells {
+				text := cell.String()
+				if text != "" {
+					areaMap[k] = text
+				}
+			}
+		} else { //数据列
+			row := sheet.Row(i)
+			cells := row.Cells
+			date := ""
+			for k, cell := range cells {
+				fmt.Printf("当前第%d列 \n", k)
+				text := cell.String()
+				if k == 0 {
+					tmpRow := row
+					r := &ExcelDateRecordFirst{}
+					if e := tmpRow.ReadStruct(r); e != nil {
+						utils.FileLog.Info(fmt.Sprintf("读取行，时间列失败 Err:%s", e))
+						break
+					}
+					// 查询当月的最后一天
+					monthDate := r.Date.Format(utils.FormatYearMonthDate)
+					firstDayStr := monthDate + "-01"
+					tmpT, _ := time.ParseInLocation(utils.FormatDate, firstDayStr, time.Local)
+					date = tmpT.AddDate(0, 1, -1).Format(utils.FormatDate)
+					fmt.Println(date)
+					continue
+				} else {
+					// 判断出不是字符的，则过滤
+					if text == "" {
+						continue
+					}
+					if strings.Contains(text, "%") {
+						text = strings.Replace(text, "%", "", 1)
+					}
+					_, e := strconv.ParseFloat(text, 64)
+					if e != nil {
+						continue
+					}
+				}
+
+				area, ok1 := areaMap[k]
+				if !ok1 {
+					err = fmt.Errorf("找不到对应的列名，第%d行，第%d列", i, k)
+					return
+				}
+				if area == "环比" || area == "日期" || area == "同比" {
+					continue
+				}
+				fmt.Printf("当前第%d行第%d列, 当前省份: %s \n", i, k, area)
+				// 处理指标名称
+				fullIndexName := fmt.Sprintf("%s/%s", namePrefix, area)
+				areaPingyin := utils.GetFirstPingYin(area)
+				fullIndexNamePingyin := namePrefixPingin + areaPingyin
+
+				indexItem, okIndex := indexMap[fullIndexName]
+				if !okIndex {
+					// 新增指标
+					indexItem = new(models.YongyiExcelIndex)
+					indexItem.IndexName = fullIndexName
+					indexItem.ClassifyName = classifyName
+					indexItem.IndexCode = fullIndexNamePingyin
+					indexItem.Frequency = frequency
+					indexItem.Sort = k
+					indexItem.Unit = unit
+					indexItem.ExcelDataMap = make(map[string]string)
+				}
+				fmt.Printf("IndexCode: %s\n", indexItem.IndexCode)
+
+				indexItem.ExcelDataMap[date] = text
+				indexMap[fullIndexName] = indexItem
+				continue
+			}
+		}
+	}
+	for _, v := range indexMap {
+		indexList = append(indexList, v)
+	}
+	return
+}
+
+// HandleYongyiExcelWeekly9 月度-小猪存栏（2020年5月新增）
+func HandleYongyiExcelWeekly9(sheet *xlsx.Sheet) (indexList []*models.YongyiExcelIndex, err error) {
+	info, ok := YongyiWeeklySheetMap9[sheet.Name]
+	if !ok {
+		return
+	}
+	classifyName := info.ClassifyName
+	frequency := info.Frequency
+	unit := info.Unit
+	namePrefix := info.NamePrefix
+	namePrefixPingin := "yyzx" + utils.GetFirstPingYin(namePrefix)
+
+	/*classifyName := "月度-小猪存栏（2020年5月新增）"
+	frequency := "月度"
+	unit := "头"
+	namePrefix := "50kg以下小猪存栏量"
+	namePrefixPingin := "yyzx" + utils.GetFirstPingYin(namePrefix)*/
+
+	// 遍历行读取
+	indexList = make([]*models.YongyiExcelIndex, 0)
+	areaMap := make(map[int]string)
+	maxRow := sheet.MaxRow
+	fmt.Println("最大行")
+	fmt.Println(maxRow)
+	// 指标名称
+	indexMap := make(map[string]*models.YongyiExcelIndex)
+	for i := 0; i < maxRow; i++ {
+		fmt.Printf("当前第%d行 \n", i)
+		if i <= 1 {
+			continue
+		} else if i == 2 { //表示表头
+			// 处理 index指标表
+			row := sheet.Row(i)
+			cells := row.Cells
+			for k, cell := range cells {
+				text := cell.String()
+				if text != "" {
+					areaMap[k] = text
+				}
+			}
+		} else { //数据列
+			row := sheet.Row(i)
+			cells := row.Cells
+			date := ""
+			for k, cell := range cells {
+				fmt.Printf("当前第%d列 \n", k)
+				text := cell.String()
+				if k == 0 {
+					tmpRow := row
+					r := &ExcelDateRecordFirst{}
+					if e := tmpRow.ReadStruct(r); e != nil {
+						err = fmt.Errorf("读取行，时间列失败 Err:%s", e)
+						return
+					}
+					// 查询当月的最后一天
+					monthDate := r.Date.Format(utils.FormatYearMonthDate)
+					firstDayStr := monthDate + "-01"
+					tmpT, _ := time.ParseInLocation(utils.FormatDate, firstDayStr, time.Local)
+					date = tmpT.AddDate(0, 1, -1).Format(utils.FormatDate)
+					fmt.Println(date)
+					continue
+				} else {
+					// 判断出不是字符的，则过滤
+					if text == "" {
+						continue
+					}
+					if strings.Contains(text, "%") {
+						text = strings.Replace(text, "%", "", 1)
+					}
+					_, e := strconv.ParseFloat(text, 64)
+					if e != nil {
+						continue
+					}
+				}
+
+				area, ok1 := areaMap[k]
+				if !ok1 {
+					err = fmt.Errorf("找不到对应的列名，第%d行，第%d列", i, k)
+					return
+				}
+				if area == "环比" || area == "日期" || area == "同比" {
+					continue
+				}
+				fmt.Printf("当前第%d行第%d列, 当前省份: %s \n", i, k, area)
+				// 处理指标名称
+				fullIndexName := fmt.Sprintf("%s/%s", namePrefix, area)
+				areaPingyin := utils.GetFirstPingYin(area)
+				fullIndexNamePingyin := namePrefixPingin + areaPingyin
+
+				indexItem, okIndex := indexMap[fullIndexName]
+				if !okIndex {
+					// 新增指标
+					indexItem = new(models.YongyiExcelIndex)
+					indexItem.IndexName = fullIndexName
+					indexItem.ClassifyName = classifyName
+					indexItem.IndexCode = fullIndexNamePingyin
+					indexItem.Frequency = frequency
+					indexItem.Sort = k
+					indexItem.Unit = unit
+					indexItem.ExcelDataMap = make(map[string]string)
+				}
+				fmt.Printf("IndexCode: %s\n", indexItem.IndexCode)
+
+				indexItem.ExcelDataMap[date] = text
+				indexMap[fullIndexName] = indexItem
+				continue
+			}
+		}
+	}
+	for _, v := range indexMap {
+		indexList = append(indexList, v)
+	}
+	return
+}
+
+// HandleYongyiExcelWeekly10 月度-商品猪出栏量
+func HandleYongyiExcelWeekly10(sheet *xlsx.Sheet) (indexList []*models.YongyiExcelIndex, err error) {
+	classifyName := "月度-商品猪出栏量"
+	frequency := "月度"
+	unit := "头"
+	namePrefix := "商品猪出栏量"
+	namePrefixPingin := "yyzx" + utils.GetFirstPingYin(namePrefix)
+
+	// 遍历行读取
+	indexList = make([]*models.YongyiExcelIndex, 0)
+	areaMap := make(map[int]string)
+	maxRow := sheet.MaxRow
+	fmt.Println("最大行")
+	fmt.Println(maxRow)
+	// 指标名称
+	indexMap := make(map[string]*models.YongyiExcelIndex)
+	for i := 0; i < maxRow; i++ {
+		fmt.Printf("当前第%d行 \n", i)
+		if i == 0 {
+			continue
+		} else if i == 1 { //表示表头
+			// 处理 index指标表
+			row := sheet.Row(i)
+			cells := row.Cells
+			for k, cell := range cells {
+				text := cell.String()
+				if text != "" {
+					areaMap[k] = text
+				}
+			}
+		} else { //数据列
+			row := sheet.Row(i)
+			cells := row.Cells
+			date := ""
+			for k, cell := range cells {
+				fmt.Printf("当前第%d列 \n", k)
+				text := cell.String()
+				if k == 0 {
+					tmpRow := row
+					r := &ExcelDateRecordFirst{}
+					if e := tmpRow.ReadStruct(r); e != nil {
+						err = fmt.Errorf("读取行，时间列失败 Err:%s", e)
+						return
+					}
+					// 查询当月的最后一天
+					monthDate := r.Date.Format(utils.FormatYearMonthDate)
+					firstDayStr := monthDate + "-01"
+					tmpT, _ := time.ParseInLocation(utils.FormatDate, firstDayStr, time.Local)
+					date = tmpT.AddDate(0, 1, -1).Format(utils.FormatDate)
+					fmt.Println(date)
+					continue
+				} else {
+					// 判断出不是字符的，则过滤
+					if text == "" {
+						continue
+					}
+					if strings.Contains(text, "%") {
+						text = strings.Replace(text, "%", "", 1)
+					}
+					_, e := strconv.ParseFloat(text, 64)
+					if e != nil {
+						continue
+					}
+				}
+
+				area, ok1 := areaMap[k]
+				if !ok1 {
+					err = fmt.Errorf("找不到对应的列名，第%d行，第%d列", i, k)
+					return
+				}
+				if area == "环比" || area == "日期" || area == "同比" || area == "较非瘟前" {
+					continue
+				}
+				fmt.Printf("当前第%d行第%d列, 当前省份: %s \n", i, k, area)
+				// 处理指标名称
+				fullIndexName := fmt.Sprintf("%s/%s", namePrefix, area)
+				areaPingyin := utils.GetFirstPingYin(area)
+				fullIndexNamePingyin := namePrefixPingin + areaPingyin
+
+				indexItem, okIndex := indexMap[fullIndexName]
+				if !okIndex {
+					// 新增指标
+					indexItem = new(models.YongyiExcelIndex)
+					indexItem.IndexName = fullIndexName
+					indexItem.ClassifyName = classifyName
+					indexItem.IndexCode = fullIndexNamePingyin
+					indexItem.Frequency = frequency
+					indexItem.Sort = k
+					indexItem.Unit = unit
+					indexItem.ExcelDataMap = make(map[string]string)
+				}
+				fmt.Printf("IndexCode: %s\n", indexItem.IndexCode)
+
+				indexItem.ExcelDataMap[date] = text
+				indexMap[fullIndexName] = indexItem
+				continue
+			}
+		}
+	}
+	for _, v := range indexMap {
+		indexList = append(indexList, v)
+	}
+	return
+}

utils/common.go

@@ -31,29 +31,38 @@ import (
 // GetFirstPingYin 拼音首字母
 func GetFirstPingYin(name string) string {
 	a := pinyin.NewArgs()
-	code := ""
+	a.Separator = ""
+	a.Style = pinyin.FirstLetter
+	a.Fallback = func(r rune, a pinyin.Args) []string {
+		return []string{string(r)}
+	}
 	rows := pinyin.Pinyin(name, a)
-	for i := 0; i < len(rows); i++ {
-		if len(rows[i]) != 0 {
-			str := rows[i][0]
-			pi := str[0:1]
-			code += pi
+	code := ""
+	for _, item := range rows {
+		for _, v := range item {
+			code += v
 		}
 	}
+
 	return code
 }
 
 // GetFullPingYin 获取全拼音
 func GetFullPingYin(name string) string {
 	a := pinyin.NewArgs()
-	code := ""
+	a.Separator = ""
+	a.Style = pinyin.Normal
+	a.Fallback = func(r rune, a pinyin.Args) []string {
+		return []string{string(r)}
+	}
 	rows := pinyin.Pinyin(name, a)
-	for i := 0; i < len(rows); i++ {
-		if len(rows[i]) != 0 {
-			str := rows[i][0]
-			code += str
+	code := ""
+	for _, item := range rows {
+		for _, v := range item {
+			code += v
 		}
 	}
+
 	return code
 }