Merge branch 'edb_pb_finance' into debug

# Conflicts:
#	utils/constants.go

models/tables/edb_data/query.go

@@ -15,7 +15,7 @@ func GetEdbDataTableName(source int) (tableName string) {
 		tableName = "edb_data_ths"
 	case utils.DATA_SOURCE_WIND:
 		tableName = "edb_data_wind"
-	case utils.DATA_SOURCE_PB:
+	case utils.DATA_SOURCE_PB, utils.DATA_SOURCE_PB_FINANCE:
 		tableName = "edb_data_pb"
 	case utils.DATA_SOURCE_CALCULATE:
 		tableName = "edb_data_calculate"
@@ -119,7 +119,7 @@ func GetEdbDataList(source, endInfoId int, startDate, endDate string) (list []*E
 	if len(list) > 0 {
 		for _, row := range list {
 			if row.DataTime != "" {
-				row.DataTime = row.DataTime[:10]	// 此处获取的字符串row.DataTime长度有长有短，截取年月日
+				row.DataTime = row.DataTime[:10] // 此处获取的字符串row.DataTime长度有长有短，截取年月日
 				//tempTime, _ := time.Parse("2006-01-02T00:00:00+08:00", row.DataTime)
 				//row.DataTime = tempTime.Format(utils.FormatDate)
 			}
@@ -150,4 +150,4 @@ func GetEdbInfoMaxAndMinInfo(source int, edbCode string) (item *EdbInfoMaxAndMin
 	err = global.MYSQL["data"].Raw(sql, edbCode).Scan(&latest_value).Error
 	item.LatestValue = latest_value
 	return
-}
+}

services/chart/edb_data.go

@@ -35,6 +35,8 @@ func RefreshEdbData(edbInfoId, source int, edbCode, startDate string) (resp *Ref
 		urlStr = "/wind/refresh"
 	case utils.DATA_SOURCE_PB:
 		urlStr = "/pb/refresh"
+	case utils.DATA_SOURCE_PB_FINANCE:
+		urlStr = "/pb_finance/refresh"
 	case utils.DATA_SOURCE_MANUAL:
 		urlStr = "/manual/refresh"
 	case utils.DATA_SOURCE_LZ:
@@ -121,4 +123,4 @@ func RefreshEdbCalculateData(edbInfoId int, edbCode, startDate string) (resp *Re
 	param["StartDate"] = startDate
 	resp, err = postRefreshEdbData(param, "/calculate/refresh")
 	return
-}
+}

utils/constants.go

@@ -23,7 +23,7 @@ const (
 )
 
 const (
-	APPNAME = "弘则研报"
+	APPNAME          = "弘则研报"
 	EmailSendToUsers = "317699326@qq.com;984198890@qq.com;hsun@hzinsights.com;xyxie@hzinsights.com"
 )
 
@@ -69,11 +69,12 @@ const (
 	DATA_SOURCE_LT                              //路透->25
 	DATA_SOURCE_COAL                            //中国煤炭网->26
 	DATA_SOURCE_PYTHON                          //python代码->27
+	DATA_SOURCE_PB_FINANCE                      //彭博财务数据->28
 )
 
 const (
 	HZ_CHART_LIB_DETAIL = "HZ_CHART_LIB_DETAIL_"
-	HONGZEYB_ = "hongze_yb:"
+	HONGZEYB_           = "hongze_yb:"
 )
 
 //var (
@@ -87,9 +88,9 @@ const (
 
 //数据刷新频率
 const (
-	DATA_REFRESH        = 7 //7个单位，日/周/月/季度/年
+	DATA_REFRESH             = 7 //7个单位，日/周/月/季度/年
 	DATA_START_REFRESH_LIMIT = 7 //7个单位，日/周/月/季度/年
-	DATA_END_DATE_LIMIT = 4 //数据结束日期为，当前日期，加上4年时间
+	DATA_END_DATE_LIMIT      = 4 //数据结束日期为，当前日期，加上4年时间
 )
 
 const (
@@ -99,7 +100,6 @@ const (
 	EDB_DATA_LIMIT = 10
 )
 
-
 var PermissionFiccClassifyArr = [...]string{"宏观经济", "化工产业", "黑色产业", "有色产业", "市场策略"}
 
 //缓存key
@@ -109,7 +109,7 @@ const (
 
 // es相关
 const (
-	ES_INDEX_RDDP_REPORT = "research_report_v1"                //报告
+	ES_INDEX_RDDP_REPORT = "research_report_v1" //报告
 )
 
 //EDB_LIB
@@ -126,4 +126,3 @@ const HZPHONE = "057187186319"    //弘则电话
 const (
 	DEFAULT_HONGZE_USER_LOGO = "https://hzstatic.hzinsights.com/static/icon/hzyb/default_avatar.png"    //个人中心默认头像、匿名用户留言默认头像
 	DEFAULT_HONGZE_SYS_LOGO = "https://hzstatic.hzinsights.com/static/yb_wx/hongze_sys_default_head.png"     //弘则官方默认头像
-)