删除无用代码

bi-server/src/main/java/com/usoftchina/bi/server/dao/chart/ChartsConfigMapper.java

@@ -297,20 +297,6 @@ public interface ChartsConfigMapper {
     @Select("select bd.create_id from bi_charts bc,bi_data_connectors bd where bc.bd_data_id = bd.id and bc.id = #{id}")
     int getCreateIdBychart(int id);
 
-    /*
-    通过图表查询数据源ID
-     */
-    @Select("select bd_data_id from bi_charts where id = #{id}")
-    int getBaseIdByChart(int id);
-
-    /*
-    通过用户Id查询数据源ID
-     */
-    @Select("select bs_db_id from bi_db_strategys where bs_id in (select bo_st_id from " +
-            "bi_db_object where (bo_ob_id = #{id} and bo_type = '1') or (bo_ob_id = '1' and bo_type = '0' and bo_ob_id in" +
-            "(select br_user_group from bi_user_rel_groups where br_user_id= #{id}))) and is_open = '1'")
-    int getBaseIdByUser(int id);
-
     @Select("select table_name as sql, columns_config as columnConfig from bi_data_connectors where id = #{id}")
     ColumnConfigAndSql getConfigAndSql(int id);
 

bi-server/src/main/java/com/usoftchina/bi/server/dao/chart/ShowChartsMapper.java

@@ -2,7 +2,6 @@ package com.usoftchina.bi.server.dao.chart;
 
 import com.usoftchina.bi.core.base.TestPage;
 import com.usoftchina.bi.server.model.bo.*;
-import com.usoftchina.bi.server.model.po.TargetData;
 import org.apache.ibatis.annotations.CacheNamespace;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -18,176 +17,6 @@ import java.util.Map;
 @CacheNamespace(flushInterval = 300000L)
 public interface ShowChartsMapper {
     /*
-    查询X轴列数
-     */
-    @Select("select count(*) from (select DISTINCT ${xAxisName} from ${tableName})")
-    int getNumForX(@Param("xAxisName") String xAxisName, @Param("tableName") String tableName);
-
-    //x轴
-    @Select("select * from (select DISTINCT ${xAxisName} from ${tableName} ${screenToColumn}) where rownum <= #{num}")
-    List<String> getXAxis(@Param("xAxisName") String xAxisName, @Param("tableName") String tableName, @Param("screenToColumn") String screenToColumn, @Param("num") int num);
-
-
-    //XY轴数据
-    @Select("select ${dataType}(${yAxisName}) as \"value\",${xColumn} as \"date\" from ${tableName} where 1=1 ${screen} group by ${xColumn}")
-    List<LineSeriesMap> getXAndYValues(@Param("yAxisName") String yAxisName, @Param("xColumn") String xColumn,
-                          @Param("tableName") String tableName, @Param("dataType") String dataType,
-                          @Param("screen") String screen);
-
-    //x轴数据
-    @Select("select ${dataType}(${yAxisName}) from ${tableName} where ${xColumn} = #{xdata} ${screen}")
-    String getXValue(@Param("yAxisName") String yAxisName, @Param("xColumn") String xColumn,
-                     @Param("tableName") String tableName, @Param("dataType") String dataType,
-                     @Param("xdata") String xdata, @Param("screen") String screen);
-
-    //x轴数据 -> 优化后
-    @Select("select ${dataType}(${yAxisName}) from ${tableName} where 1=1 ${screen} and ${xColumn} in (select * from (select DISTINCT ${xColumn} from ${tableName} ${screenToColumn}) where rownum <= #{num}) GROUP BY ${xColumn}")
-    List<Double> getValues(@Param("yAxisName") String yAxisName, @Param("xColumn") String xColumn,
-                    @Param("tableName") String tableName, @Param("dataType") String dataType,
-                    @Param("screen") String screen, @Param("screenToColumn") String screenToColumn, @Param("num") int num);
-
-    //x轴数据 -> 饼图优化后
-    @Select("select ${dataType}(${yAxisName}) value, ${xColumn} name from ${tableName} where 1=1 ${screen} GROUP BY ${xColumn}")
-    List<PieSeriesMap> getPieXValues(@Param("yAxisName") String yAxisName, @Param("xColumn") String xColumn,
-                                    @Param("tableName") String tableName, @Param("dataType") String dataType,
-                                    @Param("screen") String screen);
-
-    //x轴为空时的数据
-    @Select("select ${dataType}(${yAxisName}) from ${tableName} where ${xColumn} is null ${screen}")
-    String getValuesIsNull(@Param("yAxisName") String yAxisName, @Param("xColumn") String xColumn,
-                     @Param("tableName") String tableName, @Param("dataType") String dataType,
-                           @Param("screen") String screen);
-
-
-
-    //查询分组系列
-    @Select("SELECT * FROM (select ${groupsBy} from ${tableName} where ${groupsBy} is not null ${screen} group by ${groupsBy}) WHERE rownum<=#{count}")
-    List<String> getGroups(@Param("groupsBy") String groupsBy, @Param("tableName") String tableName, @Param("screen") String screen, @Param("count") int count);
-
-    //查询分组系列个数
-    @Select("select count(*) from (select ${groupsBy} from ${tableName} where 1=1 ${screen} group by ${groupsBy})")
-    int getGroupsCount(@Param("groupsBy") String groupsBy, @Param("tableName") String tableName, @Param("screen") String screen);
-
-
-    //查询分组的值
-    @Select("select ${dataType}(${yAxisName}) from ${tableName} where ${groupsColumn} and ${xColumn} ${screen}")
-    String getGroupsValue(@Param("dataType") String dataType, @Param("yAxisName") String yAxisName, @Param("tableName") String tableName,
-                          @Param("groupsColumn") String groupsColumn,
-                          @Param("xColumn") String xColumn,
-                          @Param("screen") String screen);
-
-    //时间类型的X轴
-    @Select("select distinct to_char(${xAxisName},${timeType})time from ${tableName} ${screen} ORDER by to_char(${xAxisName},${timeType}) ASC")
-    List<String> getTimeDate(@Param("xAxisName") String xAxisName, @Param("tableName") String tableName,
-                             @Param("timeType") String timeType, @Param("screen") String screen, @Param("count") int count);
-
-    //时间类型的X轴查count
-    @Select("select count(*) from (select distinct to_char(${xAxisName},${timeType})time from ${tableName} ${screen} ORDER by to_char(${xAxisName},${timeType}) ASC)")
-    int getTimeDateConunt(@Param("xAxisName") String xAxisName, @Param("tableName") String tableName,
-                             @Param("timeType") String timeType, @Param("screen") String screen);
-
-    //半年
-    @Select("select distinct case when to_char(${xAxisName},'MM')<=6 then to_char(${xAxisName},'YYYY')|| '-H1'" +
-            "else to_char(${xAxisName},'YYYY')||'-H2' end time from ${tableName} ${screen} and ${xAxisName} is not null order by time")
-    List<String> getTimeYear(@Param("xAxisName") String xAxisName, @Param("tableName") String tableName, @Param("screen") String screen);
-    
-    //无分组时间类型值
-    @Select("select ${dataType}(${yAxisName}) from ${tableName} where (to_char(${xAxisName},${timeType})) = #{xColumnIndex}  ${screen}")
-    String getTimeValue (@Param("dataType") String dataType, @Param("yAxisName") String yAxisName,
-                         @Param("tableName") String tableName, @Param("xAxisName") String xAxisName,
-                         @Param("timeType") String timeType, @Param("xColumnIndex") String xColumnIndex,
-                         @Param("screen") String screen);
-
-    //无分组时间类型值->优化后
-    @Select("select ${dataType}(${yAxisName}) as \"value\",(to_char(${xAxisName},'YYYY-MM-DD')) as \"date\" from ${tableName} ${screen} GROUP BY (to_char(${xAxisName},'YYYY-MM-DD')) ORDER BY (to_char(${xAxisName},'YYYY-MM-DD'))")
-    List<LineSeriesMap> getTimeValues (@Param("dataType") String dataType, @Param("yAxisName") String yAxisName,
-                                 @Param("tableName") String tableName, @Param("xAxisName") String xAxisName,
-                                 @Param("screen") String screen);
-
-    //无分组时间类型值(柱状图)->优化后
-    @Select("select ${dataType}(${yAxisName}) from ${tableName} WHERE 1=1 ${screen} GROUP BY (to_char(${xAxisName},${timeType})) ")
-    List<Double> getHistogramTimeValue(@Param("dataType") String dataType, @Param("yAxisName") String yAxisName,
-                                       @Param("tableName") String tableName, @Param("xAxisName") String xAxisName,
-                                       @Param("timeType") String timeType, @Param("screen") String screen);
-
-    //无分组半年时间值
-    @Select("select ${dataType}(${yAxisName}) from ${tableName} where TO_CHAR(${xAxisName},'YYYY-MM') between #{firstIndex} and #{afterIndex} ${screen}")
-    String getTimeValueYear(@Param("dataType") String dataType, @Param("yAxisName") String yAxisName, @Param("tableName") String tableName,
-                            @Param("xAxisName") String xAxisName, @Param("firstIndex") String firstIndex,
-                            @Param("afterIndex") String afterIndex, @Param("screen") String screen);
-
-    /**
-     * 无分组半年时间值(柱状图)
-     * @param dataType
-     * @param yAxisName
-     * @param tableName
-     * @param xAxisName
-     * @param firstIndex
-     * @param afterIndex
-     * @param screen
-     * @return
-     */
-    @Select("select ${dataType}(${yAxisName}) from ${tableName} where TO_CHAR(${xAxisName},'YYYY-MM') between #{firstIndex} and #{afterIndex} ${screen}")
-    Double getHistogramTimeValueYear(@Param("dataType") String dataType, @Param("yAxisName") String yAxisName, @Param("tableName") String tableName,
-                                     @Param("xAxisName") String xAxisName, @Param("firstIndex") String firstIndex,
-                                     @Param("afterIndex") String afterIndex, @Param("screen") String screen);
-    //时间为空时间值
-    @Select("select ${dataType}(${yAxisName}) from ${tableName} where ${xAxisName} is null ${screen}")
-    String getTimeIsNull(@Param("dataType") String dataType, @Param("yAxisName") String yAxisName, @Param("tableName") String tableName,
-                         @Param("xAxisName") String xAxisName, @Param("screen") String screen);
-
-
-    //查询时间类型分组的值
-    @Select("select ${dataType}(${yAxisName}) from ${tableName} where ${groupsColumn}=#{groupsIndex} and TO_CHAR(${xColumn},${timeType})=#{xColumnIndex, jdbcType=VARCHAR} ")
-    String getGroupsValueTime(@Param("dataType") String dataType, @Param("yAxisName") String yAxisName, @Param("tableName") String tableName,
-                          @Param("groupsColumn") String groupsColumn, @Param("groupsIndex") String groupsIndex,
-                          @Param("xColumn") String xColumn, @Param("timeType") String timeType, @Param("xColumnIndex") String xColumnIndex
-                           );
-
-    //查询时间类型分组的值->优化后(折线图)
-    @Select("select ${dataType}(${yAxisName}) as \"value\",TO_CHAR(${xColumn},${timeType}) as \"date\" from ${tableName} where ${groupsColumn}=#{groupsIndex} GROUP BY TO_CHAR(${xColumn},${timeType}) ")
-    List<LineSeriesMap> getGroupValuesTime(@Param("dataType") String dataType, @Param("yAxisName") String yAxisName, @Param("tableName") String tableName,
-                              @Param("groupsColumn") String groupsColumn, @Param("groupsIndex") String groupsIndex,
-                              @Param("xColumn") String xColumn, @Param("timeType") String timeType
-    );
-
-    //查询时间类型分组的值->优化后(柱状图)
-    @Select("select ${dataType}(${yAxisName}) from ${tableName} where ${groupsColumn}=#{groupsIndex} GROUP BY TO_CHAR(${xColumn},${timeType}) ORDER BY TO_CHAR(${xColumn},${timeType})")
-    List<Double> getHistogramTimeValueGroupValuesTime(@Param("dataType") String dataType, @Param("yAxisName") String yAxisName, @Param("tableName") String tableName,
-                                                      @Param("groupsColumn") String groupsColumn, @Param("groupsIndex") String groupsIndex,
-                                                      @Param("xColumn") String xColumn, @Param("timeType") String timeType);
-
-    //查询时间类型分组的值->优化后
-    @Select("select ${dataType}(${yAxisName}) as \"value\",TO_CHAR(${xColumn},${timeType}) as \"date\",${groupsColumn} as \"group\" from ${tableName} where ${groupsColumn} IN (SELECT ${groupsColumn} FROM ${tableName} GROUP BY ${groupsColumn}) ${screen} GROUP BY TO_CHAR(${xColumn},${timeType}),${groupsColumn} ")
-    List<LineSeriesGroupMap> getGroupsValuesTime(@Param("dataType") String dataType, @Param("yAxisName") String yAxisName, @Param("tableName") String tableName,
-                                                 @Param("groupsColumn") String groupsColumn, @Param("groupsIndex") String groupsIndex,
-                                                 @Param("xColumn") String xColumn, @Param("timeType") String timeType, @Param("screen") String screen
-    );
-
-    //有分组时时间类型为空值
-    @Select("select ${dataType}(${yAxisName}) from ${tableName} where ${groupsColumn} is null and TO_CHAR(${xColumn},${timeType})=#{xColumnIndex} ${screen}")
-    String getGroupsValueTimeIsNull(@Param("dataType") String dataType, @Param("yAxisName") String yAxisName, @Param("tableName") String tableName,
-                              @Param("groupsColumn") String groupsColumn, @Param("groupsIndex") String groupsIndex,
-                              @Param("xColumn") String xColumn, @Param("timeType") String timeType,
-                                    @Param("xColumnIndex") String xColumnIndex, @Param("screen") String screen
-    );
-
-
-    //查询分组的值（时间类型半年）
-    //分组半年时间值
-    @Select("select ${dataType}(${yAxisName}) from ${tableName} where TO_CHAR(${xAxisName},'YYYY-MM') between #{firstIndex} and #{afterIndex} and ${groupsColumn}=#{groupsIndex} ${screen}")
-    String getTimeValueHalfYear(@Param("dataType") String dataType, @Param("yAxisName") String yAxisName, @Param("tableName") String tableName,
-                            @Param("xAxisName") String xAxisName, @Param("firstIndex") String firstIndex, @Param("afterIndex") String afterIndex,
-                                @Param("groupsColumn") String groupsColumn, @Param("groupsIndex") String groupsIndex, @Param("screen") String screen);
-
-    //查询分组的值（时间类型半年）  柱状图
-    //分组半年时间值
-    @Select("select ${dataType}(${yAxisName}) from ${tableName} where TO_CHAR(${xAxisName},'YYYY-MM') between #{firstIndex} and #{afterIndex} and ${groupsColumn}=#{groupsIndex} ${screen}")
-    Double getHistogramTimeValueHalfYear (@Param("dataType") String dataType, @Param("yAxisName") String yAxisName, @Param("tableName") String tableName,
-                                          @Param("xAxisName") String xAxisName, @Param("firstIndex") String firstIndex, @Param("afterIndex") String afterIndex,
-                                          @Param("groupsColumn") String groupsColumn, @Param("groupsIndex") String groupsIndex, @Param("screen") String screen);
-
-    /*
    总体未分组
     */
     @Select("select ${operation}(${columnName}) from ${tableName} ${screen}")
@@ -209,18 +38,6 @@ public interface ShowChartsMapper {
     Double getDistinctCountColumnData(@Param("tableName") String tableName, @Param("columnName") String columnName,
                                       @Param("operation") String operation, @Param("screen") String screen);
 
-    /*
-    取主键名称
-     */
-    @Select("select column_name from user_cons_columns where table_name = #{tableName} and constraint_name = #{tableKey}")
-    String getTableKey(@Param("tableName") String tableName, @Param("tableKey") String tableKey, @Param("screen") String screen);
-
-    /*
-    取目标列的值
-     */
-    @Select("select ${keyName} as id,${columnName} as data from (select ${keyName},${columnName} from ${tableName} order by ${columnName} ${sort}) where rownum<${line}")
-    List<TargetData> getTargetData(@Param("keyName") String keyName, @Param("columnName") String columnName, @Param("tableName") String tableName, @Param("sort") String sort, @Param("line") String line);
-
     /*
     获取其他类数据
      */
@@ -242,17 +59,6 @@ public interface ShowChartsMapper {
     List<Map<String, Object>> getGroupByValue(@Param("groupBy") String groupBy, @Param("operation") String operation, @Param("tableName") String tableName,
                                               @Param("groupByOne") String groupByOne, @Param("screen") String screen);
 
-    /*
-    总体TH值
-     */
-    @Select("select median(${columnName}) from ${tableName} where ${columnName} between " +
-            " (select ${fOperation}(${columnName}) from ${tableName}) and (select ${aOperation}(${columnName}) from ${tableName})" +
-            " group by " +
-            " ${groupBy} order by ${groupByOne}")
-    List<LinkedHashMap<String, Object>> getGroupByValueTh(@Param("groupBy") String groupBy, @Param("columnName") String columnName, @Param("tableName") String tableName,
-                                                        @Param("groupByOne") String groupByOne, @Param("screen") String screen, @Param("fOperation") String fOperation,
-                                                          @Param("aOperation") String aOperation);
-
     /*
     查询筛选列信息
      */

bi-server/src/main/java/com/usoftchina/bi/server/service/chart/ShowHistogramService.java

@@ -27,8 +27,6 @@ public class ShowHistogramService {
     @Autowired
     ShowChartsMapper showChartsMapper;
     @Autowired
-    TimeConverterUtil timeConverterUtil;
-    @Autowired
     ChartsConfigMapper chartsConfigMapper;
     @Autowired
     ObjectMapper objectMapper;

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

@@ -25,8 +25,6 @@ public class ShowLineService {
     @Autowired
     ShowChartsMapper showChartsMapper;
     @Autowired
-    TimeConverterUtil timeConverterUtil;
-    @Autowired
     ChartsConfigMapper chartsConfigMapper;
     @Autowired
     GetChartsDataUtilService getChartsDataUtilService;

bi-server/src/main/java/com/usoftchina/bi/server/service/chart/ShowPieService.java

@@ -25,8 +25,6 @@ public class ShowPieService {
     @Autowired
     ShowChartsMapper showChartsMapper;
     @Autowired
-    TimeConverterUtil timeConverterUtil;
-    @Autowired
     ChartsConfigMapper chartsConfigMapper;
     @Autowired
     ScreenUtil screenUtil;
@@ -52,7 +50,6 @@ public class ShowPieService {
         List<PieSeriesMap> value = new ArrayList<PieSeriesMap>();
         List<PieSeries> serieses = new ArrayList<PieSeries>();      //生成柱状图的系列
         List<String> xAxisData = new ArrayList<String>();       //X轴自己用
-        List<String> xData = new ArrayList<String>();           //X轴前端用
 
         List<Screen> filters = pieConfigInfo.getFilters();
         ScreenStr scr = new ScreenStr();

bi-server/src/main/java/com/usoftchina/bi/server/service/chart/ShowScatterService.java

@@ -28,8 +28,6 @@ public class ShowScatterService {
     @Autowired
     ShowChartsMapper showChartsMapper;
     @Autowired
-    TimeConverterUtil timeConverterUtil;
-    @Autowired
     ChartsConfigMapper chartsConfigMapper;
     @Autowired
     GetChartsDataUtilService getChartsDataUtilService;

bi-server/src/main/java/com/usoftchina/bi/server/service/chart/TimeConverterUtil.java

@@ -13,288 +13,7 @@ import java.util.List;
 /*
 处理时间分段
  */
-@Service
 public class TimeConverterUtil {
-    @Autowired
-    ShowChartsMapper showChartsMapper;
-
-    //x轴时间类型
-    public TimeReture timeConverter(String xColumnName, String tableName, String timeType, String screen, int counts){
-        TimeReture timeReture = new TimeReture();
-        String timeGroup = "'YYYY-MM-DD'";
-        List<String> value = new ArrayList<String>();
-        if ("year".equals(timeType)){
-            timeGroup = "'YYYY'";
-            value = showChartsMapper.getTimeDate(xColumnName, tableName, timeGroup, screen, counts);
-            timeReture.setValues(value);
-        }else if ("month".equals(timeType)){
-            timeGroup = "'YYYY-MM'";
-            int count = showChartsMapper.getTimeDateConunt(xColumnName, tableName, timeGroup, screen);
-            if (count > counts){
-                timeReture.setOverdose(false);
-            }else {
-                timeReture.setOverdose(true);
-            }
-            value = showChartsMapper.getTimeDate(xColumnName, tableName, timeGroup, screen, counts);
-            timeReture.setValues(value);
-        }else if ("day".equals(timeType) || "".equals(timeType)){
-            int count = showChartsMapper.getTimeDateConunt(xColumnName, tableName, timeGroup, screen);
-            if (count > counts){
-                timeReture.setOverdose(false);
-            }else {
-                timeReture.setOverdose(true);
-            }
-            value = showChartsMapper.getTimeDate(xColumnName, tableName, timeGroup, screen, counts);
-            timeReture.setValues(value);
-        }else if ("quarter".equals(timeType)){
-            timeGroup = "'YYYY-Q'";
-            int count = showChartsMapper.getTimeDateConunt(xColumnName, tableName, timeGroup, screen);
-            if (count > counts){
-                timeReture.setOverdose(false);
-            }else {
-                timeReture.setOverdose(true);
-            }
-            value = showChartsMapper.getTimeDate(xColumnName, tableName, timeGroup, screen, counts);
-            timeReture.setValues(value);
-        }else if ("week".equals(timeType)){
-            timeGroup = "'YYYY-WW'";
-            int count = showChartsMapper.getTimeDateConunt(xColumnName, tableName, timeGroup, screen);
-            if (count > counts){
-                timeReture.setOverdose(false);
-            }else {
-                timeReture.setOverdose(true);
-            }
-            value = showChartsMapper.getTimeDate(xColumnName, tableName, timeGroup, screen, counts);
-            timeReture.setValues(value);
-        }else if ("halfYear".equals(timeType)){
-            int count = showChartsMapper.getTimeDateConunt(xColumnName, tableName, timeGroup, screen);
-            if (count > counts){
-                timeReture.setOverdose(false);
-            }else {
-                timeReture.setOverdose(true);
-            }
-            if (StringUtils.isEmpty(screen)) {
-                screen = "where 1 = 1";
-            }
-            value = showChartsMapper.getTimeYear(xColumnName, tableName, screen);
-            timeReture.setValues(value);
-        }else {
-            timeGroup = "'YYYY-MM-DD'";
-            int count = showChartsMapper.getTimeDateConunt(xColumnName, tableName, timeGroup, screen);
-            if (count > counts){
-                timeReture.setOverdose(false);
-            }else {
-                timeReture.setOverdose(true);
-            }
-            value = showChartsMapper.getTimeDate(xColumnName, tableName, timeGroup, screen,counts);
-            timeReture.setValues(value);
-        }
-        return timeReture;
-    }
-
-    //x轴时间类型包装
-    public List<String> toRespons(List<String> dataList, String timeType){
-        List<String> value = new ArrayList<String>();
-        String dataLast = null;
-        Iterator isDataList = dataList.iterator();
-        while (isDataList.hasNext()){
-            String data = (String) isDataList.next();
-            if (data == null || "".equals(data)){
-                continue;
-            }
-            if ("quarter".equals(timeType)){
-                String[] str = data.split("-");
-                dataLast = str[0] + "-Q" + str[1];
-            }else if ("month".equals(timeType)){
-                String[] str = data.split("-");
-                dataLast = str[0] + "-M" + str[1];
-            }else if ("week".equals(timeType)){
-                String[] str = data.split("-");
-                dataLast = str[0] + "-W" + str[1];
-            }
-            value.add(dataLast);
-        }
-        return value;
-    }
-
-    //无分组时间值
-    public String getTimeValueConverter(String yColumn, String xColumn, String tableName, String dataType, String timeType, String xdata, String screen){
-
-        String timeGroup = "'YYYY-MM-DD'";
-        String value = null;
-        //判断时间类型
-        if (xdata == null || "".equals(xdata)){
-            value = showChartsMapper.getTimeIsNull(dataType, yColumn, tableName, xColumn, screen);
-        }else {
-            if ("halfYear".equals(timeType)) {
-                String[] str = xdata.split("-");
-                if ("H1".equals(str[1])) {
-                    String firstIndex = str[0] + "-01";
-                    String afterIndex = str[0] + "-06";
-                    value = showChartsMapper.getTimeValueYear(dataType, yColumn, tableName, xColumn, firstIndex, afterIndex, screen);
-                } else {
-                    String firstIndex = str[0] + "-07";
-                    String afterIndex = str[0] + "-12";
-                    value = showChartsMapper.getTimeValueYear(dataType, yColumn, tableName, xColumn, firstIndex, afterIndex, screen);
-                }
-            } else if ("year".equals(timeType)) {
-                timeGroup = "'YYYY'";
-                value = showChartsMapper.getTimeValue(dataType, yColumn, tableName, xColumn, timeGroup, xdata, screen);
-            } else if ("month".equals(timeType)) {
-                timeGroup = "'YYYY-MM'";
-                value = showChartsMapper.getTimeValue(dataType, yColumn, tableName, xColumn, timeGroup, xdata, screen);
-            } else if ("day".equals(timeType) || "".equals(timeType)) {
-                value = showChartsMapper.getTimeValue(dataType, yColumn, tableName, xColumn, timeGroup, xdata, screen);
-            } else if ("quarter".equals(timeType)) {
-                timeGroup = "'YYYY-Q'";
-                value = showChartsMapper.getTimeValue(dataType, yColumn, tableName, xColumn, timeGroup, xdata, screen);
-            } else if ("week".equals(timeType)) {
-                timeGroup = "'YYYY-WW'";
-                value = showChartsMapper.getTimeValue(dataType, yColumn, tableName, xColumn, timeGroup, xdata, screen);
-            } else {
-                value = showChartsMapper.getTimeValue(dataType, yColumn, tableName, xColumn, timeGroup, xdata, screen);
-            }
-        }
-        return value;
-    }
-
-    /**
-     * 无分组时间值(柱状图)
-     * @param yColumn
-     * @param xColumn
-     * @param tableName
-     * @param dataType
-     * @param timeType
-     * @param xAxisData
-     * @param screen
-     * @return
-     */
-    public List<Double> getHistogramTimeValue(String yColumn, String xColumn, String tableName, String dataType, String timeType, List<String> xAxisData, String screen){
-        String timeGroup = "'YYYY-MM-DD'";
-        List<Double> result = new ArrayList<>();
-        Double value = null;
-        //判断时间类型
-        if ("halfYear".equals(timeType)) {
-            for(String xData : xAxisData) {
-                String firstIndex = null;
-                String afterIndex = null;
-                String[] str = xData.split("-");
-                if ("H1".equals(str[1])) {
-                    firstIndex = str[0] + "-01";
-                    afterIndex = str[0] + "-06";
-                } else {
-                    firstIndex = str[0] + "-07";
-                    afterIndex = str[0] + "-12";
-                }
-                value = showChartsMapper.getHistogramTimeValueYear(dataType, yColumn, tableName, xColumn, firstIndex, afterIndex, screen);
-                result.add(value);
-            }
-            return result;
-        } else if ("year".equals(timeType)) {
-            timeGroup = "'YYYY'";
-        } else if ("month".equals(timeType)) {
-            timeGroup = "'YYYY-MM'";
-        } else if ("day".equals(timeType) || "".equals(timeType)) {
-        } else if ("quarter".equals(timeType)) {
-            timeGroup = "'YYYY-Q'";
-        } else if ("week".equals(timeType)) {
-            timeGroup = "'YYYY-WW'";
-        }
-        return showChartsMapper.getHistogramTimeValue(dataType, yColumn, tableName, xColumn, timeGroup, screen);
-    }
-
-    //有分组时间类型值处理
-    public String getGroupTimeConverter(String dataType, String yColumn, String tableName, String groupByName, String timeType,
-                                        String groupsName, String xColumn, String xAxisDataOne, String screen){
-        String timeGroup = "'YYYY-MM-DD'";
-        String value = null;
-        if(groupsName == null || "".equals(groupsName)){
-            value = showChartsMapper.getGroupsValueTimeIsNull(dataType, yColumn, tableName, groupByName, groupsName, xColumn,
-                    timeGroup, xAxisDataOne, screen);
-        }else {
-            if ("year".equals(timeType)) {
-                timeGroup = "'YYYY'";
-                value = showChartsMapper.getGroupsValueTime(dataType, yColumn, tableName, groupByName, groupsName, xColumn,
-                        timeGroup, xAxisDataOne);
-            } else if ("month".equals(timeType)) {
-                timeGroup = "'YYYY-MM'";
-                value = showChartsMapper.getGroupsValueTime(dataType, yColumn, tableName, groupByName, groupsName, xColumn,
-                        timeGroup, xAxisDataOne);
-            } else if ("quarter".equals(timeType)) {
-                timeGroup = "'YYYY-Q'";
-                value = showChartsMapper.getGroupsValueTime(dataType, yColumn, tableName, groupByName, groupsName, xColumn,
-                        timeGroup, xAxisDataOne);
-            } else if ("week".equals(timeType)) {
-                timeGroup = "'YYYY-WW'";
-                value = showChartsMapper.getGroupsValueTime(dataType, yColumn, tableName, groupByName, groupsName, xColumn,
-                        timeGroup, xAxisDataOne);
-            } else if ("day".equals(timeType) || "".equals(timeType)) {
-                value = showChartsMapper.getGroupsValueTime(dataType, yColumn, tableName, groupByName, groupsName, xColumn,
-                        timeGroup, xAxisDataOne);
-            } else if ("halfYear".equals(timeType)) {
-                String[] str = xAxisDataOne.split("-");
-                if ("上半年".equals(str[1])) {
-                    String firstIndex = str[0] + "-01";
-                    String afterIndex = str[0] + "-06";
-                    value = showChartsMapper.getTimeValueHalfYear(dataType, yColumn, tableName, xColumn, firstIndex, afterIndex, groupByName, groupsName, screen);
-                } else {
-                    String firstIndex = str[0] + "-07";
-                    String afterIndex = str[0] + "-12";
-                    value = showChartsMapper.getTimeValueHalfYear(dataType, yColumn, tableName, xColumn, firstIndex, afterIndex, groupByName, groupsName, screen);
-                }
-            } else {
-                value = showChartsMapper.getGroupsValueTime(dataType, yColumn, tableName, groupByName, groupsName, xColumn,
-                        timeGroup, xAxisDataOne);
-            }
-        }
-        return value;
-    }
-
-    /**
-     * 有分组时间类型值处理(柱状图)
-     * @param dataType
-     * @param yColumn
-     * @param tableName
-     * @param groupByName
-     * @param timeType
-     * @param groupsName
-     * @param xColumn
-     * @param xAxisData
-     * @param screen
-     * @return
-     */
-    public List<Double> getHistogramGroupTime(String dataType, String yColumn, String tableName, String groupByName, String timeType,
-                                        String groupsName, String xColumn, List<String> xAxisData, String screen){
-        String timeGroup = "'YYYY-MM-DD'";
-        Double value = null;
-        List<Double> result = new ArrayList<>();
-        if ("halfYear".equals(timeType)) {
-            for (String xAxisDataOne : xAxisData) {
-                String firstIndex = null;
-                String afterIndex = null;
-                String[] str = xAxisDataOne.split("-");
-                if ("上半年".equals(str[1])) {
-                    firstIndex = str[0] + "-01";
-                    afterIndex = str[0] + "-06";
-                } else {
-                    firstIndex = str[0] + "-07";
-                    afterIndex = str[0] + "-12";
-                }
-                value = showChartsMapper.getHistogramTimeValueHalfYear(dataType, yColumn, tableName, xColumn, firstIndex, afterIndex, groupByName, groupsName, screen);
-                result.add(value);
-            }
-            return result;
-        } else if ("year".equals(timeType)) {
-            timeGroup = "'YYYY'";
-        } else if ("month".equals(timeType)) {
-            timeGroup = "'YYYY-MM'";
-        } else if ("quarter".equals(timeType)) {
-            timeGroup = "'YYYY-Q'";
-        } else if ("week".equals(timeType)) {
-            timeGroup = "'YYYY-WW'";
-        }
-        return showChartsMapper.getHistogramTimeValueGroupValuesTime(dataType, yColumn, tableName, groupByName, groupsName, xColumn, timeGroup);
-    }
 
     public static String convertToOracleDateStr(String xColumn, String timeType) {
         if ("year".equals(timeType)){