Merge branch 'hotfix/bug6655_static_edb_name' into debug

# Conflicts:
#	logic/predict_edb.go
#	models/db.go
#	models/edb_data_table.go
#	routers/router.go
#	static/pcsg_task.json
#	utils/constants.go

models/edb_data_table.go

@@ -174,6 +174,10 @@ func GetEdbDataTableName(source, subSource int) (tableName string) {
 		tableName = "edb_data_ly"
 	case utils.DATA_SOURCE_CALCULATE_STL: // STL趋势分解->98
 		tableName = "edb_data_calculate_stl"
+	case utils.DATA_SOURCE_PREDICT_CALCULATE_PHASE_SHIFT: // 预测指标 - 期数位移
+		tableName = "edb_data_predict_calculate_phase_shift"
+	case utils.DATA_SOURCE_CALCULATE_PHASE_SHIFT: // 指标 - 期数位移
+		tableName = "edb_data_calculate_phase_shift"
 	default:
 		edbSource := EdbSourceIdMap[source]
 		if edbSource != nil {

routers/router.go

@@ -322,11 +322,6 @@ func init() {
 				&controllers.BaseFromTradeAnalysisController{},
 			),
 		),
-		beego.NSNamespace("/hisugar",
-			beego.NSInclude(
-				&controllers.HisugarController{},
-			),
-		),
 		beego.NSNamespace("/trade_analysis",
 			beego.NSInclude(
 				&controllers.BaseFromTradeAnalysisController{},
@@ -337,6 +332,11 @@ func init() {
 				&controllers.UsdaFasController{},
 			),
 		),
+		beego.NSNamespace("/hisugar",
+			beego.NSInclude(
+				&controllers.HisugarController{},
+			),
+		),
 	)
 	beego.AddNamespace(ns)
 }

static/pcsg_task.json

@@ -55,11 +55,36 @@
     "ExtraLetter": "O",
     "IndexNamePrefix": "Open Interest -"
   },
+  {
+    "TaskKey": "IDpcsgDailySnap0345",
+    "Frequency": "日度",
+    "VCode": false,
+    "ExtraLetter": "",
+    "IndexNamePrefix": "",
+    "IndexCodeSuffix": ""
+  },
   {
     "TaskKey": "IDpcsgMonthRun2",
     "Frequency": "月度",
     "VCode": false,
     "ExtraLetter": "",
-    "IndexNamePrefix": ""
+    "IndexNamePrefix": "",
+    "IndexCodeSuffix": ""
+  },
+  {
+    "TaskKey": "IDpcsgDailyRun10",
+    "Frequency": "日度",
+    "VCode": false,
+    "ExtraLetter": "",
+    "IndexNamePrefix": "",
+    "IndexCodeSuffix": ""
+  },
+  {
+    "TaskKey": "IDpcsgDailyRun11",
+    "Frequency": "日度",
+    "VCode": false,
+    "ExtraLetter": "",
+    "IndexNamePrefix": "",
+    "IndexCodeSuffix": ""
   }
-]
+]

utils/constants.go

@@ -115,12 +115,13 @@ const (
 	DATA_SOURCE_PREDICT_CALCULATE_RANGEANLYSIS       = 90 // 预测指标区间计算->90
 	DATA_SOURCE_LY                                   = 91 // 粮油商务网
 	DATA_SOURCE_TRADE_ANALYSIS                       = 92 // 持仓分析
-	DATA_SOURCE_HISUGAR                              = 93 //泛糖科技 -> 93
+	DATA_SOURCE_USDA_FAS                             = 96 //美国农业部
+	DATA_SOURCE_HISUGAR                              = 93 // 泛糖科技 -> 93
+	DATA_SOURCE_CALCULATE_STL                        = 98 // STL趋势分解 -> 98
 	DATA_SOURCE_PREDICT_CALCULATE_PHASE_SHIFT        = 94 //预测指标 - 期数移位
 	DATA_SOURCE_CALCULATE_PHASE_SHIFT                = 95 // 期数移动
-	DATA_SOURCE_USDA_FAS                             = 96 // 美国农业部->96
 	DATA_SOURCE_RZD                                  = 97 // 睿咨得科技 -> 93
-	DATA_SOURCE_CALCULATE_STL                        = 98 // STL趋势分解 -> 98
+
 )
 
 // 指标来源的中文展示
@@ -206,14 +207,14 @@ const (
 	DATA_SOURCE_NAME_CALCULATE_SUM                        = `多指标求和`
 	DATA_SOURCE_NAME_CALCULATE_AVG                        = `多指标求平均`
 	DATA_SOURCE_NAME_BUSINESS                             = `自有数据`
+	DATA_SOURCE_NAME_CALCULATE_RANGEANLYSIS               = `区间计算`   //区间计算->87
+	DATA_SOURCE_NAME_PREDICT_CALCULATE_RANGEANLYSIS       = `预测区间计算` //区间计算->90
+	DATA_SOURCE_NAME_TRADE_ANALYSIS                       = `持仓分析`   // 持仓分析
+	DATA_SOURCE_NAME_USDA_FAS                             = `美国农业部`  //美国农业部->96
 	DATA_SOURCE_NAME_CCF                                  = `CCF`    // CCF化纤信息
 	DATA_SOURCE_NAME_SCI_HQ                               = `卓创红期`   // 卓创红期
 	DATA_SOURCE_NAME_OILCHEM                              = `隆众资讯`   // 隆众资讯 -> 89
-	DATA_SOURCE_NAME_CALCULATE_RANGEANLYSIS               = `区间计算`   //区间计算->87
-	DATA_SOURCE_NAME_PREDICT_CALCULATE_RANGEANLYSIS       = `预测区间计算` //区间计算->90
 	DATA_SOURCE_NAME_HISUGAR                              = `泛糖科技`   // 泛糖科技 -> 93
-	DATA_SOURCE_NAME_TRADE_ANALYSIS                       = `持仓分析`   // 持仓分析
-	DATA_SOURCE_NAME_USDA_FAS                             = `泛糖科技`   // 泛糖科技 -> 93
 )
 
 // 基础数据初始化日期