修改指标生成方式

models/edb_classify.go

@@ -16,3 +16,25 @@ type EdbClassify struct {
 	UniqueCode      string    `description:"唯一编码"`
 	Sort            int       `description:"排序字段，越小越靠前，默认值：10"`
 }
+
+type ClassifyResp struct {
+	Ret     int    `json:"Ret"`
+	Msg     string `json:"Msg"`
+	ErrMsg  string `json:"ErrMsg"`
+	ErrCode string `json:"ErrCode"`
+	Data    struct {
+		ClassifyId      int       `json:"ClassifyId"`
+		ClassifyType    int       `json:"ClassifyType"`
+		ClassifyName    string    `json:"ClassifyName"`
+		ParentId        int       `json:"ParentId"`
+		HasData         int       `json:"HasData"`
+		CreateTime      time.Time `json:"CreateTime"`
+		ModifyTime      time.Time `json:"ModifyTime"`
+		SysUserId       int       `json:"SysUserId"`
+		SysUserRealName string    `json:"SysUserRealName"`
+		Level           int       `json:"Level"`
+		UniqueCode      string    `json:"UniqueCode"`
+		Sort            int       `json:"Sort"`
+	} `json:"Data"`
+	Success bool `json:"Success"`
+}

services/base.go

@@ -3,7 +3,6 @@ package services
 import (
 	"encoding/json"
 	"fmt"
-	"hongze/hz_eta_data/models"
 	"hongze/hz_eta_data/utils"
 	"io/ioutil"
 	"net/http"
@@ -11,21 +10,17 @@ import (
 )
 
 // PostEdbLib 调用指标接口
-func PostEdbLib(param map[string]interface{}, method string) (resp *models.BaseResponse, err error) {
+func PostEdbLib(param map[string]interface{}, method string) (result []byte, err error) {
 	postUrl := utils.EDB_LIB_URL + method
 	postData, err := json.Marshal(param)
 	if err != nil {
 		return
 	}
-	result, err := HttpPost(postUrl, string(postData), "application/json")
+	result, err = HttpPost(postUrl, string(postData), "application/json")
 	if err != nil {
 		return
 	}
-	err = json.Unmarshal(result, &resp)
-	if err != nil {
-		return
-	}
-	return resp, nil
+	return
 }
 
 func HttpPost(url, postData string, params ...string) ([]byte, error) {

services/init_base_index.go

@@ -1,6 +1,7 @@
 package services
 
 import (
+	"encoding/json"
 	"fmt"
 	"github.com/xuri/excelize/v2"
 	"hongze/hz_eta_data/models"
@@ -85,11 +86,19 @@ func InitBaseIndexData() {
 				classifyFirstMap["ParentId"] = 0
 				classifyFirstMap["Level"] = 0
 				classifyFirstMap["ClassifyType"] = 0
-				resp, err := PostEdbLib(classifyFirstMap, method)
+				result, err := PostEdbLib(classifyFirstMap, method)
 				if err != nil {
 					utils.FileLog.Info("初始化分类1失败:" + err.Error())
 					return
 				}
+
+				resp := new(models.ClassifyResp)
+				err = json.Unmarshal(result, &resp)
+				if err != nil {
+					utils.FileLog.Info("初始化分类1失败:" + err.Error())
+					return
+				}
+
 				if resp.Ret != 200 {
 					utils.FileLog.Info("初始化分类1失败:" + resp.Msg + ";" + resp.ErrMsg)
 					return
@@ -97,10 +106,16 @@ func InitBaseIndexData() {
 
 				classifySecondMap := make(map[string]interface{})
 				classifySecondMap["ClassifyName"] = classifySecond
-				classifySecondMap["ParentId"] = 0
-				classifySecondMap["Level"] = 0
+				classifySecondMap["ParentId"] = resp.Data.ClassifyId
+				classifySecondMap["Level"] = 1
 				classifySecondMap["ClassifyType"] = 0
-				resp, err = PostEdbLib(classifySecondMap, method)
+				result, err = PostEdbLib(classifySecondMap, method)
+				if err != nil {
+					utils.FileLog.Info("初始化分类2失败:" + err.Error())
+					return
+				}
+				resp = new(models.ClassifyResp)
+				err = json.Unmarshal(result, &resp)
 				if err != nil {
 					utils.FileLog.Info("初始化分类2失败:" + err.Error())
 					return
@@ -112,23 +127,25 @@ func InitBaseIndexData() {
 
 				classifyThreeMap := make(map[string]interface{})
 				classifyThreeMap["ClassifyName"] = classifyThree
-				classifyThreeMap["ParentId"] = 0
-				classifyThreeMap["Level"] = 0
+				classifyThreeMap["ParentId"] = resp.Data.ClassifyId
+				classifyThreeMap["Level"] = 2
 				classifyThreeMap["ClassifyType"] = 0
-				resp, err = PostEdbLib(classifyThreeMap, method)
+				result, err = PostEdbLib(classifyThreeMap, method)
 				if err != nil {
 					utils.FileLog.Info("初始化分类3失败:" + err.Error())
 					return
 				}
+				resp = new(models.ClassifyResp)
+				err = json.Unmarshal(result, &resp)
+				if err != nil {
+					utils.FileLog.Info("初始化分类2失败:" + err.Error())
+					return
+				}
+
 				if resp.Ret != 200 {
 					utils.FileLog.Info("初始化分类3失败:" + resp.Msg + ";" + resp.ErrMsg)
 					return
 				}
-				classify := resp.Data.(*models.EdbClassify)
-				var classifyId int
-				if classify != nil {
-					classifyId = classify.ClassifyId
-				}
 				method = "edb_info/add"
 				indexMap := make(map[string]interface{})
 				indexMap["Source"] = IndexSourceMap[source]
@@ -136,17 +153,24 @@ func InitBaseIndexData() {
 				indexMap["EdbName"] = indexName
 				indexMap["Frequency"] = frequency
 				indexMap["Unit"] = unit
-				indexMap["ClassifyId"] = classifyId
-				resp, err = PostEdbLib(indexMap, method)
+				indexMap["ClassifyId"] = resp.Data.ClassifyId
+				result, err = PostEdbLib(indexMap, method)
 				if err != nil {
 					utils.FileLog.Info("初始化指标失败:" + err.Error())
 					return
 				}
-				if resp.Ret != 200 {
-					utils.FileLog.Info("初始化指标失败:" + resp.Msg + ";" + resp.ErrMsg)
+
+				indexResp := new(models.BaseResponse)
+				err = json.Unmarshal(result, &indexResp)
+				if err != nil {
+					utils.FileLog.Info("初始化分类2失败:" + err.Error())
 					return
 				}
 
+				if indexResp.Ret != 200 {
+					utils.FileLog.Info("初始化指标失败:" + indexResp.Msg + ";" + indexResp.ErrMsg)
+					return
+				}
 				fmt.Println("add index success:" + indexCode)
 			} else {
 				fmt.Println("data is empty")