Merge branch '11.7'

models/data_manage/edb_data_base.go

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

models/edb_data_base.go

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

services/data/chart_info.go

@@ -291,18 +291,11 @@ func GetChartEdbData(chartInfoId, chartType int, calendar, startDate, endDate st
 		dataList := make([]*models.EdbDataList, 0)
 		//fmt.Println("chart:", v.Source, v.EdbInfoId, startDateReal, endDate)
 
-		var newEdbInfo *data_manage.EdbInfo
 		switch v.EdbInfoCategoryType {
 		case 0:
 			dataList, err = models.GetEdbDataList(v.Source, v.EdbInfoId, startDateReal, endDate)
 		case 1:
-			newEdbInfo, dataList, _, _, err, _ = GetPredictDataListByPredictEdbInfoId(v.EdbInfoId, startDateReal, endDate, false)
-			if item.MaxValue < newEdbInfo.MaxValue {
-				item.MaxData = newEdbInfo.MaxValue
-			}
-			if item.MinData > newEdbInfo.MinValue {
-				item.MinData = newEdbInfo.MinValue
-			}
+			_, dataList, _, _, err, _ = GetPredictDataListByPredictEdbInfoId(v.EdbInfoId, startDateReal, endDate, false)
 		default:
 			err = errors.New(fmt.Sprint("获取失败,指标类型异常", v.EdbInfoCategoryType))
 		}

utils/constants.go

@@ -68,6 +68,7 @@ const (
 	DATA_SOURCE_MYSTEEL_CHEMICAL                 //钢联化工->34
 	DATA_SOURCE_CALCULATE_CJJX                   //超季节性->35
 	DATA_SOURCE_EIA_STEO                         //eia steo报告->36
+	DATA_SOURCE_CALCULATE_NHCC                   //计算指标（拟合残差）->37
 )
 
 //数据刷新频率