新增路径修改功能

main.go

@@ -1,8 +1,13 @@
 package main
 
 import (
+	"fmt"
 	"hongze/mysteel_watch/core"
 	"hongze/mysteel_watch/watch"
+	"os"
+	"path/filepath"
+	"strings"
+	"sync"
 )
 
 // @title 弘则人力资源管理系统API接口文档
@@ -23,3 +28,59 @@ func main() {
 	core.RunServe()
 	go watch.ListenFolderNew()
 }
+
+//检测指标文件
+func TestFileName(filePath string) {
+	fmt.Println("filePath:", filePath)
+	var newFilePath string
+	defer func() {
+		//重命名文件
+		fmt.Println("newFilePath")
+		fmt.Println(newFilePath)
+		err := os.Rename(filePath, newFilePath)
+		if err != nil {
+			fmt.Println("os.Rename Err:" + err.Error())
+		}
+	}()
+	var runMode string
+	if strings.Contains(filePath, "debug") {
+		runMode = "debug"
+	} else {
+		runMode = "release"
+	}
+	fmt.Println(runMode)
+
+	//处理文件名
+	dir, fp := filepath.Split(filePath)
+	fmt.Println(dir)
+	fmt.Println(fp)
+	frequency := "年"
+
+	var wg = sync.WaitGroup{}
+	wg.Add(1)
+	go func() {
+		var frequencyStr string
+		if strings.Contains(frequency, "日") {
+			frequencyStr = "day"
+		} else if strings.Contains(frequency, "周") {
+			frequencyStr = "week"
+		} else if strings.Contains(frequency, "月") {
+			frequencyStr = "month"
+		} else if strings.Contains(frequency, "年") {
+			frequencyStr = "year"
+		}
+		if !strings.Contains(filePath, frequencyStr) {
+			fpArr := strings.Split(fp, "_")
+			for k, v := range fpArr {
+				if k == 0 {
+					newFilePath = v + "_" + frequencyStr
+				} else {
+					newFilePath = newFilePath + "_" + v
+				}
+			}
+		}
+		wg.Done()
+	}()
+	wg.Wait()
+	newFilePath = dir + newFilePath
+}

models/index/index.go

@@ -20,6 +20,7 @@ type BaseFromMysteelChemicalIndex struct {
 	UpdateWeek                     string `gorm:"column:update_week" json:"update_week"`
 	SysUserId                      int    `gorm:"column:sys_user_id" json:"sys_user_id"`
 	SysUserRealName                string `gorm:"column:sys_user_real_name" json:"sys_user_real_name"`
+	FilePath                       string `gorm:"column:file_path" json:"file_path"`
 	base.TimeBase
 }
 
@@ -52,8 +53,8 @@ func (r *BaseFromMysteelChemicalIndex) Update(runMod string, updateCols []string
 }
 
 type IndexAddReq struct {
-	IndexCode  string `json:"IndexCode" binding:"required"`                          //指标编码
-	UpdateWeek string `json:"UpdateWeek"`                                            //更新周期
+	IndexCode  string `json:"IndexCode" binding:"required"`                       //指标编码
+	UpdateWeek string `json:"UpdateWeek"`                                         //更新周期
 	RunMode    string `description:"运行环境:debug:测试(默认),release:生产" json:"RunMode"` //更新周期
 }
 

watch/watch.go

@@ -6,7 +6,10 @@ import (
 	"hongze/mysteel_watch/models/index"
 	"hongze/mysteel_watch/utils"
 	"log"
+	"os"
+	"path/filepath"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/fsnotify/fsnotify"
@@ -50,6 +53,7 @@ func ListenFolderNew() {
 //检测指标文件
 func WatchIndexFile(filePath string) {
 	fmt.Println("filePath:", filePath)
+	//filePath:D:\mysteel_data\CM0000568866_release.xlsx
 	time.Sleep(3 * time.Second)
 	//读取文件内容
 	global.LOG.Info("WatchFile:" + filePath)
@@ -59,11 +63,19 @@ func WatchIndexFile(filePath string) {
 		fmt.Println("OpenFile:" + filePath + ",Err:" + err.Error())
 		return
 	}
+	var newFilePath string
 	defer func() {
 		if err := f.Close(); err != nil {
 			fmt.Println("FileClose Err:" + err.Error())
 			return
 		}
+		//重命名文件
+		if filePath != newFilePath {
+			err := os.Rename(filePath, newFilePath)
+			if err != nil {
+				fmt.Println("os.Rename Err:" + err.Error())
+			}
+		}
 	}()
 	var runMode string
 	if strings.Contains(filePath, "debug") {
@@ -71,6 +83,11 @@ func WatchIndexFile(filePath string) {
 	} else {
 		runMode = "release"
 	}
+
+	dir, fp := filepath.Split(filePath)
+
+	var wg = sync.WaitGroup{}
+	wg.Add(1)
 	go func() {
 		sheetList := f.GetSheetList()
 		for _, sv := range sheetList {
@@ -151,6 +168,32 @@ func WatchIndexFile(filePath string) {
 							if !strings.Contains(frequency, "度") {
 								frequency = frequency + "度"
 							}
+
+							var frequencyStr string
+							if strings.Contains(frequency, "日") {
+								frequencyStr = "day"
+							} else if strings.Contains(frequency, "周") {
+								frequencyStr = "week"
+							} else if strings.Contains(frequency, "月") || strings.Contains(frequency, "旬") {
+								frequencyStr = "month"
+							} else if strings.Contains(frequency, "年") {
+								frequencyStr = "year"
+							}
+
+							if !strings.Contains(filePath, frequencyStr) {
+								fpArr := strings.Split(fp, "_")
+								for k, v := range fpArr {
+									if k == 0 {
+										newFilePath = v + "_" + frequencyStr
+									} else {
+										newFilePath = newFilePath + "_" + v
+									}
+								}
+								newFilePath = dir + newFilePath
+							} else {
+								newFilePath = filePath
+							}
+
 							if isAdd == 1 {
 								indexObj.IndexCode = indexCode
 								indexObj.IndexName = indexName
@@ -160,6 +203,7 @@ func WatchIndexFile(filePath string) {
 								indexObj.StartDate = startDate
 								indexObj.EndDate = endDate
 								indexObj.Frequency = frequency
+								indexObj.FilePath = newFilePath
 								err = indexObj.Add(runMode)
 								if err != nil {
 									fmt.Println("add err:" + err.Error())
@@ -175,6 +219,7 @@ func WatchIndexFile(filePath string) {
 								indexObj.StartDate = startDate
 								indexObj.EndDate = endDate
 								indexObj.Frequency = frequency
+								indexObj.FilePath = newFilePath
 								indexObj.ModifyTime = time.Now()
 								indexId = item.BaseFromMysteelChemicalIndexId
 								//修改数据
@@ -188,6 +233,7 @@ func WatchIndexFile(filePath string) {
 								updateColsArr = append(updateColsArr, "describe")
 								updateColsArr = append(updateColsArr, "end_date")
 								updateColsArr = append(updateColsArr, "modify_time")
+								updateColsArr = append(updateColsArr, "file_path")
 
 								indexObj.Update(runMode, updateColsArr)
 
@@ -241,7 +287,9 @@ func WatchIndexFile(filePath string) {
 				}
 			}
 		}
+		wg.Done()
 	}()
+	wg.Wait()
 }
 
 /*