|
|
@@ -62,15 +62,11 @@ public class ShowHistogramService {
|
|
|
}
|
|
|
|
|
|
int baseId = getChartsDataUtilService.getBaseId(id);
|
|
|
- System.out.println("切换数据库"+baseId);
|
|
|
|
|
|
try{
|
|
|
if (!DynamicDataSourceContextHolder.isContainsDataSource(String.valueOf(baseId))) {
|
|
|
- //joinPoint.getSignature() :获取连接点的方法签名对象
|
|
|
- System.out.println("数据源 " + baseId + " 不存在使用默认的数据源 -> ");
|
|
|
return new RepEntity(RepCode.DataSourceNull);
|
|
|
} else {
|
|
|
- System.out.println("使用数据源:" + baseId);
|
|
|
DynamicDataSourceContextHolder.setDataSourceType(String.valueOf(baseId));
|
|
|
}
|
|
|
|
|
|
@@ -108,12 +104,10 @@ public class ShowHistogramService {
|
|
|
screen = scr.getRet();
|
|
|
screenToColumn = scr.getWithColumnRet();
|
|
|
StringBuilder sb = new StringBuilder(screenToColumn);
|
|
|
- System.out.println("sb:"+sb);
|
|
|
if (screenToColumn != null && !("".equals(screenToColumn))){
|
|
|
screenToColumnS = screenToColumn + " " + screen; //and
|
|
|
screenToColumn = String.valueOf(sb .replace(1, 5, "where "));
|
|
|
screen = screenToColumn + " " + screen; //where
|
|
|
- System.out.println("screen:" + screen);
|
|
|
} else {
|
|
|
StringBuilder sb1 = new StringBuilder(screen);
|
|
|
screenToColumnS = screen;
|
|
|
@@ -127,9 +121,7 @@ public class ShowHistogramService {
|
|
|
timeReture = timeConverterUtil.timeConverter(xColumn, tableName, xAxisType, screen, 20);
|
|
|
xAxisData = timeReture.getValues();
|
|
|
chartsDataInfo.setTooMany(timeReture.isOverdose());
|
|
|
- System.out.println("xA:" + xAxisData);
|
|
|
xData = timeConverterUtil.toRespons(xAxisData,xAxisType );
|
|
|
- System.out.println("data:"+xAxisData);
|
|
|
}else {
|
|
|
int count = showChartsMapper.getNumForX(xColumn, tableName);
|
|
|
if (count > 20){
|
|
|
@@ -170,11 +162,9 @@ public class ShowHistogramService {
|
|
|
value.add(valueOne);
|
|
|
}
|
|
|
|
|
|
- System.out.println(value);
|
|
|
series.setName(xColumn);
|
|
|
series.setValue(value);
|
|
|
serieses.add(series);
|
|
|
- System.out.println(serieses);
|
|
|
|
|
|
//有分组
|
|
|
if (groupBy.size() != 0){
|
|
|
@@ -189,7 +179,6 @@ public class ShowHistogramService {
|
|
|
chartsDataInfo.setTooMany(true);
|
|
|
}
|
|
|
List<String> groupsData = showChartsMapper.getGroups(groupByName,tableName, screenToColumnS, 20); //查询每个分组系列
|
|
|
- System.out.println("groupdata:"+ groupsData.toString());
|
|
|
Iterator itGroupsData = groupsData.iterator();
|
|
|
|
|
|
//每个分组得到得每个系列
|
|
|
@@ -236,20 +225,16 @@ public class ShowHistogramService {
|
|
|
}
|
|
|
|
|
|
ne.setValue(groupsValue);
|
|
|
- System.out.println("值:"+ series);
|
|
|
serieses.add(ne);
|
|
|
}
|
|
|
- System.out.println(serieses);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
chartsDataInfo.setSerieses(serieses);
|
|
|
}catch (Exception e){
|
|
|
e.printStackTrace();
|
|
|
- System.out.println("异常");
|
|
|
return new RepEntity(RepCode.erro);
|
|
|
}finally {
|
|
|
- System.out.println("关闭数据源");
|
|
|
DynamicDataSourceContextHolder.clearDataSourceType();
|
|
|
}
|
|
|
|