Browse Source

test 嘉悦

hsun 1 year ago
parent
commit
af51db564b

+ 73 - 3
controllers/data_manage/edb_info.go

@@ -1553,8 +1553,78 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				isAdd = true
 			}
 		} else {
-			br.Msg = "无效的数据来源"
-			return
+			// 代码中没有的来源那么从edb_source中找是否有对应的
+			cond := ` AND edb_source_id = ?`
+			pars := make([]interface{}, 0)
+			pars = append(pars, source)
+			sourceItem, e := data_manage.GetEdbSourceItemByCondition(cond, pars)
+			if e != nil {
+				if e.Error() == utils.ErrNoRow() {
+					br.Msg = "无效指标来源"
+					return
+				}
+				br.Msg = "获取失败"
+				br.ErrMsg = "获取指标来源失败, Err: " + e.Error()
+				return
+			}
+
+			// 获取指标数据
+			dataList, e := data_manage.GetEdbDataAllByEdbCode(edbCode, source, utils.EDB_DATA_LIMIT)
+			if e != nil {
+				br.Msg = "获取失败"
+				br.ErrMsg = "获取指标数据失败, Err: " + e.Error()
+				return
+			}
+			if len(dataList) > 0 {
+				searchItem.EdbCode = edbCode
+				searchItem.DataList = dataList
+				// 获取最大最小值
+				edbInfoMaxAndMinInfo, e := data_manage.GetEdbInfoMaxAndMinInfo(source, edbCode)
+				if e != nil && e.Error() != utils.ErrNoRow() {
+					br.Msg = "获取失败"
+					br.ErrMsg = "获取数据失败, GetEdbInfoMaxAndMinInfo Err:" + e.Error()
+					return
+				}
+				if edbInfoMaxAndMinInfo != nil {
+					searchItem.StartDate = edbInfoMaxAndMinInfo.MinDate
+					searchItem.EndDate = edbInfoMaxAndMinInfo.MaxDate
+				}
+			} else {
+				// 新增指标数据
+				addRes, e := data.AddEdbData(source, edbCode)
+				if e != nil {
+					br.Msg = "获取失败"
+					br.ErrMsg = "获取失败,Err:" + e.Error()
+					return
+				}
+				if addRes == nil {
+					br.Msg = "获取失败"
+					br.ErrMsg = "新增指标数据失败, addRes nil"
+					return
+				}
+				if addRes.Ret != 200 {
+					br.Msg = "未搜索到该指标, " + addRes.Msg
+					br.ErrMsg = addRes.ErrMsg + ";EdbCode:" + edbCode
+					return
+				}
+				isAdd = true
+			}
+
+			// 指标来源于桥接服务: 桥接服务获取指标取频度信息等
+			if sourceItem.BridgeFlag != "" {
+				bridgeOb := data.InitBridgeOB(sourceItem.BridgeFlag)
+				if bridgeOb != nil {
+					bridgeIndex, e := bridgeOb.GetIndex(data.GetIndexFromBridgeReq{IndexCode: edbCode, Source: sourceItem.EdbSourceId, SourceExtend: sourceItem.SourceExtend})
+					if e != nil {
+						br.Msg = "获取失败"
+						br.ErrMsg = "桥接服务获取指标信息失败, Err: " + e.Error()
+						return
+					}
+					searchItem.EdbName = bridgeIndex.IndexName
+					searchItem.Frequency = bridgeIndex.Frequency
+					searchItem.Unit = bridgeIndex.Unit
+				}
+			}
 		}
 		if isAdd {
 			dataList, err := data_manage.GetEdbDataAllByEdbCode(edbCode, source, utils.EDB_DATA_LIMIT)
@@ -4324,7 +4394,7 @@ func (this *EdbInfoController) EdbChartAdminList() {
 			if v1 == depList[k].RealName && v1 != "" {
 				item := &company.DepartmentGroupAdmins{
 					AdminId:  "group_" + strconv.Itoa(k),
-					RealName: strings.Replace(k1,v1,"",-1),
+					RealName: strings.Replace(k1, v1, "", -1),
 				}
 				depList[k].ChildrenList = append(depList[k].ChildrenList, item)
 			}

+ 1 - 1
controllers/data_manage/jiayue_edb_source.go

@@ -36,7 +36,7 @@ func (this *JiaYueEdbSourceController) List() {
 		return
 	}
 
-	cond := ` AND is_base = 1 AND is_private = 1`
+	cond := ` AND is_base = 1 AND from_bridge = 1`
 	pars := make([]interface{}, 0)
 	sources, e := data_manage.GetEdbSourceItemsByCondition(cond, pars, []string{}, "")
 	if e != nil {

+ 28 - 2
models/data_manage/edb_data_base.go

@@ -7,7 +7,33 @@ import (
 	"time"
 )
 
-// 指标数据->存储表
+var (
+	EdbDataTableNameMap     map[int]string // 指标来源对应数据表名
+	EdbDataAddMethodMap     map[int]string // 指标来源对应的新增指标方法
+	EdbDataRefreshMethodMap map[int]string // 指标来源对应的刷新指标方法
+	EdbSourceNameMap        map[int]string // 指标来源名称
+)
+
+// InitEdbSourceVar 初始化时加载指标来源对应信息, 避免循环中查库, 注意edb_source表修改table_name的话需要重启服务
+func InitEdbSourceVar() {
+	EdbDataTableNameMap = make(map[int]string)
+	EdbDataAddMethodMap = make(map[int]string)
+	EdbDataRefreshMethodMap = make(map[int]string)
+	EdbSourceNameMap = make(map[int]string)
+	sources, e := GetEdbSourceItemsByCondition(``, make([]interface{}, 0), []string{}, "")
+	if e != nil {
+		utils.FileLog.Info("init source table err: %s", e.Error())
+		return
+	}
+	for _, v := range sources {
+		EdbDataTableNameMap[v.EdbSourceId] = v.TableName
+		EdbDataAddMethodMap[v.EdbSourceId] = v.EdbAddMethod
+		EdbDataRefreshMethodMap[v.EdbSourceId] = v.EdbRefreshMethod
+		EdbSourceNameMap[v.EdbSourceId] = v.SourceName
+	}
+}
+
+// GetEdbDataTableName 指标数据->存储表
 func GetEdbDataTableName(source int) (tableName string) {
 	switch source {
 	case utils.DATA_SOURCE_THS:
@@ -157,7 +183,7 @@ func GetEdbDataTableName(source int) (tableName string) {
 	case utils.DATA_SOURCE_CALCULATE_RJZ: //日均值->75
 		tableName = "edb_data_calculate_rjz"
 	default:
-		tableName = ""
+		tableName = EdbDataTableNameMap[source] // 没有对应的从edb_source中取
 	}
 	return
 }

+ 9 - 6
models/data_manage/edb_source.go

@@ -8,12 +8,15 @@ import (
 
 // EdbSource 指标来源表
 type EdbSource struct {
-	EdbSourceId  int    `orm:"column(edb_source_id);pk"`
-	SourceName   string `description:"指标来源名称"`
-	TableName    string `description:"数据表名"`
-	IsBase       int    `description:"是否为基础指标: 0-否; 1-是"`
-	IsPrivate    int    `description:"是否为自有来源: 0-否; 1-是"`
-	SourceExtend string `description:"扩展字段做查询用, 如嘉悦的wind对应wind、wind_stop"`
+	EdbSourceId      int    `orm:"column(edb_source_id);pk"`
+	SourceName       string `description:"指标来源名称"`
+	TableName        string `description:"数据表名"`
+	EdbAddMethod     string `description:"指标新增接口"`
+	EdbRefreshMethod string `description:"指标刷新接口"`
+	IsBase           int    `description:"是否为基础指标: 0-否; 1-是"`
+	FromBridge       int    `description:"是否来源于桥接服务: 0-否; 1-是"`
+	BridgeFlag       string `description:"桥接服务对象标识"`
+	SourceExtend     string `description:"扩展字段做查询用"`
 }
 
 // GetEdbSourceItemsByCondition 获取指标来源列表

+ 40 - 0
models/data_manage/jiayue_index.go

@@ -42,6 +42,46 @@ type DictIndex struct {
 	UpdateTime        time.Time `description:"更新时间"`
 }
 
+// BridgeJiaYueIndexParams 桥接服务-获取嘉悦指标入参
+type BridgeJiaYueIndexParams struct {
+	IndexCode    string `json:"index_code" form:"index_code" description:"指标编码"`
+	SourceExtend string `json:"source_extend" form:"source_extend" description:"来源"`
+}
+
+// BridgeJiaYueIndexDataParams 桥接服务-获取嘉悦指标数据入参
+type BridgeJiaYueIndexDataParams struct {
+	BridgeJiaYueIndexParams
+	StartDate string `json:"start_date" form:"start_date" description:"开始日期"`
+	EndDate   string `json:"end_date" form:"end_date" description:"结束日期"`
+}
+
+// BridgeJiaYueResultIndexData 桥接服务-获取嘉悦指标数据响应体
+type BridgeJiaYueResultIndexData struct {
+	Code int                      `json:"code" description:"状态码"`
+	Msg  string                   `json:"msg" description:"提示信息"`
+	Data BridgeJiaYueIndexAndData `json:"data" description:"返回数据"`
+}
+
+// BridgeJiaYueIndexAndData 桥接服务-嘉悦指标和数据
+type BridgeJiaYueIndexAndData struct {
+	Id             int                     `description:"指标自增ID" json:"id"`
+	IndexCode      string                  `description:"指标编码" json:"index_code"`
+	IndexName      string                  `description:"指标名称" json:"index_name"`
+	Unit           string                  `description:"单位" json:"unit"`
+	Frequency      string                  `description:"频度" json:"frequency"`
+	LastDate       time.Time               `description:"指标最新时间" json:"last_date"`
+	LastUpdateTime time.Time               `description:"最新更新时间" json:"last_update_time"`
+	Status         int                     `description:"指标状态" json:"status"`
+	IndexData      []BridgeJiaYueIndexData `description:"指标数据" json:"index_data"`
+}
+
+// BridgeJiaYueIndexData 桥接服务-嘉悦指标数据
+type BridgeJiaYueIndexData struct {
+	Val        float64   `json:"val"`
+	DataTime   time.Time `json:"data_time"`
+	UpdateTime time.Time `json:"update_time"`
+}
+
 // BridgeJiaYueResultFrequencyList 桥接服务-频度列表响应体
 type BridgeJiaYueResultFrequencyList struct {
 	Code int      `json:"code" description:"状态码"`

+ 3 - 0
models/db.go

@@ -140,6 +140,9 @@ func init() {
 	if utils.BusinessCode == utils.BusinessCodeSandbox {
 		initEtaTrial()
 	}
+
+	// 初始化部分数据表变量(直接init会有顺序问题=_=!)
+	data_manage.InitEdbSourceVar()
 }
 
 // initSystem 系统表 数据表

+ 51 - 0
services/data/base_bridge.go

@@ -0,0 +1,51 @@
+package data
+
+import "time"
+
+// EdbBridge 桥接数据源接口
+type EdbBridge interface {
+	GetIndex(GetIndexFromBridgeReq) (BridgeIndexItem, error)
+	GetIndexAndData(GetIndexAndDataFromBridgeReq) (BridgeIndexItem, error)
+}
+
+// GetIndexFromBridgeReq 获取指标信息请求体
+type GetIndexFromBridgeReq struct {
+	IndexCode    string `description:"指标编码"`
+	Source       int    `description:"指标来源ID"`
+	SourceExtend string `description:"指标来源(用作查询条件)"`
+}
+
+// GetIndexAndDataFromBridgeReq 获取指标数据请求体
+type GetIndexAndDataFromBridgeReq struct {
+	IndexCode    string `description:"指标编码"`
+	Source       int    `description:"指标来源ID"`
+	SourceExtend string `description:"指标来源(用作查询条件)"`
+	StartDate    string `description:"数据开始日期"`
+	EndDate      string `description:"数据结束日期"`
+}
+
+// BridgeIndexItem 桥接服务指标信息
+type BridgeIndexItem struct {
+	Id        int                   `description:"自增ID"`
+	IndexCode string                `description:"指标编码"`
+	IndexName string                `description:"指标名称"`
+	Unit      string                `description:"单位"`
+	Frequency string                `description:"频度"`
+	Data      []BridgeIndexDataItem `description:"数据值"`
+}
+
+// BridgeIndexDataItem 桥接服务指标数据信息
+type BridgeIndexDataItem struct {
+	Val        float64   `description:"数据值"`
+	DataTime   time.Time `description:"数据日期"`
+	UpdateTime time.Time `description:"更新时间"`
+}
+
+// InitBridgeOB 初始化桥接服务
+func InitBridgeOB(bridgeKey string) EdbBridge {
+	switch bridgeKey {
+	case "bridge_jiayue":
+		return new(EdbBridgeJiaYue) // 嘉悦物产
+	}
+	return nil
+}

+ 7 - 0
services/data/base_edb_lib.go

@@ -15,6 +15,7 @@ import (
 func AddEdbData(source int, edbCode string) (resp *models.BaseResponse, err error) {
 	param := make(map[string]interface{})
 	param["EdbCode"] = edbCode
+	param["Source"] = source
 	urlStr := ``
 	switch source {
 	case utils.DATA_SOURCE_THS:
@@ -66,6 +67,7 @@ func AddEdbData(source int, edbCode string) (resp *models.BaseResponse, err erro
 	case utils.DATA_SOURCE_FUBAO:
 		urlStr = "fubao/add"
 	default:
+		urlStr = data_manage.EdbDataAddMethodMap[source] // 没有对应的从edb_source中取
 	}
 	if urlStr == "" {
 		err = fmt.Errorf("未实现该指标的刷新接口,请联系管理员")
@@ -179,6 +181,8 @@ func RefreshEdbData(edbInfoId, source int, edbCode, startDate string) (resp *mod
 		urlStr = "national_statistics/refresh"
 	case utils.DATA_SOURCE_FUBAO:
 		urlStr = "fubao/refresh"
+	default:
+		urlStr = data_manage.EdbDataRefreshMethodMap[source] // 没有对应的从edb_source中取
 	}
 	if urlStr == "" {
 		err = fmt.Errorf(fmt.Sprint("source:", source, ";未实现该指标的刷新接口,请联系管理员"))
@@ -367,6 +371,9 @@ func HttpPost(url, postData string, params ...string) ([]byte, error) {
 	req.Header.Set("Content-Type", contentType)
 	req.Header.Set("authorization", utils.MD5(utils.APP_EDB_LIB_NAME_EN+utils.EDB_LIB_Md5_KEY))
 	resp, err := client.Do(req)
+	if err != nil {
+		return nil, err
+	}
 	defer resp.Body.Close()
 	b, err := ioutil.ReadAll(resp.Body)
 	fmt.Println("HttpPost:" + string(b))

+ 7 - 3
services/data/edb_info.go

@@ -2572,9 +2572,13 @@ func EdbInfoAdd(source, classifyId int, edbCode, edbName, frequency, unit, start
 
 	sourceName, ok := sourceNameMap[source]
 	if !ok {
-		errMsg = "指标来源异常"
-		err = errors.New(errMsg)
-		return
+		name := data_manage.EdbSourceNameMap[source]
+		if name == "" {
+			errMsg = "指标来源异常"
+			err = errors.New(errMsg)
+			return
+		}
+		sourceName = name
 	}
 	edbInfo.SourceName = sourceName
 

+ 203 - 2
services/data/jiayue_index.go

@@ -3,6 +3,7 @@ package data
 import (
 	"encoding/json"
 	"eta/eta_api/models/data_manage"
+	"eta/eta_api/services/alarm_msg"
 	"eta/eta_api/utils"
 	"fmt"
 	"io/ioutil"
@@ -10,13 +11,213 @@ import (
 	"strings"
 )
 
-// 桥接服务接口
+// 嘉悦桥接服务接口
 var (
-	BridgeApiJiaYueIndexUrl         = "/api/index_data/jiayue/index"          // 获取指标数据
+	BridgeApiJiaYueIndexUrl         = "/api/index_data/jiayue/index"          // 获取指标信息
+	BridgeApiJiaYueIndexDataUrl     = "/api/index_data/jiayue/index_data"     // 获取指标数据
 	BridgeApiJiaYuePageIndexUrl     = "/api/index_data/jiayue/page_index"     // 获取指标列表-分页
 	BridgeApiJiaYueFrequencyListUrl = "/api/index_data/jiayue/frequency_list" // 获取指标频度列表
 )
 
+type EdbBridgeJiaYue struct{}
+
+// GetIndex 获取指标信息
+func (brg *EdbBridgeJiaYue) GetIndex(req GetIndexFromBridgeReq) (item BridgeIndexItem, err error) {
+	var params data_manage.BridgeJiaYueIndexParams
+	params.IndexCode = req.IndexCode
+	params.SourceExtend = req.SourceExtend
+	indexData, e := GetJiaYueIndexFromBridge(params)
+	if e != nil {
+		err = fmt.Errorf("GetJiaYueIndexDataFromBridge err: %s", e.Error())
+		return
+	}
+	if indexData.Id <= 0 {
+		return
+	}
+	item.Id = indexData.Id
+	item.IndexCode = indexData.IndexCode
+	item.IndexName = indexData.IndexName
+	item.Unit = indexData.Unit
+	item.Frequency = brg.TransFrequency(indexData.Frequency)
+	return
+}
+
+// GetIndexAndData 获取指标和数据
+func (brg *EdbBridgeJiaYue) GetIndexAndData(req GetIndexAndDataFromBridgeReq) (item BridgeIndexItem, err error) {
+	var params data_manage.BridgeJiaYueIndexDataParams
+	params.IndexCode = req.IndexCode
+	params.SourceExtend = req.SourceExtend
+	params.StartDate = req.StartDate
+	params.EndDate = req.EndDate
+	indexData, e := GetJiaYueIndexDataFromBridge(params)
+	if e != nil {
+		err = fmt.Errorf("GetJiaYueIndexDataFromBridge err: %s", e.Error())
+		return
+	}
+	if indexData.Id <= 0 {
+		return
+	}
+	item.Id = indexData.Id
+	item.IndexCode = indexData.IndexCode
+	item.IndexName = indexData.IndexName
+	item.Unit = indexData.Unit
+	item.Frequency = brg.TransFrequency(indexData.Frequency)
+	var dataList []BridgeIndexDataItem
+	for _, v := range indexData.IndexData {
+		dataList = append(dataList, BridgeIndexDataItem{
+			Val:        v.Val,
+			DataTime:   v.DataTime,
+			UpdateTime: v.UpdateTime,
+		})
+	}
+	item.Data = dataList
+	return
+}
+
+// TransFrequency 嘉悦指标频度转换
+func (brg *EdbBridgeJiaYue) TransFrequency(origin string) string {
+	mapping := map[string]string{
+		"日":  "日度",
+		"周":  "周度",
+		"半月": "旬度",
+		"月":  "月度",
+		"季":  "季度",
+		"半年": "半年度",
+		"年":  "年度",
+	}
+	return mapping[origin]
+}
+
+// GetJiaYueIndexFromBridge 从桥接服务获取指标信息
+func GetJiaYueIndexFromBridge(param data_manage.BridgeJiaYueIndexParams) (indexData data_manage.BridgeJiaYueIndexAndData, err error) {
+	defer func() {
+		if err != nil {
+			b, _ := json.Marshal(param)
+			tips := fmt.Sprintf("桥接服务-获取嘉悦指标信息, err: %s, params: %s", err.Error(), string(b))
+			go alarm_msg.SendAlarmMsg(tips, 3)
+		}
+	}()
+
+	url := fmt.Sprint(utils.EtaBridgeUrl, BridgeApiJiaYueIndexUrl)
+	data, e := json.Marshal(param)
+	if e != nil {
+		err = fmt.Errorf("data json marshal err: %s", e.Error())
+		return
+	}
+	body := ioutil.NopCloser(strings.NewReader(string(data)))
+	client := &http.Client{}
+	req, e := http.NewRequest("POST", url, body)
+	if e != nil {
+		err = fmt.Errorf("http create request err: %s", e.Error())
+		return
+	}
+
+	checkToken := utils.MD5(utils.EtaBridgeAppNameEn + utils.EtaBridgeMd5Key)
+	contentType := "application/json;charset=utf-8"
+	req.Header.Set("Content-Type", contentType)
+	req.Header.Set("Authorization", checkToken)
+	resp, e := client.Do(req)
+	if e != nil {
+		err = fmt.Errorf("http client do err: %s", e.Error())
+		return
+	}
+	defer func() {
+		_ = resp.Body.Close()
+	}()
+	b, e := ioutil.ReadAll(resp.Body)
+	if e != nil {
+		err = fmt.Errorf("resp body read err: %s", e.Error())
+		return
+	}
+	if len(b) == 0 {
+		err = fmt.Errorf("resp body is empty")
+		return
+	}
+	// 生产环境解密
+	if utils.RunMode == "release" {
+		str := string(b)
+		str = strings.Trim(str, `"`)
+		b = utils.DesBase64Decrypt([]byte(str), utils.EtaBridgeDesKey)
+	}
+
+	result := new(data_manage.BridgeJiaYueResultIndexData)
+	if e = json.Unmarshal(b, &result); e != nil {
+		err = fmt.Errorf("result unmarshal err: %s\nresult: %s", e.Error(), string(b))
+		return
+	}
+	if result.Code != 200 {
+		err = fmt.Errorf("result: %s", string(b))
+		return
+	}
+	indexData = result.Data
+	return
+}
+
+// GetJiaYueIndexDataFromBridge 从桥接服务获取指标数据
+func GetJiaYueIndexDataFromBridge(param data_manage.BridgeJiaYueIndexDataParams) (indexData data_manage.BridgeJiaYueIndexAndData, err error) {
+	defer func() {
+		if err != nil {
+			b, _ := json.Marshal(param)
+			tips := fmt.Sprintf("桥接服务-获取嘉悦指标数据, err: %s, params: %s", err.Error(), string(b))
+			go alarm_msg.SendAlarmMsg(tips, 3)
+		}
+	}()
+
+	url := fmt.Sprint(utils.EtaBridgeUrl, BridgeApiJiaYueIndexDataUrl)
+	data, e := json.Marshal(param)
+	if e != nil {
+		err = fmt.Errorf("data json marshal err: %s", e.Error())
+		return
+	}
+	body := ioutil.NopCloser(strings.NewReader(string(data)))
+	client := &http.Client{}
+	req, e := http.NewRequest("POST", url, body)
+	if e != nil {
+		err = fmt.Errorf("http create request err: %s", e.Error())
+		return
+	}
+
+	checkToken := utils.MD5(utils.EtaBridgeAppNameEn + utils.EtaBridgeMd5Key)
+	contentType := "application/json;charset=utf-8"
+	req.Header.Set("Content-Type", contentType)
+	req.Header.Set("Authorization", checkToken)
+	resp, e := client.Do(req)
+	if e != nil {
+		err = fmt.Errorf("http client do err: %s", e.Error())
+		return
+	}
+	defer func() {
+		_ = resp.Body.Close()
+	}()
+	b, e := ioutil.ReadAll(resp.Body)
+	if e != nil {
+		err = fmt.Errorf("resp body read err: %s", e.Error())
+		return
+	}
+	if len(b) == 0 {
+		err = fmt.Errorf("resp body is empty")
+		return
+	}
+	// 生产环境解密
+	if utils.RunMode == "release" {
+		str := string(b)
+		str = strings.Trim(str, `"`)
+		b = utils.DesBase64Decrypt([]byte(str), utils.EtaBridgeDesKey)
+	}
+
+	result := new(data_manage.BridgeJiaYueResultIndexData)
+	if e = json.Unmarshal(b, &result); e != nil {
+		err = fmt.Errorf("result unmarshal err: %s\nresult: %s", e.Error(), string(b))
+		return
+	}
+	if result.Code != 200 {
+		err = fmt.Errorf("result: %s", string(b))
+		return
+	}
+	indexData = result.Data
+	return
+}
+
 // GetJiaYueFrequencyListFromBridge 获取指标频度列表
 func GetJiaYueFrequencyListFromBridge() (frequencies []string, err error) {
 	url := fmt.Sprint(utils.EtaBridgeUrl, BridgeApiJiaYueFrequencyListUrl)