pcsg初始化

controllers/data_init.go

@@ -216,45 +216,16 @@ func (this *DataInitController) InitPCSGBloomberg() {
 		br.Msg = "文件名称不能为空"
 		return
 	}
-
-	filePath := "/docs/" + fileName
-	fmt.Println("filePath:" + filePath)
-	services.InitPCSGBloombergData(filePath, false, "")
-
-	br.Ret = 200
-	br.Msg = "初始化成功"
-}
-
-// InitPCSGBloombergRun3
-// @Title 批量导入中石油新加坡Bloomberg指标
-// @Description 批量导入中石油新加坡Bloomberg指标
-// @Param   FileName  query  string  true  "文件名称"
-// @Success Ret=200
-// @router /pcsg/bloomberg/run3 [get]
-func (this *DataInitController) InitPCSGBloombergRun3() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	fileName := this.GetString("FileName")
-	if fileName == "" {
-		br.Msg = "文件名称不能为空"
-		return
-	}
-	extraLetter := this.GetString("ExtraLetter")
-	if extraLetter == "" {
-		br.Msg = "额外字母不能为空"
+	taskKey := this.GetString("TaskKey")
+	if taskKey == "" {
+		br.Msg = "TaskKey不可为空"
 		return
 	}
+	fmt.Println("TaskKey: ", taskKey)
 
 	filePath := "/docs/" + fileName
 	fmt.Println("filePath:" + filePath)
-	services.InitPCSGBloombergData(filePath, true, extraLetter)
+	services.InitPCSGBloombergData(filePath, taskKey)
 
 	br.Ret = 200
 	br.Msg = "初始化成功"

routers/commentsRouter.go

@@ -106,15 +106,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_data_init/controllers:DataInitController"] = append(beego.GlobalControllerRouter["eta/eta_data_init/controllers:DataInitController"],
-        beego.ControllerComments{
-            Method: "InitPCSGBloombergRun3",
-            Router: `/pcsg/bloomberg/run3`,
-            AllowHTTPMethods: []string{"get"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["eta/eta_data_init/controllers:DataInitController"] = append(beego.GlobalControllerRouter["eta/eta_data_init/controllers:DataInitController"],
         beego.ControllerComments{
             Method: "SmmToIndexLib",

services/init_pcsg_bloomberg.go

@@ -14,7 +14,7 @@ import (
 )
 
 // InitPCSGBloombergData 初始化中石油新加坡Bloomberg指标
-func InitPCSGBloombergData(dataPath string, vCode bool, extraLetter string) {
+func InitPCSGBloombergData(dataPath string, taskKey string) {
 	var err error
 	defer func() {
 		if err != nil {
@@ -32,7 +32,7 @@ func InitPCSGBloombergData(dataPath string, vCode bool, extraLetter string) {
 
 	dir := filepath.Dir(path)
 	dataPath = dir + dataPath
-	//dataPath = "docs/dailyHistory-uSQMbp3jkAEy-20240717.xlsx"
+	//dataPath = "docs/dailyHistory-IDpcsgDailyRun7-20240904.xlsx"
 	f, e := excelize.OpenFile(dataPath)
 	if e != nil {
 		err = fmt.Errorf("open file err: %s", e.Error())
@@ -133,8 +133,7 @@ func InitPCSGBloombergData(dataPath string, vCode bool, extraLetter string) {
 		requestMap := make(map[string]interface{})
 		requestMap["IndexCode"] = v.IndexCode
 		requestMap["DataMap"] = v.DataMap
-		requestMap["IsVCode"] = vCode
-		requestMap["ExtraLetter"] = extraLetter
+		requestMap["TaskKey"] = taskKey
 		indexRes, e := PostEdbLib(requestMap, method)
 		if e != nil {
 			fmt.Printf("post edb lib err: %s; result: %s", e.Error(), string(indexRes))