fix bug

models/index/index.go

@@ -27,6 +27,8 @@ type BaseFromMysteelChemicalIndex struct {
 	FilePath                       string    `gorm:"column:file_path" json:"file_path"`
 	MergeFilePath                  string    `gorm:"column:merge_file_path" json:"merge_file_path"`
 	FileIndex                      int       `gorm:"column:file_index" json:"file_index"`
+	MergeUpdateWeek                string    `gorm:"column:merge_update_week" json:"merge_update_week"`
+	UpdateDate                     string    `gorm:"column:update_date" json:"update_date"`
 	base.TimeBase
 }
 
@@ -124,7 +126,7 @@ func (d *BaseFromMysteelChemicalIndex) GetIndexByFrequencyCount(frequency string
 func (d *BaseFromMysteelChemicalIndex) GetNoMergeIndexByFrequencyCount(frequency string) (total int64, err error) {
 	err = global.MYSQL["hzdata"].WithContext(context.TODO()).Model(d).
 		//Where("frequency=? ", frequency).
-		Where("frequency=? AND merge_file_path = ?", frequency, "").
+		Where("frequency=? AND merge_file_path = ? AND index_name NOT LIKE '%停%' ", frequency, "").
 		Count(&total).Error
 	return
 }
@@ -173,7 +175,7 @@ func (d *BaseFromMysteelChemicalIndex) GetIndexLatestMergeFilePath(frequency str
 
 func (d *BaseFromMysteelChemicalIndex) GetMaxFileIndex(frequency string) (item *BaseFromMysteelChemicalIndex, err error) {
 	err = global.MYSQL["hzdata"].WithContext(context.TODO()).Model(d).
-		Where("frequency=?", frequency).
+		Where("frequency=? AND index_name NOT LIKE '%停%' ", frequency).
 		Order("file_index DESC").
 		First(&item).Error
 	return
@@ -188,4 +190,4 @@ func (d *BaseFromMysteelChemicalIndex) GetIndexRefreshMethanolByMergeFile() (ite
 	err = global.MYSQL["hzdata"].WithContext(context.TODO()).Model(d).Where("merge_file_path != ? AND base_from_mysteel_chemical_classify_id IN(54,55,56,57) ", "").
 		Group("merge_file_path").Find(&item).Error
 	return
-}
+}

watch/watch.go

@@ -257,6 +257,14 @@ func WatchIndexFile(filePath string) {
 								indexObj.EndDate, _ = time.ParseInLocation(utils.FormatDate, endDate, time.Local)
 								indexObj.Frequency = frequency
 								indexObj.FilePath = newFilePath
+								indexObj.UpdateDate = updateDate
+								if updateDate != "" {
+									updateDateT, err := time.Parse(utils.FormatDate, updateDate)
+									if err == nil {
+										week := utils.GetWeekZn(updateDateT.Weekday().String())
+										indexObj.MergeUpdateWeek = week
+									}
+								}
 								err = indexObj.Add(runMode)
 								if err != nil {
 									fmt.Println("add err:" + err.Error())
@@ -274,6 +282,14 @@ func WatchIndexFile(filePath string) {
 								indexObj.Frequency = frequency
 								indexObj.FilePath = newFilePath
 								indexObj.ModifyTime = time.Now()
+								if updateDate != "" {
+									updateDateT, err := time.Parse(utils.FormatDate, updateDate)
+									if err == nil {
+										week := utils.GetWeekZn(updateDateT.Weekday().String())
+										indexObj.MergeUpdateWeek = week
+									}
+									indexObj.UpdateDate = updateDate
+								}
 								indexId = item.BaseFromMysteelChemicalIndexId
 								//修改数据
 								updateColsArr := make([]string, 0)
@@ -287,6 +303,8 @@ func WatchIndexFile(filePath string) {
 								updateColsArr = append(updateColsArr, "end_date")
 								updateColsArr = append(updateColsArr, "modify_time")
 								updateColsArr = append(updateColsArr, "file_path")
+								updateColsArr = append(updateColsArr, "update_date")
+								updateColsArr = append(updateColsArr, "merge_update_week")
 
 								indexObj.Update(runMode, updateColsArr)