|
|
@@ -325,7 +325,20 @@ func GetChartEdbData(chartInfoId, chartType int, calendar, startDate, endDate st
|
|
|
}
|
|
|
|
|
|
extraConfig = tmpExtraConfig
|
|
|
-
|
|
|
+ case utils.CHART_TYPE_RADAR:
|
|
|
+ var barConfig data_manage.RadarChartInfoReq
|
|
|
+ if extraConfigStr == `` {
|
|
|
+ errMsg = "雷达图未配置"
|
|
|
+ err = errors.New(errMsg)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ err = json.Unmarshal([]byte(extraConfigStr), &barConfig)
|
|
|
+ if err != nil {
|
|
|
+ errMsg = "雷达图配置异常"
|
|
|
+ err = errors.New(errMsg)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ extraConfig = barConfig
|
|
|
default:
|
|
|
xEdbIdValue = make([]int, 0)
|
|
|
yDataList = make([]data_manage.YData, 0)
|
|
|
@@ -379,8 +392,10 @@ func GetChartEdbData(chartInfoId, chartType int, calendar, startDate, endDate st
|
|
|
for _, v := range edbList {
|
|
|
v.DataList = nil
|
|
|
}
|
|
|
+ case utils.CHART_TYPE_RADAR: //雷达图
|
|
|
+ radarConf := extraConfig.(data_manage.RadarChartInfoReq)
|
|
|
+ xEdbIdValue, dataResp, err = RadarChartData(mappingList, edbDataListMap, radarConf)
|
|
|
}
|
|
|
-
|
|
|
return
|
|
|
}
|
|
|
|
|
|
@@ -569,7 +584,7 @@ func getEdbDataMapList(chartInfoId, chartType int, calendar, startDate, endDate
|
|
|
}
|
|
|
item.DataList = quarterDataList
|
|
|
}
|
|
|
- } else if chartType == 7 { //柱方图
|
|
|
+ } else if chartType == 7 || chartType == utils.CHART_TYPE_RADAR { //柱方图
|
|
|
//item.DataList = dataList
|
|
|
} else {
|
|
|
item.DataList = dataList
|
|
|
@@ -1476,8 +1491,20 @@ func CheckChartExtraConfig(chartType int, extraConfigStr string) (edbIdList []in
|
|
|
edbIdList = append(edbIdList, v.YEdbInfoId)
|
|
|
}
|
|
|
}
|
|
|
+ case utils.CHART_TYPE_RADAR:
|
|
|
+ var extraConfig data_manage.RadarChartInfoReq
|
|
|
+ if extraConfigStr == `` {
|
|
|
+ errMsg = "雷达图未配置"
|
|
|
+ err = errors.New(errMsg)
|
|
|
+ return
|
|
|
+ }
|
|
|
+ err = json.Unmarshal([]byte(extraConfigStr), &extraConfig)
|
|
|
+ if err != nil {
|
|
|
+ errMsg = "雷达图配置异常"
|
|
|
+ err = errors.New(errMsg)
|
|
|
+ return
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
return
|
|
|
}
|
|
|
|
|
|
@@ -1860,7 +1887,12 @@ func AddChartInfo(req data_manage.AddChartInfoReq, sysUserId int, sysUserRealNam
|
|
|
|
|
|
chartType := req.ChartType
|
|
|
extraConfig := req.ExtraConfig
|
|
|
-
|
|
|
+ var extraConfigEdbInfoIdArr []int
|
|
|
+ extraConfigEdbInfoIdArr, err, errMsg = CheckChartExtraConfig(chartType, extraConfig)
|
|
|
+ if err != nil {
|
|
|
+ err = errors.New("添加失败:" + err.Error())
|
|
|
+ return
|
|
|
+ }
|
|
|
// 季节性图表额外配置信息
|
|
|
var seasonExtraConfig string
|
|
|
// 关联指标
|
|
|
@@ -1936,14 +1968,7 @@ func AddChartInfo(req data_manage.AddChartInfoReq, sysUserId int, sysUserRealNam
|
|
|
err = errors.New(errMsg)
|
|
|
return
|
|
|
}
|
|
|
-
|
|
|
- tmpEdbInfoIdArr, tmpErr, tmpErrMsg := CheckChartExtraConfig(chartType, extraConfig)
|
|
|
- if err != nil {
|
|
|
- errMsg = tmpErrMsg
|
|
|
- err = errors.New("添加失败:" + tmpErr.Error())
|
|
|
- return
|
|
|
- }
|
|
|
- edbInfoIdArr = tmpEdbInfoIdArr
|
|
|
+ edbInfoIdArr = extraConfigEdbInfoIdArr
|
|
|
lenEdbInfoIdArr := len(edbInfoIdArr)
|
|
|
if lenEdbInfoIdArr > 0 {
|
|
|
tmpEdbList, tmpErr := data_manage.GetEdbInfoByIdList(edbInfoIdArr)
|
|
|
@@ -2108,6 +2133,8 @@ func AddChartInfo(req data_manage.AddChartInfoReq, sysUserId int, sysUserRealNam
|
|
|
chartInfo.Instructions = req.Instructions
|
|
|
chartInfo.MarkersLines = req.MarkersLines
|
|
|
chartInfo.MarkersAreas = req.MarkersAreas
|
|
|
+ chartInfo.Unit = req.Unit
|
|
|
+ chartInfo.UnitEn = req.UnitEn
|
|
|
newId, err := data_manage.AddChartInfo(chartInfo)
|
|
|
if err != nil {
|
|
|
errMsg = `保存失败`
|
|
|
@@ -2218,6 +2245,13 @@ func EditChartInfo(req data_manage.EditChartInfoReq, sysUser *system.Admin) (cha
|
|
|
return
|
|
|
}
|
|
|
|
|
|
+ var extraConfigEdbInfoIdArr []int
|
|
|
+ extraConfigEdbInfoIdArr, err, errMsg = CheckChartExtraConfig(req.ChartType, req.ExtraConfig)
|
|
|
+ if err != nil {
|
|
|
+ err = errors.New("添加失败:" + err.Error())
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
// 季节性图表额外配置信息
|
|
|
var seasonExtraConfig string
|
|
|
// 图表关联指标id
|
|
|
@@ -2299,14 +2333,7 @@ func EditChartInfo(req data_manage.EditChartInfoReq, sysUser *system.Admin) (cha
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- // 校验配置的指标列表
|
|
|
- tmpEdbInfoIdArr, tmpErr, tmpErrMsg := CheckChartExtraConfig(req.ChartType, req.ExtraConfig)
|
|
|
- if tmpErr != nil {
|
|
|
- errMsg = tmpErrMsg
|
|
|
- err = errors.New("添加失败:" + tmpErr.Error())
|
|
|
- return
|
|
|
- }
|
|
|
- edbInfoIdArr = tmpEdbInfoIdArr
|
|
|
+ edbInfoIdArr = extraConfigEdbInfoIdArr
|
|
|
lenEdbInfoIdArr := len(edbInfoIdArr)
|
|
|
if lenEdbInfoIdArr > 0 {
|
|
|
tmpEdbList, tmpErr := data_manage.GetEdbInfoByIdList(edbInfoIdArr)
|
|
|
@@ -2514,3 +2541,117 @@ func GetEdbSourceByEdbInfoIdList(chartEdbInfoMappingList []*data_manage.ChartEdb
|
|
|
}
|
|
|
return
|
|
|
}
|
|
|
+
|
|
|
+// RadarChartData 雷达图的数据处理
|
|
|
+func RadarChartData(mappingList []*data_manage.ChartEdbInfoMapping, edbDataListMap map[int][]*data_manage.EdbDataList, extraConfig data_manage.RadarChartInfoReq) (edbIdList []int, chartDataResp data_manage.RadarChartInfoResp, err error) {
|
|
|
+ // 指标数据数组（10086:{"2022-12-02":100.01,"2022-12-01":102.3}）
|
|
|
+ edbDataMap := make(map[int]map[string]float64)
|
|
|
+ for edbInfoId, edbDataList := range edbDataListMap {
|
|
|
+ edbDateData := make(map[string]float64)
|
|
|
+ for _, edbData := range edbDataList {
|
|
|
+ edbDateData[edbData.DataTime] = edbData.Value
|
|
|
+ }
|
|
|
+ edbDataMap[edbInfoId] = edbDateData
|
|
|
+ }
|
|
|
+ // edbIdList 指标展示顺序；x轴的指标顺序
|
|
|
+ edbIdList = make([]int, 0)
|
|
|
+ for _, v := range mappingList {
|
|
|
+ edbIdList = append(edbIdList, v.EdbInfoId)
|
|
|
+ }
|
|
|
+ chartDateList := extraConfig.DateList
|
|
|
+
|
|
|
+ yDataList := make([]data_manage.RadarYData, 0) //y轴的数据列表
|
|
|
+
|
|
|
+ for _, chartDate := range chartDateList {
|
|
|
+ var maxDate time.Time
|
|
|
+
|
|
|
+ findDataList := make([]float64, 0) // 当前日期的数据值
|
|
|
+ for _, edbInfoId := range edbIdList {
|
|
|
+ findDate := chartDate.Date //需要的日期值
|
|
|
+ dataList := edbDataListMap[edbInfoId] //指标的所有数据值
|
|
|
+ if len(dataList) <= 0 {
|
|
|
+ // 没有数据的指标id
|
|
|
+ findDataList = append(findDataList, 0)
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ switch chartDate.Type {
|
|
|
+ case 1: //最新值
|
|
|
+ findDate = dataList[len(dataList)-1].DataTime
|
|
|
+ case 2: //近期几天
|
|
|
+ findDateTime, tmpErr := time.ParseInLocation(utils.FormatDate, dataList[len(dataList)-1].DataTime, time.Local)
|
|
|
+ if tmpErr != nil {
|
|
|
+ err = tmpErr
|
|
|
+ return
|
|
|
+ }
|
|
|
+ findDateTime = findDateTime.AddDate(0, 0, -chartDate.Value)
|
|
|
+
|
|
|
+ lenData := len(dataList) - 1
|
|
|
+ for i := lenData; i >= 0; i-- {
|
|
|
+ currDateTime, e := time.ParseInLocation(utils.FormatDate, dataList[i].DataTime, time.Local)
|
|
|
+ if e != nil {
|
|
|
+ err = e
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if currDateTime.Equal(findDateTime) || currDateTime.Before(findDateTime) {
|
|
|
+ findDate = dataList[i].DataTime
|
|
|
+ break
|
|
|
+ }
|
|
|
+ }
|
|
|
+ case 3: // 固定日期
|
|
|
+ //最早的日期
|
|
|
+ minDateTime, tmpErr := time.ParseInLocation(utils.FormatDate, dataList[0].DataTime, time.Local)
|
|
|
+ if tmpErr != nil {
|
|
|
+ err = tmpErr
|
|
|
+ return
|
|
|
+ }
|
|
|
+ //寻找固定日期的数据
|
|
|
+ findDateTime, tmpErr := time.ParseInLocation(utils.FormatDate, chartDate.Date, time.Local)
|
|
|
+ if tmpErr != nil {
|
|
|
+ err = tmpErr
|
|
|
+ return
|
|
|
+ }
|
|
|
+ for tmpDateTime := findDateTime; tmpDateTime.After(minDateTime) || tmpDateTime.Equal(minDateTime); tmpDateTime = tmpDateTime.AddDate(0, 0, -1) {
|
|
|
+ tmpDate := tmpDateTime.Format(utils.FormatDate)
|
|
|
+ if _, ok := edbDataMap[edbInfoId][tmpDate]; ok { //如果能找到数据，那么就返回
|
|
|
+ findDate = tmpDate
|
|
|
+ break
|
|
|
+ }
|
|
|
+ }
|
|
|
+ default:
|
|
|
+ err = errors.New(fmt.Sprint("日期类型异常,Type:", chartDate.Type))
|
|
|
+ return
|
|
|
+ }
|
|
|
+ findDateTime, _ := time.ParseInLocation(utils.FormatDate, findDate, time.Local)
|
|
|
+ if maxDate.IsZero() {
|
|
|
+ maxDate = findDateTime
|
|
|
+ } else {
|
|
|
+ if findDateTime.After(maxDate) {
|
|
|
+ maxDate = findDateTime
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if tmpValue, ok := edbDataMap[edbInfoId][findDate]; ok {
|
|
|
+ tmpValue, _ = decimal.NewFromFloat(tmpValue).Round(4).Float64()
|
|
|
+ findDataList = append(findDataList, tmpValue)
|
|
|
+ } else {
|
|
|
+ findDataList = append(findDataList, 0)
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ yDate := "0000-00-00"
|
|
|
+ if !maxDate.IsZero() {
|
|
|
+ yDate = maxDate.Format(utils.FormatDate)
|
|
|
+ }
|
|
|
+ yDataList = append(yDataList, data_manage.RadarYData{
|
|
|
+ Date: yDate,
|
|
|
+ Value: findDataList,
|
|
|
+ Color: chartDate.Color,
|
|
|
+ Name: chartDate.Name,
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
+ chartDataResp = data_manage.RadarChartInfoResp{
|
|
|
+ YDataList: yDataList,
|
|
|
+ XEdbIdValue: edbIdList,
|
|
|
+ }
|
|
|
+ return
|
|
|
+}
|
