Sfoglia il codice sorgente

关闭打印日志

xyxie 1 anno fa
parent
commit
6d1831b229

+ 47 - 47
services/base_from_yongyi.go

@@ -155,8 +155,8 @@ func HandleYongyiExcelWeekly(filePath string) (err error) {
 	return
 }
 
-const (
-	YongyiDownloadUrl = "http://127.0.0.1:7010/yongyi/download"
+var (
+	YongyiDownloadUrl = fmt.Sprintf("%syongyi/download", utils.YongyiDownloadHost)
 )
 
 // YongyiDownloadDaily
@@ -343,55 +343,55 @@ func ReadWatchYongyiFile(cont context.Context) (err error) {
 }
 
 var YongyiDailyHandlers = map[string]func(f *excelize.File, sheetName string) ([]*models.YongyiExcelIndex, error){
-	"出栏价":       base_from_yongyi_v2.HandleYongyiExcelDaily1,
-	"标肥价差":      base_from_yongyi_v2.HandleYongyiExcelDaily2,
-	"价格+宰量":     base_from_yongyi_v2.HandleYongyiExcelDaily3,
+	"出栏价":             base_from_yongyi_v2.HandleYongyiExcelDaily1,
+	"标肥价差":           base_from_yongyi_v2.HandleYongyiExcelDaily2,
+	"价格+宰量":          base_from_yongyi_v2.HandleYongyiExcelDaily3,
 	"屠宰企业日度屠宰量": base_from_yongyi_v2.HandleYongyiExcelDaily4,
 }
 
 var YongyiWeeklyHandlers = map[string]func(f *excelize.File, sheetName string) ([]*models.YongyiExcelIndex, error){
-	"周度-商品猪出栏价":            base_from_yongyi_v2.HandleYongyiExcelWeekly1,
-	"周度-体重":                base_from_yongyi_v2.HandleYongyiExcelWeekly2,
-	"周度-屠宰厂宰前活猪重":          base_from_yongyi_v2.HandleYongyiExcelWeekly3,
-	"周度-各体重段价差":            base_from_yongyi_v2.HandleYongyiExcelWeekly4,
-	"周度-50公斤二元母猪价格":        base_from_yongyi_v2.HandleYongyiExcelWeekly5,
-	"周度-规模场15公斤仔猪出栏价":      base_from_yongyi_v2.HandleYongyiExcelWeekly5,
-	"周度-宰后结算价":             base_from_yongyi_v2.HandleYongyiExcelWeekly5,
-	"周度-冻品库存":              base_from_yongyi_v2.HandleYongyiExcelWeekly5,
-	"周度-猪肉价(前三等级白条均价)":     base_from_yongyi_v2.HandleYongyiExcelWeekly5,
-	"周度-冻品库存多样本":           base_from_yongyi_v2.HandleYongyiExcelWeekly6,
-	"月度出栏完成率":              base_from_yongyi_v2.HandleYongyiExcelWeekly6,
-	"月度计划出栏量":              base_from_yongyi_v2.HandleYongyiExcelWeekly7,
-	"月度-能繁母猪存栏(2020年2月新增)": base_from_yongyi_v2.HandleYongyiExcelWeekly8,
-	"月度-小猪存栏(2020年5月新增)":   base_from_yongyi_v2.HandleYongyiExcelWeekly9,
-	"月度-中猪存栏(2020年5月新增)":   base_from_yongyi_v2.HandleYongyiExcelWeekly9,
-	"月度-大猪存栏(2020年5月新增)":   base_from_yongyi_v2.HandleYongyiExcelWeekly9,
-	"月度-商品猪出栏量":            base_from_yongyi_v2.HandleYongyiExcelWeekly10,
-	"历史猪价":                 base_from_yongyi_v2.HandleYongyiExcelWeekly12,
-	"二育成本":                 base_from_yongyi_v2.HandleYongyiExcelWeekly13,
-	"二育销量":                 base_from_yongyi_v2.HandleYongyiExcelWeekly14,
-	"育肥栏舍利用率":              base_from_yongyi_v2.HandleYongyiExcelWeekly15,
-	"周度-养殖利润最新":            base_from_yongyi_v2.HandleYongyiExcelWeekly16,
-	"周度-当期、预期成本":           base_from_yongyi_v2.HandleYongyiExcelWeekly17,
-	"育肥全价料出厂价":             base_from_yongyi_v2.HandleYongyiExcelWeekly18,
-	"周度-成本计算附件":            base_from_yongyi_v2.HandleYongyiExcelWeekly19,
-	"周度-毛白价差":              base_from_yongyi_v2.HandleYongyiExcelWeekly20,
-	"仔猪、母猪":                base_from_yongyi_v2.HandleYongyiExcelWeekly21,
-	"周度-河南屠宰白条成本":          base_from_yongyi_v2.HandleYongyiExcelWeekly22,
-	"周度-淘汰母猪价格":            base_from_yongyi_v2.HandleYongyiExcelWeekly23, //todo 少两个指标,云南和贵州,数据都不符合规范
-	"鲜销率":                  base_from_yongyi_v2.HandleYongyiExcelWeekly24, //todo 等待解析(正月初六-二月初四)2022.2.6-3.6
-	"周度-猪肉产品价格":            base_from_yongyi_v2.HandleYongyiExcelWeekly25,
-	"周度-屠宰企业日度屠宰量":         base_from_yongyi_v2.HandleYongyiExcelWeekly26,
-	"周度-屠宰新2022.10.28":     base_from_yongyi_v2.HandleYongyiExcelWeekly27,
-	"月度-淘汰母猪屠宰厂宰杀量":        base_from_yongyi_v2.HandleYongyiExcelWeekly28,
-	"月度-猪料销量":              base_from_yongyi_v2.HandleYongyiExcelWeekly29,
-	"月度-屠宰企业开工率":           base_from_yongyi_v2.HandleYongyiExcelWeekly30,
-	"月度-屠宰厂公母比例":           base_from_yongyi_v2.HandleYongyiExcelWeekly31,
-	"月度-生产指标(2021.5.7新增)":  base_from_yongyi_v2.HandleYongyiExcelWeekly32,
-	"月度-生产指标2":             base_from_yongyi_v2.HandleYongyiExcelWeekly33,
-	"月度-二元三元能繁比例":          base_from_yongyi_v2.HandleYongyiExcelWeekly34, //todo 2019年1-6月
-	"月度-能繁母猪存栏量":           base_from_yongyi_v2.HandleYongyiExcelWeekly35,
-	"月度-原种场二元后备母猪销量及出栏日龄":  base_from_yongyi_v2.HandleYongyiExcelWeekly11,
+	"周度-商品猪出栏价":                     base_from_yongyi_v2.HandleYongyiExcelWeekly1,
+	"周度-体重":                             base_from_yongyi_v2.HandleYongyiExcelWeekly2,
+	"周度-屠宰厂宰前活猪重":                 base_from_yongyi_v2.HandleYongyiExcelWeekly3,
+	"周度-各体重段价差":                     base_from_yongyi_v2.HandleYongyiExcelWeekly4,
+	"周度-50公斤二元母猪价格":               base_from_yongyi_v2.HandleYongyiExcelWeekly5,
+	"周度-规模场15公斤仔猪出栏价":           base_from_yongyi_v2.HandleYongyiExcelWeekly5,
+	"周度-宰后结算价":                       base_from_yongyi_v2.HandleYongyiExcelWeekly5,
+	"周度-冻品库存":                         base_from_yongyi_v2.HandleYongyiExcelWeekly5,
+	"周度-猪肉价(前三等级白条均价)":         base_from_yongyi_v2.HandleYongyiExcelWeekly5,
+	"周度-冻品库存多样本":                   base_from_yongyi_v2.HandleYongyiExcelWeekly6,
+	"月度出栏完成率":                        base_from_yongyi_v2.HandleYongyiExcelWeekly6,
+	"月度计划出栏量":                        base_from_yongyi_v2.HandleYongyiExcelWeekly7,
+	"月度-能繁母猪存栏(2020年2月新增)":      base_from_yongyi_v2.HandleYongyiExcelWeekly8,
+	"月度-小猪存栏(2020年5月新增)":          base_from_yongyi_v2.HandleYongyiExcelWeekly9,
+	"月度-中猪存栏(2020年5月新增)":          base_from_yongyi_v2.HandleYongyiExcelWeekly9,
+	"月度-大猪存栏(2020年5月新增)":          base_from_yongyi_v2.HandleYongyiExcelWeekly9,
+	"月度-商品猪出栏量":                     base_from_yongyi_v2.HandleYongyiExcelWeekly10,
+	"历史猪价":                              base_from_yongyi_v2.HandleYongyiExcelWeekly12,
+	"二育成本":                              base_from_yongyi_v2.HandleYongyiExcelWeekly13,
+	"二育销量":                              base_from_yongyi_v2.HandleYongyiExcelWeekly14,
+	"育肥栏舍利用率":                        base_from_yongyi_v2.HandleYongyiExcelWeekly15,
+	"周度-养殖利润最新":                     base_from_yongyi_v2.HandleYongyiExcelWeekly16,
+	"周度-当期、预期成本":                    base_from_yongyi_v2.HandleYongyiExcelWeekly17,
+	"育肥全价料出厂价":                      base_from_yongyi_v2.HandleYongyiExcelWeekly18,
+	"周度-成本计算附件":                     base_from_yongyi_v2.HandleYongyiExcelWeekly19,
+	"周度-毛白价差":                         base_from_yongyi_v2.HandleYongyiExcelWeekly20,
+	"仔猪、母猪":                             base_from_yongyi_v2.HandleYongyiExcelWeekly21,
+	"周度-河南屠宰白条成本":                 base_from_yongyi_v2.HandleYongyiExcelWeekly22,
+	"周度-淘汰母猪价格":                     base_from_yongyi_v2.HandleYongyiExcelWeekly23, //todo 少两个指标,云南和贵州,数据都不符合规范
+	"鲜销率":                                base_from_yongyi_v2.HandleYongyiExcelWeekly24, //todo 等待解析(正月初六-二月初四)2022.2.6-3.6
+	"周度-猪肉产品价格":                     base_from_yongyi_v2.HandleYongyiExcelWeekly25,
+	"周度-屠宰企业日度屠宰量":               base_from_yongyi_v2.HandleYongyiExcelWeekly26,
+	"周度-屠宰新2022.10.28":                 base_from_yongyi_v2.HandleYongyiExcelWeekly27,
+	"月度-淘汰母猪屠宰厂宰杀量":             base_from_yongyi_v2.HandleYongyiExcelWeekly28,
+	"月度-猪料销量":                         base_from_yongyi_v2.HandleYongyiExcelWeekly29,
+	"月度-屠宰企业开工率":                   base_from_yongyi_v2.HandleYongyiExcelWeekly30,
+	"月度-屠宰厂公母比例":                   base_from_yongyi_v2.HandleYongyiExcelWeekly31,
+	"月度-生产指标(2021.5.7新增)":           base_from_yongyi_v2.HandleYongyiExcelWeekly32,
+	"月度-生产指标2":                        base_from_yongyi_v2.HandleYongyiExcelWeekly33,
+	"月度-二元三元能繁比例":                 base_from_yongyi_v2.HandleYongyiExcelWeekly34, //todo 2019年1-6月
+	"月度-能繁母猪存栏量":                   base_from_yongyi_v2.HandleYongyiExcelWeekly35,
+	"月度-原种场二元后备母猪销量及出栏日龄": base_from_yongyi_v2.HandleYongyiExcelWeekly11,
 }
 var YongyiWeeklyChartHandlers = map[string]func(f *excelize.File, sheetName string) ([]*models.YongyiExcelIndex, error){
 	"涌益样本测算": base_from_yongyi_v2.HandleYongyiExcelWeekly36,

+ 4 - 4
services/base_from_yongyi_v2/chartWeek.go

@@ -34,7 +34,7 @@ func HandleYongyiExcelWeekly36(f *excelize.File, sheetName string) (indexList []
 	// 指标名称
 	indexMap := make(map[string]*models.YongyiExcelIndex)
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		if i == 0 {
 			continue
 		} else if i == 1 {
@@ -47,7 +47,7 @@ func HandleYongyiExcelWeekly36(f *excelize.File, sheetName string) (indexList []
 		} else { //数据列
 			date := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					text = strings.TrimSpace(text)
 					var dateT time.Time
@@ -83,7 +83,7 @@ func HandleYongyiExcelWeekly36(f *excelize.File, sheetName string) (indexList []
 					err = fmt.Errorf("找不到对应的列名,第%d行,第%d列", i, k)
 					return
 				}
-				fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, name)
+				//fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, name)
 				if strings.Contains(name, "时间") || name == "肉产量(吨)" || name == "肉产量(万吨)" || name == "断奶仔猪量" {
 					continue
 				}
@@ -129,7 +129,7 @@ func HandleYongyiExcelWeekly36(f *excelize.File, sheetName string) (indexList []
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("IndexCode: %s", indexItem.IndexCode)
+				//fmt.Printf("IndexCode: %s", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem

+ 52 - 52
services/base_from_yongyi_v2/week10.go

@@ -14,7 +14,7 @@ import (
 func HandleYongyiExcelWeekly1(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly1 周度-商品猪出栏价 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly1 周度-商品猪出栏价 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly1 周度-商品猪出栏价ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -41,13 +41,13 @@ func HandleYongyiExcelWeekly1(f *excelize.File, sheetName string) (indexList []*
 		return
 	}
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		currentMergeCells, mergeOk := mergeCellMap[i]
 
 		// 首行,表示时间
 		if i == 0 {
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k > 1 && text != "" {
 					text = strings.TrimSpace(text)
 					if mergeOk {
@@ -62,7 +62,7 @@ func HandleYongyiExcelWeekly1(f *excelize.File, sheetName string) (indexList []*
 		} else if i == 1 { //表示表头
 			// 处理 index指标表
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if text != "" {
 					provinceMap[k] = text
 				}
@@ -70,7 +70,7 @@ func HandleYongyiExcelWeekly1(f *excelize.File, sheetName string) (indexList []*
 		} else { //数据列
 			date := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					continue
 				} else if k == 1 {
@@ -108,7 +108,7 @@ func HandleYongyiExcelWeekly1(f *excelize.File, sheetName string) (indexList []*
 					err = fmt.Errorf("找不到对应的列名,第%d行,第%d列", i, k)
 					return
 				}
-				fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, province)
+				//fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, province)
 				// 处理指标名称
 				fullIndexName := fmt.Sprintf("%s/%s/%s", namePrefix, area, province)
 				provincePingyin := utils.GetFullPingYin(province)
@@ -136,7 +136,7 @@ func HandleYongyiExcelWeekly1(f *excelize.File, sheetName string) (indexList []*
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("indexItem%s", indexItem.IndexCode)
+				//fmt.Printf("indexItem%s", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem
@@ -154,7 +154,7 @@ func HandleYongyiExcelWeekly1(f *excelize.File, sheetName string) (indexList []*
 func HandleYongyiExcelWeekly2(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly1 周度-商品猪出栏价 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly1 周度-商品猪出栏价 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly1 周度-商品猪出栏价ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -183,7 +183,7 @@ func HandleYongyiExcelWeekly2(f *excelize.File, sheetName string) (indexList []*
 		return
 	}
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		currentMergeCells, mergeOk := mergeCellMap[i]
 
 		if i == 0 { // 首行,表示时间
@@ -213,7 +213,7 @@ func HandleYongyiExcelWeekly2(f *excelize.File, sheetName string) (indexList []*
 			date := ""
 			name := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					continue
 				} else if k == 1 {
@@ -256,7 +256,7 @@ func HandleYongyiExcelWeekly2(f *excelize.File, sheetName string) (indexList []*
 					err = fmt.Errorf("找不到对应的列名,第%d行,第%d列", i, k)
 					return
 				}
-				fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, province)
+				//fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, province)
 				// 处理指标名称
 				fullIndexName := fmt.Sprintf("%s/%s/%s/%s", namePrefix, area, province, name)
 				provincePingyin := utils.GetFullPingYin(province)
@@ -286,7 +286,7 @@ func HandleYongyiExcelWeekly2(f *excelize.File, sheetName string) (indexList []*
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("indexItem%s", indexItem.IndexCode)
+				//fmt.Printf("indexItem%s", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem
@@ -304,7 +304,7 @@ func HandleYongyiExcelWeekly2(f *excelize.File, sheetName string) (indexList []*
 func HandleYongyiExcelWeekly3(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly1 周度-商品猪出栏价 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly1 周度-商品猪出栏价 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly1 周度-商品猪出栏价ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -331,7 +331,7 @@ func HandleYongyiExcelWeekly3(f *excelize.File, sheetName string) (indexList []*
 		return
 	}
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		currentMergeCells, mergeOk := mergeCellMap[i]
 
 		if i < 2 {
@@ -362,7 +362,7 @@ func HandleYongyiExcelWeekly3(f *excelize.File, sheetName string) (indexList []*
 
 			date := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					continue
 				} else if k == 1 {
@@ -403,7 +403,7 @@ func HandleYongyiExcelWeekly3(f *excelize.File, sheetName string) (indexList []*
 				} else if province == "全国平均" {
 					province = "全国"
 				}
-				fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, province)
+				//fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, province)
 				// 处理指标名称
 				fullIndexName := fmt.Sprintf("%s/%s", namePrefix, province)
 				provincePingyin := utils.GetFullPingYin(province)
@@ -423,7 +423,7 @@ func HandleYongyiExcelWeekly3(f *excelize.File, sheetName string) (indexList []*
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("indexItem%s", indexItem.IndexCode)
+				//fmt.Printf("indexItem%s", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem
@@ -441,7 +441,7 @@ func HandleYongyiExcelWeekly3(f *excelize.File, sheetName string) (indexList []*
 func HandleYongyiExcelWeekly4(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly1 周度-商品猪出栏价 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly1 周度-商品猪出栏价 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly1 周度-商品猪出栏价ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -469,7 +469,7 @@ func HandleYongyiExcelWeekly4(f *excelize.File, sheetName string) (indexList []*
 		return
 	}
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		currentMergeCells, mergeOk := mergeCellMap[i]
 
 		if i == 0 {
@@ -493,7 +493,7 @@ func HandleYongyiExcelWeekly4(f *excelize.File, sheetName string) (indexList []*
 			date := ""
 			name := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					continue
 				} else if k == 1 {
@@ -566,8 +566,8 @@ func HandleYongyiExcelWeekly4(f *excelize.File, sheetName string) (indexList []*
 		}
 	}
 	for _, v := range indexMap {
-		fmt.Printf("IndexName: %s \n", v.IndexName)
-		fmt.Printf("IndexCode: %s \n", v.IndexCode)
+		//fmt.Printf("IndexName: %s \n", v.IndexName)
+		//fmt.Printf("IndexCode: %s \n", v.IndexCode)
 		indexList = append(indexList, v)
 	}
 	return
@@ -577,7 +577,7 @@ func HandleYongyiExcelWeekly4(f *excelize.File, sheetName string) (indexList []*
 func HandleYongyiExcelWeekly5(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly1 周度-商品猪出栏价 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly1 周度-商品猪出栏价 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly1 周度-商品猪出栏价ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -605,7 +605,7 @@ func HandleYongyiExcelWeekly5(f *excelize.File, sheetName string) (indexList []*
 		return
 	}
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		currentMergeCells, mergeOk := mergeCellMap[i]
 
 		if i == 0 {
@@ -635,7 +635,7 @@ func HandleYongyiExcelWeekly5(f *excelize.File, sheetName string) (indexList []*
 
 			date := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					continue
 				} else if k == 1 {
@@ -672,7 +672,7 @@ func HandleYongyiExcelWeekly5(f *excelize.File, sheetName string) (indexList []*
 				if province == "全  国1" || province == "全  国2" || province == "全国1" || province == "全国2" {
 					province = strings.ReplaceAll(province, " ", "")
 				}
-				fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, province)
+				//fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, province)
 				// 处理指标名称
 				fullIndexName := fmt.Sprintf("%s/%s", namePrefix, province)
 				provincePingyin := utils.GetFullPingYin(province)
@@ -692,7 +692,7 @@ func HandleYongyiExcelWeekly5(f *excelize.File, sheetName string) (indexList []*
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("IndexCode: %s", indexItem.IndexCode)
+				//fmt.Printf("IndexCode: %s", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem
@@ -711,7 +711,7 @@ func HandleYongyiExcelWeekly6(f *excelize.File, sheetName string) (indexList []*
 
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly1 周度-商品猪出栏价 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly1 周度-商品猪出栏价 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly1 周度-商品猪出栏价ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -739,7 +739,7 @@ func HandleYongyiExcelWeekly6(f *excelize.File, sheetName string) (indexList []*
 		return
 	}
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		currentMergeCells, mergeOk := mergeCellMap[i]
 
 		if i == 0 {
@@ -762,7 +762,7 @@ func HandleYongyiExcelWeekly6(f *excelize.File, sheetName string) (indexList []*
 
 			date := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					text = strings.TrimSpace(text)
 					var dateT time.Time
@@ -797,7 +797,7 @@ func HandleYongyiExcelWeekly6(f *excelize.File, sheetName string) (indexList []*
 					err = fmt.Errorf("找不到对应的列名,第%d行,第%d列", i, k)
 					return
 				}
-				fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, area)
+				//fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, area)
 				// 处理指标名称
 				fullIndexName := fmt.Sprintf("%s/%s", namePrefix, area)
 				areaPingyin := utils.GetFirstPingYin(area)
@@ -820,7 +820,7 @@ func HandleYongyiExcelWeekly6(f *excelize.File, sheetName string) (indexList []*
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("IndexCode: %s", indexItem.IndexCode)
+				//fmt.Printf("IndexCode: %s", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem
@@ -838,7 +838,7 @@ func HandleYongyiExcelWeekly6(f *excelize.File, sheetName string) (indexList []*
 func HandleYongyiExcelWeekly7(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly1 周度-商品猪出栏价 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly1 周度-商品猪出栏价 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly1 周度-商品猪出栏价ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -867,7 +867,7 @@ func HandleYongyiExcelWeekly7(f *excelize.File, sheetName string) (indexList []*
 		return
 	}
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		currentMergeCells, mergeOk := mergeCellMap[i]
 
 		if i == 0 {
@@ -898,7 +898,7 @@ func HandleYongyiExcelWeekly7(f *excelize.File, sheetName string) (indexList []*
 
 			date := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					text = strings.TrimSpace(text)
 					var dateT time.Time
@@ -937,7 +937,7 @@ func HandleYongyiExcelWeekly7(f *excelize.File, sheetName string) (indexList []*
 				if province == "本月计划较上月实际销售" {
 					continue
 				}
-				fmt.Printf("当前第%d行第%d列, 当前省份: %s \n", i, k, province)
+				//fmt.Printf("当前第%d行第%d列, 当前省份: %s \n", i, k, province)
 				// 处理指标名称
 				fullIndexName := fmt.Sprintf("%s/%s", namePrefix, province)
 				provincePingyin := utils.GetFullPingYin(province)
@@ -968,7 +968,7 @@ func HandleYongyiExcelWeekly7(f *excelize.File, sheetName string) (indexList []*
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("IndexCode: %s\n", indexItem.IndexCode)
+				//fmt.Printf("IndexCode: %s\n", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem
@@ -986,7 +986,7 @@ func HandleYongyiExcelWeekly7(f *excelize.File, sheetName string) (indexList []*
 func HandleYongyiExcelWeekly8(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly1 周度-商品猪出栏价 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly1 周度-商品猪出栏价 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly1 周度-商品猪出栏价ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -1014,7 +1014,7 @@ func HandleYongyiExcelWeekly8(f *excelize.File, sheetName string) (indexList []*
 		return
 	}
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		currentMergeCells, mergeOk := mergeCellMap[i]
 
 		if i <= 2 {
@@ -1038,7 +1038,7 @@ func HandleYongyiExcelWeekly8(f *excelize.File, sheetName string) (indexList []*
 
 			date := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					text = strings.TrimSpace(text)
 					var dateT time.Time
@@ -1077,7 +1077,7 @@ func HandleYongyiExcelWeekly8(f *excelize.File, sheetName string) (indexList []*
 				if area == "环比" || area == "日期" || area == "同比" {
 					continue
 				}
-				fmt.Printf("当前第%d行第%d列, 当前省份: %s \n", i, k, area)
+				//fmt.Printf("当前第%d行第%d列, 当前省份: %s \n", i, k, area)
 				// 处理指标名称
 				fullIndexName := fmt.Sprintf("%s/%s", namePrefix, area)
 				areaPingyin := utils.GetFirstPingYin(area)
@@ -1097,7 +1097,7 @@ func HandleYongyiExcelWeekly8(f *excelize.File, sheetName string) (indexList []*
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("IndexCode: %s\n", indexItem.IndexCode)
+				//fmt.Printf("IndexCode: %s\n", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem
@@ -1115,7 +1115,7 @@ func HandleYongyiExcelWeekly8(f *excelize.File, sheetName string) (indexList []*
 func HandleYongyiExcelWeekly9(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly1 周度-商品猪出栏价 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly1 周度-商品猪出栏价 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly1 周度-商品猪出栏价ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -1143,7 +1143,7 @@ func HandleYongyiExcelWeekly9(f *excelize.File, sheetName string) (indexList []*
 		return
 	}
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		currentMergeCells, mergeOk := mergeCellMap[i]
 
 		if i <= 1 {
@@ -1167,7 +1167,7 @@ func HandleYongyiExcelWeekly9(f *excelize.File, sheetName string) (indexList []*
 
 			date := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					text = strings.TrimSpace(text)
 					var dateT time.Time
@@ -1206,7 +1206,7 @@ func HandleYongyiExcelWeekly9(f *excelize.File, sheetName string) (indexList []*
 				if area == "环比" || area == "日期" || area == "同比" {
 					continue
 				}
-				fmt.Printf("当前第%d行第%d列, 当前省份: %s \n", i, k, area)
+				//fmt.Printf("当前第%d行第%d列, 当前省份: %s \n", i, k, area)
 				// 处理指标名称
 				fullIndexName := fmt.Sprintf("%s/%s", namePrefix, area)
 				areaPingyin := utils.GetFirstPingYin(area)
@@ -1226,7 +1226,7 @@ func HandleYongyiExcelWeekly9(f *excelize.File, sheetName string) (indexList []*
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("IndexCode: %s\n", indexItem.IndexCode)
+				//fmt.Printf("IndexCode: %s\n", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem
@@ -1244,7 +1244,7 @@ func HandleYongyiExcelWeekly9(f *excelize.File, sheetName string) (indexList []*
 func HandleYongyiExcelWeekly10(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly1 周度-商品猪出栏价 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly1 周度-商品猪出栏价 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly1 周度-商品猪出栏价ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -1272,7 +1272,7 @@ func HandleYongyiExcelWeekly10(f *excelize.File, sheetName string) (indexList []
 		return
 	}
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		currentMergeCells, mergeOk := mergeCellMap[i]
 		if i == 0 {
 			continue
@@ -1294,7 +1294,7 @@ func HandleYongyiExcelWeekly10(f *excelize.File, sheetName string) (indexList []
 
 			date := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					text = strings.TrimSpace(text)
 					var dateT time.Time
@@ -1333,7 +1333,7 @@ func HandleYongyiExcelWeekly10(f *excelize.File, sheetName string) (indexList []
 				if area == "环比" || area == "日期" || area == "同比" || area == "较非瘟前" {
 					continue
 				}
-				fmt.Printf("当前第%d行第%d列, 当前省份: %s \n", i, k, area)
+				//fmt.Printf("当前第%d行第%d列, 当前省份: %s \n", i, k, area)
 				// 处理指标名称
 				fullIndexName := fmt.Sprintf("%s/%s", namePrefix, area)
 				areaPingyin := utils.GetFirstPingYin(area)
@@ -1353,7 +1353,7 @@ func HandleYongyiExcelWeekly10(f *excelize.File, sheetName string) (indexList []
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("IndexCode: %s\n", indexItem.IndexCode)
+				//fmt.Printf("IndexCode: %s\n", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem

+ 55 - 55
services/base_from_yongyi_v2/week20.go

@@ -14,7 +14,7 @@ import (
 func HandleYongyiExcelWeekly11(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly11 月度-原种场二元后备母猪销量及出栏日龄 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly11 月度-原种场二元后备母猪销量及出栏日龄 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly11 月度-原种场二元后备母猪销量及出栏日龄 ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -35,14 +35,14 @@ func HandleYongyiExcelWeekly11(f *excelize.File, sheetName string) (indexList []
 	indexMap := make(map[string]*models.YongyiExcelIndex)
 
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		// 首行,表示时间
 		if i == 0 {
 			continue
 		} else if i == 1 { //表示表头
 			// 处理 index指标表
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k >= 7 && text != "" {
 					text = strings.TrimSpace(text)
 					nameMap[k] = text
@@ -51,7 +51,7 @@ func HandleYongyiExcelWeekly11(f *excelize.File, sheetName string) (indexList []
 		} else { //数据列
 			date := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k <= 6 {
 					continue
 				} else if k == 7 {
@@ -92,7 +92,7 @@ func HandleYongyiExcelWeekly11(f *excelize.File, sheetName string) (indexList []
 					continue
 				}
 				name = "二元母猪销量"
-				fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, name)
+				//fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, name)
 				// 处理指标名称
 				fullIndexName := fmt.Sprintf("%s/%s", namePrefix, name)
 				areaPingin := utils.GetFirstPingYin(name)
@@ -112,7 +112,7 @@ func HandleYongyiExcelWeekly11(f *excelize.File, sheetName string) (indexList []
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("indexItem%s", indexItem.IndexCode)
+				//fmt.Printf("indexItem%s", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem
@@ -130,7 +130,7 @@ func HandleYongyiExcelWeekly11(f *excelize.File, sheetName string) (indexList []
 func HandleYongyiExcelWeekly12(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly12 月度-历史猪价 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly12 月度-历史猪价 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly12 月度-历史猪价 ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -151,13 +151,13 @@ func HandleYongyiExcelWeekly12(f *excelize.File, sheetName string) (indexList []
 	indexMap := make(map[string]*models.YongyiExcelIndex)
 
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		// 首行,表示时间
 		if i == 0 {
 			continue
 		} else if i == 1 {
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if text != "" {
 					text = strings.TrimSpace(text)
 					yearMap[k] = text
@@ -166,7 +166,7 @@ func HandleYongyiExcelWeekly12(f *excelize.File, sheetName string) (indexList []
 		} else { //数据列
 			month := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					// 日期
 					month = strings.TrimSpace(text)
@@ -216,7 +216,7 @@ func HandleYongyiExcelWeekly12(f *excelize.File, sheetName string) (indexList []
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("indexItem%s", indexItem.IndexCode)
+				//fmt.Printf("indexItem%s", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem
@@ -234,7 +234,7 @@ func HandleYongyiExcelWeekly12(f *excelize.File, sheetName string) (indexList []
 func HandleYongyiExcelWeekly13(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly13 二育成本 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly13 二育成本 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly13 二育成本 ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -259,13 +259,13 @@ func HandleYongyiExcelWeekly13(f *excelize.File, sheetName string) (indexList []
 	indexMap := make(map[string]*models.YongyiExcelIndex)
 
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		// 首行,表示时间
 		if i == 0 || i == 1 {
 			continue
 		} else if i == 2 {
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if text != "" {
 					text = strings.TrimSpace(text)
 					nameMap[k] = text
@@ -275,7 +275,7 @@ func HandleYongyiExcelWeekly13(f *excelize.File, sheetName string) (indexList []
 			date := ""
 			weight := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					// 日期
 					text = strings.TrimSpace(text)
@@ -342,7 +342,7 @@ func HandleYongyiExcelWeekly13(f *excelize.File, sheetName string) (indexList []
 		}
 	}
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		// 首行,表示时间
 		if i == 0 || i == 1 || i == 2 {
 			continue
@@ -350,7 +350,7 @@ func HandleYongyiExcelWeekly13(f *excelize.File, sheetName string) (indexList []
 			date := dateMap[i]
 			weight := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					continue
 				} else {
@@ -403,7 +403,7 @@ func HandleYongyiExcelWeekly13(f *excelize.File, sheetName string) (indexList []
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("indexItem%s", indexItem.IndexCode)
+				//fmt.Printf("indexItem%s", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem
@@ -412,8 +412,8 @@ func HandleYongyiExcelWeekly13(f *excelize.File, sheetName string) (indexList []
 		}
 	}
 	for _, v := range indexMap {
-		fmt.Printf("IndexName:%s\n", v.IndexName)
-		fmt.Printf("IndexCode:%s\n", v.IndexCode)
+		//fmt.Printf("IndexName:%s\n", v.IndexName)
+		//fmt.Printf("IndexCode:%s\n", v.IndexCode)
 		indexList = append(indexList, v)
 	}
 	return
@@ -423,7 +423,7 @@ func HandleYongyiExcelWeekly13(f *excelize.File, sheetName string) (indexList []
 func HandleYongyiExcelWeekly14(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly14 二育销量 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly14 二育销量 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly14 二育销量ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -445,13 +445,13 @@ func HandleYongyiExcelWeekly14(f *excelize.File, sheetName string) (indexList []
 	// 指标名称
 	indexMap := make(map[string]*models.YongyiExcelIndex)
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		if i <= 2 {
 			continue
 		} else { //数据列
 			date := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					if text != "" {
 						text = strings.TrimSpace(text)
@@ -511,7 +511,7 @@ func HandleYongyiExcelWeekly14(f *excelize.File, sheetName string) (indexList []
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("IndexCode: %s", indexItem.IndexCode)
+				//fmt.Printf("IndexCode: %s", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem
@@ -529,7 +529,7 @@ func HandleYongyiExcelWeekly14(f *excelize.File, sheetName string) (indexList []
 func HandleYongyiExcelWeekly15(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly15 育肥栏舍利用率 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly15 育肥栏舍利用率 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly15 育肥栏舍利用率ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -552,7 +552,7 @@ func HandleYongyiExcelWeekly15(f *excelize.File, sheetName string) (indexList []
 	// 指标名称
 	indexMap := make(map[string]*models.YongyiExcelIndex)
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		if i == 0 {
 			continue
 		} else if i == 1 { //表示表头
@@ -573,7 +573,7 @@ func HandleYongyiExcelWeekly15(f *excelize.File, sheetName string) (indexList []
 		} else { //数据列
 			province := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 || k == 2 || k == 3 {
 					continue
 				} else if k == 1 {
@@ -600,7 +600,7 @@ func HandleYongyiExcelWeekly15(f *excelize.File, sheetName string) (indexList []
 					continue
 				}
 
-				fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, province)
+				//fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, province)
 				// 处理指标名称
 				fullIndexName := fmt.Sprintf("%s/%s", namePrefix, province)
 				provincePingyin := utils.GetFullPingYin(province)
@@ -620,7 +620,7 @@ func HandleYongyiExcelWeekly15(f *excelize.File, sheetName string) (indexList []
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("IndexCode: %s", indexItem.IndexCode)
+				//fmt.Printf("IndexCode: %s", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem
@@ -638,7 +638,7 @@ func HandleYongyiExcelWeekly15(f *excelize.File, sheetName string) (indexList []
 func HandleYongyiExcelWeekly16(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly16 周度-养殖利润最新 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly16 周度-养殖利润最新 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly16 周度-养殖利润最新ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -666,7 +666,7 @@ func HandleYongyiExcelWeekly16(f *excelize.File, sheetName string) (indexList []
 		return
 	}
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		currentMergeCells, mergeOk := mergeCellMap[i]
 
 		if i == 0 {
@@ -689,7 +689,7 @@ func HandleYongyiExcelWeekly16(f *excelize.File, sheetName string) (indexList []
 
 			date := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 || k == 2 {
 					continue
 				} else if k == 1 {
@@ -751,7 +751,7 @@ func HandleYongyiExcelWeekly16(f *excelize.File, sheetName string) (indexList []
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("IndexCode: %s\n", indexItem.IndexCode)
+				//fmt.Printf("IndexCode: %s\n", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem
@@ -769,7 +769,7 @@ func HandleYongyiExcelWeekly16(f *excelize.File, sheetName string) (indexList []
 func HandleYongyiExcelWeekly17(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly17 周度-当期、预期成本 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly17 周度-当期、预期成本 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly17 周度-当期、预期成本 ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -791,7 +791,7 @@ func HandleYongyiExcelWeekly17(f *excelize.File, sheetName string) (indexList []
 	// 指标名称
 	indexMap := make(map[string]*models.YongyiExcelIndex)
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		if i > 22 {
 			break
 		}
@@ -826,7 +826,7 @@ func HandleYongyiExcelWeekly17(f *excelize.File, sheetName string) (indexList []
 		} else { //数据列
 			name := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					continue
 				} else if k == 1 || k == 2 {
@@ -879,7 +879,7 @@ func HandleYongyiExcelWeekly17(f *excelize.File, sheetName string) (indexList []
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("IndexCode: %s", indexItem.IndexCode)
+				//fmt.Printf("IndexCode: %s", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem
@@ -897,7 +897,7 @@ func HandleYongyiExcelWeekly17(f *excelize.File, sheetName string) (indexList []
 func HandleYongyiExcelWeekly18(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly18 育肥全价料出厂价 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly18 育肥全价料出厂价 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly18 育肥全价料出厂价ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -918,14 +918,14 @@ func HandleYongyiExcelWeekly18(f *excelize.File, sheetName string) (indexList []
 	indexMap := make(map[string]*models.YongyiExcelIndex)
 
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		// 首行,表示时间
 		if i <= 2 {
 			continue
 		} else if i == 3 { //表示表头
 			// 处理 index指标表
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if text != "" {
 					provinceMap[k] = text
 				}
@@ -933,7 +933,7 @@ func HandleYongyiExcelWeekly18(f *excelize.File, sheetName string) (indexList []
 		} else { //数据列
 			date := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					// 日期
 					text = strings.TrimSpace(text)
@@ -964,7 +964,7 @@ func HandleYongyiExcelWeekly18(f *excelize.File, sheetName string) (indexList []
 					err = fmt.Errorf("找不到对应的列名,第%d行,第%d列", i, k)
 					return
 				}
-				fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, province)
+				//fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, province)
 
 				// 处理指标名称
 				fullIndexName := fmt.Sprintf("%s/%s", namePrefix, province)
@@ -991,7 +991,7 @@ func HandleYongyiExcelWeekly18(f *excelize.File, sheetName string) (indexList []
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("indexItem%s", indexItem.IndexCode)
+				//fmt.Printf("indexItem%s", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem
@@ -1009,7 +1009,7 @@ func HandleYongyiExcelWeekly18(f *excelize.File, sheetName string) (indexList []
 func HandleYongyiExcelWeekly19(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly19 周度-成本计算附件 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly19 周度-成本计算附件 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly19 周度-成本计算附件 ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -1037,7 +1037,7 @@ func HandleYongyiExcelWeekly19(f *excelize.File, sheetName string) (indexList []
 	indexMap := make(map[string]*models.YongyiExcelIndex)
 	name := ""
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		currentMergeCells, mergeOk := mergeCellMap[i]
 		if i == 0 { //表示表头
 			// 处理 index指标表
@@ -1102,7 +1102,7 @@ func HandleYongyiExcelWeekly19(f *excelize.File, sheetName string) (indexList []
 
 			subName := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 || (k >= 5 && k <= 11) {
 					continue
 				} else if k == 1 || k == 2 {
@@ -1110,7 +1110,7 @@ func HandleYongyiExcelWeekly19(f *excelize.File, sheetName string) (indexList []
 					if text != "" {
 						name = text
 					}
-					fmt.Printf("name: %s \n", name)
+					//fmt.Printf("name: %s \n", name)
 					continue
 				} else if k == 3 || k == 4 {
 					text = strings.TrimSpace(text)
@@ -1186,7 +1186,7 @@ func HandleYongyiExcelWeekly19(f *excelize.File, sheetName string) (indexList []
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				//fmt.Printf("IndexCode: %s", indexItem.IndexCode)
+				////fmt.Printf("IndexCode: %s", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem
@@ -1195,8 +1195,8 @@ func HandleYongyiExcelWeekly19(f *excelize.File, sheetName string) (indexList []
 		}
 	}
 	for _, v := range indexMap {
-		fmt.Printf("IndexName: %s \n", v.IndexName)
-		fmt.Printf("IndexCode: %s \n", v.IndexCode)
+		//fmt.Printf("IndexName: %s \n", v.IndexName)
+		//fmt.Printf("IndexCode: %s \n", v.IndexCode)
 		indexList = append(indexList, v)
 	}
 	return
@@ -1206,7 +1206,7 @@ func HandleYongyiExcelWeekly19(f *excelize.File, sheetName string) (indexList []
 func HandleYongyiExcelWeekly20(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly20 周度-毛白价差 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly20 周度-毛白价差 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly20 周度-毛白价差 ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -1227,12 +1227,12 @@ func HandleYongyiExcelWeekly20(f *excelize.File, sheetName string) (indexList []
 	indexMap := make(map[string]*models.YongyiExcelIndex)
 
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		// 首行,表示时间
 		if i == 0 { //表示表头
 			// 处理 index指标表
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if text != "" {
 					nameMap[k] = text
 				}
@@ -1240,7 +1240,7 @@ func HandleYongyiExcelWeekly20(f *excelize.File, sheetName string) (indexList []
 		} else { //数据列
 			date := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					// 日期
 					text = strings.TrimSpace(text)
@@ -1293,7 +1293,7 @@ func HandleYongyiExcelWeekly20(f *excelize.File, sheetName string) (indexList []
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("indexItem%s", indexItem.IndexCode)
+				//fmt.Printf("indexItem%s", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem

+ 51 - 51
services/base_from_yongyi_v2/week30.go

@@ -14,7 +14,7 @@ import (
 func HandleYongyiExcelWeekly21(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly21 仔猪、母猪 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly21 仔猪、母猪 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly21 仔猪、母猪 ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -37,7 +37,7 @@ func HandleYongyiExcelWeekly21(f *excelize.File, sheetName string) (indexList []
 	// 指标名称
 	indexMap := make(map[string]*models.YongyiExcelIndex)
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		if i == 0 {
 			continue
 		} else if i == 1 { //表示表头
@@ -52,7 +52,7 @@ func HandleYongyiExcelWeekly21(f *excelize.File, sheetName string) (indexList []
 			date := ""
 			name := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					text = strings.TrimSpace(text)
 					var dateT time.Time
@@ -88,7 +88,7 @@ func HandleYongyiExcelWeekly21(f *excelize.File, sheetName string) (indexList []
 					return
 				}
 
-				fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, province)
+				//fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, province)
 				// 处理指标名称
 				fullIndexName := fmt.Sprintf("%s/%s/%s", "仔猪价", name, province)
 				provincePingyin := utils.GetFullPingYin(province)
@@ -112,7 +112,7 @@ func HandleYongyiExcelWeekly21(f *excelize.File, sheetName string) (indexList []
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("IndexCode: %s", indexItem.IndexCode)
+				//fmt.Printf("IndexCode: %s", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem
@@ -130,7 +130,7 @@ func HandleYongyiExcelWeekly21(f *excelize.File, sheetName string) (indexList []
 func HandleYongyiExcelWeekly22(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly22 周度-河南屠宰白条成本 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly22 周度-河南屠宰白条成本 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly22 周度-河南屠宰白条成本 ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -152,7 +152,7 @@ func HandleYongyiExcelWeekly22(f *excelize.File, sheetName string) (indexList []
 	// 指标名称
 	indexMap := make(map[string]*models.YongyiExcelIndex)
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		if i == 0 {
 			continue
 		} else if i == 1 { //表示表头
@@ -166,7 +166,7 @@ func HandleYongyiExcelWeekly22(f *excelize.File, sheetName string) (indexList []
 		} else { //数据列
 			date := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					text = strings.TrimSpace(text)
 					var dateT time.Time
@@ -218,7 +218,7 @@ func HandleYongyiExcelWeekly22(f *excelize.File, sheetName string) (indexList []
 				if name == "预冷损耗" {
 					continue
 				}
-				fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, name)
+				//fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, name)
 				// 处理指标名称
 				fullIndexName := fmt.Sprintf("%s/%s", namePrefix, name)
 				namePingin := utils.GetFirstPingYin(name)
@@ -238,7 +238,7 @@ func HandleYongyiExcelWeekly22(f *excelize.File, sheetName string) (indexList []
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("IndexCode: %s", indexItem.IndexCode)
+				//fmt.Printf("IndexCode: %s", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem
@@ -256,7 +256,7 @@ func HandleYongyiExcelWeekly22(f *excelize.File, sheetName string) (indexList []
 func HandleYongyiExcelWeekly23(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly23 周度-淘汰母猪价格 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly23 周度-淘汰母猪价格 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly23 周度-淘汰母猪价格 ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -279,7 +279,7 @@ func HandleYongyiExcelWeekly23(f *excelize.File, sheetName string) (indexList []
 	// 指标名称
 	indexMap := make(map[string]*models.YongyiExcelIndex)
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		if i == 0 {
 			continue
 		} else if i == 1 { //表示表头
@@ -293,7 +293,7 @@ func HandleYongyiExcelWeekly23(f *excelize.File, sheetName string) (indexList []
 		} else { //数据列
 			date := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					continue
 				} else if k == 1 {
@@ -328,7 +328,7 @@ func HandleYongyiExcelWeekly23(f *excelize.File, sheetName string) (indexList []
 					return
 				}
 
-				fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, province)
+				//fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, province)
 				// 处理指标名称
 				fullIndexName := fmt.Sprintf("%s/%s", namePrefix, province)
 				provincePingyin := utils.GetFullPingYin(province)
@@ -348,7 +348,7 @@ func HandleYongyiExcelWeekly23(f *excelize.File, sheetName string) (indexList []
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("IndexCode: %s", indexItem.IndexCode)
+				//fmt.Printf("IndexCode: %s", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem
@@ -366,7 +366,7 @@ func HandleYongyiExcelWeekly23(f *excelize.File, sheetName string) (indexList []
 func HandleYongyiExcelWeekly24(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly24 鲜销率 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly24 鲜销率 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly24 鲜销率 ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -389,7 +389,7 @@ func HandleYongyiExcelWeekly24(f *excelize.File, sheetName string) (indexList []
 	// 指标名称
 	indexMap := make(map[string]*models.YongyiExcelIndex)
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		if i <= 1 || i > 2 && i <= 5 {
 			continue
 		} else if i == 2 { //表示表头
@@ -403,7 +403,7 @@ func HandleYongyiExcelWeekly24(f *excelize.File, sheetName string) (indexList []
 		} else { //数据列
 			date := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					continue
 				} else if k == 1 {
@@ -438,7 +438,7 @@ func HandleYongyiExcelWeekly24(f *excelize.File, sheetName string) (indexList []
 					return
 				}
 
-				fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, province)
+				//fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, province)
 				// 处理指标名称
 				fullIndexName := fmt.Sprintf("%s/%s", namePrefix, province)
 				provincePingyin := utils.GetFullPingYin(province)
@@ -458,7 +458,7 @@ func HandleYongyiExcelWeekly24(f *excelize.File, sheetName string) (indexList []
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("IndexCode: %s", indexItem.IndexCode)
+				//fmt.Printf("IndexCode: %s", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem
@@ -476,7 +476,7 @@ func HandleYongyiExcelWeekly24(f *excelize.File, sheetName string) (indexList []
 func HandleYongyiExcelWeekly25(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly25 周度-猪肉产品价格 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly25 周度-猪肉产品价格 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly25 周度-猪肉产品价格 ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -499,7 +499,7 @@ func HandleYongyiExcelWeekly25(f *excelize.File, sheetName string) (indexList []
 	// 指标名称
 	indexMap := make(map[string]*models.YongyiExcelIndex)
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		if i == 0 {
 			continue
 		} else if i == 1 { //表示表头
@@ -514,7 +514,7 @@ func HandleYongyiExcelWeekly25(f *excelize.File, sheetName string) (indexList []
 			date := ""
 			name := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					continue
 				} else if k == 1 {
@@ -561,7 +561,7 @@ func HandleYongyiExcelWeekly25(f *excelize.File, sheetName string) (indexList []
 				if strings.Contains(name, "二元母猪价") {
 					continue
 				}
-				fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, province)
+				//fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, province)
 				// 处理指标名称
 				fullIndexName := fmt.Sprintf("%s/%s/%s", namePrefix, name, province)
 				provincePingyin := utils.GetFullPingYin(province)
@@ -592,8 +592,8 @@ func HandleYongyiExcelWeekly25(f *excelize.File, sheetName string) (indexList []
 		}
 	}
 	for _, v := range indexMap {
-		fmt.Printf("IndexName: %s \n", v.IndexName)
-		fmt.Printf("IndexCode: %s \n", v.IndexCode)
+		//fmt.Printf("IndexName: %s \n", v.IndexName)
+		//fmt.Printf("IndexCode: %s \n", v.IndexCode)
 		indexList = append(indexList, v)
 	}
 	return
@@ -603,7 +603,7 @@ func HandleYongyiExcelWeekly25(f *excelize.File, sheetName string) (indexList []
 func HandleYongyiExcelWeekly26(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly26 周度-屠宰企业日度屠宰量 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly26 周度-屠宰企业日度屠宰量 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly26 周度-屠宰企业日度屠宰量 ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -626,7 +626,7 @@ func HandleYongyiExcelWeekly26(f *excelize.File, sheetName string) (indexList []
 	// 指标名称
 	indexMap := make(map[string]*models.YongyiExcelIndex)
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		if i == 0 { //表示表头
 			// 处理 index指标表
 			for k, text := range row {
@@ -638,7 +638,7 @@ func HandleYongyiExcelWeekly26(f *excelize.File, sheetName string) (indexList []
 		} else { //数据列
 			date := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					text = strings.TrimSpace(text)
 					var dateT time.Time
@@ -671,7 +671,7 @@ func HandleYongyiExcelWeekly26(f *excelize.File, sheetName string) (indexList []
 					return
 				}
 
-				fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, province)
+				//fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, province)
 				// 处理指标名称
 				fullIndexName := fmt.Sprintf("%s/%s", namePrefix, province)
 				provincePingyin := utils.GetFullPingYin(province)
@@ -696,7 +696,7 @@ func HandleYongyiExcelWeekly26(f *excelize.File, sheetName string) (indexList []
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("IndexCode: %s", indexItem.IndexCode)
+				//fmt.Printf("IndexCode: %s", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem
@@ -714,7 +714,7 @@ func HandleYongyiExcelWeekly26(f *excelize.File, sheetName string) (indexList []
 func HandleYongyiExcelWeekly27(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly27 周度-屠宰新2022.10.28 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly27 周度-屠宰新2022.10.28 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly27 周度-屠宰新2022.10.28 ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -737,7 +737,7 @@ func HandleYongyiExcelWeekly27(f *excelize.File, sheetName string) (indexList []
 	// 指标名称
 	indexMap := make(map[string]*models.YongyiExcelIndex)
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		if i == 0 {
 			continue
 		} else if i == 1 { //表示表头
@@ -751,7 +751,7 @@ func HandleYongyiExcelWeekly27(f *excelize.File, sheetName string) (indexList []
 		} else { //数据列
 			date := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					continue
 				} else if k == 1 {
@@ -797,7 +797,7 @@ func HandleYongyiExcelWeekly27(f *excelize.File, sheetName string) (indexList []
 				if name != "规模屠宰厂全国前10家" && name != "各省规模屠宰厂100家" && name != "县区+乡镇宰杀 70家" {
 					continue
 				}
-				fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, name)
+				//fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, name)
 				// 处理指标名称不同规模屠宰厂宰杀量/县区+乡镇宰杀 70家
 				name = strings.Replace(name, " ", "", -1)
 				fullIndexName := fmt.Sprintf("%s/%s", namePrefix, name)
@@ -818,7 +818,7 @@ func HandleYongyiExcelWeekly27(f *excelize.File, sheetName string) (indexList []
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("IndexCode: %s", indexItem.IndexCode)
+				//fmt.Printf("IndexCode: %s", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem
@@ -836,7 +836,7 @@ func HandleYongyiExcelWeekly27(f *excelize.File, sheetName string) (indexList []
 func HandleYongyiExcelWeekly28(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly28 月度-淘汰母猪屠宰厂宰杀量 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly28 月度-淘汰母猪屠宰厂宰杀量 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly28 月度-淘汰母猪屠宰厂宰杀量 ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -864,7 +864,7 @@ func HandleYongyiExcelWeekly28(f *excelize.File, sheetName string) (indexList []
 		return
 	}
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		currentMergeCells, mergeOk := mergeCellMap[i]
 		if i == 0 { //表示表头
 			// 处理 index指标表
@@ -891,7 +891,7 @@ func HandleYongyiExcelWeekly28(f *excelize.File, sheetName string) (indexList []
 		} else { //数据列
 			date := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					text = strings.TrimSpace(text)
 					var dateT time.Time
@@ -936,7 +936,7 @@ func HandleYongyiExcelWeekly28(f *excelize.File, sheetName string) (indexList []
 				if strings.Contains(name, "环比") {
 					continue
 				}
-				fmt.Printf("当前第%d行第%d列, 当前省份: %s \n", i, k, province)
+				//fmt.Printf("当前第%d行第%d列, 当前省份: %s \n", i, k, province)
 				// 处理指标名称
 				fullIndexName := fmt.Sprintf("%s/%s%s", namePrefix, province, name)
 				provincePingyin := utils.GetFullPingYin(province)
@@ -957,7 +957,7 @@ func HandleYongyiExcelWeekly28(f *excelize.File, sheetName string) (indexList []
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("IndexCode: %s\n", indexItem.IndexCode)
+				//fmt.Printf("IndexCode: %s\n", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem
@@ -975,7 +975,7 @@ func HandleYongyiExcelWeekly28(f *excelize.File, sheetName string) (indexList []
 func HandleYongyiExcelWeekly29(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly29 月度-猪料销量 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly29 月度-猪料销量 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly29 月度-猪料销量 ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -998,7 +998,7 @@ func HandleYongyiExcelWeekly29(f *excelize.File, sheetName string) (indexList []
 	// 指标名称
 	indexMap := make(map[string]*models.YongyiExcelIndex)
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		if i == 0 {
 			continue
 		} else if i == 1 { //表示表头
@@ -1012,7 +1012,7 @@ func HandleYongyiExcelWeekly29(f *excelize.File, sheetName string) (indexList []
 		} else { //数据列
 			date := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					text = strings.TrimSpace(text)
 					var dateT time.Time
@@ -1058,7 +1058,7 @@ func HandleYongyiExcelWeekly29(f *excelize.File, sheetName string) (indexList []
 					return
 				}
 
-				fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, name)
+				//fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, name)
 
 				fullIndexName := fmt.Sprintf("%s/%s", namePrefix, name)
 				namePingin := utils.GetFirstPingYin(name)
@@ -1078,7 +1078,7 @@ func HandleYongyiExcelWeekly29(f *excelize.File, sheetName string) (indexList []
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("IndexCode: %s", indexItem.IndexCode)
+				//fmt.Printf("IndexCode: %s", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem
@@ -1096,7 +1096,7 @@ func HandleYongyiExcelWeekly29(f *excelize.File, sheetName string) (indexList []
 func HandleYongyiExcelWeekly30(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly30 月度-屠宰企业开工率 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly30 月度-屠宰企业开工率 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly30 月度-屠宰企业开工率 ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -1117,11 +1117,11 @@ func HandleYongyiExcelWeekly30(f *excelize.File, sheetName string) (indexList []
 	// 指标名称
 	indexMap := make(map[string]*models.YongyiExcelIndex)
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		if i > 0 { //数据列
 			date := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					text = strings.TrimSpace(text)
 					var dateT time.Time
@@ -1153,7 +1153,7 @@ func HandleYongyiExcelWeekly30(f *excelize.File, sheetName string) (indexList []
 				}
 
 				name := "屠宰企业开工率全国平均"
-				fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, name)
+				//fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, name)
 
 				fullIndexName := fmt.Sprintf("%s%s", namePrefix, name)
 				namePingin := utils.GetFirstPingYin(name)
@@ -1173,7 +1173,7 @@ func HandleYongyiExcelWeekly30(f *excelize.File, sheetName string) (indexList []
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("IndexCode: %s", indexItem.IndexCode)
+				//fmt.Printf("IndexCode: %s", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem

+ 25 - 25
services/base_from_yongyi_v2/week40.go

@@ -14,7 +14,7 @@ import (
 func HandleYongyiExcelWeekly31(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly31 月度-屠宰厂公母比例 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly31 月度-屠宰厂公母比例 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly31 月度-屠宰厂公母比例 ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -34,7 +34,7 @@ func HandleYongyiExcelWeekly31(f *excelize.File, sheetName string) (indexList []
 	// 指标名称
 	indexMap := make(map[string]*models.YongyiExcelIndex)
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		if i == 0 {
 			for k, text := range row {
 				if text != "" {
@@ -45,7 +45,7 @@ func HandleYongyiExcelWeekly31(f *excelize.File, sheetName string) (indexList []
 		} else { //数据列
 			date := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					text = strings.TrimSpace(text)
 					var dateT time.Time
@@ -97,7 +97,7 @@ func HandleYongyiExcelWeekly31(f *excelize.File, sheetName string) (indexList []
 					err = fmt.Errorf("找不到对应的列名,第%d行,第%d列", i, k)
 					return
 				}
-				fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, name)
+				//fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, name)
 				unit = "头"
 				if strings.Contains(name, "占比") {
 					unit = "%"
@@ -120,7 +120,7 @@ func HandleYongyiExcelWeekly31(f *excelize.File, sheetName string) (indexList []
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("IndexCode: %s", indexItem.IndexCode)
+				//fmt.Printf("IndexCode: %s", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem
@@ -138,7 +138,7 @@ func HandleYongyiExcelWeekly31(f *excelize.File, sheetName string) (indexList []
 func HandleYongyiExcelWeekly32(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly32 月度-生产指标(2021.5.7新增) ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly32 月度-生产指标(2021.5.7新增) ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly32 月度-生产指标(2021.5.7新增) ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -164,7 +164,7 @@ func HandleYongyiExcelWeekly32(f *excelize.File, sheetName string) (indexList []
 	// 指标名称
 	indexMap := make(map[string]*models.YongyiExcelIndex)
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		currentMergeCells, mergeOk := mergeCellMap[i]
 		if i == 0 {
 			for k, text := range row {
@@ -186,7 +186,7 @@ func HandleYongyiExcelWeekly32(f *excelize.File, sheetName string) (indexList []
 		} else { //数据列
 			date := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					text = strings.TrimSpace(text)
 					var dateT time.Time
@@ -229,7 +229,7 @@ func HandleYongyiExcelWeekly32(f *excelize.File, sheetName string) (indexList []
 				if strings.Contains(name, "环比") {
 					continue
 				}
-				fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, name)
+				//fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, name)
 				unit = "头"
 				if strings.Contains(name, "率") {
 					unit = "%"
@@ -258,7 +258,7 @@ func HandleYongyiExcelWeekly32(f *excelize.File, sheetName string) (indexList []
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("IndexCode: %s", indexItem.IndexCode)
+				//fmt.Printf("IndexCode: %s", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem
@@ -276,7 +276,7 @@ func HandleYongyiExcelWeekly32(f *excelize.File, sheetName string) (indexList []
 func HandleYongyiExcelWeekly33(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly33 月度-生产指标2ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly33 月度-生产指标2ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly33 月度-生产指标2 ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -296,7 +296,7 @@ func HandleYongyiExcelWeekly33(f *excelize.File, sheetName string) (indexList []
 	// 指标名称
 	indexMap := make(map[string]*models.YongyiExcelIndex)
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		if i == 0 {
 			continue
 		} else if i == 1 {
@@ -309,7 +309,7 @@ func HandleYongyiExcelWeekly33(f *excelize.File, sheetName string) (indexList []
 		} else { //数据列
 			date := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					text = strings.TrimSpace(text)
 					var dateT time.Time
@@ -345,7 +345,7 @@ func HandleYongyiExcelWeekly33(f *excelize.File, sheetName string) (indexList []
 					err = fmt.Errorf("找不到对应的列名,第%d行,第%d列", i, k)
 					return
 				}
-				fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, name)
+				//fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, name)
 
 				fullIndexName := fmt.Sprintf("%s/%s", namePrefix, name)
 				namePingin := utils.GetFirstPingYin(name)
@@ -368,7 +368,7 @@ func HandleYongyiExcelWeekly33(f *excelize.File, sheetName string) (indexList []
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("IndexCode: %s", indexItem.IndexCode)
+				//fmt.Printf("IndexCode: %s", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem
@@ -386,7 +386,7 @@ func HandleYongyiExcelWeekly33(f *excelize.File, sheetName string) (indexList []
 func HandleYongyiExcelWeekly34(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly34 月度-二元三元能繁比例ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly34 月度-二元三元能繁比例ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly34 月度-二元三元能繁比例 ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -407,7 +407,7 @@ func HandleYongyiExcelWeekly34(f *excelize.File, sheetName string) (indexList []
 	// 指标名称
 	indexMap := make(map[string]*models.YongyiExcelIndex)
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		if i == 0 {
 			for k, text := range row {
 				if k > 3 && text != "" {
@@ -418,7 +418,7 @@ func HandleYongyiExcelWeekly34(f *excelize.File, sheetName string) (indexList []
 		} else { //数据列
 			date := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k <= 3 || k > 8 {
 					continue
 				} else if k == 4 {
@@ -476,7 +476,7 @@ func HandleYongyiExcelWeekly34(f *excelize.File, sheetName string) (indexList []
 					err = fmt.Errorf("找不到对应的列名,第%d行,第%d列", i, k)
 					return
 				}
-				fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, name)
+				//fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, name)
 				name += "比例"
 				fullIndexName := fmt.Sprintf("%s/%s", namePrefix, name)
 				namePingin := utils.GetFirstPingYin(name)
@@ -496,7 +496,7 @@ func HandleYongyiExcelWeekly34(f *excelize.File, sheetName string) (indexList []
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("IndexCode: %s", indexItem.IndexCode)
+				//fmt.Printf("IndexCode: %s", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem
@@ -514,7 +514,7 @@ func HandleYongyiExcelWeekly34(f *excelize.File, sheetName string) (indexList []
 func HandleYongyiExcelWeekly35(f *excelize.File, sheetName string) (indexList []*models.YongyiExcelIndex, err error) {
 	defer func() {
 		if err != nil {
-			fmt.Printf("HandleYongyiExcelWeekly35 月度-能繁母猪存栏量 ErrMsg: %s\n", err.Error())
+			//fmt.Printf("HandleYongyiExcelWeekly35 月度-能繁母猪存栏量 ErrMsg: %s\n", err.Error())
 			utils.FileLog.Info(fmt.Sprintf("HandleYongyiExcelWeekly35 月度-能繁母猪存栏量 ErrMsg: %s", err.Error()))
 		}
 	}()
@@ -534,7 +534,7 @@ func HandleYongyiExcelWeekly35(f *excelize.File, sheetName string) (indexList []
 	// 指标名称
 	indexMap := make(map[string]*models.YongyiExcelIndex)
 	for i, row := range rows {
-		fmt.Printf("当前第%d行 \n", i)
+		//fmt.Printf("当前第%d行 \n", i)
 		if i == 0 {
 			continue
 		} else if i == 1 {
@@ -546,7 +546,7 @@ func HandleYongyiExcelWeekly35(f *excelize.File, sheetName string) (indexList []
 		} else { //数据列
 			date := ""
 			for k, text := range row {
-				fmt.Printf("当前第%d列 \n", k)
+				//fmt.Printf("当前第%d列 \n", k)
 				if k == 0 {
 					text = strings.TrimSpace(text)
 					var dateT time.Time
@@ -584,7 +584,7 @@ func HandleYongyiExcelWeekly35(f *excelize.File, sheetName string) (indexList []
 				if strings.Contains(name, "环比") || strings.Contains(name, "同比") || strings.Contains(name, "日期") {
 					continue
 				}
-				fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, name)
+				//fmt.Printf("当前第%d行第%d列, 当前省份%s \n", i, k, name)
 
 				fullIndexName := fmt.Sprintf("%s/%s", namePrefix, name)
 				namePingin := utils.GetFirstPingYin(name)
@@ -615,7 +615,7 @@ func HandleYongyiExcelWeekly35(f *excelize.File, sheetName string) (indexList []
 					indexItem.ExcelDataMap = make(map[string]string)
 					sort++
 				}
-				fmt.Printf("IndexCode: %s", indexItem.IndexCode)
+				//fmt.Printf("IndexCode: %s", indexItem.IndexCode)
 
 				indexItem.ExcelDataMap[date] = text
 				indexMap[fullIndexName] = indexItem

+ 5 - 0
utils/config.go

@@ -41,6 +41,7 @@ var (
 	YongyiFilePath     string //excel文件地址
 	YongyiReadFilePath string //已读的excel文件地址
 	YongyiOpen         string //是否配置涌益生猪数据源,1已配置
+	YongyiDownloadHost string
 )
 
 // 中国煤炭网
@@ -110,6 +111,10 @@ func init() {
 		YongyiFilePath = config["yongyi_file_path"]
 		YongyiReadFilePath = config["yongyi_read_file_path"]
 		YongyiOpen = config["yongyi_open"]
+		YongyiDownloadHost = config["yongyi_download_host"]
+		if YongyiDownloadHost == "" {
+			YongyiDownloadHost = "http://127.0.0.1:7010/"
+		}
 	}
 
 	//中国煤炭网文件夹配置