Merge branch 'feature/eta1.4.3_yongyi' into debug

models/tables/edb_data/query.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"hongze/hongze_yb/global"
+	"hongze/hongze_yb/models/tables/edb_source"
 	"hongze/hongze_yb/utils"
 	"strconv"
 	"time"
@@ -163,7 +164,10 @@ func GetEdbDataTableName(source, subSource int) (tableName string) {
 	case utils.DATA_SOURCE_CALCULATE_RJZ: //日均值->75
 		tableName = "edb_data_calculate_rjz"
 	default:
-		tableName = ""
+		edbSource, _ := edb_source.GetEdbSourceBySource(source)
+		if edbSource != nil {
+			tableName = edbSource.TbName
+		}
 	}
 	return
 }

models/tables/edb_source/edb_source.go

@@ -0,0 +1,19 @@
+package edb_source
+
+type EdbSource struct {
+	EdbSourceId      int    `gorm:"column:edb_source_id;primary_key;AUTO_INCREMENT;NOT NULL;comment:'指标来源ID'"`
+	SourceName       string `gorm:"column:source_name;default:;NOT NULL;comment:'指标来源名称'"`
+	TbName           string `gorm:"column:table_name;default:;NOT NULL;comment:'数据表名'"`
+	EdbAddMethod     string `gorm:"column:edb_add_method;default:;NOT NULL;comment:'指标新增接口'"`
+	EdbRefreshMethod string `gorm:"column:edb_refresh_method;default:;NOT NULL;comment:'指标刷新接口'"`
+	IsBase           uint8  `gorm:"column:is_base;default:0;NOT NULL;comment:'是否为基础指标：2-否；1-是'"`
+	FromBridge       int8   `gorm:"column:from_bridge;default:0;NOT NULL;comment:'是否来源于桥接服务：0-否；1-是'"`
+	BridgeFlag       string `gorm:"column:bridge_flag;default:;NOT NULL;comment:'桥接服务对象标识'"`
+	SourceExtend     string `gorm:"column:source_extend;default:;NOT NULL;comment:'扩展字段做查询用, 如嘉悦的wind对应wind、wind_stop'"`
+	EdbCodeRequired  int8   `gorm:"column:edb_code_required;default:0;NOT NULL;comment:'指标编码是否必填: 0-否; 1-是'"`
+	IndexTableName   string `gorm:"column:index_table_name;default:;NOT NULL;comment:'源指标表名'"`
+}
+
+func (e *EdbSource) TableName() string {
+	return "edb_source"
+}

models/tables/edb_source/query.go

@@ -0,0 +1,32 @@
+package edb_source
+
+import (
+	"context"
+	jsoniter "github.com/json-iterator/go"
+	"hongze/hongze_yb/global"
+	"hongze/hongze_yb/utils"
+	"strconv"
+	"time"
+)
+
+func GetEdbSourceBySource(source int) (item *EdbSource, err error) {
+	cacheKey := utils.HONGZEYB_EBD_SOURCE + strconv.Itoa(source)
+	sourceInfo, _ := global.Redis.Get(context.TODO(), cacheKey).Result()
+	if sourceInfo != "" {
+		err = jsoniter.UnmarshalFromString(sourceInfo, &item)
+		if err != nil {
+			return
+		}
+		return
+	} else {
+		err = global.MYSQL["data"].Where("edb_source_id = ? ", source).First(&item).Error
+		if err == nil && item.EdbSourceId > 0 {
+			sourceInfo, err = jsoniter.MarshalToString(item)
+			if err != nil {
+				return
+			}
+			_ = global.Redis.SetEX(context.TODO(), cacheKey, sourceInfo, 24*time.Hour)
+		}
+	}
+	return
+}

services/chart/edb_data.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"hongze/hongze_yb/global"
+	"hongze/hongze_yb/models/tables/edb_source"
 	"hongze/hongze_yb/utils"
 	"io/ioutil"
 	"net/http"
@@ -83,6 +84,11 @@ func RefreshEdbData(edbInfoId, source, subSource int, edbCode, startDate string)
 		urlStr = "stock_plant/refresh"
 	case utils.DATA_SOURCE_NATIONAL_STATISTICS:
 		urlStr = "national_statistics/refresh"
+	default:
+		edbSource, _ := edb_source.GetEdbSourceBySource(source)
+		if edbSource != nil {
+			urlStr = edbSource.EdbRefreshMethod
+		}
 	}
 	if urlStr == "" {
 		err = fmt.Errorf(fmt.Sprint("source:", source, ";未实现该指标的刷新接口，请联系管理员"))

utils/constants.go

@@ -124,6 +124,7 @@ const (
 const (
 	HZ_CHART_LIB_DETAIL = "HZ_CHART_LIB_DETAIL_"
 	HONGZEYB_           = "hongze_yb:"
+	HONGZEYB_EBD_SOURCE = "hongze_yb:edb_source:"
 )
 
 //var (