Browse Source

图表水印、来源

hsun 1 year ago
parent
commit
0fe5f9a31f
5 changed files with 70 additions and 11 deletions
  1. 12 0
      controllers/chart_common.go
  2. 46 0
      models/business_conf.go
  3. 1 0
      models/chart.go
  4. 11 2
      services/data/edb_info.go
  5. 0 9
      utils/config.go

+ 12 - 0
controllers/chart_common.go

@@ -98,6 +98,18 @@ func (this *ChartController) CommonChartInfoDetailFromUniqueCode() {
 		br.ErrMsg = errMsg
 		return
 	}
+
+	// 图表水印
+	conf, e := models.GetBusinessConf()
+	if e != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取配置信息失败, Err: " + e.Error()
+		return
+	}
+	if conf[models.BusinessConfWatermarkChart] == "true" && conf[models.BusinessConfCompanyWatermark] != "" {
+		resp.WaterMark = conf[models.BusinessConfCompanyWatermark]
+	}
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

+ 46 - 0
models/business_conf.go

@@ -0,0 +1,46 @@
+package models
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"html"
+	"time"
+)
+
+const (
+	BusinessConfCompanyName      = "CompanyName"
+	BusinessConfCompanyWatermark = "CompanyWatermark"
+	BusinessConfWatermarkChart   = "WatermarkChart"
+)
+
+// BusinessConf 商户配置表
+type BusinessConf struct {
+	Id         int    `orm:"column(id);pk"`
+	ConfKey    string `description:"配置Key"`
+	ConfVal    string `description:"配置值"`
+	ValType    int    `description:"1-字符串;2-数值;3-字符串数组;4-富文本;"`
+	Necessary  int    `description:"是否必填:0-否;1-是"`
+	Remark     string `description:"备注"`
+	CreateTime time.Time
+}
+
+// GetBusinessConf 获取商家配置
+func GetBusinessConf() (list map[string]string, err error) {
+	list = make(map[string]string)
+
+	var items []*BusinessConf
+	o := orm.NewOrm()
+	sql := `SELECT * FROM business_conf`
+	_, err = o.Raw(sql).QueryRows(&items)
+	if err != nil {
+		return
+	}
+
+	for _, v := range items {
+		if v.ValType == 4 {
+			list[v.ConfKey] = html.UnescapeString(v.ConfVal)
+			continue
+		}
+		list[v.ConfKey] = v.ConfVal
+	}
+	return
+}

+ 1 - 0
models/chart.go

@@ -166,6 +166,7 @@ type ChartInfoDetailResp struct {
 	XDataList            []XData          `description:"商品价格曲线的X轴数据"`
 	CorrelationChartInfo *CorrelationInfo `description:"相关性图表信息"`
 	DataResp             interface{}      `description:"图表数据,根据图的类型而定的,没有确定的数据格式"`
+	WaterMark            string           `description:"水印"`
 }
 
 // XData 商品价格曲线的的x轴数据

+ 11 - 2
services/data/edb_info.go

@@ -595,8 +595,17 @@ func GetEdbSourceByEdbInfoIdList(chartEdbInfoMappingList []*models.ChartEdbInfoM
 		}
 		sourceNameEnList = append(sourceNameEnList, sourceNameEn)
 	}
-	sourceNameList = append(sourceNameList, utils.ChartDefaultNameCn)
-	sourceNameEnList = append(sourceNameEnList, utils.ChartDefaultNameEn)
+	//sourceNameList = append(sourceNameList, utils.ChartDefaultNameCn)
+	//sourceNameEnList = append(sourceNameEnList, utils.ChartDefaultNameEn)
 
+	// 图表来源
+	conf, e := models.GetBusinessConf()
+	if e != nil {
+		return
+	}
+	if conf[models.BusinessConfCompanyName] != "" {
+		sourceNameList = append(sourceNameList, conf[models.BusinessConfCompanyName])
+		sourceNameEnList = append(sourceNameEnList, conf[models.BusinessConfCompanyName])
+	}
 	return
 }

+ 0 - 9
utils/config.go

@@ -24,10 +24,6 @@ var (
 	SystemType string
 	// APPNAME 项目中文名称
 	APPNAME string
-	// ChartDefaultNameCn 图表上的默认名称(中文)
-	ChartDefaultNameCn string
-	// ChartDefaultNameEn 图表上的默认名称(英文)
-	ChartDefaultNameEn string
 	// EmailSendToUsers 邮件提醒人员
 	EmailSendToUsers string
 	// AlarmMsgUrl 报警服务地址
@@ -94,11 +90,6 @@ func init() {
 	// 邮件提醒人员
 	EmailSendToUsers = config["email_send_to_users"]
 
-	// 图表上的默认中文名称
-	ChartDefaultNameCn = config["chart_default_name_cn"]
-	// 图表上的默认英文名称
-	ChartDefaultNameEn = config["chart_default_name_en"]
-
 	// 报警服务地址
 	AlarmMsgUrl = config["alarm_msg_url"]