hsun 6 miesięcy temu
rodzic
commit
48e2e45094

+ 2 - 2
controllers/base_from_bloomberg.go

@@ -184,7 +184,7 @@ func (this *BloombergController) PCSGImportHistoryData() {
 	indexes = append(indexes, index)
 
 	// 写入数据
-	if e := services.PCSGWrite2BaseBloomberg(indexes, req.IsVCode, req.ExtraLetter, ""); e != nil {
+	if e := services.PCSGWrite2BaseBloomberg(indexes, req.IsVCode, req.ExtraLetter, "", ""); e != nil {
 		br.Msg = "刷新失败"
 		br.ErrMsg = "PCSG-写入Bloomberg数据源失败, Err: " + e.Error()
 		return
@@ -270,7 +270,7 @@ func (this *BloombergController) PCSGRefreshTask() {
 		}
 
 		// 写入数据
-		if e = services.PCSGWrite2BaseBloomberg(newIndexes, v.VCode, v.ExtraLetter, v.IndexNamePrefix); e != nil {
+		if e = services.PCSGWrite2BaseBloomberg(newIndexes, v.VCode, v.ExtraLetter, v.IndexNamePrefix, v.IndexCodeSuffix); e != nil {
 			br.Msg = "刷新失败"
 			br.ErrMsg = "PCSG-写入Bloomberg数据源失败, Err: " + e.Error()
 			return

+ 7 - 2
services/base_from_pcsg.go

@@ -27,7 +27,8 @@ type PCSGBloombergTask struct {
 	Frequency       string `json:"Frequency"`
 	VCode           bool   `json:"VCode"`
 	ExtraLetter     string `json:"ExtraLetter"`
-	IndexNamePrefix string `json:"IndexNamePrefix"`
+	IndexNamePrefix string `json:"IndexNamePrefix" description:"指标名称前缀"`
+	IndexCodeSuffix string `json:"IndexCodeSuffix" description:"指标编码后缀"`
 }
 
 // LoadPCSGBloombergTask 加载配置
@@ -112,7 +113,7 @@ func GetPCSGBloombergGeneralIndexFromBridge(params PCSGBloombergApiReq) (indexes
 }
 
 // PCSGWrite2BaseBloomberg 写入彭博数据源
-func PCSGWrite2BaseBloomberg(indexes []models.BaseFromBloombergApiIndexAndData, isVCode bool, extraLetter, namePrefix string) (err error) {
+func PCSGWrite2BaseBloomberg(indexes []models.BaseFromBloombergApiIndexAndData, isVCode bool, extraLetter, namePrefix, codeSuffix string) (err error) {
 	defer func() {
 		if err != nil {
 			tips := fmt.Sprintf("PCSGWrite2BaseBloomberg-写入彭博数据源失败, err: %s", err.Error())
@@ -137,6 +138,10 @@ func PCSGWrite2BaseBloomberg(indexes []models.BaseFromBloombergApiIndexAndData,
 		if isVCode {
 			v.IndexCode = utils.InsertStr2StrIdx(v.IndexCode, " ", 1, extraLetter)
 		}
+		// 指标编码后缀
+		if codeSuffix != "" {
+			v.IndexCode = fmt.Sprintf("%s %s", v.IndexCode, codeSuffix)
+		}
 
 		// 指标是否存在
 		index, e := models.GetBaseFromBloombergIndexByCode(v.IndexCode)

+ 42 - 9
static/pcsg_task.json

@@ -4,62 +4,95 @@
     "Frequency": "日度",
     "VCode": false,
     "ExtraLetter": "",
-    "IndexNamePrefix": ""
+    "IndexNamePrefix": "",
+    "IndexCodeSuffix": ""
   },
   {
     "TaskKey": "IDpcsgDailyRunHist4",
     "Frequency": "日度",
     "VCode": false,
     "ExtraLetter": "",
-    "IndexNamePrefix": ""
+    "IndexNamePrefix": "",
+    "IndexCodeSuffix": ""
   },
   {
     "TaskKey": "IDpcsgDailyRunHist1",
     "Frequency": "日度",
     "VCode": false,
     "ExtraLetter": "",
-    "IndexNamePrefix": ""
+    "IndexNamePrefix": "",
+    "IndexCodeSuffix": ""
   },
   {
     "TaskKey": "IDpcsgDailyRunHist2",
     "Frequency": "日度",
     "VCode": false,
     "ExtraLetter": "",
-    "IndexNamePrefix": ""
+    "IndexNamePrefix": "",
+    "IndexCodeSuffix": ""
   },
   {
     "TaskKey": "IDpcsgDailyRunHistV1",
     "Frequency": "日度",
     "VCode": false,
     "ExtraLetter": "",
-    "IndexNamePrefix": ""
+    "IndexNamePrefix": "",
+    "IndexCodeSuffix": ""
   },
   {
     "TaskKey": "IDpcsgDailyRun4",
     "Frequency": "日度",
     "VCode": false,
     "ExtraLetter": "",
-    "IndexNamePrefix": ""
+    "IndexNamePrefix": "",
+    "IndexCodeSuffix": ""
   },
   {
     "TaskKey": "IDpcsgDailyRun6",
     "Frequency": "日度",
     "VCode": false,
     "ExtraLetter": "",
-    "IndexNamePrefix": ""
+    "IndexNamePrefix": "",
+    "IndexCodeSuffix": ""
   },
   {
     "TaskKey": "IDpcsgDailyRun7",
     "Frequency": "日度",
     "VCode": true,
     "ExtraLetter": "O",
-    "IndexNamePrefix": "Open Interest -"
+    "IndexNamePrefix": "Open Interest -",
+    "IndexCodeSuffix": ""
+  },
+  {
+    "TaskKey": "IDpcsgDailyRun8",
+    "Frequency": "日度",
+    "VCode": false,
+    "ExtraLetter": "",
+    "IndexNamePrefix": "",
+    "IndexCodeSuffix": ""
+  },
+  {
+    "TaskKey": "IDpcsgDailySnap0000",
+    "Frequency": "日度",
+    "VCode": false,
+    "ExtraLetter": "",
+    "IndexNamePrefix": "",
+    "IndexCodeSuffix": "0000"
+  },
+  {
+    "TaskKey": "IDpcsgDailySnap0330",
+    "Frequency": "日度",
+    "VCode": false,
+    "ExtraLetter": "",
+    "IndexNamePrefix": "",
+    "IndexCodeSuffix": "0330"
   },
   {
     "TaskKey": "IDpcsgMonthRun2",
     "Frequency": "月度",
     "VCode": false,
     "ExtraLetter": "",
-    "IndexNamePrefix": ""
+    "IndexNamePrefix": "",
+    "IndexCodeSuffix": ""
   }
 ]