图表返回数据修改

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

@@ -35,11 +35,11 @@ public interface ChartsConfigMapper {
             "</script>")
     void deleteCharts(List<Integer> idList);
 
-    @Select("select bc.id as chartId, chart_name as chartName, 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, bd.DATA_NAME as dataName, bc.demo from bi_charts bc left join BI_DATA_CONNECTORS bd on bc.BD_DATA_ID = bd.id" +
-            "             where bc.id = #{id}")
+    @Select("select bc.id as chartId, chart_name as chartName, 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 " +
+            "where bc.id = #{id, jdbcType=INTEGER}")
     ChartConfig getOneChart(int id);
 
     @Select("select DATA_NAME as name from BI_DATA_CONNECTORS where id = #{id}")
@@ -96,8 +96,8 @@ public interface ChartsConfigMapper {
             "        ) and bs2.BS_DB_ID = bc.BD_DATA_ID" +
             "    ) = 0 then '0'" +
             "    else null end authority, case when bc.BD_DATA_ID not in(select id from bi_data_connectors) then '1' else '0' end dbStatus, bc.id as chartId, bc.chart_name as chartName, bc.chart_type as chartType, bc.create_by as createBy, bc.create_date as createDate" +
-            "    ,bc.bc_filters as filters, bc.CHART_DESCRIBES as describes, bc.bc_charts_group as chartsGroup, bc.bc_charts_option as chartOption ,bc.bd_data_id as dataId,bd.data_name as dataName, bc.create_id as createId, bc.demo  " +
-            "     from bi_charts bc left join bi_data_connectors bd on bc.bd_data_id=bd.id where (bc.create_id = #{id} or bc.id in (" +
+            "    ,bc.bc_filters as filters, bc.CHART_DESCRIBES as describes, bc.bc_charts_group as chartsGroup, bc.bc_charts_option as chartOption ,bc.bd_data_id as dataId,bd.data_name as dataName, bc.create_id as createId, bc.demo, bds.BASES_NAME as dataConnectionName, bds.id as dataConnectionId " +
+            "     from bi_charts bc left join bi_data_connectors bd on bc.bd_data_id=bd.id left join BI_DATABASES bds on bds.id = BD.DB_CONFIG where (bc.create_id = #{id} or bc.id in (" +
             "      select bc_chart_id from bi_chart_strategys where BC_ID in (" +
             "        select BO_ST_ID from BI_CHART_OBJECT where (BO_TYPE='1' and BO_OB_ID = #{id})" +
             "        or (" +

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

@@ -21,9 +21,27 @@ public class ChartConfig {
     private String createDate; //数据类型
     private String updateDate; //数据类型
     private String chartOption;      //列表缩略图数据
-    private String dataName;
+    private String dataName;    //数据源名称
     private String fetchConfig;
     private boolean demo;
+    private String dataConnectionId;
+    private String dataConnectionName;
+
+    public String getDataConnectionId() {
+        return dataConnectionId;
+    }
+
+    public void setDataConnectionId(String dataConnectionId) {
+        this.dataConnectionId = dataConnectionId;
+    }
+
+    public String getDataConnectionName() {
+        return dataConnectionName;
+    }
+
+    public void setDataConnectionName(String dataConnectionName) {
+        this.dataConnectionName = dataConnectionName;
+    }
 
     public boolean isDemo() {
         return demo;

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

@@ -20,6 +20,24 @@ public class ChartConfigList {
     private Date reDate;
     private String dbStatus;
     private boolean demo;
+    private String dataConnectionId;
+    private String dataConnectionName;
+
+    public String getDataConnectionId() {
+        return dataConnectionId;
+    }
+
+    public void setDataConnectionId(String dataConnectionId) {
+        this.dataConnectionId = dataConnectionId;
+    }
+
+    public String getDataConnectionName() {
+        return dataConnectionName;
+    }
+
+    public void setDataConnectionName(String dataConnectionName) {
+        this.dataConnectionName = dataConnectionName;
+    }
 
     public boolean isDemo() {
         return demo;