Ver código fonte

增加涌益生猪配置项

xyxie 1 ano atrás
pai
commit
e3d4f31d9d
3 arquivos alterados com 15 adições e 10 exclusões
  1. 1 1
      services/base_from_yongyi/week.go
  2. 10 7
      services/task.go
  3. 4 2
      utils/config.go

+ 1 - 1
services/base_from_yongyi/week.go

@@ -747,7 +747,7 @@ func HandleYongyiExcelWeekly6(sheet *xlsx.Sheet) (indexList []*models.YongyiExce
 				text := cell.String()
 				if k == 0 {
 					tmpRow := row
-					r := &ExcelDateRecord{}
+					r := &ExcelDateRecordFirst{}
 					if e := tmpRow.ReadStruct(r); e != nil {
 						utils.FileLog.Info(fmt.Sprintf("sheet:%s 第%d行, 第%d列 读取行,时间列失败 Err:%s", sheet.Name, i, k, e))
 						continue

+ 10 - 7
services/task.go

@@ -1,20 +1,23 @@
 package services
 
 import (
+	"eta/eta_data_analysis/utils"
 	"fmt"
 	"github.com/beego/beego/v2/task"
 )
 
 func Task() {
 	fmt.Println("task start")
-	handleYongyiExcelDaily := task.NewTask("handleYongyiExcelDaily", "0 30 13,23 * * *", HandleYongyiExcelDaily)
-	task.AddTask("涌益咨询日度指标处理", handleYongyiExcelDaily)
+	if utils.YongyiOpen == "1" {
+		handleYongyiExcelDaily := task.NewTask("handleYongyiExcelDaily", "0 30 13,23 * * *", HandleYongyiExcelDaily)
+		task.AddTask("涌益咨询日度指标处理", handleYongyiExcelDaily)
 
-	handleYongyiExcelWeekly := task.NewTask("handleYongyiExcelWeekly", "0 0 17,23 * * *", HandleYongyiExcelWeekly)
-	task.AddTask("涌益咨询周度指标处理", handleYongyiExcelWeekly)
+		handleYongyiExcelWeekly := task.NewTask("handleYongyiExcelWeekly", "0 0 17,23 * * *", HandleYongyiExcelWeekly)
+		task.AddTask("涌益咨询周度指标处理", handleYongyiExcelWeekly)
+		//HandleYongyiExcelDaily("/Users/xiexiaoyuan/Downloads/2023年11月21日涌益咨询日度数据 (1).xlsx")
+		//HandleYongyiExcelWeekly()
+		task.StartTask()
+	}
 
-	task.StartTask()
-	//HandleYongyiExcelDaily("/Users/xiexiaoyuan/Downloads/2023年11月21日涌益咨询日度数据 (1).xlsx")
-	//HandleYongyiExcelWeekly("/Users/xiexiaoyuan/Downloads/涌益生猪项目数据库/2023.11.10-2023.11.16涌益咨询 周度数据.xlsx")
 	fmt.Println("task end")
 }

+ 4 - 2
utils/config.go

@@ -36,9 +36,10 @@ var (
 	LogMaxDays int //日志最大保留天数
 )
 
-// 涌益生猪excel文件地址
+// 涌益生猪
 var (
-	YongyiFilePath string
+	YongyiFilePath string //excel文件地址
+	YongyiOpen     string //是否配置涌益生猪数据源,1已配置
 )
 
 func init() {
@@ -81,6 +82,7 @@ func init() {
 	//涌益咨询文件夹配置
 	{
 		YongyiFilePath = config["yongyi_file_path"]
+		YongyiOpen = config["yongyi_open"]
 	}
 }