Browse Source

fix:去除埋点信息,调整结构

zqbao 8 months ago
parent
commit
433fda8a27
2 changed files with 27 additions and 29 deletions
  1. 0 7
      controllers/chart_common.go
  2. 27 22
      services/dw_mini/dw_mini.go

+ 0 - 7
controllers/chart_common.go

@@ -10,7 +10,6 @@ import (
 	"eta/eta_chart_lib/models/data_manage/future_good/response"
 	line_equationReq "eta/eta_chart_lib/models/data_manage/line_equation/request"
 	line_featureReq "eta/eta_chart_lib/models/data_manage/line_feature/request"
-	"eta/eta_chart_lib/services/alarm_msg"
 	"eta/eta_chart_lib/services/data"
 	correlationServ "eta/eta_chart_lib/services/data/correlation"
 	"eta/eta_chart_lib/services/data/cross_variety"
@@ -38,10 +37,6 @@ import (
 func (this *ChartController) CommonChartInfoDetailFromUniqueCode() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
-		if br.Ret != 200 {
-			b, _ := json.Marshal(br)
-			alarm_msg.SendAlarmMsg(string(b), 1)
-		}
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
@@ -70,10 +65,8 @@ func (this *ChartController) CommonChartInfoDetailFromUniqueCode() {
 		if err != nil {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取收藏状态失败,Err:" + err.Error()
-			alarm_msg.SendAlarmMsg(fmt.Sprintf("收藏状态失败,Err:%s", err.Error()), 1)
 			return
 		}
-		alarm_msg.SendAlarmMsg(fmt.Sprintf("收藏状态:%t", tmpIsCollect), 1)
 		isCollect = tmpIsCollect
 	}
 	//判断是否有缓存

+ 27 - 22
services/dw_mini/dw_mini.go

@@ -7,27 +7,41 @@ import (
 	"eta/eta_chart_lib/utils"
 )
 
+type MyChartIsCollect struct {
+	IsCollect bool
+}
+
+type BaseResponse struct {
+	Ret     int
+	Msg     string
+	ErrMsg  string
+	ErrCode string
+	Data    MyChartIsCollect
+}
+
+type MyChartIsCollectReq struct {
+	UniqueCode string
+}
+
+type MyChartCollectReq struct {
+	UniqueCode  string
+	ChartName   string
+	ChartImage  string
+	ChartInfoId int
+}
+
+type MyChartCollectCancelReq struct {
+	UniqueCode string
+}
+
 func GetMyChartIsCollect(token string, uniqueCode string) (isCollect bool, err error) {
 	url := utils.ETA_MINI_URL + "mychart/isCollect"
-	type MyChartIsCollectReq struct {
-		UniqueCode string
-	}
 	req := MyChartIsCollectReq{UniqueCode: uniqueCode}
 	reqBody, _ := json.Marshal(req)
 	result, err := HttpPost(url, string(reqBody), token)
 	if err != nil {
 		return
 	}
-	type MyChartIsCollect struct {
-		IsCollect bool
-	}
-	type BaseResponse struct {
-		Ret     int
-		Msg     string
-		ErrMsg  string
-		ErrCode string
-		Data    MyChartIsCollect
-	}
 	var resp BaseResponse
 	if err = json.Unmarshal(result, &resp); err != nil {
 		return
@@ -42,12 +56,6 @@ func GetMyChartIsCollect(token string, uniqueCode string) (isCollect bool, err e
 
 func MyChartCollect(token, uniqueCode, chartName, chartImage string, chartInfoId int) (resp *models.BaseResponse, err error) {
 	url := utils.ETA_MINI_URL + "mychart/collect"
-	type MyChartCollectReq struct {
-		UniqueCode  string
-		ChartName   string
-		ChartImage  string
-		ChartInfoId int
-	}
 	req := MyChartCollectReq{
 		UniqueCode:  uniqueCode,
 		ChartName:   chartName,
@@ -70,9 +78,6 @@ func MyChartCollect(token, uniqueCode, chartName, chartImage string, chartInfoId
 
 func MyChartCollectCancel(token string, uniqueCode string) (resp *models.BaseResponse, err error) {
 	url := utils.ETA_MINI_URL + "mychart/collectCancel"
-	type MyChartCollectCancelReq struct {
-		UniqueCode string
-	}
 	req := MyChartCollectCancelReq{UniqueCode: uniqueCode}
 	reqBody, _ := json.Marshal(req)
 	result, err := HttpPost(url, string(reqBody), token)