图表配置增加theme

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

@@ -18,9 +18,9 @@ import java.util.Map;
 public interface ChartsConfigMapper {
 
     @Insert("insert into bi_charts(id,CHART_NAME,CHART_TYPE,BD_DATA_ID,CHART_CONFIG,GROUP_BY,ACCESS_AUTHORITY,UPDATE_AUTHORITY,BC_CHARTS_GROUP,CHART_DESCRIBES,BC_CHART_STYLE," +
-            "create_by,create_date, bc_charts_option, create_id, BC_FETCHCONFIG, from_id, from_data_id,thumbnail) " +
+            "create_by,create_date, bc_charts_option, create_id, BC_FETCHCONFIG, from_id, from_data_id,thumbnail,theme) " +
             "VALUES (#{chartId,jdbcType=INTEGER},#{chartName,jdbcType=VARCHAR},#{chartType,jdbcType=VARCHAR}, #{dataId,jdbcType=INTEGER}, #{chartConfig,jdbcType=VARCHAR}, #{groupBy,jdbcType=VARCHAR}, #{accessAuthority,jdbcType=VARCHAR}, #{updateAuthority,jdbcType=VARCHAR}, #{chartsGroup,jdbcType=INTEGER}," +
-            "#{describes,jdbcType=VARCHAR},#{style,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR},to_date(to_char(sysdate,'yyyy-mm-dd hh24:mi:ss'),'YYYY-MM-DD hh24:mi:ss'),  #{chartOption,jdbcType=VARCHAR}, #{createId,jdbcType=INTEGER}, #{fetchConfig,jdbcType=VARCHAR},#{from_id,jdbcType=INTEGER},#{from_data_id,jdbcType=INTEGER},#{thumbnail,jdbcType=CLOB})" )
+            "#{describes,jdbcType=VARCHAR},#{style,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR},to_date(to_char(sysdate,'yyyy-mm-dd hh24:mi:ss'),'YYYY-MM-DD hh24:mi:ss'),  #{chartOption,jdbcType=VARCHAR}, #{createId,jdbcType=INTEGER}, #{fetchConfig,jdbcType=VARCHAR},#{from_id,jdbcType=INTEGER},#{from_data_id,jdbcType=INTEGER},#{thumbnail,jdbcType=CLOB},#{theme,jdbcType=VARCHAR})" )
     @SelectKey(before=true,keyProperty="chartId",resultType=Integer.class,statement="SELECT bi_charts_sequence.nextval from dual",keyColumn = "id")
     void insertCharts(ChartConfig chartConfig);
 
@@ -30,7 +30,7 @@ public interface ChartsConfigMapper {
     @Delete("delete from bi_charts where id = #{id}")
     void deleteCharts(Long id);
 
-    @Select("select bc.id as chartId, chart_name as chartName, BC_FETCHCONFIG as fetchConfig, chart_type as chartType, bc.create_by as createBy, bc.create_date as createDate, bc_charts_group as chartsGroup " +
+    @Select("select bc.id as chartId,theme, chart_name as chartName, BC_FETCHCONFIG as fetchConfig, chart_type as chartType, bc.create_by as createBy, bc.create_date as createDate, bc_charts_group as chartsGroup " +
             ",bc.bc_filters as filters, bc.BD_DATA_ID as dataId, bc_table_name as tableName, CHART_CONFIG as chartConfig, bc.GROUP_BY as groupBy, bc_charts_option as chartOption, " +
             "bc.ACCESS_AUTHORITY as accessAuthority, UPDATE_AUTHORITY as updateAuthority, CHART_DESCRIBES as describes, BC_CHART_STYLE as style, BC_FILTERS as filters " +
             ",bc.create_id as createId, bdc.DATA_NAME as dataName, bc.demo, BD.BASES_NAME as dataConnectionName, BD.ID as dataConnectionId  from bi_charts bc left join BI_DATA_CONNECTORS bdc on bc.BD_DATA_ID = bdc.id left join BI_DATABASES bd on BD.ID = BDC.DB_CONFIG " +

bi-server/src/main/java/com/usoftchina/bi/server/model/bo/Column.java

@@ -3,9 +3,9 @@ package com.usoftchina.bi.server.model.bo;
 public class Column {
     private String columnName;
     private String columnRename;
-    private String columnType;               //列类型
-    private String showDataType;                 //展示数据类型，x轴只有time类型中有类别，Y轴为sum，max,min等
-    private String showDataLable;               //对应showDataType(中文)
+    private String columnType;                      //列类型
+    private String showDataType;                    //展示数据类型，x轴只有time类型中有类别，Y轴为sum，max,min等
+    private String showDataLable;                   //对应showDataType(中文)
 
     public String getColumnName() {
         return columnName;

bi-server/src/main/java/com/usoftchina/bi/server/model/po/ChartConfig.java

@@ -32,6 +32,16 @@ public class ChartConfig implements Serializable{
     private Integer from_data_id;//复制数据源ID
     private String thumbnail;
 
+    public String getTheme() {
+        return theme;
+    }
+
+    public void setTheme(String theme) {
+        this.theme = theme;
+    }
+
+    private String theme;
+
     public String getThumbnail() {
         return thumbnail;
     }

bi-server/src/main/java/com/usoftchina/bi/server/model/vo/configVo/ChartConfigInfo.java

@@ -25,6 +25,15 @@ public class ChartConfigInfo {
     private String chartOption;      //列表缩略图数据
     private String fetchConfig;         //保存请求数据信息
     private String thumbnail;
+    private String theme;
+
+    public String getTheme() {
+        return theme;
+    }
+
+    public void setTheme(String theme) {
+        this.theme = theme;
+    }
 
     public String getThumbnail() {
         return thumbnail;