Merge branch 'feature/eta1.7.7_eta_forum' into debug

controllers/data_manage/chart_theme.go

@@ -8,6 +8,7 @@ import (
 	"eta/eta_api/models/data_manage/chart_theme"
 	"eta/eta_api/models/data_manage/chart_theme/request"
 	"eta/eta_api/services/data"
+	"eta/eta_api/services/eta_forum"
 	"eta/eta_api/utils"
 	"time"
 )
@@ -325,7 +326,7 @@ func (c *ChartThemeController) Add() {
 		br.ErrMsg = "添加失败，Err:" + err.Error()
 		return
 	}
-
+	go eta_forum.ChartThemeSave(chartTheme)
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "添加成功"
@@ -395,7 +396,7 @@ func (c *ChartThemeController) Edit() {
 		br.ErrMsg = "修改失败，Err:" + err.Error()
 		return
 	}
-
+	go eta_forum.ChartThemeSave(chartTheme)
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "修改成功"

services/eta_forum/eta_forum_hub.go

@@ -234,6 +234,7 @@ func GetEdbListByEdbInfoId(edbInfoIds []int) (edbInfoList []*data_manage.EdbInfo
 	for _, edbInfoId := range edbInfoIds {
 		edbMappingList, err = traceEdbInfoByEdbInfoId(edbInfoId, hasFindMap, edbInfoIdMap, edbMappingList, edbMappingMap)
 		if err != nil {
+			err = fmt.Errorf(" traceEdbInfoByEdbInfoId err: %s", err.Error())
 			return
 		}
 	}
@@ -245,7 +246,7 @@ func GetEdbListByEdbInfoId(edbInfoIds []int) (edbInfoList []*data_manage.EdbInfo
 	}
 	edbInfoList, err = data_manage.GetEdbInfoByIdList(edbInfoIdList)
 	if err != nil {
-		err = fmt.Errorf("traceEdbInfoByEdbInfoId GetEdbInfoByIdList err: %s", err.Error())
+		err = fmt.Errorf(" GetEdbInfoByIdList err: %s", err.Error())
 		return
 	}
 
@@ -452,3 +453,33 @@ func AdminDelete(adminName string) (err error) {
 	}
 	return
 }
+
+type ChartThemeReq struct {
+	*chart_theme.ChartTheme
+	BusinessCode string `description:"商家编码"`
+}
+
+// 上传主题信息
+func ChartThemeSave(theme *chart_theme.ChartTheme) (err error) {
+	if utils.BusinessCode == "" || (utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeDebug && utils.BusinessCode != utils.BusinessCodeSandbox) {
+		return
+	}
+	var req ChartThemeReq
+	req.ChartTheme = theme
+	req.BusinessCode = utils.BusinessCode
+	reqJson, err := json.Marshal(req)
+	if err != nil {
+		err = fmt.Errorf("参数解析异常,Err:" + err.Error())
+		return
+	}
+	respItem, err := ChartThemeSaveLib(string(reqJson))
+	if err != nil {
+		err = fmt.Errorf("上传图表主题信息失败,Err:" + err.Error())
+		return
+	}
+	if respItem.Ret != 200 {
+		err = fmt.Errorf("上传图表主题信息失败,Err:%v,errMsg:%v", respItem.Msg, respItem.ErrMsg)
+		return
+	}
+	return
+}

services/eta_forum/eta_forum_hub_lib.go

@@ -60,6 +60,16 @@ func AdminDeleteLib(req string) (resp *models.BaseResponse, err error) {
 	return
 }
 
+// ChartThemeSaveLib 上传图表主题信息
+func ChartThemeSaveLib(req string) (resp *models.BaseResponse, err error) {
+	_, resultByte, err := post(req, "/v1/chart/theme/save")
+	err = json.Unmarshal(resultByte, &resp)
+	if err != nil {
+		return
+	}
+	return
+}
+
 // post
 func post(paramStr string, urlStr string) (resp *models.BaseResponse, result []byte, err error) {
 	if utils.ETA_FORUM_HUB_URL == "" {