Pārlūkot izejas kodu

1.修改数据源更新时不重新保存数据源的BUG

heqinwei 7 gadi atpakaļ
vecāks
revīzija
a79262d372

+ 4 - 4
src/main/java/com/dao/ChartsConfigMapper.java

@@ -12,9 +12,9 @@ import java.util.List;
 @Repository
 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) " +
+    @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) " +
             "VALUES (#{chartId},#{chartName},#{chartType}, #{dataId}, #{chartConfig}, #{groupBy}, #{accessAuthority}, #{updateAuthority}, #{chartsGroup}," +
-            "#{describes},#{style}, #{createBy},to_date(#{createDate},'YYYY-MM-DD hh24:mi:ss'))" )
+            "#{describes},#{style}, #{createBy},to_date(#{createDate},'YYYY-MM-DD hh24:mi:ss')), #{chartsOption}" )
 //    @Options(useGeneratedKeys=false, keyProperty = "chartId",keyColumn = "id")
     @SelectKey(before=true,keyProperty="chartId",resultType=Integer.class,statement="SELECT charts_squence.nextval from dual",keyColumn = "id")
     void insertCharts(ChartConfig chartConfig);
@@ -30,13 +30,13 @@ public interface ChartsConfigMapper {
     void deleteCharts(List<Integer> idList);
 
     @Select("select id as chartId, chart_name as chartName, chart_type as chartType, create_by as createBy, create_date as createDate, bc_charts_group as chartsGroup" +
-            ",bc_filters as filters, BD_DATA_ID as dataId, bc_table_name as tableName, CHART_CONFIG as chartConfig, GROUP_BY as groupBy," +
+            ",bc_filters as filters, BD_DATA_ID as dataId, bc_table_name as tableName, CHART_CONFIG as chartConfig, GROUP_BY as groupBy, bc_charts_option as chartsOption, " +
             "ACCESS_AUTHORITY as accessAuthority, UPDATE_AUTHORITY as updateAuthority, CHART_DESCRIBES as describes, BC_CHART_STYLE as style, BC_FILTERS as filters " +
             " from bi_charts where id = #{id}")
     ChartConfig getOneChart(int id);
 
     @Select("select id as chartId, chart_name as chartName, chart_type as chartType, create_by as createBy, create_date as createDate" +
-            ",bc_filters as filters, CHART_DESCRIBES as describes, bc_charts_group as chartsGroup from bi_charts")
+            ",bc_filters as filters, CHART_DESCRIBES as describes, bc_charts_group as chartsGroup, bc_charts_option as chartsOption from bi_charts")
     List<ChartConfigList> getListCharts();
 
     /*

+ 9 - 0
src/main/java/com/model/po/ChartConfig.java

@@ -19,6 +19,7 @@ public class ChartConfig {
     private String filters;          //筛选
     private String createDate; //数据类型
     private String updateDate; //数据类型
+    private String chartOption;      //列表缩略图数据
 
 
     public int getChartsGroup() {
@@ -157,6 +158,14 @@ public class ChartConfig {
         this.tableName = tableName;
     }
 
+    public String getChartOption() {
+        return chartOption;
+    }
+
+    public void setChartOption(String chartOption) {
+        this.chartOption = chartOption;
+    }
+
     @Override
     public String toString() {
         return "ChartConfig{" +

+ 9 - 0
src/main/java/com/model/vo/configVo/ChartConfigInfo.java

@@ -21,6 +21,7 @@ public class ChartConfigInfo {
     private String describes;           //描述
     private String style;                //样式
     private String filters;          //筛选
+    private String chartOption;      //列表缩略图数据
 
 
     public int getChartsGroup() {
@@ -143,6 +144,14 @@ public class ChartConfigInfo {
         this.filters = filters;
     }
 
+    public String getChartOption() {
+        return chartOption;
+    }
+
+    public void setChartOption(String chartOption) {
+        this.chartOption = chartOption;
+    }
+
     @Override
     public String toString() {
         return "ChartConfigInfo{" +