Browse Source

Merge branch 'coal' into debug

ziwen 3 years ago
parent
commit
444bbc155a
3 changed files with 5 additions and 1 deletions
  1. 1 0
      controllers/chart.go
  2. 2 0
      models/edb_data_base.go
  3. 2 1
      utils/constants.go

+ 1 - 0
controllers/chart.go

@@ -96,6 +96,7 @@ func (this *ChartController) ChartInfoDetail() {
 		endDate =""
 	case 4:
 		startDate = strconv.Itoa(time.Now().Year()) + "-01-01"
+		startDate = "2021-01-01"
 		//endDate = time.Now().Format(utils.FormatDate)
 		endDate =""
 	case 5:

+ 2 - 0
models/edb_data_base.go

@@ -56,6 +56,8 @@ func GetEdbDataTableName(source int) (tableName string) {
 		tableName = "edb_data_calculate_ljztbpj"
 	case utils.DATA_SOURCE_LT:
 		tableName = "edb_data_lt"
+	case utils.DATA_SOURCE_COAL:
+		tableName = "edb_data_coal"
 	default:
 		tableName = ""
 	}

+ 2 - 1
utils/constants.go

@@ -57,6 +57,7 @@ const (
 	DATA_SOURCE_CALCULATE_ZJPJ                  //直接拼接->23
 	DATA_SOURCE_CALCULATE_LJZTBPJ               //累计值同比拼接->24
 	DATA_SOURCE_LT                              //路透->25
+	DATA_SOURCE_COAL                            //煤炭网->26
 )
 
 //数据刷新频率
@@ -88,4 +89,4 @@ const (
 
 var (
 	Hz_Server_Data_Url string //同花顺,万得接口服务地址(阿里云windows服务器地址)
-)
+)