hsun 9 달 전
부모
커밋
9e1e3bb739
2개의 변경된 파일10개의 추가작업 그리고 4개의 파일을 삭제
  1. 7 2
      controllers/data_init.go
  2. 3 2
      services/init_pcsg_bloomberg.go

+ 7 - 2
controllers/data_init.go

@@ -219,7 +219,7 @@ func (this *DataInitController) InitPCSGBloomberg() {
 
 	filePath := "/docs/" + fileName
 	fmt.Println("filePath:" + filePath)
-	services.InitPCSGBloombergData(filePath, false)
+	services.InitPCSGBloombergData(filePath, false, "")
 
 	br.Ret = 200
 	br.Msg = "初始化成功"
@@ -246,10 +246,15 @@ func (this *DataInitController) InitPCSGBloombergRun3() {
 		br.Msg = "文件名称不能为空"
 		return
 	}
+	extraLetter := this.GetString("ExtraLetter")
+	if extraLetter == "" {
+		br.Msg = "额外字母不能为空"
+		return
+	}
 
 	filePath := "/docs/" + fileName
 	fmt.Println("filePath:" + filePath)
-	services.InitPCSGBloombergData(filePath, true)
+	services.InitPCSGBloombergData(filePath, true, extraLetter)
 
 	br.Ret = 200
 	br.Msg = "初始化成功"

+ 3 - 2
services/init_pcsg_bloomberg.go

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