Browse Source

Merge branch 'bzq1/mysteel_chemical_custom_cfm2' of eta_server/eta_api into master

鲍自强 7 months ago
parent
commit
b7b310fbc9
2 changed files with 33 additions and 0 deletions
  1. 10 0
      controllers/data_manage/mysteel_chemical_data.go
  2. 23 0
      services/data/mysteel_chemical.go

+ 10 - 0
controllers/data_manage/mysteel_chemical_data.go

@@ -874,6 +874,16 @@ func (this *EdbClassifyController) AddMysteelChemical() {
 			br.Msg = "添加指标失败,指标数量不能超过150条"
 			return
 		}
+		ok, errMsg, err := data.HealthCheckMysteelChemicalApi()
+		if err != nil {
+			br.Msg = "添加指标失败"
+			br.ErrMsg = "钢联化工数据接口异常,Err:" + err.Error()
+			return
+		}
+		if !ok {
+			br.Msg = errMsg
+			return
+		}
 		addMySteelList := make([]*data_manage.BaseFromMysteelChemicalIndex, 0)
 		for _, v := range req.List {
 			if v.IndexCode == "" {

+ 23 - 0
services/data/mysteel_chemical.go

@@ -847,3 +847,26 @@ func RefreshMysteelChemicalData(edbCode string) {
 		errMsg = resp.ErrMsg
 	}
 }
+
+// RefreshMysteelChemicalData 根据手工指标code刷新手工指标数据
+func HealthCheckMysteelChemicalApi() (isEnable bool, ErrMsg string, err error) {
+	url := utils.EDB_LIB_URL + "mysteel_chemical/handle/mysteel/api/check"
+
+	body, err := HttpPost(url, "", utils.ZhLangVersion)
+	if err != nil {
+		return
+	}
+	var resp models.BaseResponse
+	if err = json.Unmarshal(body, &resp); err != nil {
+		return
+	}
+	apiCheck, ok := resp.Data.(map[string]interface{})
+	if ok {
+		isEnable = apiCheck["IsEnable"].(bool)
+		ErrMsg = apiCheck["ErrMsg"].(string)
+	} else {
+		err = errors.New("钢联api接口不可用")
+	}
+
+	return
+}