chenw 7 лет назад
Родитель
Сommit
8e07d410bd

+ 0 - 35
bi-server/src/main/java/com/usoftchina/bi/server/service/chart/ShowLineService.java

@@ -143,41 +143,6 @@ public class ShowLineService {
                     chartsDataInfo.setTooMany(true);
                 }
                 String groupsName = (String)itGroupsData.next();
-                /*//每个分组得到得每个系列
-                while(itGroupsData.hasNext()){
-                    String groupsName = (String)itGroupsData.next();
-                    if ("".equals(groupsName) || groupsName == null){
-                        continue;
-                    }
-                    List<LineSeriesMap> groupsValue = new ArrayList<LineSeriesMap>();
-                    *//*Iterator itXAxisData = xAxisData.iterator();
-
-                    //每个系列对应X轴上的值
-                    while (itXAxisData.hasNext()){
-                        String xAxisDataOne = (String) itXAxisData.next();
-                        if ("".equals(xAxisDataOne) || xAxisDataOne == null){
-                            continue;
-                        }
-                        double groupsValueOne = 0;
-                        String groupsValueOnes = null;
-                        groupsValueOnes = timeConverterUtil.getGroupTimeConverter(yAxisType, yColumn, tableName, groupByName, xAxisType,
-                                groupsName, xColumn, xAxisDataOne, screenToColumnS);
-                        if ("".equals(groupsValueOnes) || groupsValueOnes == null){
-                            groupsValueOne = 0;
-                        }else{
-                            groupsValueOne = Double.parseDouble(groupsValueOnes);
-                        }
-                        LineSeriesMap lineSeriesMap = new LineSeriesMap();
-                        lineSeriesMap.setDate(xAxisDataOne);
-                        lineSeriesMap.setValue(groupsValueOne);
-                        groupsValue.add(lineSeriesMap);
-                    }*//*
-                    groupsValue = showChartsMapper.getGroupValuesTime(yAxisType, yColumn, tableName, groupByName, groupsName, xColumn, "'YYYY-MM-DD'");
-                    LineSeries lineSeries = new LineSeries();
-                    lineSeries.setMdata(groupsValue);
-                    lineSeries.setName(groupsName);
-                    serieses.add(lineSeries);
-                }*/
 
                 List<LineSeriesGroupMap> lineSeriesGroupMapList = showChartsMapper.getGroupsValuesTime(yAxisType, yColumn, tableName, groupByName, groupsName, xColumn, "'YYYY-MM-DD'");
                 Map<String, List<LineSeriesGroupMap>> lineSeriesGroupMap = CollectionUtils.groupBy(lineSeriesGroupMapList, LineSeriesGroupMap::getGroup);