修改数据初始化方式

controllers/data_init.go

@@ -0,0 +1,88 @@
+package controllers
+
+import (
+	"eta/eta_data_init/models"
+	"eta/eta_data_init/services"
+	"fmt"
+	beego "github.com/beego/beego/v2/server/web"
+)
+
+// Operations about Users
+type DataInitController struct {
+	beego.Controller
+}
+
+// @Title 初始化基础指标数据-不包含钢联化工的基础指标初始化
+// @Description 初始化基础指标数据-不包含钢联化工的基础指标初始化
+// @Param   FileName    query   string true       "文件名称"
+// @Success Ret=200
+// @router /base [get]
+func (this *DataInitController) Base() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	fileName := this.GetString("FileName")
+	if fileName == "" {
+		br.Msg = "文件名称不能为空"
+		return
+	}
+
+	filePath := "/docs/" + fileName
+	fmt.Println("filePath:" + filePath)
+	services.InitBaseIndexData(filePath)
+	br.Ret = 200
+	br.Msg = "保存成功"
+}
+
+// @Title 初始化联化工指标
+// @Description 初始化联化工指标
+// @Param   FileName    query   string true       "文件名称"
+// @Success Ret=200
+// @router /mysteel_chemical [get]
+func (this *DataInitController) MySteelChemical() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	fileName := this.GetString("FileName")
+	if fileName == "" {
+		br.Msg = "文件名称不能为空"
+		return
+	}
+
+	filePath := "/docs/" + fileName
+	fmt.Println("filePath:" + filePath)
+	services.InitMysteelChemicalIndex(filePath)
+	br.Ret = 200
+	br.Msg = "保存成功"
+}
+
+// @Title 初始化钢联化工数据-由数据源批量初始化到指标库
+// @Description 初始化钢联化工数据-由数据源批量初始化到指标库
+// @Param   FileName    query   string true       "文件名称"
+// @Success Ret=200
+// @router /mysteel_chemical/base [get]
+func (this *DataInitController) MySteelChemicalBase() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	fileName := this.GetString("FileName")
+	if fileName == "" {
+		br.Msg = "文件名称不能为空"
+		return
+	}
+
+	filePath := "/docs/" + fileName
+	fmt.Println("filePath:" + filePath)
+	services.InitBaseIndexDataFromMysteel(filePath)
+	br.Ret = 200
+	br.Msg = "保存成功"
+}

controllers/home.go

@@ -1,10 +0,0 @@
-package controllers
-
-import (
-	beego "github.com/beego/beego/v2/server/web"
-)
-
-// Operations about Users
-type HomeController struct {
-	beego.Controller
-}

routers/router.go

@@ -15,9 +15,9 @@ import (
 
 func init() {
 	ns := beego.NewNamespace("/v1",
-		beego.NSNamespace("/home",
+		beego.NSNamespace("/data_init",
 			beego.NSInclude(
-				&controllers.HomeController{},
+				&controllers.DataInitController{},
 			),
 		),
 	)

services/init_base_index.go

@@ -12,7 +12,7 @@ import (
 )
 
 // InitBaseIndexData 初始化基础指标数据
-func InitBaseIndexData() {
+func InitBaseIndexData(dataPath string) {
 	var err error
 
 	defer func() {
@@ -29,7 +29,7 @@ func InitBaseIndexData() {
 
 	dir := filepath.Dir(path)
 	fmt.Println("dir:" + dir)
-	dataPath := dir + "/docs/逸诺Wind数据录入.xlsx"
+	//dataPath := dir + "/docs/东吴ETA同花顺指标20230925.xlsx"
 	fmt.Println("dataPath:" + dataPath)
 	f, err := excelize.OpenFile(dataPath)
 	if err != nil {
@@ -188,10 +188,14 @@ func InitBaseIndexData() {
 				//刷新指标
 				{
 					switch source {
-					case "wind":
+					case "wind", "万得":
 						method = "wind/refresh"
 					case "ths", "同花顺":
 						method = "ths/refresh"
+					case "彭博":
+						method = "pb/refresh"
+					case "":
+
 					}
 					if method != `` {
 						refreshMap := make(map[string]interface{})
@@ -210,7 +214,7 @@ func InitBaseIndexData() {
 }
 
 // 初始化基础指标数据-钢联
-func InitBaseIndexDataFromMysteel() {
+func InitBaseIndexDataFromMysteel(filePath string) {
 	var err error
 
 	defer func() {
@@ -228,7 +232,7 @@ func InitBaseIndexDataFromMysteel() {
 
 	dir := filepath.Dir(path)
 	fmt.Println("dir:" + dir)
-	dataPath := dir + "/docs/逸诺新增钢联数据列表.xlsx"
+	dataPath := dir + filePath
 	fmt.Println("dataPath:" + dataPath)
 	f, err := excelize.OpenFile(dataPath)
 	if err != nil {

services/init_mysteel_index.go

@@ -11,8 +11,8 @@ import (
 	"strings"
 )
 
-// InitMysteelIndex 初始化钢联指标
-func InitMysteelIndex() {
+// InitMysteelIndex 初始化钢联化工指标数据
+func InitMysteelChemicalIndex(filePath string) {
 	var err error
 
 	defer func() {
@@ -29,7 +29,7 @@ func InitMysteelIndex() {
 
 	dir := filepath.Dir(path)
 	fmt.Println("dir:" + dir)
-	dataPath := dir + "/docs/逸诺新增钢联数据列表.xlsx"
+	dataPath := dir + filePath
 	fmt.Println("dataPath:" + dataPath)
 	f, err := excelize.OpenFile(dataPath)
 	if err != nil {

services/task.go

@@ -3,7 +3,6 @@ package services
 import (
 	"eta/eta_data_init/utils"
 	"fmt"
-	"time"
 )
 
 var IndexSourceMap map[string]int
@@ -23,14 +22,7 @@ func Task() {
 	IndexSourceMap["同花顺"] = utils.DATA_SOURCE_THS
 	IndexSourceMap["wind"] = utils.DATA_SOURCE_WIND
 	IndexSourceMap["钢联"] = utils.DATA_SOURCE_MYSTEEL_CHEMICAL
-
-	time.Sleep(3 * time.Second)
-
-	fmt.Println("start InitCalculateIndex")
-	//InitBaseIndexDataFromMysteel()
-	InitMysteelIndex()
-	//InitBaseIndexData()
-	fmt.Println("end InitCalculateIndex")
+	IndexSourceMap["彭博"] = utils.DATA_SOURCE_PB
 
 	fmt.Println("task end")
 }