|
@@ -960,7 +960,7 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
|
|
//根据数据确定最早的年份,和最近年份
|
|
//根据数据确定最早的年份,和最近年份
|
|
//根据横轴的日期,汇总所有的年份
|
|
//根据横轴的日期,汇总所有的年份
|
|
startDate := dataList[0].DataTime
|
|
startDate := dataList[0].DataTime
|
|
- startDateT, tmpErr := time.ParseInLocation(utils.FormatDate, startDate,time.Local)
|
|
|
|
|
|
+ startDateT, tmpErr := time.ParseInLocation(utils.FormatDate, startDate, time.Local)
|
|
if tmpErr != nil {
|
|
if tmpErr != nil {
|
|
err = tmpErr
|
|
err = tmpErr
|
|
return
|
|
return
|
|
@@ -968,7 +968,7 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
|
|
startYear := startDateT.Year()
|
|
startYear := startDateT.Year()
|
|
//获取数据的最新日期
|
|
//获取数据的最新日期
|
|
lastDate := dataList[length-1].DataTime
|
|
lastDate := dataList[length-1].DataTime
|
|
- lastDateT, tmpErr := time.ParseInLocation(utils.FormatDate, lastDate,time.Local)
|
|
|
|
|
|
+ lastDateT, tmpErr := time.ParseInLocation(utils.FormatDate, lastDate, time.Local)
|
|
if tmpErr != nil {
|
|
if tmpErr != nil {
|
|
err = tmpErr
|
|
err = tmpErr
|
|
return
|
|
return
|
|
@@ -994,13 +994,13 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
|
|
name := fmt.Sprintf("%s_%s", startStr, endStr)
|
|
name := fmt.Sprintf("%s_%s", startStr, endStr)
|
|
showName := fmt.Sprintf("%d_%d", currentStartYear, currentEndYear)
|
|
showName := fmt.Sprintf("%d_%d", currentStartYear, currentEndYear)
|
|
|
|
|
|
- startT, tEr := time.ParseInLocation(utils.FormatDate, startStr,time.Local)
|
|
|
|
|
|
+ startT, tEr := time.ParseInLocation(utils.FormatDate, startStr, time.Local)
|
|
if tEr != nil {
|
|
if tEr != nil {
|
|
err = tEr
|
|
err = tEr
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
- endT, tEr := time.ParseInLocation(utils.FormatDate, endStr,time.Local)
|
|
|
|
|
|
+ endT, tEr := time.ParseInLocation(utils.FormatDate, endStr, time.Local)
|
|
if tEr != nil {
|
|
if tEr != nil {
|
|
err = tEr
|
|
err = tEr
|
|
return
|
|
return
|
|
@@ -1046,7 +1046,7 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
|
|
}
|
|
}
|
|
|
|
|
|
for _, v := range dataList {
|
|
for _, v := range dataList {
|
|
- dataTimeT, _ := time.ParseInLocation(utils.FormatDate, v.DataTime,time.Local)
|
|
|
|
|
|
+ dataTimeT, _ := time.ParseInLocation(utils.FormatDate, v.DataTime, time.Local)
|
|
year := dataTimeT.Year()
|
|
year := dataTimeT.Year()
|
|
newItemDate := dataTimeT.AddDate(nowYear-year, 0, 0)
|
|
newItemDate := dataTimeT.AddDate(nowYear-year, 0, 0)
|
|
for k, dateItem := range dataMap {
|
|
for k, dateItem := range dataMap {
|
|
@@ -1061,7 +1061,7 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
|
|
if jumpYear == 1 {
|
|
if jumpYear == 1 {
|
|
//计算前一年最大的日期, 只补齐数据到去年
|
|
//计算前一年最大的日期, 只补齐数据到去年
|
|
beforeYearMaxDate := fmt.Sprintf("%d-12-31", dateItem.StartDate.Year())
|
|
beforeYearMaxDate := fmt.Sprintf("%d-12-31", dateItem.StartDate.Year())
|
|
- beforeYearMaxDateT, _ := time.ParseInLocation(utils.FormatDate, beforeYearMaxDate,time.Local)
|
|
|
|
|
|
+ beforeYearMaxDateT, _ := time.ParseInLocation(utils.FormatDate, beforeYearMaxDate, time.Local)
|
|
if dataTimeT.Before(beforeYearMaxDateT) || dataTimeT == beforeYearMaxDateT {
|
|
if dataTimeT.Before(beforeYearMaxDateT) || dataTimeT == beforeYearMaxDateT {
|
|
newItemDate = dataTimeT.AddDate(nowYear-year-1, 0, 0)
|
|
newItemDate = dataTimeT.AddDate(nowYear-year-1, 0, 0)
|
|
} else {
|
|
} else {
|
|
@@ -1169,7 +1169,7 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
|
|
//获取数据的最新日期
|
|
//获取数据的最新日期
|
|
lastDate := result.List[length-1].Items[itemLength-1].DataTime
|
|
lastDate := result.List[length-1].Items[itemLength-1].DataTime
|
|
maxY := result.List[length-1].Year
|
|
maxY := result.List[length-1].Year
|
|
- lastDateT, tmpErr := time.ParseInLocation(utils.FormatDate, lastDate,time.Local)
|
|
|
|
|
|
+ lastDateT, tmpErr := time.ParseInLocation(utils.FormatDate, lastDate, time.Local)
|
|
if tmpErr != nil {
|
|
if tmpErr != nil {
|
|
err = tmpErr
|
|
err = tmpErr
|
|
return
|
|
return
|
|
@@ -1196,13 +1196,13 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
|
|
endStr := fmt.Sprintf("%d-%s", currentEndYear, xEndDate)
|
|
endStr := fmt.Sprintf("%d-%s", currentEndYear, xEndDate)
|
|
showName := fmt.Sprintf("%d_%d", currentStartYear, currentEndYear)
|
|
showName := fmt.Sprintf("%d_%d", currentStartYear, currentEndYear)
|
|
|
|
|
|
- startT, tEr := time.ParseInLocation(utils.FormatDate, startStr,time.Local)
|
|
|
|
|
|
+ startT, tEr := time.ParseInLocation(utils.FormatDate, startStr, time.Local)
|
|
if tEr != nil {
|
|
if tEr != nil {
|
|
err = tEr
|
|
err = tEr
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
- endT, tEr := time.ParseInLocation(utils.FormatDate, endStr,time.Local)
|
|
|
|
|
|
+ endT, tEr := time.ParseInLocation(utils.FormatDate, endStr, time.Local)
|
|
if tEr != nil {
|
|
if tEr != nil {
|
|
err = tEr
|
|
err = tEr
|
|
return
|
|
return
|
|
@@ -1295,7 +1295,7 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
|
|
DataTimestamp: item.DataTimestamp,
|
|
DataTimestamp: item.DataTimestamp,
|
|
Value: item.Value,
|
|
Value: item.Value,
|
|
}
|
|
}
|
|
- dataTimeT, _ := time.ParseInLocation(utils.FormatDate, item.DataTime,time.Local)
|
|
|
|
|
|
+ dataTimeT, _ := time.ParseInLocation(utils.FormatDate, item.DataTime, time.Local)
|
|
// year := dataTimeT.Year()
|
|
// year := dataTimeT.Year()
|
|
// newItemDate := dataTimeT.AddDate(nowYear-year, 0, 0)
|
|
// newItemDate := dataTimeT.AddDate(nowYear-year, 0, 0)
|
|
// timestamp := newItemDate.UnixNano() / 1e6
|
|
// timestamp := newItemDate.UnixNano() / 1e6
|
|
@@ -3094,6 +3094,26 @@ func GetEdbSourceByEdbInfoIdList(chartEdbInfoMappingList []*data_manage.ChartEdb
|
|
sourceNameList = append(sourceNameList, conf[models.BusinessConfCompanyName])
|
|
sourceNameList = append(sourceNameList, conf[models.BusinessConfCompanyName])
|
|
sourceNameEnList = append(sourceNameEnList, conf[models.BusinessConfCompanyName])
|
|
sourceNameEnList = append(sourceNameEnList, conf[models.BusinessConfCompanyName])
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ // (弘则)合规上的要求过滤掉SMM,彭博以及彭博财务;前端那边没办法完全处理掉入口的所以这边也过滤一下
|
|
|
|
+ if conf[models.BusinessConfHideSourceFormSMM] == "true" {
|
|
|
|
+ newNames, newEnNames := make([]string, 0), make([]string, 0)
|
|
|
|
+ for _, v := range sourceNameList {
|
|
|
|
+ str := strings.ToUpper(v)
|
|
|
|
+ if str == "SMM" || str == "彭博" || str == "彭博财务" {
|
|
|
|
+ continue
|
|
|
|
+ }
|
|
|
|
+ newNames = append(newNames, v)
|
|
|
|
+ }
|
|
|
|
+ for _, v := range sourceNameEnList {
|
|
|
|
+ str := strings.ToUpper(v)
|
|
|
|
+ if str == "SMM" || str == "彭博" || str == "彭博财务" {
|
|
|
|
+ continue
|
|
|
|
+ }
|
|
|
|
+ newEnNames = append(newEnNames, v)
|
|
|
|
+ }
|
|
|
|
+ return newNames, newEnNames
|
|
|
|
+ }
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
@@ -3947,7 +3967,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
|
|
err = e
|
|
err = e
|
|
return
|
|
return
|
|
}
|
|
}
|
|
- endDate, e := time.ParseInLocation(utils.FormatDate, endDateStr,time.Local)
|
|
|
|
|
|
+ endDate, e := time.ParseInLocation(utils.FormatDate, endDateStr, time.Local)
|
|
if e != nil {
|
|
if e != nil {
|
|
err = e
|
|
err = e
|
|
return
|
|
return
|
|
@@ -3971,7 +3991,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
|
|
continue
|
|
continue
|
|
}
|
|
}
|
|
for _, date := range dataTimeList {
|
|
for _, date := range dataTimeList {
|
|
- dateTime, e := time.ParseInLocation(utils.FormatDate, date,time.Local)
|
|
|
|
|
|
+ dateTime, e := time.ParseInLocation(utils.FormatDate, date, time.Local)
|
|
if e != nil {
|
|
if e != nil {
|
|
err = errors.New("时间格式化异常, Err:" + e.Error())
|
|
err = errors.New("时间格式化异常, Err:" + e.Error())
|
|
return
|
|
return
|
|
@@ -4087,7 +4107,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
|
|
} else {
|
|
} else {
|
|
// 旬度、月度、季度、半年度 不插值,需要先把日期列表和数据map取出来
|
|
// 旬度、月度、季度、半年度 不插值,需要先把日期列表和数据map取出来
|
|
for _, vv := range v.DataList {
|
|
for _, vv := range v.DataList {
|
|
- dateTime, e := time.ParseInLocation(utils.FormatDate, vv.DataTime,time.Local)
|
|
|
|
|
|
+ dateTime, e := time.ParseInLocation(utils.FormatDate, vv.DataTime, time.Local)
|
|
if e != nil {
|
|
if e != nil {
|
|
err = errors.New("时间格式化异常, Err:" + e.Error())
|
|
err = errors.New("时间格式化异常, Err:" + e.Error())
|
|
return
|
|
return
|
|
@@ -4265,7 +4285,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
|
|
return
|
|
return
|
|
}
|
|
}
|
|
for _, date := range dataTimeList {
|
|
for _, date := range dataTimeList {
|
|
- dateTime, e := time.ParseInLocation(utils.FormatDate, date,time.Local)
|
|
|
|
|
|
+ dateTime, e := time.ParseInLocation(utils.FormatDate, date, time.Local)
|
|
if e != nil {
|
|
if e != nil {
|
|
err = errors.New("时间格式化异常, Err:" + e.Error())
|
|
err = errors.New("时间格式化异常, Err:" + e.Error())
|
|
return
|
|
return
|
|
@@ -4354,7 +4374,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
|
|
return
|
|
return
|
|
}
|
|
}
|
|
for _, date := range dataTimeList {
|
|
for _, date := range dataTimeList {
|
|
- dateTime, e := time.ParseInLocation(utils.FormatDate, date,time.Local)
|
|
|
|
|
|
+ dateTime, e := time.ParseInLocation(utils.FormatDate, date, time.Local)
|
|
if e != nil {
|
|
if e != nil {
|
|
err = errors.New("时间格式化异常, Err:" + e.Error())
|
|
err = errors.New("时间格式化异常, Err:" + e.Error())
|
|
return
|
|
return
|
|
@@ -4426,7 +4446,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
|
|
// 自定义右轴
|
|
// 自定义右轴
|
|
if seasonConfig.RightAxis.IndicatorType != 0 {
|
|
if seasonConfig.RightAxis.IndicatorType != 0 {
|
|
if seasonConfig.RightAxis.IndicatorType == 1 {
|
|
if seasonConfig.RightAxis.IndicatorType == 1 {
|
|
- startTime, _ := time.ParseInLocation(utils.FormatDate, mappingItem.StartDate,time.Local)
|
|
|
|
|
|
+ startTime, _ := time.ParseInLocation(utils.FormatDate, mappingItem.StartDate, time.Local)
|
|
for i := len(quarterDataList) - 1; i > len(quarterDataList)-2 && i > 0; i-- {
|
|
for i := len(quarterDataList) - 1; i > len(quarterDataList)-2 && i > 0; i-- {
|
|
var rightMappingItem data_manage.ChartEdbInfoMapping
|
|
var rightMappingItem data_manage.ChartEdbInfoMapping
|
|
rightMappingItem = *mappingItem
|
|
rightMappingItem = *mappingItem
|