Merge branch 'feature/eta2.4.4_gpr_risk' into debug

# Conflicts:
#	utils/constants.go

models/db.go

@@ -149,6 +149,10 @@ func initEdbDataTable() {
 		new(data_manage.BaseFromUsdaFasIndex),
 		new(data_manage.BaseFromUsdaFasClassify),
 		new(data_manage.BaseFromUsdaFasData),
+
+		new(data_manage.BaseFromGprRiskClassify),
+		new(data_manage.BaseFromGprRiskIndex),
+		new(data_manage.BaseFromGprRiskData),
 	)
 }
 

services/gpr_risk.go

@@ -21,7 +21,7 @@ func SyncBaseFromGprRisk() (err error) {
 
 	method := `index/list`
 	data := make(map[string]interface{})
-	data["Source"] = utils.DATA_SOURCE_USDA_FAS
+	data["Source"] = utils.DATA_SOURCE_GPR_RISK
 	data["StartDate"] = startDate
 	//data["EndDate"] = endDate
 	result, err := HttpPost("SyncRankingFromGprRisk", method, data)
@@ -117,7 +117,7 @@ func SyncBaseFromGprRiskData() (err error) {
 
 	for currPage := 0; currPage < maxPage; currPage++ {
 		data := make(map[string]interface{})
-		data["Source"] = utils.DATA_SOURCE_USDA_FAS
+		data["Source"] = utils.DATA_SOURCE_GPR_RISK
 		data["StartDate"] = startDate
 		data["CurrPage"] = currPage
 		data["PageSize"] = 500 //

utils/constants.go

@@ -121,6 +121,7 @@ const (
 	DATA_SOURCE_RZD                                  = 97       // 睿姿得数据
 	DATA_SOURCE_CALCULATE_STL                        = 98       // STL趋势分解 -> 98
 	DATA_SOURCE_AI_PREDICT_MODEL                     = 103      // AI预测模型
+	DATA_SOURCE_GPR_RISK                             = 102      //GPR地缘风险指数
 )
 
 // 数据刷新频率