煤炭网mapping表合一

models/base_from_coal_coastal.go

@@ -5,14 +5,6 @@ import (
 	"time"
 )
 
-// BaseFromCoalmineCoastalMapping 沿海八省动力煤用户供耗存数据映射表
-type BaseFromCoalmineCoastalMapping struct {
-	BaseFromCoalmineCoastalMappingID int    `orm:"column(base_from_coalmine_coastal_mapping_id);pk"`
-	IndexName                     string // 省份/企业名称
-	IndexCode                     string // 持买单量指标编码
-	CreateTime time.Time
-}
-
 // BaseFromCoalmineCoastalIndex 沿海八省动力煤用户供耗存数据指标表
 type BaseFromCoalmineCoastalIndex struct {
 	BaseFromCoalmineCoastalIndexID int       `orm:"column(base_from_coalmine_coastal_index_id);pk"`
@@ -21,28 +13,12 @@ type BaseFromCoalmineCoastalIndex struct {
 	DataTime                    string    // 指标时间
 	DealValue                   string    // 数据量
 	GroupName                   string    // 地区
+	Source                      string    // 来源
 	Unit                        string    //单位
 	CreateTime                  time.Time `description:"插入时间"`
 	ModifyTime                  time.Time `description:"修改时间"`
 }
 
-//添加指标
-func AddBaseFromCoalmineCoastalMapping(item *BaseFromCoalmineCoastalMapping) (lastId int64, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
-	lastId, err = o.Insert(item)
-	return
-}
-
-//查询指标
-func GetBaseFromCoalmineCoastalMapping() (items []*BaseFromCoalmineCoastalMapping, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
-	sql := `SELECT * FROM base_from_coalmine_coastal_mapping`
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
 //查询指标
 func GetBaseFromCoalmineCoastalIndex() (items []*BaseFromCoalmineCoastalIndex, err error) {
 	o := orm.NewOrm()

models/base_from_coal_firm.go

@@ -5,15 +5,6 @@ import (
 	"time"
 )
 
-// BaseFromCoalmineFirmMapping 煤矿产量周度公司数据指标表
-type BaseFromCoalmineFirmMapping struct {
-	BaseFromCoalmineFirmMappingID int    `orm:"column(base_from_coalmine_firm_mapping_id);pk"`
-	IndexName                     string // 省份/企业名称
-	IndexCode                     string // 持买单量指标编码
-	Source                        string // 来源
-	CreateTime                    time.Time
-}
-
 // BaseFromCoalmineFirmIndex 煤矿产量周度公司数据表
 type BaseFromCoalmineFirmIndex struct {
 	BaseFromCoalmineFirmIndexID int       `orm:"column(base_from_coalmine_firm_index_id);pk"`
@@ -22,27 +13,11 @@ type BaseFromCoalmineFirmIndex struct {
 	DataTime                    string    // 指标时间
 	DealValue                   string    // 数据量
 	GroupName                   string    // 集团名
+	Source                      string    // 来源
 	CreateTime                  time.Time `description:"插入时间"`
 	ModifyTime                  time.Time `description:"修改时间"`
 }
 
-//添加指标
-func AddBaseFromCoalmineFirmMapping(item *BaseFromCoalmineFirmMapping) (lastId int64, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
-	lastId, err = o.Insert(item)
-	return
-}
-
-//查询指标
-func GetBaseFromCoalmineFirmMapping() (items []*BaseFromCoalmineFirmMapping, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
-	sql := `SELECT * FROM base_from_coalmine_firm_mapping`
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
-
 //查询指标
 func GetBaseFromCoalmineFirmIndex() (items []*BaseFromCoalmineFirmIndex, err error) {
 	o := orm.NewOrm()

models/base_from_coal_inland.go

@@ -5,42 +5,20 @@ import (
 	"time"
 )
 
-// BaseFromCoalmineInlandMapping 沿海八省动力煤用户供耗存数据映射表
-type BaseFromCoalmineInlandMapping struct {
-	BaseFromCoalmineInlandMappingID int    `orm:"column(base_from_coalmine_inland_mapping_id);pk"`
-	IndexName                     string // 省份/企业名称
-	IndexCode                     string // 持买单量指标编码
-	CreateTime time.Time
-}
 
 // BaseFromCoalmineInlandIndex 沿海八省动力煤用户供耗存数据指标表
 type BaseFromCoalmineInlandIndex struct {
 	BaseFromCoalmineInlandIndexID int       `orm:"column(base_from_coalmine_inland_index_id);pk"`
-	IndexName                   string    // 省份/企业名称
-	IndexCode                   string    // 持买单量指标编码
-	DataTime                    string    // 指标时间
-	DealValue                   string    // 数据量
-	GroupName                   string    // 地区
-	CreateTime                  time.Time `description:"插入时间"`
-	ModifyTime                  time.Time `description:"修改时间"`
-}
-
-//添加指标
-func AddBaseFromCoalmineInlandMapping(item *BaseFromCoalmineInlandMapping) (lastId int64, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
-	lastId, err = o.Insert(item)
-	return
+	IndexName                     string    // 省份/企业名称
+	IndexCode                     string    // 持买单量指标编码
+	DataTime                      string    // 指标时间
+	DealValue                     string    // 数据量
+	GroupName                     string    // 地区
+	Source                        string    // 来源
+	CreateTime                    time.Time `description:"插入时间"`
+	ModifyTime                    time.Time `description:"修改时间"`
 }
 
-//查询指标
-func GetBaseFromCoalmineInlandMapping() (items []*BaseFromCoalmineInlandMapping, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
-	sql := `SELECT * FROM base_from_coalmine_inland_mapping`
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
 
 //查询指标
 func GetBaseFromCoalmineInlandIndex() (items []*BaseFromCoalmineInlandIndex, err error) {

models/base_from_coalmine.go

@@ -9,10 +9,6 @@ type BaseFromCoalmineMapping struct {
 	BaseFromCoalmineMappingId int       `orm:"column(base_from_coalmine_mapping_id);pk"`
 	IndexName                 string    `description:"持买单量指标名称"`
 	IndexCode                 string    `description:"持买单量指标编码"`
-	Exchange                  string    `description:"样本统计类别"`
-	Source                    string    `description:"来源"`
-	Province                  string    `description:"省份"`
-	Description               string    `description:"描述"`
 	CreateTime                time.Time `description:"时间"`
 }
 
@@ -23,22 +19,13 @@ type BaseFromCoalmineIndex struct {
 	Exchange                string    `description:"样本统计类别"`
 	DealValue               string    `description:"成交量"`
 	DataTime                string    `description:"数据日期"`
+	Source                    string    `description:"来源"`
+	Province                  string    `description:"省份"`
+	Description               string    `description:"描述"`
 	CreateTime              time.Time `description:"插入时间"`
 	ModifyTime              time.Time `description:"修改时间"`
 }
 
-type BaseFromCoalmineCompanyMapping struct {
-	BaseFromCoalmineCompanyMappingId int       `orm:"column(base_from_coalmine_company_mapping_id);pk"`
-	IndexName                        string    `description:"持买单量指标名称"`
-	IndexCode                        string    `description:"持买单量指标编码"`
-	Source                           string    `description:"来源"`
-	Rank                             string    `description:"序号"`
-	Province                         string    `description:"省份"`
-	City                             string    `description:"城市"`
-	CompanyName                      string    `description:"公司名称"`
-	GroupName                        string    `description:"集团名称"`
-	CreateTime                       time.Time `description:"时间"`
-}
 
 type BaseFromCoalmineCompanyIndex struct {
 	BaseFromCoalmineCompanyIndexId int       `orm:"column(base_from_coalmine_company_index_id);pk"`
@@ -46,6 +33,10 @@ type BaseFromCoalmineCompanyIndex struct {
 	IndexCode                      string    `description:"持买单量指标编码"`
 	DealValue                      string    `description:"成交量"`
 	DataTime                       string    `description:"数据日期"`
+	Source                           string    `description:"来源"`
+	Province                         string    `description:"省份"`
+	City                             string    `description:"城市"`
+	GroupName                        string    `description:"集团名称"`
 	CreateTime                     time.Time `description:"插入时间"`
 	ModifyTime                     time.Time `description:"修改时间"`
 }
@@ -92,22 +83,22 @@ func AddBaseFromCoalmineIndex(item *BaseFromCoalmineIndex) (lastId int64, err er
 	return
 }
 
-//添加公司指标
-func AddBaseFromCoalmineCompanyMapping(item *BaseFromCoalmineCompanyMapping) (lastId int64, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
-	lastId, err = o.Insert(item)
-	return
-}
-
-//查询指标
-func GetBaseFromCoalmineCompanyMapping() (items []*BaseFromCoalmineCompanyMapping, err error) {
-	o := orm.NewOrm()
-	o.Using("data")
-	sql := `SELECT * FROM base_from_coalmine_company_mapping`
-	_, err = o.Raw(sql).QueryRows(&items)
-	return
-}
+////添加公司指标
+//func AddBaseFromCoalmineCompanyMapping(item *BaseFromCoalmineCompanyMapping) (lastId int64, err error) {
+//	o := orm.NewOrm()
+//	o.Using("data")
+//	lastId, err = o.Insert(item)
+//	return
+//}
+//
+////查询指标
+//func GetBaseFromCoalmineCompanyMapping() (items []*BaseFromCoalmineCompanyMapping, err error) {
+//	o := orm.NewOrm()
+//	o.Using("data")
+//	sql := `SELECT * FROM base_from_coalmine_company_mapping`
+//	_, err = o.Raw(sql).QueryRows(&items)
+//	return
+//}
 
 //添加公司指标
 func AddBaseFromCoalmineCompanyIndex(item *BaseFromCoalmineCompanyIndex) (lastId int64, err error) {

models/db.go

@@ -37,14 +37,10 @@ func init() {
 		new(BaseFromTradeDalianIndex),
 		new(BaseFromCoalmineMapping),
 		new(BaseFromCoalmineIndex),
-		new(BaseFromCoalmineCompanyMapping),
 		new(BaseFromCoalmineCompanyIndex),
 		new(BaseFromCoalmineFirmIndex),
-		new(BaseFromCoalmineFirmMapping),
 		new(BaseFromCoalmineCoastalIndex),
-		new(BaseFromCoalmineCoastalMapping),
 		new(BaseFromCoalmineInlandIndex),
-		new(BaseFromCoalmineInlandMapping),
 		//new(BaseFromTradeDalianData),
 	)
 }

services/commodity_coal_coastal.go

@@ -25,7 +25,7 @@ func FileCoalCoastal() (err error) {
 		return
 	}
 
-	var mappingItems []*models.BaseFromCoalmineCoastalMapping
+	var mappingItems []*models.BaseFromCoalmineMapping
 	var indexItems []*models.BaseFromCoalmineCoastalIndex
 	var codeMap = make(map[string]string)
 	var indexMap = make(map[string]string)
@@ -33,7 +33,7 @@ func FileCoalCoastal() (err error) {
 	var groupMap = make(map[int]string)
 	var dataTime string
 	var sheetName, unit string
-	codeList, err := models.GetBaseFromCoalmineCoastalMapping()
+	codeList, err := models.GetBaseFromCoalmineMapping()
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		utils.FileLog.Info("获取煤炭指标失败：", err)
 		return err
@@ -66,7 +66,7 @@ func FileCoalCoastal() (err error) {
 					if k > 0 && k < 9 {
 						text := cell.String()
 						groupMap[k] = text
-						var item models.BaseFromCoalmineCoastalMapping
+						var item models.BaseFromCoalmineMapping
 						//合计命名
 						if k == 9 {
 							item.IndexName = sheetName
@@ -125,6 +125,7 @@ func FileCoalCoastal() (err error) {
 							item.IndexCode = codeMap[nameMap[k]]
 							item.DealValue = text
 							item.GroupName = groupMap[k]
+							item.Source = "沿海八省"
 							item.DataTime = dataTime
 							item.ModifyTime = time.Now()
 							item.CreateTime = time.Now()
@@ -140,11 +141,22 @@ func FileCoalCoastal() (err error) {
 	for _, v := range mappingItems {
 		if codeMap[v.IndexName] == "" {
 			codeMap[v.IndexName] = v.IndexCode
-			newId, err := models.AddBaseFromCoalmineCoastalMapping(v)
+			newId, err := models.AddBaseFromCoalmineMapping(v)
 			if err != nil {
-				fmt.Println("添加指标名称错误")
+				for i := 0; i<10; i++ {
+					v.IndexCode = v.IndexCode + strconv.Itoa(i)
+					codeMap[v.IndexName] = v.IndexCode
+					newId, err := models.AddBaseFromCoalmineMapping(v)
+					if err != nil {
+						fmt.Println("再次添加公司指标名称错误", err)
+						continue
+					} else {
+						fmt.Println("新增公司成功", newId)
+						break
+					}
+				}
 			} else {
-				fmt.Println("添加指标名称成功", newId)
+				fmt.Println("新增公司成功", newId)
 			}
 		}
 	}

services/commodity_coal_firm.go

@@ -6,6 +6,7 @@ import (
 	"github.com/tealeg/xlsx"
 	"hongze/hongze_data_crawler/models"
 	"hongze/hongze_data_crawler/utils"
+	"strconv"
 	"strings"
 	"time"
 )
@@ -24,17 +25,16 @@ func FileCoalFirm() (err error) {
 		return
 	}
 
-	var source string
 	var year, month, day string
 	var yearMap = make(map[int]string)
 	var monthMap = make(map[int]string)
 	var dateMap = make(map[int]string)
-	var mappingItems []*models.BaseFromCoalmineFirmMapping
+	var mappingItems []*models.BaseFromCoalmineMapping
 	var indexItems []*models.BaseFromCoalmineFirmIndex
 	var codeMap = make(map[string]string)
 	var indexMap = make(map[string]string)
 	var groupName string
-	codeList, err := models.GetBaseFromCoalmineFirmMapping()
+	codeList, err := models.GetBaseFromCoalmineMapping()
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		utils.FileLog.Info("获取煤炭指标失败：", err)
 		return err
@@ -59,22 +59,6 @@ func FileCoalFirm() (err error) {
 		//遍历行读取
 		maxRow := sheet.MaxRow
 		for i := 0; i < maxRow; i++ {
-			//获取制表来源
-			if i == 1 {
-				row := sheet.Row(i)
-				cells := row.Cells
-			Loop:
-				for k, cell := range cells {
-					text := cell.String()
-					if k == 0 {
-						source = text
-						break Loop
-					}
-				}
-				if source != "" {
-					source = strings.Replace(source, "制表单位:", "", -1)
-				}
-			}
 			//获取年份
 			if i == 2 {
 				row := sheet.Row(i)
@@ -139,7 +123,7 @@ func FileCoalFirm() (err error) {
 							companyName = groupName + companyName
 						}
 						companyName = strings.Replace(companyName, " ", "", -1)
-						var item models.BaseFromCoalmineFirmMapping
+						var item models.BaseFromCoalmineMapping
 						//生成code
 						exists := ContainsSpecialName(companyName)
 						var code string
@@ -172,20 +156,20 @@ func FileCoalFirm() (err error) {
 
 						item.IndexName = companyName
 						item.IndexCode = code
-						item.Source = source
 						item.CreateTime = time.Now()
 						mappingItems = append(mappingItems, &item)
 					} else {
 						dealValue := cell.String()
 
 						item := models.BaseFromCoalmineFirmIndex{
-							IndexName:  companyName,
-							IndexCode:  codeMap[companyName],
-							DataTime:   dateMap[k],
-							DealValue:  dealValue,
-							GroupName:  groupName,
-							CreateTime: time.Now(),
-							ModifyTime: time.Now(),
+							IndexName:                   companyName,
+							IndexCode:                   codeMap[companyName],
+							DataTime:                    dateMap[k],
+							DealValue:                   dealValue,
+							GroupName:                   groupName,
+							Source:                      "全国分企业旬度",
+							CreateTime:                  time.Now(),
+							ModifyTime:                  time.Now(),
 						}
 
 						indexItems = append(indexItems, &item)
@@ -198,11 +182,22 @@ func FileCoalFirm() (err error) {
 	for _, v := range mappingItems {
 		if codeMap[v.IndexName] == "" {
 			codeMap[v.IndexName] = v.IndexCode
-			newId, err := models.AddBaseFromCoalmineFirmMapping(v)
+			newId, err := models.AddBaseFromCoalmineMapping(v)
 			if err != nil {
-				fmt.Println("添加指标名称错误")
+				for i := 0; i<10; i++ {
+					v.IndexCode = v.IndexCode + strconv.Itoa(i)
+					codeMap[v.IndexName] = v.IndexCode
+					newId, err := models.AddBaseFromCoalmineMapping(v)
+					if err != nil {
+						fmt.Println("再次添加公司指标名称错误", err)
+						continue
+					} else {
+						fmt.Println("新增公司成功", newId)
+						break
+					}
+				}
 			} else {
-				fmt.Println("添加指标名称成功", newId)
+				fmt.Println("新增公司成功", newId)
 			}
 		}
 	}

services/commodity_coal_inland.go

@@ -6,6 +6,7 @@ import (
 	"github.com/tealeg/xlsx"
 	"hongze/hongze_data_crawler/models"
 	"hongze/hongze_data_crawler/utils"
+	"strconv"
 	"time"
 )
 
@@ -23,7 +24,7 @@ func FileCoalInland() (err error) {
 		return
 	}
 
-	var mappingItems []*models.BaseFromCoalmineInlandMapping
+	var mappingItems []*models.BaseFromCoalmineMapping
 	var indexItems []*models.BaseFromCoalmineInlandIndex
 	var codeMap = make(map[string]string)
 	var indexMap = make(map[string]string)
@@ -31,7 +32,7 @@ func FileCoalInland() (err error) {
 	var groupMap = make(map[int]string)
 	var dataTime string
 	var sheetName string
-	codeList, err := models.GetBaseFromCoalmineInlandMapping()
+	codeList, err := models.GetBaseFromCoalmineMapping()
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		utils.FileLog.Info("获取煤炭指标失败：", err)
 		return err
@@ -64,7 +65,7 @@ func FileCoalInland() (err error) {
 					if k > 0 && k < 18 {
 						text := cell.String()
 						groupMap[k] = text
-						var item models.BaseFromCoalmineInlandMapping
+						var item models.BaseFromCoalmineMapping
 						//合计命名
 						if k == 9 {
 							item.IndexName = sheetName
@@ -126,6 +127,7 @@ func FileCoalInland() (err error) {
 							item.IndexCode = codeMap[nameMap[k]]
 							item.DealValue = text
 							item.GroupName = groupMap[k]
+							item.Source = "内陆十七省"
 							item.DataTime = dataTime
 							item.ModifyTime = time.Now()
 							item.CreateTime = time.Now()
@@ -140,11 +142,22 @@ func FileCoalInland() (err error) {
 	for _, v := range mappingItems {
 		if codeMap[v.IndexName] == "" {
 			codeMap[v.IndexName] = v.IndexCode
-			newId, err := models.AddBaseFromCoalmineInlandMapping(v)
+			newId, err := models.AddBaseFromCoalmineMapping(v)
 			if err != nil {
-				fmt.Println("添加指标名称错误")
+				for i := 0; i<10; i++ {
+					v.IndexCode = v.IndexCode + strconv.Itoa(i)
+					codeMap[v.IndexName] = v.IndexCode
+					newId, err := models.AddBaseFromCoalmineMapping(v)
+					if err != nil {
+						fmt.Println("再次添加公司指标名称错误", err)
+						continue
+					} else {
+						fmt.Println("新增公司成功", newId)
+						break
+					}
+				}
 			} else {
-				fmt.Println("添加指标名称成功", newId)
+				fmt.Println("新增公司成功", newId)
 			}
 		}
 	}

services/commodity_coal_mine.go

@@ -6,6 +6,7 @@ import (
 	"github.com/tealeg/xlsx"
 	"hongze/hongze_data_crawler/models"
 	"hongze/hongze_data_crawler/utils"
+	"strconv"
 	"strings"
 	"time"
 )
@@ -24,11 +25,9 @@ func FileCoalJsm() (err error) {
 		return
 	}
 
-	var source string
 	var province string
 	var description string
 	var exchange string
-	var rank string
 	var city string
 	var companyName string
 	var group string
@@ -39,7 +38,7 @@ func FileCoalJsm() (err error) {
 	var codeCompanyMap = make(map[string]string)
 	var indexCompanyMap = make(map[string]string)
 	var items []*models.BaseFromCoalmineMapping
-	var itemsCompany []*models.BaseFromCoalmineCompanyMapping
+	var itemsCompany []*models.BaseFromCoalmineMapping
 	var itemsIndex []*models.BaseFromCoalmineIndex
 	var itemsCompanyIndex []*models.BaseFromCoalmineCompanyIndex
 	codeList, err := models.GetBaseFromCoalmineMapping()
@@ -54,7 +53,7 @@ func FileCoalJsm() (err error) {
 		}
 	}
 
-	codeCompanyList, err := models.GetBaseFromCoalmineCompanyMapping()
+	codeCompanyList, err := models.GetBaseFromCoalmineMapping()
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		utils.FileLog.Info("获取煤炭公司指标失败：", err)
 		return err
@@ -91,22 +90,6 @@ func FileCoalJsm() (err error) {
 		//遍历行读取
 		maxRow := sheet.MaxRow
 		for i := 0; i < maxRow; i++ {
-			//获取制表来源
-			if i == 1 {
-				row := sheet.Row(i)
-				cells := row.Cells
-			Loop:
-				for k, cell := range cells {
-					text := cell.String()
-					if k == 0 {
-						source = text
-						break Loop
-					}
-				}
-				if source != "" {
-					source = strings.Replace(source, "制表单位:", "", -1)
-				}
-			}
 			//获取样本情况
 			if i > 3 && i < 16 {
 				row := sheet.Row(i)
@@ -156,10 +139,7 @@ func FileCoalJsm() (err error) {
 
 							item.IndexName = province + exchange
 
-							item.Exchange = exchange
-							item.Description = description
-							item.Province = province
-							item.Source = source
+
 							item.CreateTime = time.Now()
 							items = append(items, item)
 							break Loop2
@@ -173,7 +153,6 @@ func FileCoalJsm() (err error) {
 				cells := row.Cells
 				for k, cell := range cells {
 					text := cell.String()
-					fmt.Println("text：",text)
 					stamp, _ := time.ParseInLocation("01-02-06", text, time.Now().Location())
 					if k > 4 {
 						dateMap[k] = stamp.Format(utils.FormatDate)
@@ -193,6 +172,10 @@ func FileCoalJsm() (err error) {
 						item.Exchange = exchange
 						item.DealValue = text
 						item.DataTime = dateMap[k]
+						item.Exchange = exchange
+						item.Description = description
+						item.Province = province
+						item.Source = "三省周度"
 						item.ModifyTime = time.Now()
 						item.CreateTime = time.Now()
 						itemsIndex = append(itemsIndex, item)
@@ -208,9 +191,6 @@ func FileCoalJsm() (err error) {
 				for k, cell := range cells {
 					text := cell.String()
 					if text != "" {
-						if k == 0 {
-							rank = text
-						}
 						if k == 1 {
 							province = text
 						}
@@ -221,9 +201,8 @@ func FileCoalJsm() (err error) {
 							companyName = text
 						}
 						if k == 4 {
-							item := new(models.BaseFromCoalmineCompanyMapping)
+							item := new(models.BaseFromCoalmineMapping)
 							group = text
-							item.CompanyName = companyName
 							trimName := TrimCompanyName(companyName)
 							item.IndexName = trimName
 							//取处理后公司名首字母缩写
@@ -238,19 +217,6 @@ func FileCoalJsm() (err error) {
 								}
 							}
 							item.IndexCode = strResult
-
-							item.Rank = rank
-							item.Province = province
-							item.City = city
-
-							//处理无类别名时的情况
-							if group == "无" {
-								item.GroupName = trimName
-							} else {
-								item.GroupName = group
-							}
-
-							item.Source = source
 							item.CreateTime = time.Now()
 							itemsCompany = append(itemsCompany, item)
 							break Loop3
@@ -272,6 +238,17 @@ func FileCoalJsm() (err error) {
 						item.IndexCode = codeCompanyMap[item.IndexName]
 						item.DealValue = text
 						item.DataTime = dateMap[k]
+						item.Province = province
+						item.City = city
+
+						//处理无类别名时的情况
+						if group == "无" {
+							item.GroupName = companyName
+						} else {
+							item.GroupName = group
+						}
+
+						item.Source = "三省企业"
 						item.ModifyTime = time.Now()
 						item.CreateTime = time.Now()
 						//fmt.Println(item)
@@ -320,9 +297,20 @@ func FileCoalJsm() (err error) {
 	for _, v := range itemsCompany {
 		if codeCompanyMap[v.IndexName] == "" {
 			codeCompanyMap[v.IndexName] = v.IndexCode
-			newId, err := models.AddBaseFromCoalmineCompanyMapping(v)
+			newId, err := models.AddBaseFromCoalmineMapping(v)
 			if err != nil {
-				fmt.Println("添加公司指标名称错误", err)
+				for i := 0; i<10; i++ {
+					v.IndexCode = v.IndexCode + strconv.Itoa(i)
+					codeCompanyMap[v.IndexName] = v.IndexCode
+					newId, err := models.AddBaseFromCoalmineMapping(v)
+					if err != nil {
+						fmt.Println("再次添加公司指标名称错误", err)
+						continue
+					} else {
+						fmt.Println("新增公司成功", newId)
+						break
+					}
+				}
 			} else {
 				fmt.Println("新增公司成功", newId)
 			}