修改监听时间

init_serve/task.go

@@ -14,33 +14,33 @@ import (
 func InitTask() {
 	c := cron.New(cron.WithSeconds())
 
-	////每5分钟检测一次，指标生成
-	//_, err := c.AddFunc("0 */5 * * * *", CheckIndexCreate)
+	//每5分钟检测一次，指标生成
+	_, err := c.AddFunc("0 */1 * * * *", CheckIndexCreate)
+	if err != nil {
+		global.LOG.Info("DownloadCvTask err" + err.Error())
+		panic("DownloadCvTask err" + err.Error())
+	}
+
+	////每30分钟检测一次，周度指标刷新
+	//_, err = c.AddFunc("0 */30 * * * *", services.IndexRefreshWeek)
+	//if err != nil {
+	//	global.LOG.Info("DownloadCvTask err" + err.Error())
+	//	panic("DownloadCvTask err" + err.Error())
+	//}
+
+	////其他指标刷新
+	//_, err := c.AddFunc("0 00 03 * * *", services.IndexRefreshAll)
 	//if err != nil {
 	//	global.LOG.Info("DownloadCvTask err" + err.Error())
 	//	panic("DownloadCvTask err" + err.Error())
 	//}
 	//
-	////每30分钟检测一次，周度指标刷新
-	//_, err = c.AddFunc("0 */30 * * * *", services.IndexRefreshWeek)
+	////其他指标刷新
+	//_, err = c.AddFunc("0 30 12 * * *", services.IndexRefreshAll)
 	//if err != nil {
 	//	global.LOG.Info("DownloadCvTask err" + err.Error())
 	//	panic("DownloadCvTask err" + err.Error())
 	//}
-
-	//其他指标刷新
-	_, err := c.AddFunc("0 00 03 * * *", services.IndexRefreshAll)
-	if err != nil {
-		global.LOG.Info("DownloadCvTask err" + err.Error())
-		panic("DownloadCvTask err" + err.Error())
-	}
-
-	//其他指标刷新
-	_, err = c.AddFunc("0 30 12 * * *", services.IndexRefreshAll)
-	if err != nil {
-		global.LOG.Info("DownloadCvTask err" + err.Error())
-		panic("DownloadCvTask err" + err.Error())
-	}
 	c.Start()
 
 	go watch.ListenFolderNew()

models/index/index.go

@@ -81,7 +81,9 @@ type IndexDeleteReq struct {
 func (d *BaseFromMysteelChemicalIndex) GetIndexCreate() (item []*BaseFromMysteelChemicalIndex, err error) {
 	endTime := time.Now().Add(-2 * time.Minute).Format(utils.FormatDateTime)
 	err = global.MYSQL["hzdata"].WithContext(context.TODO()).Model(d).
-		Where("index_name = '' AND create_time<=? ", endTime).Find(&item).Error
+		Where("index_name = '' AND create_time<=? ", endTime).First(&item).Error
+
+	//Where("index_name = '' AND create_time<=? ", endTime).Find(&item).Error
 	return
 }
 

services/index.go

@@ -66,10 +66,12 @@ func IndexCreateCheck() (err error) {
 			v.FilePath = saveFilePath
 			fmt.Println("IndexCreate saveFilePath:" + v.FilePath)
 			time.Sleep(1 * time.Second)
-			MysteelChemicalRefresh(v.FilePath)
-			fmt.Println("MysteelChemicalRefresh end:"+v.IndexCode)
+			if utils.FileIsExist(saveFilePath) {
+				MysteelChemicalRefresh(saveFilePath)
+			}
+			fmt.Println("MysteelChemicalRefresh end:" + v.IndexCode)
 		}
-		fmt.Println("IndexCreateCheck end:"+v.IndexCode)
+		fmt.Println("IndexCreateCheck end:" + v.IndexCode)
 	}
 	return nil
 }
@@ -92,8 +94,10 @@ func IndexCreate(item *index.BaseFromMysteelChemicalIndex) (saveFilePath string,
 	templatePath := utils.IndexSaveDir + "index_template.xlsx"
 	templateFile, err := excelize.OpenFile(templatePath)
 	if err != nil {
+		fmt.Println("OpenFile template err:" + err.Error())
 		return
 	}
+
 	defer func() {
 		templateFile.Close()
 	}()
@@ -118,7 +122,6 @@ func IndexCreate(item *index.BaseFromMysteelChemicalIndex) (saveFilePath string,
 		fmt.Println(err)
 		return "", err
 	}
-	time.Sleep(1 * time.Second)
 	saveFilePath = filePath
 	return
 }

watch/watch.go

@@ -54,7 +54,11 @@ func ListenFolderNew() {
 func WatchIndexFile(filePath string) {
 	fmt.Println("filePath:", filePath)
 	//filePath:D:\mysteel_data\CM0000568866_release.xlsx
-	time.Sleep(3 * time.Second)
+	time.Sleep(10 * time.Second)
+	if !utils.FileIsExist(filePath) {
+		fmt.Println("filePath is not exist:" + filePath)
+		return
+	}
 	//读取文件内容
 	global.LOG.Info("WatchFile:" + filePath)
 	f, err := excelize.OpenFile(filePath)
@@ -179,12 +183,12 @@ func WatchIndexFile(filePath string) {
 							} else if strings.Contains(frequency, "年") {
 								frequencyStr = "year"
 							}
-							frequencyStr="_"+frequencyStr
+							frequencyStr = "_" + frequencyStr
 							if !strings.Contains(filePath, frequencyStr) {
 								fpArr := strings.Split(fp, "_")
 								for k, v := range fpArr {
 									if k == 0 {
-										newFilePath = v +  frequencyStr
+										newFilePath = v + frequencyStr
 									} else {
 										newFilePath = newFilePath + "_" + v
 									}