Merge branch 'chart/12.2' into debug

# Conflicts:
#	utils/common.go

models/tables/edb_data/query.go

@@ -81,6 +81,8 @@ func GetEdbDataTableName(source int) (tableName string) {
 		tableName = "edb_data_eia_steo"
 	case utils.DATA_SOURCE_CALCULATE_NHCC:
 		tableName = "edb_data_calculate_nhcc"
+	case utils.DATA_SOURCE_COM_TRADE:
+		tableName = "edb_data_com_trade"
 	default:
 		tableName = ""
 	}

services/chart/chart_info.go

@@ -731,7 +731,7 @@ func BarChartData(mappingList []*chartEdbMappingModel.ChartEdbInfoMapping, edbDa
 						err = tmpErr
 						return
 					}
-					if utils.GetTimeSubDay(currDateTime, findDateTime) >= 5 {
+					if currDateTime.Equal(findDateTime) || currDateTime.Before(findDateTime) {
 						findDate = dataList[i].DataTime
 						break
 					}
@@ -824,7 +824,7 @@ func BarChartData(mappingList []*chartEdbMappingModel.ChartEdbInfoMapping, edbDa
 						err = tmpErr
 						return
 					}
-					if utils.GetTimeSubDay(currDateTime, findDateTime) >= 5 {
+					if currDateTime.Equal(findDateTime) || currDateTime.Before(findDateTime) {
 						findDate = dataList[i].DataTime
 						break
 					}

services/chart/edb_data.go

@@ -69,6 +69,8 @@ func RefreshEdbData(edbInfoId, source int, edbCode, startDate string) (resp *Ref
 		urlStr = "eia_steo/refresh"
 	case utils.DATA_SOURCE_PREDICT:
 		urlStr = "predict/refresh"
+	case utils.DATA_SOURCE_COM_TRADE:
+		urlStr = "com_trade/refresh"
 	}
 	if urlStr == "" {
 		err = fmt.Errorf(fmt.Sprint("source:", source, ";未实现该指标的刷新接口，请联系管理员"))

utils/constants.go

@@ -79,6 +79,7 @@ const (
 	DATA_SOURCE_CALCULATE_CJJX                   //超季节性->35
 	DATA_SOURCE_EIA_STEO                         //eia steo报告->36
 	DATA_SOURCE_CALCULATE_NHCC                   //计算指标（拟合残差）->37
+	DATA_SOURCE_COM_TRADE                        //联合国商品贸易数据->38
 )
 
 const (