pcsg: run3

controllers/data_init.go

@@ -216,11 +216,40 @@ func (this *DataInitController) InitPCSGBloomberg() {
 		br.Msg = "文件名称不能为空"
 		return
 	}
-	isVCode := this.GetString("VCode", "")
 
 	filePath := "/docs/" + fileName
 	fmt.Println("filePath:" + filePath)
-	services.InitPCSGBloombergData(filePath, isVCode)
+	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
+	}
+
+	filePath := "/docs/" + fileName
+	fmt.Println("filePath:" + filePath)
+	services.InitPCSGBloombergData(filePath, true)
 
 	br.Ret = 200
 	br.Msg = "初始化成功"

routers/commentsRouter.go

@@ -97,6 +97,15 @@ 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, vCode string) {
+func InitPCSGBloombergData(dataPath string, vCode bool) {
 	var err error
 	defer func() {
 		if err != nil {
@@ -126,10 +126,6 @@ func InitPCSGBloombergData(dataPath, vCode string) {
 
 	// 请求接口导入数据
 	method := "bloomberg/pcsg/import_history_data"
-	var isVCode bool
-	if vCode == "true" {
-		isVCode = true
-	}
 	for _, v := range indexMap {
 		if v.IndexCode == "" {
 			continue
@@ -137,7 +133,7 @@ func InitPCSGBloombergData(dataPath, vCode string) {
 		requestMap := make(map[string]interface{})
 		requestMap["IndexCode"] = v.IndexCode
 		requestMap["DataMap"] = v.DataMap
-		requestMap["IsVCode"] = isVCode
+		requestMap["IsVCode"] = vCode
 		indexRes, e := PostEdbLib(requestMap, method)
 		if e != nil {
 			fmt.Printf("post edb lib err: %s; result: %s", e.Error(), string(indexRes))