Merge branch 'aj_mysteel'

controllers/base_from_mysteel_chemical.go

@@ -147,6 +147,10 @@ func (this *MySteelChemicalController) QueryRefresh() {
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
+	if list == nil {
+		list = make([]*models.BaseFromMysteelChemicalIndex, 0)
+	}
+
 	br.Ret = 200
 	br.Data = list
 	br.Success = true
@@ -177,3 +181,385 @@ func (this *MySteelChemicalController) HandleMysteelIndex() {
 	br.Success = true
 	br.Msg = "处理成功"
 }
+
+// GetMaxFileIndex
+// @Title 获取最大的文件编号下标
+// @Description 获取最大的文件编号下标
+// @Success 200 {object} models.HandleMysteelIndexResp
+// @router /getMaxFileIndex [post]
+func (this *MySteelChemicalController) GetMaxFileIndex() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	var req models.GetMaxFileIndexReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+
+	indexObj := new(models.BaseFromMysteelChemicalIndex)
+	// 获取最大的文件编号下标
+	item, err := indexObj.GetMaxFileIndex(req.Frequency)
+	if err != nil {
+		return
+	}
+
+	br.Data = item
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "处理成功"
+}
+
+// GetNoMergeIndexByFrequencyCount
+// @Title 获取未合并的指标总数量
+// @Description 获取未合并的指标总数量
+// @Success 200 {object} models.HandleMysteelIndexResp
+// @router /getNoMergeIndexByFrequencyCount [post]
+func (this *MySteelChemicalController) GetNoMergeIndexByFrequencyCount() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	var req models.GetMaxFileIndexReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+
+	indexObj := new(models.BaseFromMysteelChemicalIndex)
+	// 获取未合并的指标总数量
+	indexTotal, err := indexObj.GetNoMergeIndexByFrequencyCount(req.Frequency)
+	if err != nil {
+		return
+	}
+
+	br.Data = indexTotal
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "处理成功"
+}
+
+// GetNoMergeIndexByFrequencyPage
+// @Title 获取未合并的指标列表
+// @Description 获取未合并的指标列表
+// @Success 200 {object} models.HandleMysteelIndexResp
+// @router /getNoMergeIndexByFrequencyPage [post]
+func (this *MySteelChemicalController) GetNoMergeIndexByFrequencyPage() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	var req models.GetNoMergeIndexByFrequencyPageReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+
+	indexObj := new(models.BaseFromMysteelChemicalIndex)
+	// 获取未合并的指标总数量
+	indexTotal, err := indexObj.GetNoMergeIndexByFrequencyPage(req.Frequency, req.Limit)
+	if err != nil {
+		return
+	}
+
+	br.Data = indexTotal
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "处理成功"
+}
+
+// GetIndexCountByMergeFilePath
+// @Title 获取该文件下标已经存在多少的指标
+// @Description 获取该文件下标已经存在多少的指标
+// @Success 200 {object} models.HandleMysteelIndexResp
+// @router /getIndexCountByMergeFilePath [post]
+func (this *MySteelChemicalController) GetIndexCountByMergeFilePath() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	var req models.GetIndexCountByMergeFilePathReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+	if req.MergeFilePath == "" {
+		br.Msg = "参数有误"
+		br.ErrMsg = "参数有误, 文件路径有误"
+		return
+	}
+
+	indexObj := new(models.BaseFromMysteelChemicalIndex)
+	indexTotal, err := indexObj.GetIndexCountByMergeFilePath(req.MergeFilePath)
+	if err != nil {
+		return
+	}
+
+	br.Data = indexTotal
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+}
+
+// GetIndexCreate
+// @Title 获取两分钟前新增的指标
+// @Description 获取两分钟前新增的指标
+// @Success 200 {object} models.BaseFromMysteelChemicalIndex
+// @router /getIndexCreate [post]
+func (this *MySteelChemicalController) GetIndexCreate() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	indexObj := new(models.BaseFromMysteelChemicalIndex)
+	items, err := indexObj.GetIndexCreate()
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取指标失败, Err: " + err.Error()
+		return
+	}
+	if items == nil {
+		items = make([]*models.BaseFromMysteelChemicalIndex, 0)
+	}
+
+	br.Data = items
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+}
+
+// GetIndexRefreshMethanolByMergeFile
+// @Title 获取需要刷新的甲醇文件
+// @Description 获取需要刷新的甲醇文件
+// @Success 200 {object} models.BaseFromMysteelChemicalIndex
+// @router /getIndexRefreshMethanolByMergeFile [post]
+func (this *MySteelChemicalController) GetIndexRefreshMethanolByMergeFile() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	indexObj := new(models.BaseFromMysteelChemicalIndex)
+	items, err := indexObj.GetIndexRefreshMethanolByMergeFile()
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取指标失败, Err: " + err.Error()
+		return
+	}
+	if items == nil {
+		items = make([]*models.BaseFromMysteelChemicalIndex, 0)
+	}
+
+	br.Data = items
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+}
+
+// GetIndexRefreshMethanolByTimely
+// @Title 获取需要及时刷新的文件
+// @Description 获取需要及时刷新的文件
+// @Success 200 {object} models.BaseFromMysteelChemicalIndex
+// @router /getIndexRefreshMethanolByTimely [post]
+func (this *MySteelChemicalController) GetIndexRefreshMethanolByTimely() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	indexObj := new(models.BaseFromMysteelChemicalIndex)
+	items, err := indexObj.GetIndexRefreshMethanolByTimely()
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取指标失败, Err: " + err.Error()
+		return
+	}
+	if items == nil {
+		items = make([]*models.BaseFromMysteelChemicalIndex, 0)
+	}
+
+	br.Data = items
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+}
+
+// GetIndexByFrequency
+// @Title 根据频率获取指标
+// @Description 根据频率获取指标
+// @Success 200 {object} models.BaseFromMysteelChemicalIndex
+// @router /getIndexByFrequency [post]
+func (this *MySteelChemicalController) GetIndexByFrequency() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	var req models.GetIndexByFrequencyReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+	if req.Frequency == "" {
+		br.Msg = "参数有误"
+		br.ErrMsg = "参数有误"
+		return
+	}
+
+	indexObj := new(models.BaseFromMysteelChemicalIndex)
+	items, err := indexObj.GetIndexByFrequency(req.Frequency)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取指标失败, Err: " + err.Error()
+		return
+	}
+	if items == nil {
+		items = make([]*models.BaseFromMysteelChemicalIndex, 0)
+	}
+
+	br.Data = items
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+}
+
+// GetIndexRefreshWeek
+// @Title 根据周获取指标
+// @Description 根据周获取指标
+// @Success 200 {object} models.BaseFromMysteelChemicalIndex
+// @router /getIndexRefreshWeek [post]
+func (this *MySteelChemicalController) GetIndexRefreshWeek() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	var req models.GetIndexRefreshWeekReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+	if req.NowWeekZn == "" || req.StartTime == "" || req.EndTime == "" {
+		br.Msg = "参数有误"
+		br.ErrMsg = "参数有误"
+		return
+	}
+
+	indexObj := new(models.BaseFromMysteelChemicalIndex)
+	items, err := indexObj.GetIndexRefreshWeek(req.NowWeekZn, req.StartTime, req.EndTime)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取指标失败, Err: " + err.Error()
+		return
+	}
+	if items == nil {
+		items = make([]*models.BaseFromMysteelChemicalIndex, 0)
+	}
+
+	br.Data = items
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+}
+
+// UpdateIndex
+// @Title 更新指标
+// @Description 更新指标
+// @Success 200 string "操作成功"
+// @router /updateIndex [post]
+//func (this *MySteelChemicalController) UpdateIndex() {
+//	br := new(models.BaseResponse).Init()
+//	defer func() {
+//		this.Data["json"] = br
+//		this.ServeJSON()
+//	}()
+//	var req models.UpdateIndexReq
+//	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+//	if err != nil {
+//		br.Msg = "参数解析异常！"
+//		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+//		return
+//	}
+//	if req.Item == nil {
+//		br.Msg = "参数有误"
+//		br.ErrMsg = "参数有误, 指标信息有误"
+//		return
+//	}
+//	if len(req.UpdateCols) == 0 {
+//		br.Msg = "参数有误"
+//		br.ErrMsg = "参数有误, 无更新字段"
+//		return
+//	}
+//
+//	// 更新指标
+//	indexObj := new(models.BaseFromMysteelChemicalIndex)
+//	err = indexObj.UpdateIndex(req.Item, req.UpdateCols)
+//	if err != nil {
+//		br.Msg = "操作失败"
+//		br.ErrMsg = "批量更新指标失败, MultiUpdateIndexByIndexCode err: " + err.Error()
+//		return
+//	}
+//
+//	br.Ret = 200
+//	br.Success = true
+//	br.Msg = "操作成功"
+//}
+
+// MultiUpdateIndex
+// @Title 批量更新指标
+// @Description 批量更新指标
+// @Success 200 string "操作成功"
+// @router /multiUpdateIndex [post]
+func (this *MySteelChemicalController) MultiUpdateIndex() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	var req []models.UpdateIndexReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+	if len(req) == 0 {
+		br.Msg = "参数有误"
+		br.ErrMsg = "参数有误, 无指标需要更新"
+		return
+	}
+
+	// 批量更新指标
+	indexObj := new(models.BaseFromMysteelChemicalIndex)
+	err = indexObj.MultiUpdateIndex(req)
+	if err != nil {
+		br.Msg = "操作失败"
+		br.ErrMsg = "批量更新指标失败, MultiUpdateIndex err: " + err.Error()
+		return
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "操作成功"
+}

models/base_from_mysteel_chemical.go

@@ -224,13 +224,170 @@ type BaseFromMysteelChemicalIndex struct {
 }
 
 // GetIndexRefreshAllByMergeFile 根据合并文件去分组查询需要刷新的文件
-func (d *BaseFromMysteelChemicalIndex) GetIndexRefreshAllByMergeFile() (items []*BaseFromMysteelChemicalIndex, err error) {
+func (m *BaseFromMysteelChemicalIndex) GetIndexRefreshAllByMergeFile() (items []*BaseFromMysteelChemicalIndex, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE merge_file_path <>'' AND base_from_mysteel_chemical_classify_id NOT IN(54,55,56,57)`
+	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE merge_file_path <>'' AND base_from_mysteel_chemical_classify_id NOT IN(54,55,56,57) GROUP BY merge_file_path`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
 
+func (m *BaseFromMysteelChemicalIndex) GetIndexItem(indexCode string) (item *BaseFromMysteelChemicalIndex, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE index_code = ? `
+	err = o.Raw(sql, indexCode).QueryRow(&item)
+	return
+}
+
+func (m *BaseFromMysteelChemicalIndex) GetIndexCreate() (items []*BaseFromMysteelChemicalIndex, err error) {
+	o := orm.NewOrm()
+	endTime := time.Now().Add(-2 * time.Minute).Format(utils.FormatDateTime)
+	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE index_name = '' AND create_time <= ? `
+	_, err = o.Raw(sql, endTime).QueryRows(&items)
+	return
+}
+
+// Add 新增
+func (m *BaseFromMysteelChemicalIndex) Add() (err error) {
+	o := orm.NewOrm()
+	_, err = o.Insert(m)
+	return
+}
+
+func (m *BaseFromMysteelChemicalIndex) Update(cols []string) (err error) {
+	o := orm.NewOrm()
+	_, err = o.Update(m, cols...)
+	return
+}
+
+// GetNoMergeIndexByFrequencyCount 获取未合并的指标总数量
+func (m *BaseFromMysteelChemicalIndex) GetNoMergeIndexByFrequencyCount(frequency string) (total int64, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT count(1) AS total FROM base_from_mysteel_chemical_index WHERE frequency=? AND index_name NOT LIKE "%停%"  `
+	err = o.Raw(sql, frequency).QueryRow(&total)
+
+	return
+}
+
+// GetMaxFileIndexReq 获取最大文件数请求
+type GetMaxFileIndexReq struct {
+	Frequency string
+}
+
+// GetMaxFileIndex 获取最大文件的
+func (m *BaseFromMysteelChemicalIndex) GetMaxFileIndex(frequency string) (item *BaseFromMysteelChemicalIndex, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE frequency=? AND index_name NOT LIKE "%停%" ORDER BY file_index DESC `
+	err = o.Raw(sql, frequency).QueryRow(&item)
+
+	return
+}
+
+// GetNoMergeIndexByFrequencyPageReq 获取未合并的指标列表
+type GetNoMergeIndexByFrequencyPageReq struct {
+	Frequency string
+	Limit     int
+}
+
+// GetNoMergeIndexByFrequencyPage 获取未合并的指标列表
+func (m *BaseFromMysteelChemicalIndex) GetNoMergeIndexByFrequencyPage(frequency string, limit int) (items []*BaseFromMysteelChemicalIndex, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE frequency=? AND merge_file_path = '' limit ? `
+	_, err = o.Raw(sql, frequency, limit).QueryRows(&items)
+	return
+}
+
+type GetIndexCountByMergeFilePathReq struct {
+	MergeFilePath string
+}
+
+func (m *BaseFromMysteelChemicalIndex) GetIndexCountByMergeFilePath(mergeFilePath string) (total int64, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT count(1) AS total FROM base_from_mysteel_chemical_index WHERE merge_file_path = ?`
+	err = o.Raw(sql, mergeFilePath).QueryRow(&total)
+	return
+}
+
+// GetIndexRefreshMethanolByMergeFile 根据合并文件去分组查询需要刷新的甲醇文件
+func (m *BaseFromMysteelChemicalIndex) GetIndexRefreshMethanolByMergeFile() (items []*BaseFromMysteelChemicalIndex, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE merge_file_path <> '' AND base_from_mysteel_chemical_classify_id IN(54,55,56,57) GROUP BY merge_file_path`
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}
+
+// GetIndexRefreshMethanolByTimely 获取需要及时刷新的文件
+func (m *BaseFromMysteelChemicalIndex) GetIndexRefreshMethanolByTimely() (items []*BaseFromMysteelChemicalIndex, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE merge_file_path <> '' AND is_refresh = 1 GROUP BY merge_file_path`
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}
+
+type GetIndexByFrequencyReq struct {
+	Frequency string
+}
+
+// GetIndexByFrequency 根据频率获取指标
+func (m *BaseFromMysteelChemicalIndex) GetIndexByFrequency(frequency string) (items []*BaseFromMysteelChemicalIndex, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE frequency = ? AND merge_file_path = '' `
+	_, err = o.Raw(sql, frequency).QueryRows(&items)
+	return
+}
+
+type GetIndexRefreshWeekReq struct {
+	NowWeekZn string
+	StartTime string
+	EndTime   string
+}
+
+func (m *BaseFromMysteelChemicalIndex) GetIndexRefreshWeek(nowWeekZn, startTime, endTime string) (items []*BaseFromMysteelChemicalIndex, err error) {
+	where := `update_week = ? AND ((update_time >= ? AND update_time <= ?) OR (update_time2 >= ? AND update_time2 <= ?)) `
+	o := orm.NewOrm()
+	sql := fmt.Sprintf(`SELECT * FROM base_from_mysteel_chemical_index WHERE %s `, where)
+	_, err = o.Raw(sql, nowWeekZn, startTime, endTime, startTime, endTime).QueryRows(&items)
+	return
+}
+
+// UpdateIndexReq 根据编码更新指标请求体
+type UpdateIndexReq struct {
+	Item       *BaseFromMysteelChemicalIndex
+	UpdateCols []string
+}
+
+func (m *BaseFromMysteelChemicalIndex) UpdateIndex(item *BaseFromMysteelChemicalIndex, updateCols []string) (err error) {
+	if item == nil {
+		return
+	}
+	if len(updateCols) == 0 {
+		return
+	}
+	o := orm.NewOrm()
+	_, err = o.Update(item, updateCols...)
+	return
+}
+
+// MultiUpdateIndex 批量更新指标
+func (m *BaseFromMysteelChemicalIndex) MultiUpdateIndex(items []UpdateIndexReq) (err error) {
+	if len(items) == 0 {
+		return
+	}
+	o := orm.NewOrm()
+	for _, v := range items {
+		if len(v.UpdateCols) == 0 {
+			continue
+		}
+		if v.Item == nil {
+			continue
+		}
+		if _, e := o.Update(v.Item, v.UpdateCols...); e != nil {
+			err = fmt.Errorf("update err: %s", e.Error())
+			return
+		}
+	}
+	return
+}
+
 type HandleMysteelIndex struct {
 	IndexName    string `description:"指标名称"`
 	IndexCode    string `description:"指标编码"`
@@ -260,26 +417,6 @@ type BaseFromMysteelChemicalData struct {
 	ModifyTime                     time.Time `description:"修改时间"`
 }
 
-func (d *BaseFromMysteelChemicalIndex) GetIndexItem(indexCode string) (item *BaseFromMysteelChemicalIndex, err error) {
-	o := orm.NewOrm()
-	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE index_code = ? `
-	err = o.Raw(sql, indexCode).QueryRow(&item)
-	return
-}
-
-// 新增
-func (r *BaseFromMysteelChemicalIndex) Add() (err error) {
-	o := orm.NewOrm()
-	_, err = o.Insert(r)
-	return
-}
-
-func (m *BaseFromMysteelChemicalIndex) Update(cols []string) (err error) {
-	o := orm.NewOrm()
-	_, err = o.Update(m, cols...)
-	return
-}
-
 // GetIndexDataList 根据指标编码获取数据
 func (d *BaseFromMysteelChemicalData) GetIndexDataList(indexCode string) (item []*BaseFromMysteelChemicalData, err error) {
 	o := orm.NewOrm()

models/db.go

@@ -95,5 +95,7 @@ func initBaseIndex() {
 		new(BaseFromBaiinfoData),
 		new(BaseFromSmmIndex),
 		new(BaseFromSmmData),
+		new(BaseFromMysteelChemicalIndex),
+		new(BaseFromMysteelChemicalData),
 	)
 }

routers/commentsRouter.go

@@ -331,6 +331,87 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:MySteelChemicalController"] = append(beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:MySteelChemicalController"],
+        beego.ControllerComments{
+            Method: "GetIndexByFrequency",
+            Router: `/getIndexByFrequency`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:MySteelChemicalController"] = append(beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:MySteelChemicalController"],
+        beego.ControllerComments{
+            Method: "GetIndexCountByMergeFilePath",
+            Router: `/getIndexCountByMergeFilePath`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:MySteelChemicalController"] = append(beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:MySteelChemicalController"],
+        beego.ControllerComments{
+            Method: "GetIndexCreate",
+            Router: `/getIndexCreate`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:MySteelChemicalController"] = append(beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:MySteelChemicalController"],
+        beego.ControllerComments{
+            Method: "GetIndexRefreshMethanolByMergeFile",
+            Router: `/getIndexRefreshMethanolByMergeFile`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:MySteelChemicalController"] = append(beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:MySteelChemicalController"],
+        beego.ControllerComments{
+            Method: "GetIndexRefreshMethanolByTimely",
+            Router: `/getIndexRefreshMethanolByTimely`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:MySteelChemicalController"] = append(beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:MySteelChemicalController"],
+        beego.ControllerComments{
+            Method: "GetIndexRefreshWeek",
+            Router: `/getIndexRefreshWeek`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:MySteelChemicalController"] = append(beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:MySteelChemicalController"],
+        beego.ControllerComments{
+            Method: "GetMaxFileIndex",
+            Router: `/getMaxFileIndex`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:MySteelChemicalController"] = append(beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:MySteelChemicalController"],
+        beego.ControllerComments{
+            Method: "GetNoMergeIndexByFrequencyCount",
+            Router: `/getNoMergeIndexByFrequencyCount`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:MySteelChemicalController"] = append(beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:MySteelChemicalController"],
+        beego.ControllerComments{
+            Method: "GetNoMergeIndexByFrequencyPage",
+            Router: `/getNoMergeIndexByFrequencyPage`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:MySteelChemicalController"] = append(beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:MySteelChemicalController"],
         beego.ControllerComments{
             Method: "HandleMysteelIndex",
@@ -340,6 +421,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:MySteelChemicalController"] = append(beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:MySteelChemicalController"],
+        beego.ControllerComments{
+            Method: "MultiUpdateIndex",
+            Router: `/multiUpdateIndex`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:MySteelChemicalController"] = append(beego.GlobalControllerRouter["hongze/hongze_edb_lib/controllers:MySteelChemicalController"],
         beego.ControllerComments{
             Method: "QueryRefresh",

services/base_from_mysteel_chemical.go

@@ -32,7 +32,7 @@ func handleIndex(indexItem *models.HandleMysteelIndex) {
 	var isAdd int
 	item, err := indexObj.GetIndexItem(indexItem.IndexCode)
 	if err != nil {
-		if err.Error() == err.Error() {
+		if err.Error() == utils.ErrNoRow() {
 			isAdd = 1
 		} else {
 			isAdd = -1
@@ -59,6 +59,8 @@ func handleIndex(indexItem *models.HandleMysteelIndex) {
 		indexObj.StartDate, _ = time.ParseInLocation(utils.FormatDate, indexItem.StartDate, time.Local)
 		indexObj.EndDate, _ = time.ParseInLocation(utils.FormatDate, indexItem.EndDate, time.Local)
 		indexObj.Frequency = indexItem.Frequency
+		//indexObj.CreateTime = time.Now().Local()
+		//indexObj.ModifyTime = time.Now().Local()
 		err = indexObj.Add()
 		if err != nil {
 			fmt.Println("add err:" + err.Error())
@@ -66,6 +68,7 @@ func handleIndex(indexItem *models.HandleMysteelIndex) {
 		}
 		indexId = indexObj.BaseFromMysteelChemicalIndexId
 	} else if isAdd == 2 {
+		indexObj.BaseFromMysteelChemicalIndexId = item.BaseFromMysteelChemicalIndexId
 		indexObj.IndexCode = indexItem.IndexCode
 		indexObj.IndexName = indexItem.IndexName
 		indexObj.Unit = indexItem.Unit
@@ -88,7 +91,11 @@ func handleIndex(indexItem *models.HandleMysteelIndex) {
 		updateColsArr = append(updateColsArr, "end_date")
 		updateColsArr = append(updateColsArr, "modify_time")
 
-		indexObj.Update(updateColsArr)
+		e := indexObj.Update(updateColsArr)
+		if e != nil {
+			fmt.Println("Index Update Err:" + e.Error())
+			return
+		}
 
 		dataObj := new(models.BaseFromMysteelChemicalData)